diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 20 insertions, 18 deletions
diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 13990ec49e1..bf2ee04cbce 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation { - name = "ardour3"; + name = "ardour-3.0"; src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 9e4ee01810c..5e3d056f498 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation { - name = "csound5.18.02"; + name = "csound-5.18.02"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6d6234b8d3e..feced2f4538 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -3,10 +3,11 @@ randrproto, xcbutil, xf86vidmodeproto }: stdenv.mkDerivation rec { - name = "redshift"; + pname = "redshift"; version = "1.6"; + name = "${pname}-${version}"; src = fetchurl { - url = "http://launchpad.net/${name}/trunk/${version}/+download/${name}-${version}.tar.bz2"; + url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi"; }; @@ -25,4 +26,4 @@ stdenv.mkDerivation rec { license = "GPLv3+"; homepage = "http://jonls.dk/redshift"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index b2f4217afb5..e65faeac6c2 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -3,7 +3,7 @@ let inherit (composableDerivation) edf wwf; in composableDerivation.composableDerivation {} ( fixed : { - name = "yate2"; + name = "yate-2.2.0_1"; src = fetchurl { url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 2acc0ac8d89..2fb9678b832 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -23,7 +23,7 @@ rec { sha256 = sourceInfo.hash; }; - inherit (sourceInfo) name version; + name = "${sourceInfo.baseName}-${sourceInfo.version}"; inherit buildInputs; /* doConfigure should be removed if not needed */ diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index bbc868910f5..a7c1420cb54 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -2,21 +2,22 @@ # nettools needed for hostname let - name = "Isabelle2012"; + dirname = "Isabelle2013"; theories = ["HOL" "FOL" "ZF"]; in stdenv.mkDerivation { - inherit name theories; + name = "isabelle-2013"; + inherit dirname theories; src = fetchurl { - url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz; - sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq"; + url = http://isabelle.in.tum.de/dist/Isabelle2013_linux.tar.gz; + sha256 = "0l17s41hwzma0q2glpxrzic8i6mqd9b7awlpwhz0jkli7fj6ny7b"; }; buildInputs = [ perl polyml nettools ]; - sourceRoot = name; + sourceRoot = dirname; patches = [ ./settings.patch ]; @@ -40,8 +41,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - mv $TMP/$name $out - cd $out/$name + mv $TMP/$dirname $out + cd $out/$dirname bin/isabelle install -p $out/bin ''; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 6b17d7e8f50..913171827af 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -23,7 +23,7 @@ rec { sha256 = sourceInfo.hash; }; - inherit (sourceInfo) name version; + name = "${sourceInfo.baseName}-${sourceInfo.version}"; inherit buildInputs; phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix index 55eb269f79e..653c5dad03f 100644 --- a/pkgs/applications/science/logic/otter/default.nix +++ b/pkgs/applications/science/logic/otter/default.nix @@ -12,7 +12,7 @@ let ]; in stdenv.mkDerivation { - inherit (s) name version; + name = "${s.name}-${s.version}"; inherit buildInputs; src = fetchurl { inherit (s) url sha256; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 7ac3831f6a5..93b1657aa14 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "prover9"; + name = "prover9-2009-11a"; src = fetchurl { url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index f3fc8c9b6e9..1e372c928f8 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, perl }: stdenv.mkDerivation { - name = "git2cl"; + name = "git2cl-20080827"; src = fetchgit { url = "git://repo.or.cz/git2cl.git"; |