JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41009 from matthewbauer/normalize-names

Browse Source 
Add versions to packages missing it
This commit is contained in:
Matthew Justin Bauer 2018-05-25 16:32:48 -05:00 committed by GitHub
commit 98f2f08b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 210 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/altcoins/dapp.nix
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 {

6
pkgs/applications/altcoins/mist.nix
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

26
pkgs/applications/audio/renoise/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: { stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
with stdenv.lib;
# To use the full release version: # To use the full release version:
# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
@ -6,31 +8,35 @@
# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
# Note: Renoise creates an individual build for each license which screws somewhat with the # Note: Renoise creates an individual build for each license which screws somewhat with the
# use of functions like requireFile as the hash will be different for every user. # use of functions like requireFile as the hash will be different for every user.
let fileversion = "3_1_0"; let
urlVersion = replaceStrings [ "." ] [ "_" ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "renoise"; name = "renoise-${version}";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; version = "3.1.0";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
if builtins.isNull releasePath then if builtins.isNull releasePath then
fetchurl { fetchurl {
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2"; url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
} }
else else
releasePath releasePath
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
if builtins.isNull releasePath then if builtins.isNull releasePath then
fetchurl { fetchurl {
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2"; url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
} }
else else
releasePath releasePath
else throw "Platform is not supported by Renoise"; else throw "Platform is not supported by Renoise";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
installPhase = '' installPhase = ''
cp -r Resources $out cp -r Resources $out
@ -55,6 +61,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Modern tracker-based DAW"; description = "Modern tracker-based DAW";
homepage = http://www.renoise.com/; homepage = http://www.renoise.com/;
license = stdenv.lib.licenses.unfree; license = licenses.unfree;
maintainers = [];
platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }

2
pkgs/applications/editors/neovim/wrapper.nix
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

41
pkgs/applications/editors/okteta/default.nix
View File

@ -1,27 +1,34 @@
{ { stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
mkDerivation, lib, fetchurl, , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
extra-cmake-modules, kdoctools, , qca-qt5, shared-mime-info }:
qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared-mime-info
}:
let stdenv.mkDerivation rec {
name = "okteta-${version}";
version = "17.12.3"; version = "17.12.3";
in mkDerivation rec {
name = "okteta";
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 = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg bkchr ];
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared-mime-info ]; buildInputs = [ shared-mime-info ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 kconfig
karchive kcrash kinit
kcmutils
kconfigwidgets
knewstuff
kparts
qca-qt5
karchive
kcrash
]; ];
meta = with stdenv.lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg bkchr ];
platforms = platforms.linux;
};
} }

3
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -22,9 +22,8 @@ let
''; '';
} }
// a // a
# don't call this gimp-* unless you want nix replace gimp by a plugin :-)
// { // {
name = "${a.name}-${gimp.name}-plugin"; name = "gimp-plugin-${a.name}";
buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
} }

6
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -60,8 +60,8 @@ let
# of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
if actualPlugins == [] if actualPlugins == []
then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
else stdenv.mkDerivation { else lib.appendToName "with-plugins "(stdenv.mkDerivation {
name = "${terraform.name}-with-plugins"; inherit (terraform) name;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
@ -72,7 +72,7 @@ let
''; '';
inherit passthru; inherit passthru;
}; });
in withPlugins (_: []); in withPlugins (_: []);
plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };

2
pkgs/applications/networking/gmailieer/default.nix
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 {

36
pkgs/applications/office/atlassian-cli/default.nix
View File

@ -1,14 +1,30 @@
{ stdenv, fetchzip, jre }: { stdenv, fetchzip, jre }:
stdenv.mkDerivation {
name = "atlassian-cli"; stdenv.mkDerivation rec {
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";
}; };
tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv"
"hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; tools = [
"agile"
"bamboo"
"bitbucket"
"confluence"
"csv"
"hipchat"
"jira"
"servicedesk"
"structure"
"tempo"
"trello"
"upm"
];
installPhase = '' installPhase = ''
mkdir -p $out/{bin,share/doc/atlassian-cli} mkdir -p $out/{bin,share/doc/atlassian-cli}
cp -r lib $out/share/java cp -r lib $out/share/java
@ -22,10 +38,12 @@ stdenv.mkDerivation {
chmod +x $out/bin/$tool chmod +x $out/bin/$tool
done done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An integrated family of CLI’s for various Atlassian applications"; description = "An integrated family of CLI’s for various Atlassian applications";
homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
maintainers = [ maintainers.twey ]; license = licenses.unfreeRedistributable;
license = [ licenses.unfreeRedistributable ]; maintainers = with maintainers; [ twey ];
inherit (jre.meta) platforms;
}; };
} }

