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
Sander van der Burg
78d9ee096a
Bumped revision of disnix
...
svn path=/nixpkgs/trunk/; revision=33610
2012-04-05 10:45:53 +00:00
Eelco Dolstra
a78b508f8e
* Latest nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=33599
2012-04-04 22:59:16 +00:00
Sander van der Burg
4df1d122c4
Bumped revision of DisnixOS
...
svn path=/nixpkgs/trunk/; revision=33598
2012-04-04 22:07:31 +00:00
Sander van der Burg
f8af12bfef
Bumped the disnixos revision
...
svn path=/nixpkgs/trunk/; revision=33562
2012-04-04 13:24:11 +00:00
Ludovic Courtès
1a38734345
nixUnstable: Fix cross-compilation native/cross mismatch with bzip2.
...
See <http://hydra.nixos.org/build/2345751 > for the original symptom.
svn path=/nixpkgs/trunk/; revision=33515
2012-04-01 12:08:44 +00:00
Ludovic Courtès
3363c587a4
nixUnstable: Use `postInstall' instead of a custom phase.
...
svn path=/nixpkgs/trunk/; revision=33514
2012-04-01 12:08:39 +00:00
Yury G. Kudryashov
5299c1f6fb
svn merge ^/nixpkgs/trunk
...
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Michael Raskin
a6b434974b
Fixing how bzip2 is passed to nixCustom
...
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
2012-03-30 10:18:25 +00:00
Eelco Dolstra
5fd376da83
* Update nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=33480
2012-03-29 22:10:24 +00:00
Peter Simons
880dcc2c64
Removed myself as a maintainer from Haskell packages that I don't personally use.
...
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.
svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Eelco Dolstra
d1cbcc3971
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=32965
2012-03-09 19:57:33 +00:00
Eelco Dolstra
ed325cd1ae
* We accidentally lost xz support in rpm. This broke RPM builds
...
(http://hydra.nixos.org/build/2230623 ).
svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Eelco Dolstra
38615a16e9
* Fix the checkinstall build on Glibc 2.13.
...
svn path=/nixpkgs/trunk/; revision=32831
2012-03-06 19:06:33 +00:00
Eelco Dolstra
11d1104a88
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Shea Levy
584ccabaac
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
2012-02-25 20:52:15 +00:00
Yury G. Kudryashov
79d0d410cb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Eelco Dolstra
a3da139c73
* Remove ext3cow, it's dead.
...
svn path=/nixpkgs/trunk/; revision=32340
2012-02-16 19:30:41 +00:00
Yury G. Kudryashov
e5027e5b36
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
ac69747aa8
Regenerated all Haskell packages with the latest version of cabal2nix.
...
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
f7886ac78b
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Sander van der Burg
da6e4f95d4
Bumped revision of Disnix activation scripts
...
svn path=/nixpkgs/trunk/; revision=32234
2012-02-12 13:34:06 +00:00
Yury G. Kudryashov
b31c67e24d
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Eelco Dolstra
26bcec3897
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=31880
2012-01-27 13:39:47 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Sander van der Burg
c0be721441
Bumped version of DisnixOS
...
svn path=/nixpkgs/trunk/; revision=31833
2012-01-24 22:28:40 +00:00
Sander van der Burg
c436381674
Bumped versions of disnix and disnixos
...
svn path=/nixpkgs/trunk/; revision=31825
2012-01-24 21:13:42 +00:00
Eelco Dolstra
3ac44bde79
* Disable make check because it fails randomly due to a race.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
2012-01-23 12:34:07 +00:00
Eelco Dolstra
bafc4ff59d
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Eelco Dolstra
b786ce664d
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=31738
2012-01-20 15:26:47 +00:00
Yury G. Kudryashov
84c0185038
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Michael Raskin
faedda84ef
A more correct condition for adding scripts to install
...
svn path=/nixpkgs/trunk/; revision=31638
2012-01-18 17:23:41 +00:00
Eelco Dolstra
48ee2523da
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Eelco Dolstra
bbe40d00f4
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=31619
2012-01-18 12:23:42 +00:00
Yury G. Kudryashov
f77741e018
merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Eelco Dolstra
cddfcd7bcc
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=31043
2011-12-22 12:30:59 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra
3ea1c30846
* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
...
in its interaction with the ‘dontStrip’ attribute.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Eelco Dolstra
8ed604d4b8
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30740
2011-12-05 12:12:20 +00:00
Eelco Dolstra
d10ed1b45b
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30630
2011-11-29 22:56:29 +00:00
Eelco Dolstra
6c02d31c68
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30544
2011-11-23 15:59:09 +00:00
Rob Vermaas
47e2f1c820
update nixUnstable
...
svn path=/nixpkgs/trunk/; revision=30511
2011-11-21 15:41:19 +00:00
Eelco Dolstra
86e8dcc34b
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30460
2011-11-17 12:05:52 +00:00
Shea Levy
10cbd00396
Allow cross-compiling configurations to explicitly give a system string when cross-building nix
...
svn path=/nixpkgs/trunk/; revision=30458
2011-11-16 21:04:02 +00:00
Shea Levy
e895fe5e2f
Use gc, dbi, and dbd-sqlite when cross-building nix
...
The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain
svn path=/nixpkgs/trunk/; revision=30455
2011-11-16 20:21:58 +00:00
Eelco Dolstra
169d5c3214
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30319
2011-11-08 14:18:59 +00:00
Eelco Dolstra
041170f5ec
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30078
2011-10-28 18:06:23 +00:00
Sander van der Burg
631f071df8
Bumped version of disnixos
...
svn path=/nixpkgs/trunk/; revision=29929
2011-10-20 11:07:47 +00:00
Sander van der Burg
4f32c23d86
Bumped some versions of Disnix tools
...
svn path=/nixpkgs/trunk/; revision=29890
2011-10-19 12:24:24 +00:00
Eelco Dolstra
bc1298e651
* Updated nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=29203
2011-09-12 10:02:03 +00:00
Eelco Dolstra
9c9cea35ad
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=29082
2011-09-07 16:14:42 +00:00
Peter Simons
468c5dbc5c
The 'random' library is no longer a core library in GHC 7.2.1. For older
...
versions of the compiler, haskell-packages.nix provides a null attribute.
svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons
dbce2ffd0f
Generated neater meta.description strings.
...
svn path=/nixpkgs/trunk/; revision=28492
2011-08-11 13:03:51 +00:00
Peter Simons
b1ef3e6e36
Last batch of Haskell expression updates.
...
* haskell-mkcabal: updated to version 1.0.0
* haskell-ghc-syb-utils: updated to version 0.2.1.0
* haskell-darcs: updated to version 2.5.2
svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +00:00
Eelco Dolstra
9049a3000d
* Update nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=28403
2011-08-08 19:55:14 +00:00
Eelco Dolstra
4cc476fa52
* Update nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=27782
2011-07-14 17:16:00 +00:00
Sander van der Burg
84be287f40
bumped disnixos
...
svn path=/nixpkgs/trunk/; revision=27673
2011-07-08 14:42:13 +00:00
Ludovic Courtès
e7e3bea7bf
Update Nix unstable.
...
svn path=/nixpkgs/trunk/; revision=27596
2011-07-04 14:44:46 +00:00
Sander van der Burg
24e3b3a58b
Added opkg package
...
svn path=/nixpkgs/trunk/; revision=27554
2011-06-28 09:45:51 +00:00
Sander van der Burg
3496c064d8
Bumped DisnixOS which has no longer issues with the new nixos-build-vms
...
svn path=/nixpkgs/trunk/; revision=27530
2011-06-22 22:27:42 +00:00
Sander van der Burg
e2897bdd52
Bumped versions of disnix and disnixos to deal with recent NixOS changes
...
svn path=/nixpkgs/trunk/; revision=27248
2011-05-13 13:23:13 +00:00
Michael Raskin
3827d28f27
Update nixCustom for all the dependencies of latest SVN Nix
...
svn path=/nixpkgs/trunk/; revision=27084
2011-05-02 08:29:01 +00:00
Eelco Dolstra
03ef305478
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=26851
2011-04-15 13:39:44 +00:00
Andres Löh
3e0ac9b040
Major Haskell packages overhaul.
...
Several changes, some highlights:
* Structure of haskell-packages.nix updated. It's now easier to
select different default versions of packages for different
versions of GHC.
* GHC 7.0.2 is now default.
* Haskell Platform 2011.2.0.0 has been added and is now default.
* Several packages have been updated
(gtk2hs, gitit, xmonad, darcs, ...).
* Some old packages have been removed.
svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00