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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-22 12:02:28 +00:00 committed by GitHub
commit 2f87f0af26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.9.0"; # Please backport all updates to the stable channel. version = "5.10.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/compilers/openjdk/11.nix
View File

@ -11,8 +11,8 @@
let let
major = "11"; major = "11";
minor = "0"; minor = "0";
update = "10"; update = "12";
build = "9"; build = "7";
openjdk = stdenv.mkDerivation rec { openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless"; pname = "openjdk" + lib.optionalString headless "-headless";
@ -22,7 +22,7 @@ let
owner = "openjdk"; owner = "openjdk";
repo = "jdk${major}u"; repo = "jdk${major}u";
rev = "jdk-${version}"; rev = "jdk-${version}";
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli";
}; };
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];

4
pkgs/servers/nosql/redis/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "redis"; pname = "redis";
version = "6.2.4"; version = "6.2.5";
src = fetchurl { src = fetchurl {
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms"; sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb";
}; };
# Cross-compiling fixes # Cross-compiling fixes

29
pkgs/tools/package-management/nix/default.nix
View File

@ -189,10 +189,25 @@ common =
preBuild = "unset NIX_INDENT_MAKE"; preBuild = "unset NIX_INDENT_MAKE";
}); });
inherit boehmgc;
}; };
}; };
in nix; in nix;
boehmgc_nix = boehmgc.override {
enableLargeConfig = true;
};
boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
patches = (drv.patches or []) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
(fetchpatch {
url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
})
];
});
in rec { in rec {
nix = nixStable; nix = nixStable;
@ -205,22 +220,26 @@ in rec {
sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
}; };
inherit storeDir stateDir confDir boehmgc; boehmgc = boehmgc_nix;
inherit storeDir stateDir confDir;
}); });
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210601_5985b8b"; suffix = "pre20210707_02dd6bb";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
}; };
inherit storeDir stateDir confDir boehmgc; boehmgc = boehmgc_nixUnstable;
inherit storeDir stateDir confDir;
}); });

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

@ -30442,7 +30442,6 @@ in
inherit (callPackage ../tools/package-management/nix { inherit (callPackage ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store"; storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}) })
nix nix