2
pkgs/applications/science/machine-learning/torch/torch-distro.nix
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;

114
pkgs/applications/science/misc/simgrid/default.nix
View File

@ -10,42 +10,37 @@
, moreTests ? false , moreTests ? false
}: }:
# helpers for options with stdenv.lib;
let optionals = stdenv.lib.optionals;
optionalString = stdenv.lib.optionalString; let
optionOnOff = option: "${if option then "on" else "off"}"; optionOnOff = option: "${if option then "on" else "off"}";
urlVersion = replaceStrings ["."] ["_"];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
major_version = "3"; name = "simgrid-${version}";
minor_version = "17"; version = "3.17";
version = "v${major_version}.${minor_version}";
tagged_version = "${major_version}_${minor_version}";
name = "simgrid";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simgrid"; owner = "simgrid";
repo = "simgrid"; repo = "simgrid";
rev = "v3_17"; rev = "v${urlVersion version}";
sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
#rev = "master";
#sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
}; };
nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind] nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ]
++ optionals fortranSupport [gfortran] ++ optionals fortranSupport [ gfortran ]
++ optionals buildJavaBindings [openjdk] ++ optionals buildJavaBindings [ openjdk ]
++ optionals buildDocumentation [transfig ghostscript doxygen] ++ optionals buildDocumentation [ transfig ghostscript doxygen ]
++ optionals modelCheckingSupport [libunwind libevent]; ++ optionals modelCheckingSupport [ libunwind libevent ];
#buildInputs = optional luaSupport lua5; #buildInputs = optional luaSupport lua5;
preConfigure = # Make it so that libsimgrid.so will be found when running programs from
# Make it so that libsimgrid.so will be found when running programs from # the build dir.
# the build dir. preConfigure = ''
''
export LD_LIBRARY_PATH="$PWD/build/lib" export LD_LIBRARY_PATH="$PWD/build/lib"
''; '';
# Release mode is not supported in SimGrid # Release mode is not supported in SimGrid
cmakeBuildType = "Debug"; cmakeBuildType = "Debug";
@ -60,58 +55,57 @@ stdenv.mkDerivation rec {
# For more information see: # For more information see:
# http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
cmakeFlags= '' cmakeFlags= ''
-Denable_documentation=${optionOnOff buildDocumentation} -Denable_documentation=${optionOnOff buildDocumentation}
-Denable_java=${optionOnOff buildJavaBindings} -Denable_java=${optionOnOff buildJavaBindings}
-Denable_fortran=${optionOnOff fortranSupport} -Denable_fortran=${optionOnOff fortranSupport}
-Denable_model-checking=${optionOnOff modelCheckingSupport} -Denable_model-checking=${optionOnOff modelCheckingSupport}
-Denable_ns3=off -Denable_ns3=off
-Denable_lua=off -Denable_lua=off
-Denable_lib_in_jar=off -Denable_lib_in_jar=off
-Denable_maintainer_mode=off -Denable_maintainer_mode=off
-Denable_mallocators=on -Denable_mallocators=on
-Denable_debug=on -Denable_debug=on
-Denable_smpi=on -Denable_smpi=on
-Denable_smpi_ISP_testsuite=${optionOnOff moreTests} -Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
-Denable_compile_warnings=${optionOnOff debug} -Denable_compile_warnings=${optionOnOff debug}
-Denable_compile_optimizations=${optionOnOff (!debug)} -Denable_compile_optimizations=${optionOnOff (!debug)}
-Denable_lto=${optionOnOff (!debug)} -Denable_lto=${optionOnOff (!debug)}
''; '';
#-Denable_lua=${optionOnOff luaSupport} # -Denable_lua=${optionOnOff luaSupport}
#-Denable_smpi_papi=${optionOnOff moreTests} # -Denable_smpi_papi=${optionOnOff moreTests}
makeFlags = optionalString debug "VERBOSE=1"; makeFlags = optionalString debug "VERBOSE=1";
preBuild = # Some Perl scripts are called to generate test during build which
'' # is before the fixupPhase, so do this manualy here:
# Some perl scripts are called to generate test during build which preBuild = ''
# is before the fixupPhase of nix, so do this manualy here: patchShebangs ..
patchShebangs .. '';
'';
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
ctest --output-on-failure -E smpi-replay-multiple ctest --output-on-failure -E smpi-replay-multiple
runHook postCheck runHook postCheck
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = {
description = "Framework for the simulation of distributed applications"; description = "Framework for the simulation of distributed applications";
longDescription = longDescription = ''
'' SimGrid is a toolkit that provides core functionalities for the SimGrid is a toolkit that provides core functionalities for the
simulation of distributed applications in heterogeneous distributed simulation of distributed applications in heterogeneous distributed
environments. The specific goal of the project is to facilitate environments. The specific goal of the project is to facilitate
research in the area of distributed and parallel application research in the area of distributed and parallel application
scheduling on distributed computing platforms ranging from simple scheduling on distributed computing platforms ranging from simple
network of workstations to Computational Grids. network of workstations to Computational Grids.
''; '';
homepage = http://simgrid.gforge.inria.fr/; homepage = http://simgrid.gforge.inria.fr/;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ mickours ]; maintainers = with maintainers; [ mickours ];
platforms = platforms.x86_64; platforms = platforms.x86_64;
license = licenses.lgpl2Plus;
}; };
} }

