diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:00:32 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:03:27 +0100 |
| commit | db0fe5c3eb1d680fb8c635f8e327c412528eba90 (patch) | |
| tree | eb73686ee894bbc2d528824803dacf5bc914f28f /pkgs/desktops/pantheon | |
| parent | 5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (diff) | |
| parent | c127653b72574199463a73a56e1809223eaec0df (diff) | |
| download | nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar.gz nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar.bz2 nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar.lz nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar.xz nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.tar.zst nixpkgs-db0fe5c3eb1d680fb8c635f8e327c412528eba90.zip | |
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that was fixed in 1088f05 & eba8f542.
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 67f4105ff3d..7953105951c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -8,15 +8,18 @@ , plugs # Only useful to disable for development testing. , useDefaultPlugs ? true +, testName ? null }: let selectedPlugs = if plugs == null then switchboardPlugs else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); + + testingName = lib.optionalString (testName != null) "${testName}-"; in stdenv.mkDerivation rec { - name = "${switchboard.name}-with-plugs"; + name = "${testingName}${switchboard.name}-with-plugs"; src = null; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 51c87d5f34b..995577b80d0 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.5"; + version = "unstable-2020-10-01"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-txEjChutJCse/WjgQEfo+MSeeGWdpHUABGCsAqK6i3o="; + rev = "2b59d646ea0d66ae45dafc851374f24dcd98c064"; + sha256 = "sha256-selp70P+7RhbdHF6iiNmcNbMf/c+B9zZ6nlxwRSZGn4="; }; passthru = { |