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.
This commit is contained in:
Matthew Bauer 2018-05-23 23:37:33 -05:00
parent f22a63d533
commit 02297beade
43 changed files with 65 additions and 62 deletions

View File

@ -2,7 +2,7 @@
, seth, git, solc, shellcheck, nodejs, hevm }: , seth, git, solc, shellcheck, nodejs, hevm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dapp"; name = "dapp-${version}";
version = "0.5.7"; version = "0.5.7";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -25,7 +25,7 @@ let
categories = "Network;"; categories = "Network;";
}; };
mist = stdenv.mkDerivation { mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
inherit name version; inherit name version;
src = { src = {
@ -53,10 +53,10 @@ let
--set-rpath "${atomEnv.libPath}:$out/lib/mist" \ --set-rpath "${atomEnv.libPath}:$out/lib/mist" \
$out/lib/mist/mist $out/lib/mist/mist
''; '';
}; });
in in
buildFHSUserEnv { buildFHSUserEnv {
name = "mist"; name = "mist-${stdenv.lib.getVersion mist}";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
mist mist

View File

@ -9,7 +9,7 @@
let fileversion = "3_1_0"; let fileversion = "3_1_0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "renoise"; name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
src = src =

View File

@ -51,7 +51,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; name = "neovim-${stdenv.lib.getVersion neovim}";
buildCommand = let bin="${neovim}/bin/nvim"; in '' buildCommand = let bin="${neovim}/bin/nvim"; in ''
if [ ! -x "${bin}" ] if [ ! -x "${bin}" ]
then then

View File

@ -9,9 +9,9 @@
let let
version = "17.12.3"; version = "17.12.3";
in mkDerivation rec { in mkDerivation rec {
name = "okteta"; name = "okteta-${version}";
src = fetchurl { 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"; sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
}; };
meta = { meta = {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3Packages }: { stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "gmailieer"; name = "gmailieer-${version}";
version = "0.6"; version = "0.6";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -1,9 +1,9 @@
{ stdenv, fetchzip, jre }: { stdenv, fetchzip, jre }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "atlassian-cli"; name = "atlassian-cli-${version}";
version = "7.8.0"; version = "7.8.0";
src = fetchzip { 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"; sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
extraPostFetch = "chmod go-w $out"; extraPostFetch = "chmod go-w $out";
}; };

View File

@ -57,6 +57,8 @@ let
in in
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
name = "${args.name}-${lua.luaversion}";
inherit preBuild postInstall; inherit preBuild postInstall;
inherit luadeps runtimeDeps; inherit luadeps runtimeDeps;

View File

@ -19,14 +19,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
major_version = "3"; major_version = "3";
minor_version = "17"; minor_version = "17";
version = "v${major_version}.${minor_version}"; version = "${major_version}.${minor_version}";
tagged_version = "${major_version}_${minor_version}"; name = "simgrid-${version}";
name = "simgrid";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simgrid"; owner = "simgrid";
repo = "simgrid"; repo = "simgrid";
rev = "v3_17"; rev = "v${major_version}_${minor_version}";
sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
#rev = "master"; #rev = "master";
#sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm"; #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";

View File

@ -8,7 +8,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit version jarName; inherit version jarName;
name = "bfg-repo-cleaner"; name = "bfg-repo-cleaner-${version}";
src = fetchurl { src = fetchurl {
url = mavenUrl; url = mavenUrl;

View File

@ -10,7 +10,7 @@ let
sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "gitweb"; name = "gitweb-${stdenv.lib.getVersion git}";
src = git.gitweb; src = git.gitweb;

View File

@ -77,7 +77,7 @@ let
# Lightworks expects some files in /usr/share/lightworks # Lightworks expects some files in /usr/share/lightworks
in buildFHSUserEnv rec { in buildFHSUserEnv rec {
name = "lightworks"; name = "lightworks-${stdenv.lib.getVersion lightworks}";
targetPkgs = pkgs: [ targetPkgs = pkgs: [
lightworks lightworks

View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.1"; version = "1.2.1";
name = "meslo-lg"; name = "meslo-lg-${version}";
meslo-lg = fetchurl { meslo-lg = fetchurl {
url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }: { stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "adobe-flex-sdk-4.0.0.14159-mpl"; name = "adobe-flex-sdk-4.0.0.14159";
src = fetchurl { src = fetchurl {
# This is the open source distribution # This is the open source distribution

View File

@ -15,7 +15,7 @@ let
''; '';
}; };
emscriptenfastcomp = symlinkJoin { emscriptenfastcomp = symlinkJoin {
name = "emscriptenfastcomp"; name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
preferLocalBuild = false; preferLocalBuild = false;
allowSubstitutes = true; allowSubstitutes = true;

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }: { stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "c-blosc"; name = "c-blosc-${version}";
version = "1.11.3"; version = "1.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "frog"; name = "frog-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "frog-${release.version}.tar.gz"; }; name = "frog-${release.version}.tar.gz"; };

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "frogdata"; name = "frogdata-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "frogdata-${release.version}.tar.gz"; }; name = "frogdata-${release.version}.tar.gz"; };

View File

@ -8,7 +8,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libfolia"; name = "libfolia-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "libfolia-${release.version}.tar.gz"; }; name = "libfolia-${release.version}.tar.gz"; };

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mbt"; name = "mbt-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "mbt-${release.version}.tar.gz"; }; name = "mbt-${release.version}.tar.gz"; };

View File

@ -7,7 +7,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ticcutils"; name = "ticcutils-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "ticcutils-${release.version}.tar.gz"; }; name = "ticcutils-${release.version}.tar.gz"; };

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "timbl"; name = "timbl-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "timbl-${release.version}.tar.gz"; }; name = "timbl-${release.version}.tar.gz"; };

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "timblserver"; name = "timblserver-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "timblserver-${release.version}.tar.gz"; }; name = "timblserver-${release.version}.tar.gz"; };

View File

@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ucto"; name = "ucto-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "ucto-${release.version}.tar.gz"; }; name = "ucto-${release.version}.tar.gz"; };

View File

@ -8,7 +8,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "uctodata"; name = "uctodata-${release.version}";
version = release.version; version = release.version;
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "uctodata-${release.version}.tar.gz"; }; name = "uctodata-${release.version}.tar.gz"; };

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, clang }: { stdenv, fetchFromGitHub, clang }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "blocksruntime"; name = "blocksruntime-20140624";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mackyle"; owner = "mackyle";

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch }: { stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nlojet++"; name = "nlojet++-${version}";
version = "4.1.3"; version = "4.1.3";
src = fetchurl { src = fetchurl {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtinstaller"; name = "qtinstaller-${version}";
propagatedBuildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtdeclarative qttools ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "re2"; name = "re2-${version}";
version = "20140304"; version = "20140304";
src = fetchurl { src = fetchurl {
url = "https://re2.googlecode.com/files/${name}-${version}.tgz"; url = "https://re2.googlecode.com/files/${name}.tgz";
sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb"; sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb";
}; };

View File

@ -45,8 +45,8 @@ let
}; };
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
name = "gn"; name = "gn-${version}";
version = "20180423"; version = "20180423";
sourceRoot = "."; sourceRoot = ".";

View File

@ -2,7 +2,7 @@
, beamPackages, z3, python27 }: , beamPackages, z3, python27 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cuter"; name = "cuter-${version}";
version = "0.1"; version = "0.1";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pcre } : { stdenv, fetchFromGitHub, pcre } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "imatix_gsl"; name = "imatix_gsl-${version}";
version = "4.1"; version = "4.1";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yuicompressor"; name = "yuicompressor-${version}";
version = "2.4.8"; version = "2.4.8";
src = fetchurl { src = fetchurl {
url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar"; url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
}; };
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildCommand = '' buildCommand = ''
mkdir -p $out/{bin,lib} mkdir -p $out/{bin,lib}
ln -s $src $out/lib/yuicompressor.jar ln -s $src $out/lib/yuicompressor.jar
makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \ makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
"-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
''; '';
} }

