darcs2 has a stable version now. This patch reflects this change
svn path=/nixpkgs/trunk/; revision=11624
This commit is contained in:
parent
f875c682d4
commit
23264b9db7
@ -1,10 +1,10 @@
|
|||||||
{stdenv, fetchurl, ghc, zlib, ncurses, curl}:
|
{stdenv, fetchurl, ghc, zlib, ncurses, curl}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "darcs-2.0.0pre3";
|
name = "darcs-2.0.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://darcs.net/darcs-2.0.0pre3.tar.gz;
|
url = http://darcs.net/darcs-2.0.0.tar.gz;
|
||||||
sha256 = "";
|
sha256 = "1admaglbf7i15x9pihncqj5iraqzcw801pf76f0pd2hbc2k0yx7x";
|
||||||
};
|
};
|
||||||
buildInputs = [ghc zlib ncurses curl];
|
buildInputs = [ghc zlib ncurses curl];
|
||||||
|
|
@ -25,7 +25,7 @@ args:
|
|||||||
else builtins.trace "warning, no bleeding edge source info (${fetchUrlInfoFile}) found for ${name}, hash will propably be wrong"
|
else builtins.trace "warning, no bleeding edge source info (${fetchUrlInfoFile}) found for ${name}, hash will propably be wrong"
|
||||||
(let attr = __getAttr name repos;
|
(let attr = __getAttr name repos;
|
||||||
in if (attr.type == "darcs")
|
in if (attr.type == "darcs")
|
||||||
then fetchdarcs_2pre { inherit (attr) url md5; }
|
then fetchdarcs2 { inherit (attr) url md5; }
|
||||||
else throw "TODO") );
|
else throw "TODO") );
|
||||||
|
|
||||||
repos = {
|
repos = {
|
||||||
|
@ -335,9 +335,9 @@ let pkgs = rec {
|
|||||||
|
|
||||||
# only temporarely / don't know yet wether it's save to switch
|
# only temporarely / don't know yet wether it's save to switch
|
||||||
# but I have trouble getting HAppS repos
|
# but I have trouble getting HAppS repos
|
||||||
fetchdarcs_2pre = import ../build-support/fetchdarcs {
|
fetchdarcs2 = import ../build-support/fetchdarcs {
|
||||||
inherit stdenv nix;
|
inherit stdenv nix;
|
||||||
darcs = darcs_2_pre;
|
darcs = darcs2;
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchsvn = import ../build-support/fetchsvn {
|
fetchsvn = import ../build-support/fetchsvn {
|
||||||
@ -1860,7 +1860,7 @@ let pkgs = rec {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
bleedingEdgeRepos = import ../development/misc/bleeding-edge-repos {
|
bleedingEdgeRepos = import ../development/misc/bleeding-edge-repos {
|
||||||
inherit getConfig fetchdarcs_2pre fetchurl;
|
inherit getConfig fetchdarcs2 fetchurl;
|
||||||
};
|
};
|
||||||
|
|
||||||
ecj = import ../development/eclipse/ecj {
|
ecj = import ../development/eclipse/ecj {
|
||||||
@ -5013,7 +5013,7 @@ let pkgs = rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# some speed bottle necks are resolved in this version I think .. perhaps you like to try it?
|
# some speed bottle necks are resolved in this version I think .. perhaps you like to try it?
|
||||||
darcs_2_pre = import ../applications/version-management/darcs_2_pre.nix {
|
darcs2 = import ../applications/version-management/darcs/darcs-2.nix {
|
||||||
inherit fetchurl stdenv zlib ncurses curl ghc;
|
inherit fetchurl stdenv zlib ncurses curl ghc;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -6227,7 +6227,7 @@ let pkgs = rec {
|
|||||||
nixRepositoryManager = import ../tools/package-management/nixRepositoryManager {
|
nixRepositoryManager = import ../tools/package-management/nixRepositoryManager {
|
||||||
inherit fetchurl stdenv bleedingEdgeRepos lib writeText getConfig;
|
inherit fetchurl stdenv bleedingEdgeRepos lib writeText getConfig;
|
||||||
ghc = ghcsAndLibs.ghc68.ghc;
|
ghc = ghcsAndLibs.ghc68.ghc;
|
||||||
fetchdarcs = fetchdarcs_2pre;
|
fetchdarcs = fetchdarcs2;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixStatic = import ../tools/package-management/nix-static {
|
nixStatic = import ../tools/package-management/nix-static {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user