2
pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
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;

2
pkgs/applications/version-management/git-and-tools/gitweb/default.nix
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;

2
pkgs/applications/video/lightworks/default.nix
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

2
pkgs/data/fonts/liberationsansnarrow/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liberationsansnarrow"; pname = "liberationsansnarrow";
version = "1.07.3"; version = "1.07.3";
name = "${pname}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";

2
pkgs/data/fonts/meslo-lg/default.nix
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";

2
pkgs/data/fonts/mph-2b-damase/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchzip}: {stdenv, fetchzip}:
fetchzip { fetchzip {
name = "MPH-2B-Damase"; name = "MPH-2B-Damase-2";
url = http://www.wazu.jp/downloads/damase_v.2.zip; url = http://www.wazu.jp/downloads/damase_v.2.zip;

2
pkgs/development/compilers/adobe-flex-sdk/default.nix
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

2
pkgs/development/compilers/emscripten/fastcomp/default.nix
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;

6
pkgs/development/idris-modules/with-packages.nix
View File

@ -4,9 +4,9 @@
let paths = stdenv.lib.closePropagation packages; let paths = stdenv.lib.closePropagation packages;
in in
symlinkJoin { stdenv.lib.appendToName "with-packages" (symlinkJoin {
name = idris.name + "-with-packages"; inherit (idris) name;
paths = paths ++ [idris] ; paths = paths ++ [idris] ;
@ -17,4 +17,4 @@ symlinkJoin {
--set IDRIS_LIBRARY_PATH $out/libs --set IDRIS_LIBRARY_PATH $out/libs
''; '';
} })

2
pkgs/development/libraries/c-blosc/default.nix
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 {

2
pkgs/development/libraries/languagemachines/frog.nix
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"; };

2
pkgs/development/libraries/languagemachines/frogdata.nix
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"; };

2
pkgs/development/libraries/languagemachines/libfolia.nix
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"; };

2
pkgs/development/libraries/languagemachines/mbt.nix
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"; };

2
pkgs/development/libraries/languagemachines/ticcutils.nix
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"; };

2
pkgs/development/libraries/languagemachines/timbl.nix
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"; };

2
pkgs/development/libraries/languagemachines/timblserver.nix
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"; };

2
pkgs/development/libraries/languagemachines/ucto.nix
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"; };

2
pkgs/development/libraries/languagemachines/uctodata.nix
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"; };

2
pkgs/development/libraries/libblocksruntime/default.nix
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";

2
pkgs/development/libraries/physics/nlojet/default.nix
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 {

2
pkgs/development/libraries/qtinstaller/default.nix
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 ];

4
pkgs/development/libraries/re2/default.nix
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";
}; };

4
pkgs/development/tools/build-managers/gn/default.nix
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 = ".";

2
pkgs/development/tools/erlang/cuter/default.nix
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 {

2
pkgs/development/tools/imatix_gsl/default.nix
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 {

26
pkgs/development/tools/yuicompressor/default.nix
View File

@ -1,27 +1,29 @@
{ 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";
}; };
buildInputs = [makeWrapper jre]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
meta = {
description = "A JavaScript and CSS minifier";
maintainers = [ stdenv.lib.maintainers.jwiegley ];
platforms = stdenv.lib.platforms.all;
homepage = http://yui.github.io/yuicompressor/;
license = stdenv.lib.licenses.bsd3;
};
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"
''; '';
meta = with stdenv.lib; {
description = "A JavaScript and CSS minifier";
homepage = http://yui.github.io/yuicompressor/;
license = licenses.bsd3;
maintainers = with maintainers; [ jwiegley ];
platforms = platforms.all;
};
} }

2
pkgs/games/quake2/yquake2/wrapper.nix
View File

@ -12,7 +12,7 @@ let
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit name; name = "${name}-${stdenv.lib.getVersion yquake2}";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

7
pkgs/misc/cups/drivers/brlaser/default.nix
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 ];