View File

@ -2,13 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "brlaser"; name = "brlaser-${version}";
version = "4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pdewacht"; owner = "pdewacht";
repo = "brlaser"; repo = "brlaser";
rev = "a52149823373e11f918d9e6a56eda7242935c99b"; rev = "v${version}";
sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6"; sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
}; };
buildInputs = [ cmake zlib cups ]; buildInputs = [ cmake zlib cups ];

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }: { stdenv, fetchurl, perl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "cups-toshiba-estudio"; name = "cups-toshiba-estudio-${version}";
version = "7.51"; version = "7.51";
src = fetchurl { src = fetchurl {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit }: { stdenv, fetchgit }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnome-breeze"; name = "gnome-breeze-20160526";
src = fetchgit { src = fetchgit {
url = "https://github.com/dirruk1/gnome-breeze"; url = "https://github.com/dirruk1/gnome-breeze";
sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";

View File

@ -95,7 +95,7 @@ let
]; ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "xquartz"; name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
buildInputs = [ ruby makeWrapper ]; buildInputs = [ ruby makeWrapper ];

View File

@ -3,11 +3,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpDris2"; pname = "mpDris2";
name = "${pname}-${version}";
version = "0.7"; version = "0.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz"; url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz";
sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21";
}; };

View File

@ -3,10 +3,10 @@
let version = "0.8"; in let version = "0.8"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "buildtorrent"; name = "buildtorrent-${version}";
src = fetchurl { src = fetchurl {
url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz"; url = "http://mathr.co.uk/blog/code/${name}.tar.gz";
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
}; };
@ -16,4 +16,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, dbus, pkgconfig }: { stdenv, fetchFromGitHub, dbus, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "notify-desktop"; name = "notify-desktop-${version}";
version = "0.2.0"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.9"; version = "1.9";
name = "dnstracer"; name = "dnstracer-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz"; url = "http://www.mavetju.org/download/${name}.tar.gz";
sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f";
}; };

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.8"; version = "1.2.8";
name = "zerotierone"; name = "zerotierone-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";

View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, protobuf }: { stdenv, fetchurl, cmake, protobuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jumanpp"; name = "jumanpp-${version}";
version = "2.0.0-rc2"; version = "2.0.0-rc2";
src = fetchurl { src = fetchurl {
url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}-${version}.tar.xz"; url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz";
sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
}; };
buildInputs = [ cmake protobuf ]; buildInputs = [ cmake protobuf ];