diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2017-12-08 10:32:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 10:32:03 +0100 |
| commit | b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c (patch) | |
| tree | 461ff29c695eda2dd2f2c7f895756f86097882ec /pkgs | |
| parent | cdde22aef5c126e4474f3ecb67c32507db5a3138 (diff) | |
| parent | d3e488c3a32f43b03649966121f6b192f0ba65db (diff) | |
| download | nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar.gz nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar.bz2 nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar.lz nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar.xz nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.tar.zst nixpkgs-b00f806ed0be623d1b7a48610b5ce2ff9cf5a71c.zip | |
Merge pull request #32400 from vbgl/ocamlnet-4.1.5
ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/nettle/3.3.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/development/libraries/nettle/3.3.nix b/pkgs/development/libraries/nettle/3.3.nix deleted file mode 100644 index 3923daad6f4..00000000000 --- a/pkgs/development/libraries/nettle/3.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.3"; - - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526"; - }; -}) diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5de3993d961..573de26096c 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle_3_3 }: +, gnutls, nettle }: -# These overrides are just temporary, until ocamlnet supports nettle-3.4. -let gnutls_orig = gnutls; in -let gnutls = gnutls_orig.override { nettle = nettle_3_3; }; - nettle = nettle_3_3; -in - -let version = "4.1.4"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocamlnet-${version}"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; + sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 315837087ed..27bc072bda7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10060,7 +10060,6 @@ with pkgs; }; nettle = callPackage ../development/libraries/nettle { }; - nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { }; newt = callPackage ../development/libraries/newt { }; |