Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sander van der Burg
a6bda1a62a
disnix: bump to version 0.5
2016-01-27 22:32:34 +00:00
Eelco Dolstra
42e53ba62c
nix: 1.10 -> 1.11.1
2016-01-26 17:00:15 +01:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Rob Vermaas
ce2756f701
Fix nixops URL
2016-01-19 10:00:32 +00:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice
33e2c9c29a
dpkg: 1.18.2 -> 1.18.4
2016-01-19 02:04:18 +01:00
Eelco Dolstra
320f1b4e3c
nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c
2016-01-14 13:20:49 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Eelco Dolstra
63bf2a551e
nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4
2015-12-29 17:54:58 +01:00
Domen Kožar
688ff0c0dc
Merge pull request #11992 from dezgeg/pr-update-diffoscope
...
diffoscope: 29 -> 44
2015-12-28 07:46:12 +01:00
Tuomas Tynkkynen
c0aada1e1f
rpm: Hack fix finding libpython when compiling for Python 3
...
Currently, building RPM with `python = python3` causes this:
checking for a Python interpreter with version >= 2.6... python3
checking for python3... /nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library
That comes from this snippet in configure.ac:
AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
WITH_PYTHON_LIB="$ac_res"
],[AC_MSG_ERROR([missing python library])
])
So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
2015-12-28 02:16:23 +02:00
Domen Kožar
0e4e01c7a6
add back nixopsUnstable
2015-12-18 18:51:12 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Eelco Dolstra
2de76b2753
nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932
2015-12-10 15:25:48 +01:00
Pascal Wittmann
fbcf7fcd33
opkg: 0.3.0 -> 0.3.1
2015-12-08 22:54:03 +01:00
Tuomas Tynkkynen
c47910ae4e
nix-prefetch-scripts: Split into multiple derivations
...
This makes it possible to e.g. only install nix-prefetch-git and not the
others.
Closes #7399 .
2015-12-04 14:38:41 +02:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Tobias Geerinckx-Rice
5e63a0b51a
packagekit: fix typo urmpi -> urpmi
2015-11-24 01:40:41 +01:00
Tobias Geerinckx-Rice
8a222f6844
packagekit: convert configureFlags string -> list
2015-11-24 01:40:41 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Matej Cotman
5f5fd03a71
nixui: upgrade to 0.2.1
2015-11-17 12:28:22 +01:00
zimbatm
76bf9c54ea
nix-prefetch-git: add missing coreutils dependency
...
At runtime, `readlink` is a dependency
2015-11-16 11:54:43 +01:00
Eelco Dolstra
58f9896a43
nixUnstable: Update to 1.11pre4273_71039be
2015-10-31 00:22:32 +01:00
Eelco Dolstra
d9d5c98c56
Add option environment.enableDebugInfo
...
This makes the debug outputs of packages that have them available to
programs like gdb.
2015-10-30 15:21:16 +01:00
Tuomas Tynkkynen
c471cb866f
subversion: Split into multiple outputs
2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
bff9b546e4
nix-prefetch-scripts: Reference correct output of curl
2015-10-28 10:17:12 +01:00
Sander van der Burg
644dd145c9
dysnomia: bump to version 0.4.1
2015-10-24 18:23:47 +00:00
Vladimír Čunát
ba9b80c7e0
nspr,nss: split into multiple outputs
...
Hopefully most references are OK.
2015-10-13 20:18:44 +02:00
Eelco Dolstra
1286435499
nixUnstable: Update to 1.11pre4244_133a421
2015-10-09 14:44:27 +02:00
Eelco Dolstra
24483ebe47
nixUnstable: Update to 1.11pre4243_2075ec8
2015-10-08 15:57:29 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Arseniy Seroka
f34aedfbd7
Merge pull request #10161 from dezgeg/pr-update-rpm
...
rpm: 4.11.2 -> 4.12.0
2015-10-01 14:20:43 +03:00
Tuomas Tynkkynen
aa6076f9f5
rpm: 4.11.2 -> 4.12.0
2015-10-01 00:42:36 +03:00
Rob Vermaas
df9fc0f8e0
Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops.
2015-09-30 12:49:11 +00:00
Rob Vermaas
92e98c2b03
nixops: 1.2 -> 1.3
...
(cherry picked from commit a91d4f8a243933181c119ceff434e59eae09be10)
2015-09-29 19:53:47 +00:00
Rob Vermaas
ad4f110b73
Revert "nixops: 1.2 -> 1.3."
...
This reverts commit 43dee76b4b
.
2015-09-28 11:41:10 +00:00
Rob Vermaas
43dee76b4b
nixops: 1.2 -> 1.3.
...
(cherry picked from commit fcaf96b8d40e0c9559523674da03ab47edcfc8fb)
2015-09-28 11:33:58 +00:00
Eelco Dolstra
2a28bc6691
separateDebugInfo: Assert Linux
...
Also remove some unintended setting of separateDebugInfo.
2015-09-22 20:21:10 +02:00
Domen Kožar
6b7c2a47c2
nixopsUnstable: bump
...
(cherry picked from commit 9a401ca40430028310b4bcfa18f5c5b268b54014)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-19 16:37:33 +02:00
Eelco Dolstra
ec5b66eb4a
Enable separate debug info
...
You can now pass
separateDebugInfo = true;
to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
2015-09-17 15:56:33 +02:00
Eric Seidel
1d5a96c3c6
Merge pull request #9309 from acowley/nix-darwin
...
nix: use libsodium on darwin
2015-09-14 15:12:33 -07:00
Eelco Dolstra
a5ea7ddb08
nix-repl: Update
...
Fixes #9710 .
2015-09-08 10:41:13 +02:00
Eelco Dolstra
86eaeb4c0a
Nix: Update to 1.10
2015-09-04 10:40:08 +02:00
Frederik Rietdijk
3e0fab3864
nox: use propagatedBuildInputs instead of pythonPath, fixes #9633
...
This way, when accessing Nox via Python, the dependencies will be
available.
2015-09-03 12:51:47 +02:00
Tobias Geerinckx-Rice
6a02e7201c
packagekit: 1.0.7 -> 1.0.8
2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice
80a882e6cc
dpkg: 1.18.1 -> 1.18.2
2015-08-31 17:17:33 +02:00
Eelco Dolstra
fa67a2d301
nixUnstable: Update
2015-08-24 18:58:45 +02:00