diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
| commit | 6b8223e634b1326f448b870351ae53a0607aa043 (patch) | |
| tree | cc1754cc8e195a5b84bdadf0d01db22f73da25af /pkgs/os-specific | |
| parent | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff) | |
| parent | 1c3e3e081c22ba4dbf8f1b8cb31a55830596b838 (diff) | |
| download | nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.gz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.bz2 nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.lz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.xz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.zst nixlib-6b8223e634b1326f448b870351ae53a0607aa043.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/yabai/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/input-utils/default.nix | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 0f07fc83e482..b7880a247774 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "16y719384f9bx8zwfsjk5v2nyjyf43m154idsfzxpx0bbl8w5bpj"; + sha256 = "11hdssqi8j39ihflx0bwxrn2zkmpp3rb8za7wwgrq3jm8h3a76c6"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 9fe40cb60f70..87a37feb1cc8 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -247,7 +247,6 @@ stdenv.mkDerivation rec { "fwupd/ata.conf" # "fwupd/daemon.conf" # already created by the module "fwupd/redfish.conf" - "fwupd/remotes.d/dell-esrt.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" @@ -262,6 +261,8 @@ stdenv.mkDerivation rec { "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" + ] ++ stdenv.lib.optionals haveDell [ + "fwupd/remotes.d/dell-esrt.conf" ]; # BlacklistPlugins key in fwupd/daemon.conf diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index 97c7b8b23f2b..0fc2130d102a 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" - "STRIP=-s" + "STRIP=" ]; meta = with stdenv.lib; { |