diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-23 23:37:33 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-25 15:48:05 -0500 |
commit | 02297beade7813c6a716e53a5f1373f1123d8753 (patch) | |
tree | 6f6f387ca8b053eb5d2ef6f000e7976672d94478 /pkgs/applications | |
parent | f22a63d533893b88e4b9d61e66291286ffa6ae92 (diff) | |
download | nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar.gz nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar.bz2 nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar.lz nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar.xz nixlib-02297beade7813c6a716e53a5f1373f1123d8753.tar.zst nixlib-02297beade7813c6a716e53a5f1373f1123d8753.zip |
treewide: add version to packages
Lots of packages are missing versions in their name. This adds them where appropriate. These were found with this command: $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$' See issue #41007.
Diffstat (limited to 'pkgs/applications')
12 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index 6ad66a24397f..a89725f6e30f 100644 --- a/pkgs/applications/altcoins/dapp.nix +++ b/pkgs/applications/altcoins/dapp.nix @@ -2,7 +2,7 @@ , seth, git, solc, shellcheck, nodejs, hevm }: stdenv.mkDerivation rec { - name = "dapp"; + name = "dapp-${version}"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index c112384f3d84..d80e8b521822 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -25,7 +25,7 @@ let categories = "Network;"; }; - mist = stdenv.mkDerivation { + mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { inherit name version; src = { @@ -53,10 +53,10 @@ let --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ $out/lib/mist/mist ''; - }; + }); in buildFHSUserEnv { - name = "mist"; + name = "mist-${stdenv.lib.getVersion mist}"; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8af..fd2c0993e756 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -9,7 +9,7 @@ let fileversion = "3_1_0"; in stdenv.mkDerivation rec { - name = "renoise"; + name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}"; buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; src = diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index a27b5a41ac70..f1ec03cb42ee 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -51,7 +51,7 @@ let in stdenv.mkDerivation { - inherit name; + name = "neovim-${stdenv.lib.getVersion neovim}"; buildCommand = let bin="${neovim}/bin/nvim"; in '' if [ ! -x "${bin}" ] then diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 770eb63dc69e..9bec148c7f29 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -9,9 +9,9 @@ let version = "17.12.3"; in mkDerivation rec { - name = "okteta"; + name = "okteta-${version}"; src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; }; meta = { diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index c3085519ec4c..9b738fe3863f 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "gmailieer"; + name = "gmailieer-${version}"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index a56c15bffb2a..15e3d120f20b 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, jre }: -stdenv.mkDerivation { - name = "atlassian-cli"; +stdenv.mkDerivation rec { + name = "atlassian-cli-${version}"; version = "7.8.0"; src = fetchzip { - url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index d8ce1d2c6280..85a4aa02e441 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -57,6 +57,8 @@ let in stdenv.mkDerivation (args // { + name = "${args.name}-${lua.luaversion}"; + inherit preBuild postInstall; inherit luadeps runtimeDeps; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 34ff510e1d8b..2b25d99de2a7 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -19,14 +19,13 @@ in stdenv.mkDerivation rec { major_version = "3"; minor_version = "17"; - version = "v${major_version}.${minor_version}"; - tagged_version = "${major_version}_${minor_version}"; - name = "simgrid"; + version = "${major_version}.${minor_version}"; + name = "simgrid-${version}"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; - rev = "v3_17"; + rev = "v${major_version}_${minor_version}"; sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; #rev = "master"; #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm"; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 7bf83b5621b5..0d7729684163 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { inherit version jarName; - name = "bfg-repo-cleaner"; + name = "bfg-repo-cleaner-${version}"; src = fetchurl { url = mavenUrl; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 0358f850c9ab..ce251e11d328 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -10,7 +10,7 @@ let sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; }; in stdenv.mkDerivation { - name = "gitweb"; + name = "gitweb-${stdenv.lib.getVersion git}"; src = git.gitweb; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index d0376ca7e3de..4d34e08529f7 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -77,7 +77,7 @@ let # Lightworks expects some files in /usr/share/lightworks in buildFHSUserEnv rec { - name = "lightworks"; + name = "lightworks-${stdenv.lib.getVersion lightworks}"; targetPkgs = pkgs: [ lightworks |