Commit Graph

2095 Commits

Author SHA1 Message Date
Dan Peebles
4f7ea068b4 rpm-ostree: bump version of libglnx to fix environment passing bug
See https://github.com/projectatomic/rpm-ostree/issues/277 for more
details.
2016-05-04 19:04:03 +00:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
zimbatm
5901a8c63b autojump: include a way to find the share dir
autojump-share is a new script that gives you the path to autojump's
shared directory. It can then be used in the various shell's rc files to
find and source the autojump integration. Eg:

    source "$(autojump-share)/autojump.bash"

Fixes #3239
2016-05-04 11:08:41 +01:00
Alexander Ried
5c295a4925 libcap: Replace occurences of libcap_progs with libcap.out 2016-05-03 19:52:53 +02:00
Sebastian Gniazdowski
7c0063bf15 zsh-navigation-tools: 1.4 -> 2.0.7 2016-05-03 14:46:43 +00:00
Franz Pletz
5ca8694095 debootstrap: 1.0.68 -> 1.0.80 2016-05-03 16:15:20 +02:00
Franz Pletz
9da6390bae ethtool: 4.0 -> 4.5 2016-05-03 16:15:20 +02:00
Franz Pletz
18964796e6 mc: 4.8.12 -> 4.8.16 2016-05-03 16:15:20 +02:00
Franz Pletz
117920233f flashrom: 0.9.7 -> 0.9.9 2016-05-03 16:15:20 +02:00
Sebastian Gniazdowski
8ebae7fc3c zsh-navigation-tools: install all files 2016-05-03 13:44:36 +00:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03: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
befc866714 rpm-ostree: add meta and add myself as a maintainer 2016-04-30 16:06:17 +00:00
Nikolay Amiantov
05ea80af1f sdl-jstest: 20150806 -> 2016-03-29 2016-04-30 03:12:34 +03:00
Nikolay Amiantov
626b1c4101 grub4dos: 0.4.6a-2015-12-31 -> 0.4.6a-2016-04-26 2016-04-30 03:12:34 +03:00
Nikolay Amiantov
938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Joachim Fasting
4fb9b060c3 Merge pull request #15063 from mayflower/upstream/graylog
Add graylog package and service
2016-04-29 15:32:53 +02:00
Dan Peebles
203fee0618 rpm-ostree: init at 2016.1 2016-04-29 03:20:04 +00:00
Tristan Helmich
49b947635f graylog: init at 2.0.0 2016-04-28 22:11:16 +02:00
Alexander Ried
2e320a58b3 diffoscope: 49 -> 52 2016-04-28 16:21:23 +02:00
Tuomas Tynkkynen
d27caa486b filebench: Init at 1.4.9.1 2016-04-28 03:33:39 +03:00
Tuomas Tynkkynen
d5a7032042 fsmark: Init at 3.3 2016-04-28 03:33:39 +03:00
Joachim Fasting
4c0f379fc9 Merge pull request #14990 from cstrahan/dbusmap
dbus-map: init 2015-05-28
2016-04-27 19:40:00 +02:00
Tobias Geerinckx-Rice
ed9e0b960e
gparted: 0.25.0 -> 0.26.0
Key changes include:
- Implement read-only LUKS support
- Add progress bars to NTFS, XFS, and EXT2/3/4 file system copy methods
- Fix operations sometimes fail with: No such file or directory

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.0/gparted-0.26.0-README.md/view
2016-04-27 16:55:36 +02:00
Vladimír Čunát
99b91020d6 xvfb-run: fix missing tools
- it was failing to find awk and mktemp
- use `makeBinPath` for better robustness wrt. multiple outputs
2016-04-27 12:31:01 +02:00
Alexander Ried
272c87fbdf antimicro 2.18 -> 2.18.2
The original repo was deleted by it's author. I took the one with
the most recent releases I could find.
See:
https://github.com/Ryochan7/antimicro-packaging/issues/1#issuecomment-205949365
2016-04-26 10:58:33 +02:00
Dan Peebles
3a542c7374 ostree: v2015.3 -> v2016.5 2016-04-26 00:50:31 +00:00
Charles Strahan
d8faa585b0 dbus-map: init 2015-05-28 2016-04-25 17:52:24 -04:00
Rafał Łasocha
bea31c31f2 pws: Init at 1.0.6 2016-04-25 01:55:07 +02:00
Tobias Geerinckx-Rice
fe5f52599b
debian-devscripts: 2.16.3 -> 2.16.4 2016-04-24 22:03:55 +02:00
Frederik Rietdijk
92e87894c6 Merge pull request #14940 from DamienCassou/vdirsyncher-0.10
vdirsyncer: 0.9.3 -> 0.10.0
2016-04-23 23:03:23 +02:00
Damien Cassou
c397348538 vdirsyncer: 0.9.3 -> 0.10.0
lxml is not needed anymore. I added myself to the maintainers. I didn't
check why pypi is providing this complicated URL now.
2016-04-23 22:54:28 +02:00
Tuomas Tynkkynen
bd18cc3cdc Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Pascal Wittmann
b56dc1c4b0 entr: 3.4 -> 3.5 2016-04-22 21:05:38 +02:00
Tobias Geerinckx-Rice
8db6b7615a
debian-devscripts: 2.16.2 -> 2.16.3 2016-04-22 17:11:20 +02:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Tuomas Tynkkynen
01854a850a treewide: Replace module_init_tools -> kmod
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Nikolay Amiantov
8ab48c32e7 yubikey-personalization-gui: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Nikolay Amiantov
ea56bb7331 rockbox-utility: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Tadas Barzdzius
94280ecf90 exa: 2016-04-11 -> 2016-04-20 2016-04-20 12:41:37 +03:00
Tadas Barzdzius
0649edd432 Heatseeker: 1.3.0 -> 1.4.0 2016-04-20 12:40:59 +03:00
zimbatm
961ad19660 Merge pull request #14408 from retrry/rustc-update
rustc: 1.6.0 -> 1.7.0. Enable Darwin platform.
2016-04-18 20:09:44 +01:00
Tuomas Tynkkynen
87cb1b0ca1 treewide: Mass replace 'libxslt}/bin' to refer to the correct outputs 2016-04-14 08:32:20 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Tadas Barzdzius
1f3e2ced4a exa: 2016-03-22 -> 2016-04-11 2016-04-13 18:11:52 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Maarten Hoogendoorn
ec098aad41 mcrl2: 2009.01 -> 2014.09 2016-04-12 22:16:30 +02:00
Franz Pletz
23ae6a10a9 wv: 1.2.4 -> 1.2.9 2016-04-12 04:28:50 +02:00
Franz Pletz
e32ed2f78e tmux: 2.1 -> 2.2 2016-04-12 04:26:24 +02:00
joachifm
9bd758ab42 Merge pull request #14558 from joachifm/youtube-dl
youtube-dl: 2016.02.13 -> 2016.04.06
2016-04-10 12:48:15 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Joachim Fasting
aec8daed86 duc: fix meta.license 2016-04-09 21:35:29 +02:00
Luca Bruno
73bf336934 duc: init at 1.3.3 2016-04-09 20:08:38 +02:00
Joachim Fasting
6111d5b480 youtube-dl: 2016.02.13 -> 2016.04.06 2016-04-09 19:47:42 +02:00
Al Zohali
85129e6c60 dumptorrent: init at 1.2 2016-04-09 19:31:56 +03:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Tobias Geerinckx-Rice
eec040009d
tldr: 1.1.0 -> 1.2.0 2016-04-06 19:49:19 +02:00
Robert Helgesson
b375260add svtplay-dl: 0.30.2016.02.08 -> 1.0 2016-04-03 16:39:30 +02:00
Tobias Geerinckx-Rice
838217332b bandwidth: 1.1b -> 1.2.0 2016-04-02 02:55:23 +02:00
Patrick Mahoney
fc1f5d2cf1 set target for darwin binary compat in skarnet.org packages
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
2016-04-01 10:39:37 -05:00
Patrick Mahoney
e0c225857f update skarnet.org packages
skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
2016-04-01 10:38:58 -05: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
96be420e44 move growpart out of nixos into cloud-init package 2016-03-30 14:40:24 +01:00
Thomas Tuegel
4d7e3be8bb calamares: mark broken
(cherry picked from commit b8db5897c757a9a828e4bc64786ac508e8a950bb)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 21:44:21 +01:00
zimbatm
ea7068f44c direnv: 2.7.0 -> 2.8.0 2016-03-27 15:37:07 +01:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Peter Hoeg
6911785c03 togglesg-download: init at 2016-02-08 2016-03-27 15:08:23 +08:00
Joachim Fasting
cb896a1e7f yad: ad-hoc patching to fix undefined reference errors 2016-03-26 16:55:00 +01:00
Joachim Fasting
0b060bdf68 yad: fix gcc5 build
https://hydra.nixos.org/build/33612450/nixlog/1/raw
2016-03-26 16:55:00 +01:00
Pascal Wittmann
0bce9599e7 cpuminer: 2.4.3 -> 2.4.4 2016-03-25 17:22:11 +01:00
Marius Bakke
b8dc71ef8a scanmem: 0.15.2 -> 0.15.6 2016-03-25 03:05:17 +00:00
Arseniy Seroka
167ef887f7 Merge pull request #14179 from DamienCassou/vdirsyncer-0.9.3
vdirsyncer: 0.9.2 -> 0.9.3
2016-03-24 23:12:46 +03:00
Damien Cassou
f965c8f207 vdirsyncer: 0.9.2 -> 0.9.3
Regarding homepage update, changelog says "Moved to pimutils
organization on GitHub. Old links should redirect, but be aware of
client software that doesn't properly handle redirects."
2016-03-24 18:50:35 +01:00
Pascal Wittmann
f942b09bf9 abduco: 0.5 -> 0.6 2016-03-24 15:52:35 +01:00
Pascal Wittmann
92d59b37cb parallel: 20160222 -> 20160322 2016-03-24 00:07:40 +01:00
Michael Fellinger
6da0a54d2b zsh-navigation-tools: include znt-* functions 2016-03-23 10:05:52 +01:00
Nikolay Amiantov
ad1f158111 Merge pull request #14088 from jgillich/rust-head
Rust updates
2016-03-23 00:10:07 +04:00
Jakob Gillich
74ef06dab6 exa: 2016-02-15 -> 2016-03-22 2016-03-22 15:54:23 -04:00
Marius Bakke
23befca742 yubikey-personalization-gui: 3.1.21 -> 3.1.24 2016-03-20 18:49:05 +00:00
Marius Bakke
451a7ec4a9 yubikey-personalization: 1.17.2 -> 1.17.3 2016-03-20 18:48:49 +00:00
Marius Bakke
1489af2153 yubico-piv-tool: 1.0.2 -> 1.3.0 2016-03-20 18:42:23 +00:00
Pascal Wittmann
88a62b3aea datamash: 1.0.6 -> 1.0.7 2016-03-20 13:23:31 +01:00
Pascal Wittmann
6ea546e3b9 entr: 3.2 -> 3.4 2016-03-20 13:23:31 +01:00
Tobias Geerinckx-Rice
ec8484734b debian-devscripts: 2.16.1 -> 2.16.2 2016-03-20 01:22:13 +01:00
Peter Hoeg
c6a717d212 dynamic-colors: 2013-12-28 -> 0.2.1 2016-03-19 23:45:28 +00:00
Joachim Fasting
8dfb8d06f0 ipxe: fix gcc5 build
gcc5 enables additional warnings, causing the build to fail with
-Werror.  The build could be fixed by specifically disabling errors
for `discarded-array-qualifiers` and `logical-not-parentheses` warnings,
but simply passing -Wno-error is more future proof.

