From 32153b7d595c38b3eee83c058a9d853719223b2e Mon Sep 17 00:00:00 2001 From: 239 <239@pm.me> Date: Thu, 27 May 2021 21:14:18 +0200 Subject: [PATCH 1/5] bitwarden: 1.24.6 -> 1.26.4 (cherry picked from commit cdffcc9048bafc34938235a5b4f166b4f2770a88) --- pkgs/tools/security/bitwarden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 8f264ef942e..daddf9a71b6 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -2,11 +2,11 @@ , autoPatchelfHook , dpkg , fetchurl +, lib , libsecret , makeDesktopItem , makeWrapper , stdenv -, lib , udev , wrapGAppsHook }: @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.24.6"; + x86_64-linux = "1.26.4"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA="; + x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; }.${system} or ""; meta = with lib; { From d08b831a2c91d78883ee36eb4db632fe387ced4a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:18:32 +1000 Subject: [PATCH 2/5] go_1_16: 1.16.4 -> 1.16.5 (cherry picked from commit b3a05d2ccb78b2c64d65f38b3516bfa84348a1b4) --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 219f19ad27c..93c9fa5c778 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.16.4"; + version = "1.16.5"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM="; + sha256 = "sha256-e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA="; }; # perl is used for testing go vet From 035c6b0ee9a0ff5f8bec4227b82fc0fec972b744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Jul 2021 06:08:24 +0200 Subject: [PATCH 3/5] linuxPackages.dpdk: remove alias This was causing evaluation errors in some instances. Fixes https://github.com/NixOS/nixpkgs/issues/127275 (cherry picked from commit 0e82a3269727fb4c8e3d0b71a7048b465b3be8e4) --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c88304589a..9343baee093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20535,8 +20535,6 @@ in dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - dpdk = throw "The dpdk driver has been renamed to dpdk-mods."; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; From 15e437c635c350fb6d32530a28929421df64a932 Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Fri, 2 Jul 2021 23:04:39 +0100 Subject: [PATCH 4/5] tlaToolbox: fix crash on file open dialog (cherry picked from commit 5b69b1f3fe471c2336aa37a7d14ec389ba3f135d) --- .../applications/science/logic/tlaplus/toolbox.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index defe218b119..ef2d97ef6bf 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,5 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib, wrapGAppsHook }: let @@ -25,7 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; phases = [ "installPhase" ]; @@ -36,6 +40,9 @@ in stdenv.mkDerivation rec { cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" + fixupPhase + gappsWrapperArgsHook + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" @@ -52,7 +59,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ + "''${gappsWrapperArgs[@]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" From a115c9d5e09e6164fe19144b22f138991459ce86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Jul 2021 20:26:51 +0200 Subject: [PATCH 5/5] python3Packages.django_3: 3.2.4 -> 3.2.5 (cherry picked from commit d7e08efa95c983ac8b2ab38c7cc6b417f65088e0) --- pkgs/development/python-modules/django/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index ae6187e207e..7ee41a962c7 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.4"; + version = "3.2.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; + sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; }; patches = lib.optional withGdal