diff options
| author | ajs124 <git@ajs124.de> | 2021-02-13 20:23:53 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-03-03 01:36:22 +0100 |
| commit | 0843d235b9916d868317181440bb420f9963dd1e (patch) | |
| tree | 1ec004cc82d57dda77ace01c27fda8bd87220277 | |
| parent | f5bb0053a62674138b2781b3738e5d0056ac29ec (diff) | |
| download | nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar.gz nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar.bz2 nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar.lz nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar.xz nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.tar.zst nixpkgs-0843d235b9916d868317181440bb420f9963dd1e.zip | |
libproxy: 0.4.15 -> 0.4.17
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index afd1a6365b4..afe5b8dde13 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -3,10 +3,9 @@ , pkg-config , cmake , zlib -, fetchpatch , dbus , networkmanager -, spidermonkey_60 +, spidermonkey_68 , pcre , gsettings-desktop-schemas , glib @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libproxy"; - version = "0.4.15"; + version = "0.4.17"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; + sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r"; }; outputs = [ "out" "dev" "py3" ]; @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_60 + spidermonkey_68 dbus networkmanager ]); @@ -57,38 +56,6 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = [ - # Make build with spidermonkey_60 - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/86.patch"; - sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/87.patch"; - sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/95.patch"; - sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; - }) - (fetchpatch { - name = "CVE-2020-25219.patch"; - url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch"; - sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k"; - }) - (fetchpatch { - name = "CVE-2020-26154.patch"; - url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch"; - sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; - }) - - ] ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; - sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; - }) - ]; - postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" |