See https://hydra.nixos.org/build/33274006/nixlog/1/raw
2016-03-19 19:52:47 +01:00
Robin Gloster
420bc33efa Merge pull request #13984 from regnat/moreutils
moreutils : 0.57 -> 0.58
2016-03-17 12:19:28 +01:00
Théophane Hufschmitt
93856f36a2 moreutils : 0.57 -> 0.58 2016-03-17 08:54:36 +01:00
Tobias Geerinckx-Rice
df0f4baec4 hddtemp: correct licence: gpl2 -> gpl2Plus 2016-03-16 21:10:20 +01:00
joachifm
4369f06ab5 Merge pull request #13934 from jraygauthier/jrg/update_plantuml_from_8012_to_8037
plantuml: 8012 -> 8037
2016-03-16 00:20:09 +00:00
Raymond Gauthier
5e9a344e62 plantuml: 8012 -> 8037
Updated to latest stable version.
2016-03-15 09:10:20 -04:00
Damien Cassou
32dcc5a31b vdirsyncer: 0.9.0 -> 0.9.2
Also activate the automated testing
2016-03-14 09:59:27 +01:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Thomas Tuegel
d2dc8cc47f kde5.colord-kde: init at 0.5.0.20160224 2016-03-11 08:45:41 -06:00
Nikolay Amiantov
08893956fb Merge pull request #13823 from abbradar/colord
colord color management daemon
2016-03-11 13:50:12 +03:00
Nikolay Amiantov
4ebc7f74f7 colord-kde: fix build 2016-03-11 02:31:47 +03:00
Nikolay Amiantov
cf9ddb27d6 colord: fix udev rules, add sane support 2016-03-11 01:58:40 +03:00
Nikolay Amiantov
776845bbeb xiccd: init at 0.2.2 2016-03-11 01:26:56 +03:00
Thomas Tuegel
da972b6cc4 ncurses: move runtime utilities to $out
All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.

Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
2016-03-08 11:35:24 -06:00
Thomas Tuegel
394ffcb3e5 staruml: fix evaluation on closure-size 2016-03-08 11:34:52 -06: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
Robert Helgesson
9206abe642 mimeo: init at 2016.2 2016-03-06 20:44:09 +01:00
Maxwell
65dd28c569 xdo from 0.3 -> 0.5
This incorporates a number of bugfixes, as well as adding the
`below` and `above` actions

