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: ddd1f857650d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3b66f9b946d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 7, 2017

  1. libgcrypt: 1.7.6 -> 1.7.7 

    See https://lists.gnu.org/archive/html/info-gnu/2017-06/msg00001.html
for release announcement.

(cherry picked from commit b96ba3a)
    @lsix @fpletz
    lsix authored and fpletz committed Jun 7, 2017
    Copy the full SHA
    9823d1d View commit details

  2. openssl: 1.1.0e -> 1.1.0f 

    (cherry picked from commit a64194f)
    @NeQuissimus @fpletz
    NeQuissimus authored and fpletz committed Jun 7, 2017
    Copy the full SHA
    0c8509b View commit details

  3. openssl: 1.0.2k -> 1.0.2l 

    cc #26435

(cherry picked from commit 67c1f0e)
    @NeQuissimus @fpletz
    NeQuissimus authored and fpletz committed Jun 7, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Josh-Cena Joshua Chen
    GPG key ID: C37145B818BDB68F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d3b66f9 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/development/libraries/libgcrypt/default.nix
  2. +4 −4 pkgs/development/libraries/openssl/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libgcrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;

stdenv.mkDerivation rec {
name = "libgcrypt-${version}";
version = "1.7.6";
version = "1.7.7";

src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2";
sha256 = "16ndaj93asw122mwjz172x2ilpm03w1yp5mqcrp3xslk0yx5xf5r";
};

outputs = [ "out" "dev" "info" ];
8 changes: 4 additions & 4 deletions pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -109,13 +109,13 @@ let
in {

openssl_1_0_2 = common {
version = "1.0.2k";
sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";
version = "1.0.2l";
sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf";
};

openssl_1_1_0 = common {
version = "1.1.0e";
sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
version = "1.1.0f";
sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
};

}