diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 21:53:27 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 21:53:27 +0200 |
commit | 57cfb787ef629d7f62fe4233349a98440d8c95e8 (patch) | |
tree | 5d4b407378be89671a09bc974fce90d6a07f4a6e /pkgs/development | |
parent | 89a34c1cce09cc1ed552a475a8f486e621da00d1 (diff) | |
parent | 7280b5eef94ace2cdac0fb152505e888a48920df (diff) | |
download | nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.gz nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.bz2 nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.lz nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.xz nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.zst nixpkgs-57cfb787ef629d7f62fe4233349a98440d8c95e8.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/libva-utils/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/p11-kit/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/cryptography/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/cryptography/vectors.nix | 2 |
7 files changed, 35 insertions, 36 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c4e6af5d62a..a3fe432017c 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.17"; + version = "3.24.18"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; + sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm"; }; patches = [ @@ -73,21 +73,6 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch - - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/79732da1ed8cb167440fb047c72cfc0d888a187b.patch"; - sha256 = "1ynrx81dkwjfqhvg80q28qbb6jabg4x73fkbrnligzgkzimfjpx3"; - }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8.patch"; - sha256 = "00zrm77qk39p1hgn207az82cgvqiyp6is7dk0ssjxkc34403r78v"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/5a52af20cba76474e631b2a7548963bcad22d66d.patch"; - sha256 = "0sbzzwa0si1w83m5abyf312f4w445wwlms53m5hb7kdgkjbhaa3f"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index a3c7cf05cfb..a4de995ada8 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; + sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -26,10 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "VAAPI tools: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "A collection of utilities and examples for VA-API"; + longDescription = '' + libva-utils is a collection of utilities and examples to exercise VA-API + in accordance with the libva project. + ''; + homepage = "https://github.com/intel/libva-utils"; + changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index be374eaf895..86c6a88b1ef 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.6.1"; + version = "2.7.1"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva"; rev = version; - sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g"; + sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; }; outputs = [ "dev" "out" ]; @@ -38,10 +38,17 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "VAAPI library: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "An implementation for VA-API (Video Acceleration API)"; + longDescription = '' + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library (this package) and + driver-specific acceleration backends for each supported hardware vendor. + ''; + homepage = "https://01.org/linuxmedia/vaapi"; + changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d821a6c8f51..43170f25d38 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -155,8 +155,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1f"; - sha256 = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"; + version = "1.1.1g"; + sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index a13e6746469..204de957f3d 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -26,14 +26,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--without-trust-paths" - ]; # TODO: store trust anchors in a directory common to Nix and NixOS + "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt" + ]; enableParallelBuilding = true; doCheck = !stdenv.isDarwin; - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + installFlags = [ + "exampledir=${placeholder "out"}/etc/pkcs11" + ]; meta = with stdenv.lib; { description = "Library for loading and sharing PKCS#11 modules"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 9b14f4a6fc7..ba807cc99fd 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.9"; # Also update the hash in vectors.nix + version = "2.9.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c"; + sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 6fd8259d78f..520e44cccc7 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc"; + sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci"; }; # No tests included |