Also moved package from fetchurl to fetchFromGitHub
2016-03-06 08:45:23 -05:00
Tuomas Tynkkynen
ad47355786 Merge remote-tracking branch 'upstream/master' into staging 2016-03-06 11:48:57 +02:00
Tobias Geerinckx-Rice
225edbd9b5 ms-sys: 2.5.2 -> 2.5.3 2016-03-06 01:09:12 +01:00
Eelco Dolstra
e9b408936c findutils: Disable tests on Darwin
The strftime test fails with:

NZST-12NZDT,M9.5.0,M4.1.0/3: expected "1970-01-01 13:00:00 +1300 (NZDT)", got "1970-01-01 12:00:00 +1200 (NZST)"

The source in fact marks this test as "ahistorical", so the result on
Darwin might not be incorrect.

http://hydra.nixos.org/build/32578562/nixlog/1/raw
2016-03-01 16:14:58 +01:00
Pascal Wittmann
5a0dbaabad parallel: 20160122 -> 20160222 2016-02-29 23:35:32 +01:00
rnhmjoj
838379f117 bdf2psf: 1.134 -> 1.137 2016-02-28 02:56:22 +01:00
Eelco Dolstra
015c7afffa findutils: 4.4.2 -> 4.6.0
The first findutils update in six years! Changes:

