diff options
| author | Raghav Sood <r@raghavsood.com> | 2020-11-28 16:18:39 +0000 |
|---|---|---|
| committer | Raghav Sood <r@raghavsood.com> | 2020-11-28 16:32:24 +0000 |
| commit | 55da29694ceb4f88675003f41594289706900065 (patch) | |
| tree | 3dc4f87ae90bfde6554736b0accb6d4fa2c31136 | |
| parent | 00f7db841a144fe187779d542356df0cc691d391 (diff) | |
| download | nixpkgs-55da29694ceb4f88675003f41594289706900065.tar nixpkgs-55da29694ceb4f88675003f41594289706900065.tar.gz nixpkgs-55da29694ceb4f88675003f41594289706900065.tar.bz2 nixpkgs-55da29694ceb4f88675003f41594289706900065.tar.lz nixpkgs-55da29694ceb4f88675003f41594289706900065.tar.xz nixpkgs-55da29694ceb4f88675003f41594289706900065.tar.zst nixpkgs-55da29694ceb4f88675003f41594289706900065.zip | |
libmicrohttpd: support for multiple versions
| -rw-r--r-- | pkgs/development/libraries/libmicrohttpd/0.9.70.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmicrohttpd/0.9.71.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmicrohttpd/generic.nix (renamed from pkgs/development/libraries/libmicrohttpd/default.nix) | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 25 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix new file mode 100644 index 00000000000..1cd04b0b277 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.70"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; + }; +}) diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix new file mode 100644 index 00000000000..74bd6cce42c --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.71"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; + }; +}) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 4a7a228150c..9b817f21b94 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,13 +1,8 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: +{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.71"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; - }; + inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4266d1332e..946628fb5fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14289,7 +14289,9 @@ in libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; + libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; + libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd = libmicrohttpd_0_9_71; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio; |