Commit Graph

866 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
c334daa5c2 f2fs-tools: Cleanup a bit 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen
b64163a90d bonnie: 1.97 -> 1.97.3 2017-04-10 01:16:39 +03:00
Tuomas Tynkkynen
1f625ce93e ntfs3g: 2016.2.22 -> 2017.3.23 2017-04-09 21:48:25 +03:00
Peter Simons
4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Matthew Bauer
038550b596
gcsfuse: make linux-only 2017-04-08 23:34:52 -05:00
Michael Raskin
16e12a6c42 glusterfs: 3.10.0 -> 3.10.1 2017-04-08 18:37:24 +02:00
Daiderd Jordan
2aeafc16c8 Merge pull request #24559 from georgewhewell/mtools-darwin
mtools: fix build on darwin
2017-04-05 00:40:09 +02:00
George Whewell
9b1a70f1ac mtools: fix build on darwin 2017-04-04 23:32:06 +01:00
makefu
1a0a60482b
snapraid: 11.0 -> 11.1
build from source, not the release configure scripts already generated
2017-04-03 10:44:15 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Michael Raskin
1fc3486154 glusterfs: 3.9.1 -> 3.10.0 2017-03-09 18:47:38 +01:00
Tuomas Tynkkynen
2552b034ab unionfs-fuse: Use fetchFromGitHub 2017-03-04 02:14:22 +02:00
Jörg Thalheim
0c24151731 Merge pull request #23398 from rnhmjoj/gitfs
gitfs: 0.2.5 -> 0.4.5.1
2017-03-02 20:52:43 +01:00
rnhmjoj
1b9875220f
gitfs: 0.2.5 -> 0.4.5.1 2017-03-02 16:35:33 +01:00
Robin Gloster
6034d429fc
btrfs-dedupe: dependency is broken on i686 2017-03-02 14:23:41 +01:00
Felix Richter
e748e18dde mhddfs: fix-format-security (#23276)
* mhddfs: fix-format-security

* mhddfs: use fputs instead of fprintf
2017-02-28 15:53:50 +01:00
Peter Hoeg
23004ec6dc s3fs: minor cleanups 2017-02-28 17:59:09 +08:00
Robin Gloster
5dde5ded09
zkfuse: remove applied patch 2017-02-27 12:38:58 +01:00
Vladimír Čunát
488ece8169
e2fsprogs: avoid larger rebuild on Linux
I didn't notice this.  Perhaps it's through libarchive.
2017-02-26 11:01:44 +01:00
Vladimír Čunát
6afdc516b5
e2fsprogs: style nitpicks, add meta.license 2017-02-26 10:56:11 +01:00
Gavin Rogers
57212c947b e2fsprogs: fix on Darwin (#22973)
util-linux cowardly refuses to install on all platforms. Therefore we
cannot rely on it for external dependancies, in particular luuid.
e2fsprogs won't configure without the luuid dependancy being satisfied.
2017-02-26 10:49:56 +01:00
Jörg Thalheim
f4c253ff2f
jfsutils: replace sha1 with sha256 2017-02-26 10:05:40 +01:00
ikervagyok
0860565ee0 btrfs-dedupe: init at 1.1.0 (#22938) 2017-02-18 22:20:42 +01:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Armijn Hemel
34c12b1c73
e2fsprogs: 1.43.3 -> 1.43.4 2017-02-17 23:46:09 +01:00
Eelco Dolstra
4798196447
s3fs-fuse: 1.78 -> 1.80 2017-02-17 13:46:00 +01:00
Robin Gloster
79e6596993
s3backer: 1.4.2 -> 1.4.3 2017-02-17 00:12:09 +01:00
Graham Christensen
19f23d00fd
ntfs3g: patch for CVE-2017-0358
From the Debian advisory:

Jann Horn of Google Project Zero discovered that NTFS-3G, a read-write
NTFS driver for FUSE, does not scrub the environment before executing
modprobe with elevated privileges. A local user can take advantage of
this flaw for local root privilege escalation.
2017-02-08 22:12:10 -05:00
Michael Raskin
c726f79023 glusterfs: 3.9.0 -> 3.9.1 2017-02-02 11:12:16 +01:00
Jean-Pierre PRUNARET
11f878a0e5 add a maintainer 2017-01-24 13:05:58 +01:00
Jean-Pierre PRUNARET
86af731cf8 hubicfuse: 2.1.0 -> 3.0.0
* bump version
* fetchurl -> fetchFromGitHub
2017-01-24 13:05:58 +01:00
Pascal Wittmann
b35af136ef
disorderfs: 0.4.2 -> 0.5.1 2017-01-09 20:49:02 +01:00
Michael Raskin
2b44ec2e13 Merge pull request #21674 from fduraffourg/glusterfs
glusterfs: fix mount.glusterfs installation
2017-01-05 10:20:05 +00:00
Florian Duraffourg
06e16f00c4 Fix mount.glusterfs installation 2017-01-05 10:02:33 +01:00
Michael Raskin
37b8e22c72 glusterfs: 3.8.4 -> 3.9.0 2017-01-02 20:18:49 +01:00
Graham Christensen
eb01090301
ceph: mark as broken 2016-12-29 17:45:40 -05:00
Bruno Bzeznik
146985e772 irods: init at 4.2.0 2016-12-15 08:49:08 +01:00
Bjørn Forsman
a1892edcee genimage: init at 9
Genimage is a tool to generate filesystem images from directory trees.
2016-12-14 17:44:05 +01:00
Michael Raskin
d03260099f nilfs-utils: 2.2.5 -> 2.2.6 2016-12-08 16:15:18 +01:00
Jaka Hudoklin
e10198e7f4 Merge pull request #20496 from offlinehacker/pkgs/gocryptfs/init
gocryptfs: init at 1.1.1
2016-12-04 22:23:09 +01:00
Jaka Hudoklin
3675631f63 convoy: init at 0.5.0 2016-11-30 23:28:18 +01:00
Eric Litak
0a77fc86b2 f3: corrected version number 2016-11-27 06:52:38 -08:00
Jörg Thalheim
03d3531fb3 Merge pull request #20724 from elitak/f3
f3: newer git rev, build extra binaries
2016-11-27 13:15:44 +01:00
Eric Litak
c4650769f5 f3: newer git rev, build extra binaries 2016-11-27 02:40:58 -08:00
Alexey Lebedeff
7e3176bca2 blivet: Remove unneccesary patching
Fixes https://github.com/NixOS/nixops/issues/552

`--cache` argument is now mandatory for `pvscan` both from hetzner rescue
system and from nixpkgs.
2016-11-24 14:13:26 +03:00
Jörg Thalheim
9338d326c2 Merge pull request #20643 from makefu/snapraid/update/11.0
snapraid: 10.0 -> 11.0
2016-11-24 12:00:13 +01:00
makefu
247a77ad00
snapraid: 10.0 -> 11.0 2016-11-23 10:50:58 +01:00
Franz Pletz
6f1308ba95
Revert "btrfs-progs: 4.8.2 -> 4.8.3"
This reverts commit e82c325bff.

This package update breaks the `update-grub.pl` script:

    updating GRUB 2 menu...
    Btrfs did not return a path for the subvolume at /
    error: unable to activate new configuration

This backwards-incompatible change is the culprit:

    $ /nix/store/np25r3yzv2r41ji7v73j110inpj8lhn2-btrfs-progs-4.8.2/bin/btrfs subvol show /
    / is toplevel subvolume

vs.

    $ /nix/store/h53vs13nqvjwahpl26a4s7ygqk9xw1mw-btrfs-progs-4.8.3/bin/btrfs subvol show /
    /
    	Name: 			<FS_TREE>
    	UUID: 			-
    	Parent UUID: 		-
    	Received UUID: 		-
    	Creation time: 		-
    	Subvolume ID: 		5
    	Generation: 		6004631
    	Gen at creation: 	0
    	Parent ID: 		0
    	Top level ID: 		0
    	Flags: 			-
    	Snapshot(s):
2016-11-17 17:47:18 +01:00
Jaka Hudoklin
9e92237ed7 gocryptfs: init at 1.1.1 2016-11-17 14:15:47 +01:00
Eelco Dolstra
ce4cf12a3b Merge pull request #20397 from obadz/e2fsprogs
e2fsprogs: 1.42.13 -> 1.43.3
2016-11-14 11:01:32 +01:00
Tobias Geerinckx-Rice
e82c325bff
btrfs-progs: 4.8.2 -> 4.8.3 2016-11-14 05:28:22 +01:00
obadz
83fe4fa0bf e2fsprogs: 1.42.13 -> 1.43.3 2016-11-13 21:03:32 +00:00
Alex Ivanov
6be6760144 yandex-disk: 0.1.5.948 -> 0.1.5.978 2016-11-12 12:02:24 +03:00
Tim Steinbach
893bfb1a1b
Remove fuse-zip
Original sources have moved to BitBucket but clearly this is not used by anybody
2016-11-04 09:42:39 -04:00
Joachim Fasting
0ee7d1ea4e
encfs: 1.8.1 -> 1.9.1
Packaging changes
- Uses cmake
- Removes depends on rlog and boost, uses tinyxml to parse xml

Note that the encfssh utility is disabled, it requires patching to
work (and didn't work in previous versions of the package, either).
Better to leave it unusable until fixed.
2016-11-01 15:57:29 +01:00
Tim Steinbach
68dd264ccd
btrfs-progs: 4.6.1 -> 4.8.2 2016-10-26 20:11:28 -04:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Peter Hoeg
cbec6a304a vmfs-tools: init at 2016-01-16 2016-10-21 13:08:00 +03:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Frederik Rietdijk
0e3b5834c0 glusterfs: use python2
configure reports that only python2 is supported.
2016-10-18 23:16:09 +02:00
Frederik Rietdijk
509ef439ac ceph: use python2
print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk
af11ff4cdd gitfs: use python2 2016-10-18 23:14:35 +02:00
Franz Pletz
8f794cd6b8
zfstools: 0.3.3 -> 0.3.6 2016-10-14 17:34:34 +02:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
rnhmjoj
8546928f69
afpfs-ng: init at 0.8.2 2016-10-09 20:13:49 +02:00
Peter Hoeg
56c9c71f13 f2fs-tools: 1.6.1 -> 1.7.0 (#19352) 2016-10-08 13:44:58 +02:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
makefu
0b6d9734c9
snapraid: 8.1 -> 10.0
enable tests for snapraid
2016-10-01 14:28:53 +02:00
Jörg Thalheim
4d0ae0e754 Merge pull request #18980 from MostAwesomeDude/gcsfuse
gcsfuse: init at v0.19.0
2016-09-29 16:55:07 +02:00
Corbin
3f61b437ef gcsfuse: Don't depend on fuse. 2016-09-29 07:48:03 -07:00
Corbin
1819d941b0 Address code review feedback. 2016-09-28 21:47:48 -07:00
Tuomas Tynkkynen
633fb08a9a Merge pull request #19036 from makefu/init-mergerfs
mergerfs: init at 2.16.1
2016-09-28 23:27:43 +03:00
makefu
2960aa7f1b
mergerfs: init at 2.16.1 2016-09-28 22:17:57 +02:00
makefu
36e0aedae7
f3: init at 6.0 2016-09-28 13:31:27 +02:00
Corbin
eef90e4153 gcsfuse: init at v0.19.0 2016-09-26 07:51:50 -07:00
Michael Raskin
7a15d8b3ab nilfs-utils: 2.2.4 -> 2.2.5 2016-09-26 15:49:30 +02:00
Michael Raskin
72249360f9 glusterfs: 3.8.1 -> 3.8.4 2016-09-26 15:49:30 +02:00
Frederik Rietdijk
2f4da5bd83 gitfs: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Franz Pletz
668572753c
fuseiso: fix CVE-2015-8836 & CVE-2015-8837 2016-09-25 17:38:31 +02:00
Graham Christensen
70bf407cf8
davfs2: 1.5.2 -> 1.5.3 2016-09-24 08:42:24 -04:00
Joachim F
96c436612d Merge pull request #18634 from romildo/upd.avfs
avfs: 1.0.3 -> 1.0.4
2016-09-17 12:25:05 +02:00
Joachim F
0ffdb89d95 Merge pull request #18628 from joachifm/squashfs-lz4
squashfsTools: optional lz4 support
2016-09-16 11:22:09 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
José Romildo Malaquias
6cf3fdcceb avfs: 1.0.3 -> 1.0.4 2016-09-15 15:50:10 -03:00
Joachim Fasting
4653160057
squashfsTools: optional lz4 support 2016-09-15 15:37:03 +02:00
Joachim Fasting
a9fa582c5b
squashfsTools: use fetchFromGitHub 2016-09-15 15:37:03 +02:00
rushmorem
c34d83eb36 lizardfs: 3.10.0 -> 3.10.2 2016-09-14 19:24:33 +02:00
Tuomas Tynkkynen
c922c20cff e2fsprogs: Split 'dev' 2016-09-10 20:05:30 +03:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Rushmore Mushambi
dff7057743 Merge pull request #18227 from rushmorem/lizardfs-manpages
lizardfs: fix building manpages
2016-09-02 21:20:19 +02:00
rushmorem
757975c439 lizardfs: fix building manpages 2016-09-02 20:57:08 +02:00
obadz
d95a29a01a netatalk: fix build (broken since closure-size)
Helps with #18209
2016-09-02 19:38:48 +01:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Eelco Dolstra
02ee9d83d0 enableParallelBuild -> enableParallelBuilding 2016-09-01 10:46:47 +02:00
Tuomas Tynkkynen
96004b9d8c nilfs-utils: Set dontPatchELF due to broken RPATH by patchelf 2016-09-01 01:48:49 +03:00
Tuomas Tynkkynen
810135363e ceph: Fix 'lib.optional' use
Produces a list of list as buildInputs.
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Joachim Fasting
e113db1e24
relfs: port to stdenv.mkDerivation
https://github.com/NixOS/nixpkgs/issues/4210
2016-08-29 01:10:33 +02:00
Robin Gloster
b37460ec63
xtreemfs: fix substituteInPlace paths 2016-08-27 21:56:45 +00:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
rushmorem
940dc9b23a lizardfs: fix build 2016-08-21 20:04:15 +02:00
J Phani Mahesh
1894880b31 fuseiso: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:30 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
J Phani Mahesh
6a7cc8327c fuseiso: switch sf downloads to mirror:// 2016-08-20 17:29:35 +05:30
Matthew Bauer
9ab5b14d56 genromfs: fix darwin build 2016-08-16 19:25:41 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
4fb1f1ff6e bcache-tools: remove kmod from arguments 2016-08-14 22:38:27 +03:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster
572490bce9 udftools: remove obsolete gcc5 patch
fixed by setting C compiler standard
2016-08-13 09:48:26 +00:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Michael Raskin
c27ea9bb6b glusterfs: 3.7.11 -> 3.8.1 2016-08-11 17:57:35 +02:00
Tuomas Tynkkynen
1713255827 ceph: Add xfsprogs 4.5.0 compat patch 2016-08-11 00:50:16 +03:00
Matthew
5d433e35d5 xfsprogs: propagate libuuid
Before, this would fail because libuuid needed to be available.

> echo '#include <xfs/xfs.h>' | cc -E -
2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen
f80508df5f xfsprogs: 4.2.0 -> 4.5.0 2016-08-08 16:46:34 +03:00
Robin Gloster
34086084fc Merge pull request #17551 from womfoo/fix/xtreemfs-openssl-build
xtreemfs: fix build
2016-08-08 13:24:17 +00:00
Tuomas Tynkkynen
0afbb63425 grive: Broken on Darwin
Last successful build in 2014.

http://hydra.nixos.org/build/38308131
2016-08-08 16:12:29 +03:00
Tuomas Tynkkynen
6df6b1d925 gpart: Broken on Darwin
Never had a successful Darwin build.

http://hydra.nixos.org/build/38306346
2016-08-08 16:12:29 +03:00
Rushmore Mushambi
f126b1a7a9 Merge pull request #16280 from rushmorem/lizardfs-manpages
lizardfs: 3.9.4 -> 3.10.0
2016-08-06 16:58:21 +02:00
rushmorem
1767de9248 lizardfs: 3.9.4 -> 3.10.0 2016-08-06 16:38:40 +02:00
Kranium Gikos Mendoza
736517e9c7 xtreemfs: fix build 2016-08-06 14:23:02 +08:00
Franz Pletz
56f03166e1 reiser4progs: disable format hardening 2016-08-04 11:09:27 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Kranium Gikos Mendoza
9aee153f2b zerofree: 1.0.3 -> 1.0.4 2016-07-14 15:43:09 +02:00
Tobias Geerinckx-Rice
1d07b748c9
btrfs-progs: 4.6 -> 4.6.1 2016-06-26 02:07:20 +02:00
zimbatm
d2f9f251aa Merge pull request #16380 from elitak/dislocker
dislocker: init at 0.6.1
2016-06-23 15:49:07 +01:00
Eric Litak
5d3ace24e9 dislocker: init at 0.6.1 2016-06-20 16:58:21 -07:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Kirill Elagin
17b19977cf bonnie++: upgrade to 1.97
Also a patch with some OS X specific changes (stolen from Homebrew).
2016-06-16 19:49:46 +03:00
Michiel Leenaars
d56850dd49 e2tools: init -> 0.0.16 2016-06-15 16:22:03 +02:00
rushmorem
c4435493aa lizardfs: init at 3.9.4
LizardFS is a highly reliable, scalable and efficient distributed file
system.
2016-06-15 04:23:44 +02:00
Tobias Geerinckx-Rice
9f266996b4
btrfs-progs: 4.5.3 -> 4.6 2016-06-12 00:28:55 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
ce81a8a65d go-mtpfs: extracted from goPackages 2016-06-09 11:21:30 +02:00
Tobias Geerinckx-Rice
86f9ead288
exfat: 1.2.3 -> 1.2.4 2016-06-06 22:40:43 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Tobias Geerinckx-Rice
5e6175ae91
s3backer: 1.3.1 -> 1.4.2; maintain 2016-05-25 02:06:47 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00