Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Tuomas Tynkkynen
24b046ce05
rpm: Fix python3 detection hack
...
Commit 5dff3c4b68
made rpm use autoreconfHook, so the patch that we
are making to `configure` gets lost when the file is regenerated.
To fix this, just patch the equivalent string in the `configure.ac` file
instead.
Fixes #15287
2016-05-07 17:55:32 +03:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Tobias Geerinckx-Rice
e58cd82e87
dpkg: 1.18.5 -> 1.18.6
2016-05-05 02:16:56 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tobias Geerinckx-Rice
6b6463dbd2
dpkg: 1.18.4 -> 1.18.5
2016-05-03 02:01:12 +02:00
Dan Peebles
5dff3c4b68
rpm: stop build from trying to create /var/tmp, which breaks in sandboxed builds
2016-05-01 18:09:30 +00:00
Dan Peebles
6af34124a4
libhif, rpm-ostree: fix broken meta
...
Forgot to add stdenv.lib to scope!
2016-04-30 16:23:53 +00:00
Dan Peebles
c9be29c5fb
libhif: add meta and add myself as a maintainer
2016-04-30 16:03:47 +00:00
Dan Peebles
df8971ba40
librepo: add meta and add myself as a maintainer
2016-04-30 16:01:26 +00:00
Dan Peebles
48fb16ffbf
createrepo_c: add meta and myself as a maintainer
2016-04-30 02:15:04 +00:00
Dan Peebles
c048f7db7b
rpm: fix state directory in build
...
Prior to this change, it was was defaulting to storing its state in
its store path, which didn't make any sense.
Also added myself as a maintainer
2016-04-30 02:07:50 +00:00
Tobias Geerinckx-Rice
88f9f8b9ce
packagekit: 1.0.8 -> 1.1.0
2016-04-29 21:42:35 +02:00
Dan Peebles
d70752cce9
libhif: init at 87e4cb24
...
The latest released version is too old for my needs, so I'm picking
a git commit that works. I'll update it when they release a new one.
2016-04-29 03:06:02 +00:00
Dan Peebles
fcf37351bd
librepo: init at 1.7.18
2016-04-29 02:46:16 +00:00
Dan Peebles
bd8a1258bf
createrepo_c: init at 0.10.0
2016-04-29 02:40:51 +00:00
Dan Peebles
fbbf910e23
rpm: add lua support and a few propagatedBuildInputs
...
It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.
The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
2016-04-29 02:29:02 +00:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Eelco Dolstra
21a2f2ba3b
nix: Add a "dev" output
...
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Domen Kožar
d7034e6d5f
nixUnstable: bump
...
(cherry picked from commit bb6d3c16d3a851c646c0d1fc6976b546c766a227)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 20:24:43 +01:00
Tobias Geerinckx-Rice
99c4f143d9
debian-devscripts: rename from deprecated debian_devscripts
2016-03-24 20:24:00 +01:00
Ludovic Courtès
5dab370d77
Remove Guix.
2016-03-23 13:33:29 +01:00
Sander van der Burg
7ed3dc6cfc
dysnomia: bump to version 0.5.1
2016-03-20 15:21:42 +00:00
Vladimír Čunát
f9cae4f6dc
fpm: init at 1.4.0
...
/cc #14061 .
2016-03-20 11:56:07 +01:00
Domen Kožar
8e398a88a1
nixUnstable: point to latest 1.12pre
2016-03-17 13:03:36 +00:00
Sander van der Burg
0f46200f26
disnixos: bump to version 0.4.1
2016-03-16 13:27:54 +00:00
Vladimír Čunát
2cbe6bb3f0
nix: split man output from doc
2016-03-08 09:59:31 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Valérian Galliat
269d0864b5
nix-prefetch-scripts: explicitly depend on Nix
...
Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:
Switched to a new branch 'fetchgit'
removing `.git'...
/nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
2016-02-29 18:38:59 -05:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
e674356c46
nix: Fix indentation
2016-02-12 16:10:59 +01:00
Eelco Dolstra
aa31d99d29
nix: 1.11.1 -> 1.11.2
2016-02-12 15:20:27 +01:00
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