diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-05 00:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 00:01:24 +0000 |
| commit | d6a4abcbca4508d183b41b97de6991f3653071c2 (patch) | |
| tree | bc9b6725f8a26e23015ccf9e1c19d45b1c334576 /pkgs/os-specific | |
| parent | 150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c (diff) | |
| parent | 820cc7decc82f2a5841c0a7789a783f7d1f3af61 (diff) | |
| download | nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar.gz nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar.bz2 nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar.lz nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar.xz nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.tar.zst nixpkgs-d6a4abcbca4508d183b41b97de6991f3653071c2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/hid-nintendo/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/system76-power/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/system76/default.nix | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix index 321f96d0d36..e9ee88252ea 100644 --- a/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hid-nintendo"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "nicman23"; repo = "dkms-hid-nintendo"; rev = version; - sha256 = "sha256-IanH3yHfkQhqtKvKD8lh+muc9yX8XJ5bfdy1Or8Vd5g="; + sha256 = "1c262xarslicn9ildndl66sf97i5pzwzra54zh2rp11j7kkvvbyr"; }; setSourceRoot = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Nintendo HID kernel module"; homepage = "https://github.com/nicman23/dkms-hid-nintendo"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.rencire ]; platforms = platforms.linux; broken = versionOlder kernel.version "4.14"; diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix index 38ce20deeab..8ef0e40312f 100644 --- a/pkgs/os-specific/linux/system76-power/default.nix +++ b/pkgs/os-specific/linux/system76-power/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-9ndukZPNB0qtU0hA9eUYpiAC8Tw1eF16W+sVU7XKvsg="; + sha256 = "1zm06ywc3siwh2fpb8p7lp3xqjy4c08j8c8lipd6dyy3bakjh4r1"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoSha256 = "sha256-6mtBY77d2WAwTpj+g0KVpW/n39uanAL2GNHWC8Qbtqk="; + cargoSha256 = "0hda8cxa1pjz90bg215qmx5x2scz9mawq7irxbsw6zmcm7wahlii"; postInstall = '' install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index aa0ff0331ff..7d9cd9bde02 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.12"; - sha256 = "0k098zkxa8spj5rbmzpndxs0cf5i2n22g3ym6kq4j43kvs18x6c7"; + version = "1.0.13"; + sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r"; in stdenv.mkDerivation { name = "system76-module-${version}-${kernel.version}"; |