summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-11-29 15:08:29 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-11-29 15:26:13 +0100
commit79725bb5bc24055c5d8a1fe9f039babc8fea4eb0 (patch)
treedd4451019ecca401e2df08e1c00699d4251bbb4c /pkgs/os-specific
parentab1b0e6359718bd1cf9c799c7a8a85f63ce3f8f9 (diff)
downloadnixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar.gz
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar.bz2
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar.lz
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar.xz
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.tar.zst
nixpkgs-79725bb5bc24055c5d8a1fe9f039babc8fea4eb0.zip
Mark some packages as low priority and disambiguate some others
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/cryptodev/default.nix5
-rw-r--r--pkgs/os-specific/linux/ov511/ov511-2.30-default.nix2
-rw-r--r--pkgs/os-specific/linux/spl/default.nix2
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix3
4 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index c64d47d0d4d..cb797f07aa3 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, stdenv, kernel, onlyHeaders ? false }:
 
 stdenv.mkDerivation rec {
-  name = "cryptodev-linux-1.5";
+  pname = "cryptodev-linux-1.5";
+  name = "${pname}-${kernel.version}";
 
   src = fetchurl {
-    url = "http://download.gna.org/cryptodev-linux/${name}.tar.gz";
+    url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
     sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0";
   };
 
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
index 4b2cd1ed5b2..ec9cda0e4d1 100644
--- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
+++ b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, kernel}:
 
 stdenv.mkDerivation {
-  name = "ov511-2.30";
+  name = "ov511-2.30-${kernel.version}";
   builder = ./ov511-2.30-builder.sh;
   src = fetchurl {
     url = http://nixos.org/tarballs/ov511-2.30.tar.bz2;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 29d56a60e95..c31fc456d44 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
 
 stdenv.mkDerivation {
-  name = "spl-0.6.0-rc12";
+  name = "spl-0.6.0-rc12-${kernel.version}";
   src = fetchurl {
     url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz;
     sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk";
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 19f9a5d40ec..cfe460faaf4 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
 stdenv.mkDerivation {
-  name = "zfs-0.6.0-rc12";
+  name = "zfs-0.6.0-rc12-${kernel.version}";
+
   src = fetchurl {
     url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz;
     sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y";