Merge branch 'staging-next' into staging

- boost 167 removed on staging-next (7915d1e03f93f3072ab397448830d028202e5d3d) × boost attributes are inherited on staging (d20aa4955d4c31d8393753ddf088e1ee82c5d12e)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507977ac67fd5e8547af2d1071c5e0891) × hardened kernels are versioned on staging (a5341beb789c66ed24a11396dda28f2a1303768e) + removed linux_5_12 (e55554491df6e7b789d7f3d6a3b354df3575e1c6)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)

1 files changed, 4 insertions, 3 deletions

diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix
index 7f4273163a3..5915d1439df 100644
--- a/pkgs/tools/compression/lzham/default.nix
+++ b/pkgs/tools/compression/lzham/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake } :
 
-stdenv.mkDerivation {
-  name = "lzham-1.0";
+stdenv.mkDerivation rec {
+  pname = "lzham";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "lzham_codec";
-    rev = "v1_0_release";
+    rev = "v${lib.replaceStrings ["."] ["_"] version}_release";
     sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
   };