From 9506c958ee6fd8b37c154bce05fba773a1ffa045 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 16:55:15 +0000 Subject: [PATCH 1/7] python38Packages.celery: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/celery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index a48f8651298a..cd6d21b7c651 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; + sha256 = "8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"; }; # click is only used for the repl, in most cases this shouldn't impact From b346a9ac0519e96f29d0eaf6bd046a86d2da4d33 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 14 Aug 2021 12:21:06 +0300 Subject: [PATCH 2/7] python38Packages.hg-evolve: 10.3.2 -> 10.3.3 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index a0229d1e5012..00791ac642f0 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.2"; + version = "10.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860"; + sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; }; checkInputs = [ From 407f4ad6324897e45aaeb4086dcba12baaa2a849 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:02:09 +0000 Subject: [PATCH 3/7] wob: 0.11 -> 0.12 --- pkgs/tools/wayland/wob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 07fd6f433d73..7f5b7b61c628 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; + sha256 = "sha256-gVQqZbz6ylBBlmhSgyaSEvAyMi48QiuviwZodPVGJxI="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; From dd36a7c487f03d8673bd41bd9fda72d0d8252675 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Aug 2021 12:18:58 +0200 Subject: [PATCH 4/7] chromiumDev: Fix the installation phase --- pkgs/applications/networking/browsers/chromium/browser.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index a86a82fcb5f9..26c2909da54a 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -16,7 +16,8 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/crashpad_handler" "$libExecPath/" + ${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} + ${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader From 759dd3036f98985be36c41e9b85f6dd63db68c7b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Aug 2021 12:26:18 +0200 Subject: [PATCH 5/7] signal-desktop: 5.13.0 -> 5.13.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index df1ea4523517..f5078181ed67 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.13.0"; # Please backport all updates to the stable channel. + version = "5.13.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "10qlavff7q1bdda60q0cia0fzi9y7ysaavrd4y8v0nzbmcz70abr"; + sha256 = "0k3gbs6y19vri5n087wc6fdhydkis3h6rhxd3w1j9rhrb5fxjv3q"; }; nativeBuildInputs = [ From 920d515576fc13294ecf61c8b320d071ff7b3f14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:22:39 +0000 Subject: [PATCH 6/7] gnome.yelp: 40.0 -> 40.3 --- pkgs/desktops/gnome/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index f4df80f5611f..746866fc9c20 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "40.0"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; + sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; From d855d4cccc01fcc7e700fcaff5887463c4b2069b Mon Sep 17 00:00:00 2001 From: David Armstrong Lewis Date: Fri, 13 Aug 2021 13:57:08 -0700 Subject: [PATCH 7/7] cargo-watch: fix build on darwin --- pkgs/development/tools/rust/cargo-watch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index f2d5793f767e..46bd0a591a04 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ece72bc0aa9..dbfbd62173cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12255,7 +12255,7 @@ with pkgs; }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };