diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-01 14:56:58 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-01 14:56:58 -0500 |
| commit | 95579af5ec0a282d8ab2fccfeeff445c2c63c74f (patch) | |
| tree | 57b1bb741d574361f7e467d81f29b0eef0b20ebe /pkgs/os-specific | |
| parent | a486cb1af61dd88579de254637ecd4b4d3fc3173 (diff) | |
| parent | 810dd0f9844e56efec66bfbf82c5e0412acbcba7 (diff) | |
| download | nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar.gz nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar.bz2 nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar.lz nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar.xz nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.tar.zst nixlib-95579af5ec0a282d8ab2fccfeeff445c2c63c74f.zip | |
Merge remote-tracking branch 'origin/staging' into cross-nixos
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/rtlwifi_new/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/tp_smapi/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 4bf3ef82978e..b29b1f639cf7 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtlwifi_new-${version}"; - version = "2017-07-18"; + version = "2018-02-17"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtlwifi_new"; - rev = "a24cb561b4d23187ea103255336daa7ca88791a7"; - sha256 = "1w9rx5wafcp1vc4yh7lj332bv78szl6gmx3ckr8yl6c39alqcv0d"; + rev = "0588ac0cc5f530e7764705416370b70d3c2afedc"; + sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m"; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 9c8bf5597514..25eeb889cc28 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "unstable-2017-12-04"; + version = "0.43"; src = fetchFromGitHub { owner = "evgeni"; repo = "tp_smapi"; - rev = "76c5120f7be4880cf2c6801f872327e4e70c449f"; - sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy"; + rev = "tp-smapi/${version}"; + sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"; name = "tp-smapi-${version}"; }; |