diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 15:14:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 15:14:52 -0400 |
| commit | c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676 (patch) | |
| tree | 18094eb82638260130cd5648745fe28a2b0c3214 | |
| parent | d4c33d5e4ef3bdb3cbbf7a670be44961f8f2b9af (diff) | |
| parent | 45e87854df1f526de4466dd040eb9604eec428d9 (diff) | |
| download | nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar.gz nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar.bz2 nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar.lz nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar.xz nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.tar.zst nixlib-c7ca42f44d97e6b56b52ccc9f16d1ece8cb55676.zip | |
Merge branch 'master' into staging
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/slack/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/splice.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f36f0956f654..93bc6feff3c2 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -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}"; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 43951100de3d..44a46b7b6929 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -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 |