Merge pull request #41009 from matthewbauer/normalize-names

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

View File

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

View File

@ -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

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:
# 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.
# 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.
let fileversion = "3_1_0";
let
urlVersion = replaceStrings [ "." ] [ "_" ];
in
stdenv.mkDerivation rec {
name = "renoise";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
name = "renoise-${version}";
version = "3.1.0";
src =
if stdenv.system == "x86_64-linux" then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
}
else
releasePath
else if stdenv.system == "i686-linux" then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
}
else
releasePath
else throw "Platform is not supported by Renoise";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
installPhase = ''
cp -r Resources $out
@ -55,6 +61,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Modern tracker-based DAW";
homepage = http://www.renoise.com/;
license = stdenv.lib.licenses.unfree;
license = licenses.unfree;
maintainers = [];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View File

@ -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

View File

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

View File

@ -22,9 +22,8 @@ let
'';
}
// 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 []);
nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
}

View File

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

View File

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

View File

@ -1,14 +1,30 @@
{ 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;
sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
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 = ''
mkdir -p $out/{bin,share/doc/atlassian-cli}
cp -r lib $out/share/java
@ -22,10 +38,12 @@ stdenv.mkDerivation {
chmod +x $out/bin/$tool
done
'';
meta = with stdenv.lib; {
description = "An integrated family of CLIs for various Atlassian applications";
homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
maintainers = [ maintainers.twey ];
license = [ licenses.unfreeRedistributable ];
homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ twey ];
inherit (jre.meta) platforms;
};
}

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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";

View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.2.1";
name = "meslo-lg";
name = "meslo-lg-${version}";
meslo-lg = fetchurl {
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, fetchzip}:
fetchzip {
name = "MPH-2B-Damase";
name = "MPH-2B-Damase-2";
url = http://www.wazu.jp/downloads/damase_v.2.zip;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,27 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "yuicompressor";
name = "yuicompressor-${version}";
version = "2.4.8";
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";
};
buildInputs = [makeWrapper 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;
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
buildCommand = ''
mkdir -p $out/{bin,lib}
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"
'';
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;
};
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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" ];

View File

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

View File

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

View File

@ -3,10 +3,10 @@
let version = "0.8"; in
stdenv.mkDerivation rec {
name = "buildtorrent";
name = "buildtorrent-${version}";
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";
};
@ -16,4 +16,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
};
}
}

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, protobuf }:
stdenv.mkDerivation rec {
name = "jumanpp";
name = "jumanpp-${version}";
version = "2.0.0-rc2";
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";
};
buildInputs = [ cmake protobuf ];

View File

@ -12,9 +12,11 @@
# input, not "procps" which requires Linux.
let
version = "1003.1-2008";
singleBinary = cmd: providers: let
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);
} ''
mkdir -p $out/bin
@ -29,7 +31,7 @@ let
# more is unavailable in darwin
# just use less
more_compat = runCommand "more" {} ''
more_compat = runCommand "more-${version}" {} ''
mkdir -p $out/bin
ln -s ${pkgs.less}/bin/less $out/bin/more
'';
@ -142,7 +144,7 @@ let
};
makeCompat = name': value: buildEnv {
name = name' + "-compat";
name = name' + "-compat-${version}";
paths = value;
};