diff options
59 files changed, 131 insertions, 119 deletions
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index d80e8b521822..c38e613fdd4a 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -56,7 +56,7 @@ let }); in buildFHSUserEnv { - name = "mist-${stdenv.lib.getVersion mist}"; + inherit name; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 9fe0820e5d6f..cae40929f95a 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { - name = "infamousPlugins-v${version}"; + name = "infamousPlugins-${version}"; version = "0.2.04"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 26ea46149203..6fa0eb7f8f2b 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "swh-lv2-v${version}"; + name = "swh-lv2-${version}"; version = "1.0.16"; src = fetchurl { diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index fc27e4a00f7e..815af2103d58 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,11 +1,11 @@ { stdenv, zlib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "manuskript"; + pname = "manuskript"; version = "0.3.0"; src = fetchFromGitHub { - repo = name; + repo = pname; owner = "olivierkes"; rev = version; sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7"; @@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ - --replace sample-projects $out/share/${name}/sample-projects + --replace sample-projects $out/share/${pname}/sample-projects ''; buildPhase = ''''; installPhase = '' - mkdir -p $out/share/${name} + mkdir -p $out/share/${pname} cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out - cp -r sample-projects/ $out/share/${name} + cp -r sample-projects/ $out/share/${pname} ''; doCheck = false; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1c99429a7fe2..c4d2be4c740b 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,13 +4,13 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { name = "neovim-remote-${version}"; - version = "v1.8.6"; + version = "1.8.6"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; - rev = version; + rev = "v${version}"; sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l"; }; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 85d9b0546d62..5597bf0d0b3c 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.24"; + version = "0.24"; src = fetchFromGitHub { repo = "wxHexEditor"; owner = "EUA"; - rev = version; + rev = "v${version}"; sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 916f296b3fcc..e20c0a3cbca7 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -8,8 +8,8 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation { - name = "yi-custom"; +stdenv.mkDerivation rec { + name = "yi-custom-${version}"; version = "0.0.0.1"; unpackPhase = "true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 097062a8258a..7980d09fed12 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { - name = "exrtools"; + name = "exrtools-${version}"; version = "0.4"; src = fetchurl { - url = "http://scanline.ca/exrtools/${name}-${version}.tar.gz"; + url = "http://scanline.ca/exrtools/${name}.tar.gz"; sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2b391710907c..b3671ead377a 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "gnuclad"; + name = "gnuclad-${version}"; version = "0.2.4"; src = fetchurl { - url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz"; + url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz"; sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix index 4d13e62bdfec..341cc8ec2d04 100644 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -4,7 +4,7 @@ let py = python27Packages; in stdenv.mkDerivation rec { - name = "cura-lulzbot"; + name = "cura-lulzbot-${version}"; version = "15.02.1-1.03-5064"; src = diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 04f10de3d274..7e5a3a7840d7 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchgit, electron } : stdenv.mkDerivation rec { - name = "nix-tour"; + name = "nix-tour-${version}"; + version = "0.0.1"; buildInputs = [ electron ]; - version = "v0.0.1"; - src = fetchgit { url = "https://github.com/nixcloud/tour_of_nix"; - rev = "refs/tags/${version}"; + rev = "v${version}"; sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; }; @@ -34,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight ]; }; -}
\ No newline at end of file +} diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index e9bb722dcab0..bb3385ad016a 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, libXrandr}: stdenv.mkDerivation rec { - version = "v0.01"; + version = "0.01"; name = "xrandr-invert-colors-${version}"; src = fetchurl { - url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz"; + url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; }; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 8c9f23996ede..12cf108355c4 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -5,7 +5,8 @@ # but Python 2 + packages during runtime. stdenv.mkDerivation rec { - name = "uzbl-v0.9.0"; + name = "uzbl-${version}"; + version = "0.9.0"; meta = with stdenv.lib; { description = "Tiny externally controllable webkit browser"; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz"; + name = "uzbl-v${version}.tar.gz"; + url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz"; sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k"; }; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 5b70d7479269..1e88456e6b24 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "coyim-${version}"; - version = "v0.3.7_1"; + version = "0.3.7_1"; goPackagePath = "github.com/twstrike/coyim"; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 9ff1799ddd2d..987a7aa1be05 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "salut-a-toi"; + name = "salut-a-toi-${version}"; version = "0.6.1"; pname = "sat-${version}"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index dec933489af9..0d9320c12e27 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -117,7 +117,7 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in (writeScriptBin "weechat" '' + in (writeScriptBin weechat.name '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 80115f4f0222..4f028e0053af 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation { - name = "gwyddion"; + name = "gwyddion-${version}"; version = "2.48"; src = fetchurl { url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index b7453ecb01d4..651ad8a2c0f8 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -15,7 +15,7 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation { - name = "ripser"; + name = "ripser-${version}"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 7785116a835d..a329321b70c6 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -28,10 +28,11 @@ let ''; in stdenv.mkDerivation rec { - name = "dvd-slideshow"; + name = "dvd-slideshow-${version}"; version = "0.8.4-2"; + src = fetchurl { - url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz"; sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5"; }; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 4d34e08529f7..e3b94b69179c 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-${stdenv.lib.getVersion lightworks}"; + name = lightworks.name; targetPkgs = pkgs: [ lightworks diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 93e53aa30d13..4635c6d0a4e8 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli"; + name = "eli-${version}"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 01b95adf92f4..36047759baae 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-v${version}"; + name = "red-${version}"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index fcd37239e911..6dc496d0e5aa 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms"; + name = "cppcms-${version}"; version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4"; }; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 07c6e1490e7e..3423b29d76c8 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb"; + name = "cppdb-${version}"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0blr1casmxickic84d |