diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-09 12:01:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 12:01:09 +0000 |
| commit | 20d94e414f823937b7886e50d98b75d40a20c316 (patch) | |
| tree | ed9ad9370405fe78f48bd7a5e7bb9871b136e880 /pkgs/os-specific | |
| parent | dee43206d8f519882f86cafdd7a3f268e36b2d6b (diff) | |
| parent | c29ccca1a3158d7ccd38b0a82ffa3a270ab4875a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/cpuid/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 68c058789bbba..57b03ba8bdb0e 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230228"; + version = "20230406"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM="; + sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA="; }; # For pod2man during the build process. diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 307b34a8b4ece..2264e212ec676 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -122,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.8.13"; + version = "1.8.14"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-UBKFC/hq4kkrjkuHTqIimbR332Vk/X4VQeYROGeAVi8="; + hash = "sha256-xq9J44yhnF3bTutlkOLIMFM96XHMmoCL8i37tSxgPp0="; }; patches = [ |