alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2021-06-03 05:11:32 +02:00 committed by GitHub
parent 1fe3553272 789ffa23af
commit 158955e276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -164,8 +164,8 @@ in rec {
}); });
terraform_0_15 = pluggable (generic { terraform_0_15 = pluggable (generic {
version = "0.15.4"; version = "0.15.5";
sha256 = "14pxnmxy0c7idn8vgns70fxm2835gbz5vd1hmwzvhm394vr62frp"; sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d";
vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0";
patches = [ ./provider-path-0_15.patch ]; patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };

4
pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec { buildKodiBinaryAddon rec {
pname = "inputstream-adaptive"; pname = "inputstream-adaptive";
namespace = "inputstream.adaptive"; namespace = "inputstream.adaptive";
version = "2.6.15"; version = "2.6.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xbmc"; owner = "xbmc";
repo = "inputstream.adaptive"; repo = "inputstream.adaptive";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "sha256-Q4MaHIUM/ixAKyTklwuXCu7t/po+q5ZT+YpYf1n+PkA="; sha256 = "0c9cy284crmki2pmg9gvf443hrg13x1cr4vzd4yjsnpk6xpifad6";
}; };
extraNativeBuildInputs = [ gtest ]; extraNativeBuildInputs = [ gtest ];

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.3"; version = "6.2.4";
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 = "sha256-mO19UytelnH13wglu3Hw83SDoWVGNkBJOExj24dkUSs="; sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms";
}; };
# Cross-compiling fixes # Cross-compiling fixes

21
pkgs/tools/package-management/nix/default.nix
View file

@ -119,9 +119,12 @@ common =
[ "--with-store-dir=${storeDir}" [ "--with-store-dir=${storeDir}"
"--localstatedir=${stateDir}" "--localstatedir=${stateDir}"
"--sysconfdir=${confDir}" "--sysconfdir=${confDir}"
"--disable-init-state"
"--enable-gc" "--enable-gc"
] ]
++ lib.optionals (!is24) [
# option was removed in 2.4
"--disable-init-state"
]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${sh}/bin/busybox" "--with-sandbox-shell=${sh}/bin/busybox"
] ]
@ -196,10 +199,10 @@ in rec {
nixStable = callPackage common (rec { nixStable = callPackage common (rec {
pname = "nix"; pname = "nix";
version = "2.3.11"; version = "2.3.12";
src = fetchurl { src = fetchurl {
url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128"; sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10=";
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
@ -208,23 +211,17 @@ in rec {
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 = "pre20210503_6d2553a"; suffix = "pre20210601_5985b8b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "6d2553ae1496288554e871c530836428f405fd67"; rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d";
sha256 = "sha256-YeSeyOKhBAXHlkzo4mwYr8QIjIP9AgdpJ7YdhqOO2CA="; sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc=";
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
patches = [
(fetchpatch {
url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch";
sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag=";
})
];
}); });
} }