mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge pull request #278920 from panicgh/libmicrohttpd
[staging] libmicrohttpd: 0.9.74 -> 0.9.77, several unpinnings
This commit is contained in:
commit
7cf969e42d
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd_0_9_74
|
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd
|
||||||
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
|
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
|
||||||
, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo
|
, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo
|
||||||
}:
|
}:
|
||||||
@ -36,7 +36,7 @@ let
|
|||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libgcrypt
|
libgcrypt
|
||||||
libmicrohttpd_0_9_74
|
libmicrohttpd
|
||||||
jansson
|
jansson
|
||||||
libsodium
|
libsodium
|
||||||
postgresql
|
postgresql
|
||||||
|
10
pkgs/development/libraries/libmicrohttpd/0.9.77.nix
Normal file
10
pkgs/development/libraries/libmicrohttpd/0.9.77.nix
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{ callPackage, fetchurl }:
|
||||||
|
|
||||||
|
callPackage ./generic.nix ( rec {
|
||||||
|
version = "0.9.77";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
|
||||||
|
hash = "sha256-nnAjoVESAGDSgGpupME8qZM+zk6s/FyUZNIO3dt2sKA=";
|
||||||
|
};
|
||||||
|
})
|
@ -17,7 +17,7 @@
|
|||||||
, libev
|
, libev
|
||||||
, libgcrypt
|
, libgcrypt
|
||||||
, libinjection
|
, libinjection
|
||||||
, libmicrohttpd_0_9_69
|
, libmicrohttpd
|
||||||
, libuuid
|
, libuuid
|
||||||
, lz4
|
, lz4
|
||||||
, nlohmann_json
|
, nlohmann_json
|
||||||
@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
{ f = "libdaemon"; p = libdaemon; }
|
{ f = "libdaemon"; p = libdaemon; }
|
||||||
{ f = "libev"; p = libev; }
|
{ f = "libev"; p = libev; }
|
||||||
{ f = "libinjection"; p = libinjection; }
|
{ f = "libinjection"; p = libinjection; }
|
||||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; }
|
{ f = "libmicrohttpd"; p = libmicrohttpd; }
|
||||||
{ f = "libssl"; p = openssl; }
|
{ f = "libssl"; p = openssl; }
|
||||||
{ f = "lz4"; p = lz4; }
|
{ f = "lz4"; p = lz4; }
|
||||||
{ f = "pcre"; p = pcre; }
|
{ f = "pcre"; p = pcre; }
|
||||||
|
@ -23087,9 +23087,7 @@ with pkgs;
|
|||||||
libjpeg = libjpeg_turbo;
|
libjpeg = libjpeg_turbo;
|
||||||
libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; };
|
libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; };
|
||||||
|
|
||||||
libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp {
|
libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
|
||||||
libmicrohttpd = libmicrohttpd_0_9_72;
|
|
||||||
};
|
|
||||||
|
|
||||||
libjwt = callPackage ../development/libraries/libjwt { };
|
libjwt = callPackage ../development/libraries/libjwt { };
|
||||||
|
|
||||||
@ -23133,7 +23131,8 @@ with pkgs;
|
|||||||
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
|
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
|
||||||
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
|
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
|
||||||
libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { };
|
libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { };
|
||||||
libmicrohttpd = libmicrohttpd_0_9_71;
|
libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
|
||||||
|
libmicrohttpd = libmicrohttpd_0_9_77;
|
||||||
|
|
||||||
libmikmod = callPackage ../development/libraries/libmikmod {
|
libmikmod = callPackage ../development/libraries/libmikmod {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreAudio;
|
inherit (darwin.apple_sdk.frameworks) CoreAudio;
|
||||||
|
Loading…
Reference in New Issue
Block a user