Merge branch 'master' into staging
This commit is contained in:
commit
c7ca42f44d
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
|
@ -46,7 +46,7 @@ let
|
|||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = "1na163lr0lfii9z1v4q9a3scqlaxg0s561a9nhadbqj03k74dw6s";
|
||||
sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm";
|
||||
}
|
||||
else
|
||||
throw "Slack is not supported on ${stdenv.system}";
|
||||
|
|
|
@ -43,8 +43,9 @@ let
|
|||
// (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; })
|
||||
// (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; });
|
||||
# Get the set of outputs of a derivation
|
||||
getOutputs = value:
|
||||
lib.genAttrs (value.outputs or []) (output: value.${output});
|
||||
getOutputs = value: lib.genAttrs
|
||||
(value.outputs or (lib.optional (value ? out) "out"))
|
||||
(output: value.${output});
|
||||
in
|
||||
# Certain *Cross derivations will fail assertions, but we need their
|
||||
# nativeDrv. We are assuming anything that fails to evaluate is an
|
||||
|
|
Loading…
Reference in a new issue