https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00014.html
2016-02-27 23:18:50 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
zimbatm
35ab3d301f Merge remote-tracking branch 'upstream/staging' 2016-02-26 22:37:04 +00:00
Tristan Helmich
3234ca49d1 gti: init at 2015-05-21 (edaac79) 2016-02-25 18:52:19 +01:00
Vladimír Čunát
93f6af1071 Merge branch 'master' into staging 2016-02-25 09:01:48 +01:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Franz Pletz
06e37e9008 youtube-dl: 2016.01.01 -> 2016.02.13 2016-02-22 04:55:22 +01:00
Eugene Akentyev
f0b072abaa staruml: init at 2.6.0 2016-02-21 21:42:43 +03:00
Charles Strahan
11bf7888fb Merge pull request #13041 from Baughn/mprime
mprime: Init at 28.7
2016-02-20 20:45:56 -05:00
Tuomas Tynkkynen
6820d7fc5b Merge pull request #13157 from dezgeg/pr-diffoscope-2
diffoscope: 45 -> 49
2016-02-21 01:34:38 +02:00
Tuomas Tynkkynen
2a3d8fc70c diffoscope: 45 -> 49
We have a new tool dependency for cd-iccdump which comes from the colord
package - put this in the bloat category.
2016-02-21 01:21:12 +02:00
Tuomas Tynkkynen
8bfc5d7e72 coreutils: Remove ARM patch (coreutils-tail-inotify-race.patch)
The patch no longer applies as it's applied in the 8.25 release.

