Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dfa6a81a319a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2cd8b7eb6dcc
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 19, 2018

  1. xml-tooling-c: 1.6.0 -> 1.6.3 

    Resolves #33875
    @jammerful @orivej
    jammerful authored and orivej committed Jan 19, 2018

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    4414b1b View commit details

  2. opensaml-cpp: 2.6.0 -> 2.6.1 

    Resolves #33875
    @jammerful @orivej
    jammerful authored and orivej committed Jan 19, 2018
    Copy the full SHA
    edd3180 View commit details

  3. shibboleth-sp: 2.6.0 -> 2.6.1 

    Resolves #33875
    @jammerful @orivej
    jammerful authored and orivej committed Jan 19, 2018
    Copy the full SHA
    a42aef3 View commit details

  4. Merge pull request #34022 from jammerful/master 

    Update Shibboleth Service Provider Packages
    @orivej
    orivej authored Jan 19, 2018
    Copy the full SHA
    2cd8b7e View commit details
6 changes: 3 additions & 3 deletions pkgs/development/libraries/opensaml-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
name = "opensaml-cpp-${version}";
version = "2.6.0";
version = "2.6.1";

src = fetchgit {
url = "https://git.shibboleth.net/git/cpp-opensaml.git";
rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77";
sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr";
rev = version;
sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx";
};

buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/shibboleth-sp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
name = "shibboleth-sp-${version}";
version = "2.6.0";
version = "2.6.1";

src = fetchgit {
url = "https://git.shibboleth.net/git/cpp-sp.git";
rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509";
sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj";
rev = version;
sha256 = "01q13p7gc0janjfml6zs46na8qnval8hc833fk2wrnmi4w9xw4fd";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/xml-tooling-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
name = "xml-tooling-c-${version}";
version = "1.6.0";
version = "1.6.3";

src = fetchgit {
url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
rev = "db08101c3854518a59096be95ed6564838381744";
sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq";
rev = version;
sha256 = "09z2pp3yy3kqx22vwgxyi3s0vlpdv9camw8dpi3q8piff6zxak3q";
};

buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];