4
pkgs/misc/cups/drivers/estudio/default.nix
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 {

6
pkgs/misc/lilypond/with-fonts.nix
View File

@ -5,8 +5,8 @@
, fonts ? openlilylib-fonts.all , fonts ? openlilylib-fonts.all
}: }:
stdenv.mkDerivation { stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation {
name = "${lilypond.name}-with-fonts"; inherit (lilypond) name;
phases = "installPhase"; phases = "installPhase";
buildInputs = fonts; buildInputs = fonts;
nativeBuildInputs = [ lndir ]; nativeBuildInputs = [ lndir ];
@ -32,4 +32,4 @@ stdenv.mkDerivation {
substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out" substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out"
done done
''; '';
} })

2
pkgs/misc/themes/gnome-breeze/default.nix
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";

2
pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
View File

@ -2,7 +2,7 @@
stdenv.lib.overrideDerivation systemd (p: { stdenv.lib.overrideDerivation systemd (p: {
version = p.version; version = p.version;
name = "systemd-cryptsetup-generator"; name = "systemd-cryptsetup-generator-${p.version}";
nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ];
outputs = [ "out" ]; outputs = [ "out" ];

2
pkgs/servers/x11/xquartz/default.nix
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 ];

5
pkgs/tools/audio/mpdris2/default.nix
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";
}; };

6
pkgs/tools/misc/buildtorrent/default.nix
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;
}; };
} }

2
pkgs/tools/misc/notify-desktop/default.nix
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 {

4
pkgs/tools/networking/dnstracer/default.nix
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";
}; };

2
pkgs/tools/networking/zerotierone/default.nix
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";

2
pkgs/tools/security/nitrokey-app/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: { stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nitrokey-app"; name = "nitrokey-app-${version}";
version = "1.2"; version = "1.2";
# We use fetchgit instead of fetchFromGitHub because of necessary git submodules # We use fetchgit instead of fetchFromGitHub because of necessary git submodules

2
pkgs/tools/security/nitrokey-app/udev-rules.nix
View File

@ -3,7 +3,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nitrokey-udev-rules"; name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}";
inherit (nitrokey-app) src; inherit (nitrokey-app) src;

4
pkgs/tools/text/jumanpp/default.nix
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 ];

8
pkgs/top-level/unix-tools.nix
View File

@ -12,9 +12,11 @@
# input, not "procps" which requires Linux. # input, not "procps" which requires Linux.
let let
version = "1003.1-2008";
singleBinary = cmd: providers: let singleBinary = cmd: providers: let
provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
in runCommand cmd { in runCommand "${cmd}-${version}" {
meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
@ -29,7 +31,7 @@ let
# more is unavailable in darwin # more is unavailable in darwin
# just use less # just use less
more_compat = runCommand "more" {} '' more_compat = runCommand "more-${version}" {} ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${pkgs.less}/bin/less $out/bin/more ln -s ${pkgs.less}/bin/less $out/bin/more
''; '';
@ -142,7 +144,7 @@ let
}; };
makeCompat = name': value: buildEnv { makeCompat = name': value: buildEnv {
name = name' + "-compat"; name = name' + "-compat-${version}";
paths = value; paths = value;
}; };