While at it don't use FORCE_UNSAFE_CONFIGURE on ARM as I don't see why
it's needed and it works for me without it.

Build-tested GNU hello on ARMv7 and verified that this affect its hash
on i686.
2016-02-20 19:36:21 +02:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Damien Cassou
dda9f0ba23 Merge pull request #13098 from DamienCassou/vdirsyncer-0.9.0
vdirsyncer: 0.8.1 -> 0.9.0
2016-02-19 12:48:27 +01:00
Damien Cassou
38f0628928 vdirsyncer: 0.8.1 -> 0.9.0 2016-02-19 12:44:49 +01:00
Eelco Dolstra
854c27c69c coreutils: 8.24 -> 8.25 2016-02-18 21:59:11 +01:00
Rob Vermaas
1ecb2a8782 Fix xclip hash, make revision explicit, in stead of depending on HEAD.
(cherry picked from commit c9ef3b51a3e910f3850ab10378c8b58f0d2d97e8)
2016-02-17 12:00:20 +00:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Franz Pletz
0884b63e53 Merge pull request #13039 from rycee/bump/svtplay-dl
svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08
2016-02-17 04:52:43 +01:00
Ricardo M. Correia
957ed2c08c Merge pull request #13015 from ehegnes/exa
exa: init at git 2016-02-15
2016-02-16 18:11:42 +01:00
Svein Ove Aas
6efcbd8950 mprime: Init at 28.7 2016-02-16 16:37:45 +00:00
Robert Helgesson
b60ceea903 svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08 2016-02-16 17:06:48 +01:00
Arseniy Seroka
c98602d281 Merge pull request #13031 from matthiasbeyer/update-packages
Update packages
2016-02-16 19:02:58 +03:00
Eric Hegnes
23ab6bf6b2 exa: init at git 2016-02-15 2016-02-16 11:02:38 -05:00
Matthias Beyer
acd75605a2 vdirsyncer: 0.8.1 -> 0.9.0 2016-02-16 14:13:53 +01:00
Tobias Geerinckx-Rice
6b9ae8bada debian_devscripts: 2.15.10 -> 2.16.1
Changes:
http://metadata.ftp-master.debian.org/changelogs/main/d/devscripts/devscripts_2.16.1_changelog
2016-02-15 03:33:44 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Pascal Wittmann
ee90c703be progress: 0.12.1 -> 0.13 2016-02-09 21:51:41 +01:00
宋文武
3c168a714e dvtm: 0.14 -> 0.15 2016-02-08 13:10:27 +08:00
Pascal Wittmann
23a9b9b88a rrdtool: move perl libraries to the expected place
closes #12801
2016-02-07 17:17:37 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Damien Cassou
ee1a843371 Merge pull request #12774 from matthiasbeyer/update-vdirsyncer
Update vdirsyncer
2016-02-04 11:41:54 +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
Matthias Beyer
aa6deb40e8 vdirsyncer: 0.7.3 -> 0.8.1 2016-02-02 21:14:02 +01:00
Robin Gloster
d89e84f859 gnokii: use mkDerivation 2016-01-30 20:31:01 +00:00
Robin Gloster
3f417e6272 Merge pull request #12660 from garrison/bibutils
Add bibutils 5.6 package
2016-01-30 18:30:32 +01:00
Jim Garrison
d68b516341 bibutils: init at 5.6 2016-01-30 09:13:37 -08:00
Pascal Wittmann
4c8aab9140 parallel: 20151222 -> 20160122 2016-01-29 23:02:09 +01:00
Vladimír Čunát
de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Frederik Rietdijk
e366168d22 Merge pull request #12552 from NixOS/python-wip
pythonPackages: update setuptools, many updates and fixes
2016-01-27 13:19:00 +01:00
Frederik Rietdijk
ef4f65293b pythonPackages.youtube-dl: disable tests 2016-01-27 13:11:22 +01:00