diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-25 04:21:07 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-25 15:48:30 -0500 |
commit | 73b11060fc0725fbafac8a8393bc0098f284ef33 (patch) | |
tree | d899c25e6b8f8b740da84f3d3fba94b3c7c5835a | |
parent | d886a1e630d7e14c971b758a4b0472802aea5441 (diff) |
treewide: add more versions to package names
-rw-r--r-- | pkgs/data/fonts/liberationsansnarrow/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/mph-2b-damase/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/quake2/yquake2/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/nitrokey-app/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/nitrokey-app/udev-rules.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberationsansnarrow/default.nix index 6a5e81cd3c75c..0027d44d9db57 100644 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ b/pkgs/data/fonts/liberationsansnarrow/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "liberationsansnarrow"; version = "1.07.3"; - name = "${pname}"; + name = "${pname}-${version}"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 5729561c5809a..692ad63574f42 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchzip}: fetchzip { - name = "MPH-2B-Damase"; + name = "MPH-2B-Damase-2"; url = http://www.wazu.jp/downloads/damase_v.2.zip; diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix index 8cd1044456ac4..9ab086f96a21e 100644 --- a/pkgs/games/quake2/yquake2/wrapper.nix +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation { - inherit name; + name = "${name}-${stdenv.lib.getVersion yquake2}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index c89a8ff914791..720e3fbbc9fb7 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -2,7 +2,7 @@ stdenv.lib.overrideDerivation systemd (p: { version = p.version; - name = "systemd-cryptsetup-generator"; + name = "systemd-cryptsetup-generator-${p.version}"; nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; outputs = [ "out" ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1aced2cd427d1..1396e9b94c9aa 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,7 +1,7 @@ { stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: stdenv.mkDerivation rec { - name = "nitrokey-app"; + name = "nitrokey-app-${version}"; version = "1.2"; # We use fetchgit instead of fetchFromGitHub because of necessary git submodules diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index 99947a0eefef8..33d2dd1c8fa7d 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "nitrokey-udev-rules"; + name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}"; inherit (nitrokey-app) src; |