3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6620 commits

Author SHA1 Message Date
William A. Kennington III 25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
William A. Kennington III 369febb956 btrfsprogs: 4.1.1 -> 4.1.2 2015-07-15 01:58:34 -07:00
ts468 c930417537 Merge pull request #8830 from ts468/upstream.tpm-luks
tpm-luks: update -> git-2015-07-11
2015-07-15 10:52:20 +02:00
Thomas Strobel 127300a51d tpm-luks: update -> git-2015-07-11 2015-07-15 10:22:40 +02:00
Tobias Geerinckx-Rice a42b2e5f85 netsniff-ng 0.5.9-21-g8c75168 -> 0.5.9-27-g3beaa23
Functional changes:
- trafgen: Print min packet size in error message
- flowtop man: Add note about activating netfilter connection tracking
- flowtop: Fix flows disappearing
- flowtop: Fix hanging while waiting for collector
2015-07-15 03:31:54 +02:00
Arseniy Seroka 2fa88f65ea Merge pull request #8812 from k0ral/xurls
xurls: init at 0.6.0
2015-07-14 14:13:08 +03:00
koral 562f760f20 xurls: init at 0.6.0 2015-07-14 08:27:29 +00:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Maciek Starzyk d3284944a1 obnam: 1.8 -> 1.12 2015-07-13 23:44:56 +02:00
William A. Kennington III d253b3d875 coreutils: Skip sparse cp test as it fails reliably with btrfs on ubuntu 14.04 2015-07-13 13:48:59 -07:00
William A. Kennington III b2ae45bd77 btrfsProgs: Cleanup some old build changes
The change of optimization flags should be safe for all platforms as
the default for most applications is -O2. It is also unecessary to
forcefully link against libgcc_s as btrfsprogs no longer errors when
scrubbing without this linkage.
2015-07-13 12:34:06 -07:00
Pascal Wittmann 1e9561ff39 bareos: fix build (ZHF) 2015-07-13 13:43:11 +02:00
Tuomas Tynkkynen 3b81288a58 debbindiff: init at version 26
[Bjørn: set namePrefix = "" to align attrname/pkgname, break overlong
lines, change patchPhase into postPatch so that 'patches' can still be
used.]
2015-07-13 08:31:55 +02:00
Tuomas Tynkkynen 2ad7463144 pythonPackages.magic: Fix loading libmagic.so
Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
2015-07-13 08:29:05 +02:00
Pascal Wittmann dc608ff237 sbsigntool: fix build (ZHF) 2015-07-12 23:41:10 +02:00
James Cook a456168e5b Merge pull request #6702 from joachifm/dnscrypt-proxy
nixos: some improvements for dnscrypt-proxy
2015-07-12 00:17:46 -07:00
James Cook 6393688806 Merge pull request #8747 from ikervagyok/btrfs
btrfs-progs: 4.1 -> 4.1.1
2015-07-12 00:00:27 -07:00
Lengyel Balázs 3c163467aa btrfs-progs: 4.1 -> 4.1.1 2015-07-11 14:30:15 +02:00
Pascal Wittmann 3c47a9980c crackxls: do not use march=native and mtune=native
patch is from @dezgeg and is contained in #8530
2015-07-11 12:23:21 +02:00
Rickard Nilsson 6c6a06b99f httping: Enable SSL support 2015-07-10 12:58:56 +02:00
William A. Kennington III 48f44bfa69 grub2: 2015-05-14 -> 2015-07-05 2015-07-09 22:17:54 -07:00
Pascal Wittmann 0723117f4c haproxy: update from 1.5.11 to 1.5.14, fixes CVE-2015-3281 2015-07-09 20:21:24 +02:00
Tobias Geerinckx-Rice 98e7674e88 nxproxy, libxcomp: nxlibs 3.5.0.{31 -> 32}
Removes the need for patching (for now).
2015-07-09 02:41:26 +02:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
William A. Kennington III bd82a79fc1 xorriso: 1.3.8 -> 1.4.0 2015-07-08 11:28:54 -07:00
Sander van der Burg e54d0371b9 disnix: bump to version 0.4 2015-07-08 12:03:56 +00:00
Edward Tjörnhammar 2dfe7d0513 i2pd: 0.9.0 -> 0.10.0 2015-07-07 09:47:22 +02:00
William A. Kennington III e587d3e155 Merge branch 'master.upstream' into staging.upstream 2015-07-07 00:31:00 -07:00
William A. Kennington III 243b2f79ce openssh: 6.8p1 -> 6.9p1 2015-07-06 19:30:02 -07:00
William A. Kennington III 81ace52e89 openssh: Refactor and install sample config files 2015-07-06 19:29:45 -07:00
William A. Kennington III 6aa4714dba coreutils: 8.23 -> 8.24 2015-07-06 17:37:18 -07:00
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III 9eae9dd811 gnupg: 2.0.27 -> 2.0.28 2015-07-06 17:14:01 -07:00
Arseniy Seroka 6d99ecf300 Merge pull request #8658 from benley/iftop-darwin
iftop: fix Darwin build
2015-07-06 14:27:13 +03:00
Arseniy Seroka 83083da5b1 Merge pull request #8651 from ts468/upstream.sbsigntool
sbsigntool: init at 0.5
2015-07-06 14:26:39 +03:00
lethalman 8212ec8d55 Merge pull request #8659 from robbinch/pkg-gitfs
gitfs: init at 0.2.5.
2015-07-06 11:24:49 +02:00
Robbin C 945ac597b9 gitfs: init at 0.2.5
This adds gitfs, a FUSE filesystem that fully integrates with git.
2015-07-06 17:10:17 +08:00
William A. Kennington III fbfdc139d6 Merge branch 'master.upstream' into staging.upstream 2015-07-05 18:36:16 -07:00
Benjamin Staffin 806291b42e iftop: fix Darwin build 2015-07-05 17:47:54 -07:00
William A. Kennington III fe705a664c gnupg: 2.1.5 -> 2.1.6 2015-07-05 16:51:03 -07:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
William A. Kennington III 282e7e6c84 Merge pull request #8647 from ts468/upstream.trusted_grub
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:52:13 -07:00
Thomas Strobel c9e5218b33 sbsigntool: init at 0.5 2015-07-05 14:59:01 +02:00
Tuomas Tynkkynen 167cf5c0da asymptote: Fix source URL
The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
2015-07-05 14:31:46 +03:00
Thomas Strobel 2285ad1bfa trustedGRUB: GRUB 1 based -> GRUB 2 based 2015-07-05 11:48:36 +02:00
aszlig 2467c437b7
xdg_utils: Fix wrong substitution of grep command.
Fixes regression introduced by 16406e63b3.

Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:

foo="$(grep xxx)"

The replacement would be something like this:

foo="$/nix/store/.../bin/grep xxx)"

Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:

xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
                            "^Exec(\[[^]=]*])?=" "$file" |
                            /nix/store/.../bin/cut -d= -f 2- |
                            first_word`"'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 09:25:13 +02:00
Thomas Strobel 36f2ec82cc tmp-luks: init at 0.9pre 2015-07-04 23:57:59 +02:00
Michael Raskin d2cfc1dec6 Mailsend: update 1.17b15 -> 1.18 2015-07-05 00:32:54 +03:00
Michael Raskin 8454055ed4 GlusterFS: update 3.7.1 -> 3.7.2 2015-07-05 00:32:53 +03:00
Arseniy Seroka 093a8994f9 Merge pull request #8624 from ambrop72/minidlna-update
minidlna 1.1.4
2015-07-04 13:59:32 +03:00