colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-14 12:01:14 +00:00 committed by GitHub
commit acbd974996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -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

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -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 = [

4
pkgs/desktops/gnome/core/yelp/default.nix
View File

@ -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 ];

4
pkgs/development/python-modules/celery/default.nix
View File

@ -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

4
pkgs/development/python-modules/hg-evolve/default.nix
View File

@ -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 = [

4
pkgs/development/tools/rust/cargo-watch/default.nix
View File

@ -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`)

4
pkgs/tools/wayland/wob/default.nix
View File

@ -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 ];

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };