public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-10 18:23:23 +00:00
committed by GitHub
parent ba1fa5847e 6a3a358b0d
commit a3b4d14288
57 changed files with 574 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
version = "1.0.20";
version = "1.0.24";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = version;
sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0";
sha256 = "sha256-Poe18HKEQusvN3WF4ZAV1WCvU8/3HKpHEqDsfDO62V0=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--workspace" ];
cargoSha256 = "1ivn3i6kpnswiipqw5s67p6gsz3y6an0ahf6vwz7dlw2xaha0xbx";
cargoSha256 = "sha256-sKC0jfpy7mxGwO+mKU3W5e9HsJx+HQNzqq78YViNJcs=";
# Purposefully don't install systemd unit file, that's for NixOS
postInstall = ''
pkgs/os-specific/linux/zfs/default.nix
+4 -4
View File
@@ -200,9 +200,9 @@ in {
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12";
# this package should point to the latest release.
version = "2.0.3";
version = "2.0.4";
sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo=";
};
zfsUnstable = common {
@@ -210,9 +210,9 @@ in {
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12";
# this package should point to a version / git revision compatible with the latest kernel release
version = "2.0.3";
version = "2.0.4";
sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo=";
isUnstable = true;
};