Commit graph

293 commits

Author SHA1 Message Date
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Eelco Dolstra 82dc43c28b checkinstall: Make installwatch.so work with old Glibcs 2013-03-15 14:04:32 +01:00
Eelco Dolstra 4c67972e9b checkinstall: Support Glibc >= 2.16 2013-03-15 14:04:32 +01:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Eelco Dolstra 1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Danny Wilson 029864b08d Update disnix. 2013-02-28 20:04:03 +01:00
Eelco Dolstra adef38370c nix: Update to 1.5 2013-02-28 01:20:39 +01:00
Eelco Dolstra 5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Eelco Dolstra 26dd2dc425 nixUnstable: Update to 1.4pre3056_79a3ba7 2013-02-11 15:27:18 +01:00
Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Eelco Dolstra abf2ea216a nix: Update to 1.4pre3048_99ed558 2013-01-23 14:16:00 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra bcc0c1dc59 Update nixUnstable 2013-01-20 17:26:07 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Eelco Dolstra e2d6154fff nix: Update to 1.3
Also, use /etc/nix as the default configuration directory.  This way
$NIX_CONF_DIR no longer needs to be set in most cases.
2013-01-05 18:57:33 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Eelco Dolstra 1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Eelco Dolstra 6751fac418 dpkg: Fix caching of architecture name
Our deb-closure script would causes zillions of invocations of "dpkg
--print-architecture", which is rather slow.
2012-12-04 19:54:44 +01:00
Eelco Dolstra 4b48d05c58 Remove nixCustomFun
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
2012-11-29 13:47:40 +01:00
Eelco Dolstra 144b06f107 nix: Update to 1.2pre2980 2012-11-20 12:12:24 +01:00
Peter Simons 0b29bb8fd2 cabal-install: update to version 1.16.0.2 2012-11-09 11:34:11 +01:00
Eelco Dolstra a668efbae2 dpkg: Update to 1.16.9 and fix the Perl-based tools 2012-11-08 16:31:08 +01:00
Peter Simons 1c1f3962d3 cabal-install: update to version 1.16.0.1 2012-10-26 11:04:35 +02:00
Eelco Dolstra ae7044a001 nix: Update to 1.2pre2950_ac238d6 2012-10-16 17:11:54 -04:00
Peter Simons 18ccd4b340 haskell-cabal-install: add version 1.16.0 2012-10-08 10:46:10 +02:00
Michael Raskin 749cc2bf1e Adding Debian devscripts. Mostly for uscan.
I plan to later use uscan for simplifying package updates in some
NixPkgs packages. I have no code for that now.

I added Perl packages File::DesktopEntry and File::BaseDir in a slightly
hascky way because one part of the installation system replaced PREFIX=
with --prefix= and the other complained that it doesn't know what to do
with --prefix=. I checked that a script using File::DesktopEntry works,
and I don't know enough Perl to rewrite buildPerlPackage and hope that
my change is an improvement.

I removed trnaslated manpages because it uses po4a which has some more
Debian-specific dependencies of its own.
2012-10-07 18:02:46 +04:00
Peter Simons 656badd501 cabal-install: install bash-completion instructions 2012-09-25 14:44:39 +02:00
Eelco Dolstra 4606b60dbf nixUnstable: Update to 1.2pre2910_b674665 2012-09-14 12:32:44 -04:00
Eelco Dolstra c557db2d5c nix: Update to 1.2pre2793_d950cfe
Necessary for systemd.
2012-08-21 08:42:44 -04:00
Eelco Dolstra 006e3fbf46 nix: Update to latest unstable version 2012-08-18 17:54:22 -04:00
Peter Simons e198f4b237 Revert "Update RPM to 4.10.0."
Commit e29c284926 breaks some builds, i.e.
<http://hydra.nixos.org/build/2890636>.
2012-07-24 21:57:18 +02:00
Petr Rockai e29c284926 Update RPM to 4.10.0. 2012-07-23 20:30:28 +02:00
Eelco Dolstra d077a98e77 nix: Update to 1.1 2012-07-18 21:50:41 -04:00
Eelco Dolstra eeb09aa1bc nix: Update to 1.1pre2749_ccc52ad 2012-07-18 17:03:55 +02:00
Eelco Dolstra be4a92ad33 nix: Update to 1.1pre2742_a7a43ad 2012-07-16 11:22:28 -04:00
Lluís Batlle i Rossell 8f736be126 disnix-activation-scripts: updating the hash
The url change involved an output hash change. Who could have imagined.
2012-07-12 10:44:54 +02:00
Lluís Batlle i Rossell ab638b9caa disnix-activation-scripts: updating URL
Hydra should have some of those URL permament. Otherwise it will break from
time to time.

mornfall requested this change on irc.
2012-07-12 09:31:00 +02:00
Eelco Dolstra 562259efc1 nix: Update to 1.1pre2723_1aba0bf 2012-07-05 14:05:02 -04:00
Rob Vermaas 484c13cce1 nixUnstable: Updated to 1.1pre2718_8da6772
This version brings better isolation in chroot builds (private network and SysV IPC namespace).
2012-06-25 11:40:17 +02:00
Eelco Dolstra d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413
This version brings systemd support and automatic log compression.
2012-06-22 10:34:08 -04:00
Eelco Dolstra 8a5d68220a * Nix 1.0.
svn path=/nixpkgs/trunk/; revision=34068
2012-05-12 04:20:26 +00:00
Eelco Dolstra 5bdea119d4 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
2012-05-02 13:19:07 +00:00
Eelco Dolstra be901fa8be * Add an installCheckPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
2012-05-01 21:00:30 +00:00
Eelco Dolstra 83f7c6988e * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33954
2012-04-30 15:33:59 +00:00
Eelco Dolstra 12130aea67 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33915
2012-04-25 12:24:16 +00:00
Peter Simons b8a6e4d2dc haskell-cabal-install: added version 0.14.0
svn path=/nixpkgs/trunk/; revision=33819
2012-04-17 17:41:57 +00:00
Eelco Dolstra 62765a92a8 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33817
2012-04-17 15:56:14 +00:00
Eelco Dolstra b3980b78f8 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33628
2012-04-05 16:38:03 +00:00