Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03: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
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Michael Raskin
6c96968d70
glusterfs: 3.7.10 -> 3.7.11
2016-05-15 23:49:44 +02:00
Michael Raskin
4b72729691
nilfs-utils: 2.2.3 -> 2.2.4
2016-05-15 23:49:44 +02:00
Tobias Geerinckx-Rice
9385353a99
btrfs-progs: 4.5.2 -> 4.5.3
2016-05-14 16:01:33 +02:00
Tobias Geerinckx-Rice
537f0fb297
securefs: 0.3.1 -> 0.3.2
2016-05-14 16:01:33 +02:00
Joachim Fasting
e0c07070b1
duperemove: get linuxHeaders from stdenv
...
Building against anything other than the headers used to build libc
doesn't really make any sense.
Also: this package is Linux specific, so mark it as such.
2016-05-13 19:35:09 +02:00
Franz Pletz
9458198868
f2fs-tools: 1.5.0 -> 1.6.1
2016-05-13 17:27:01 +02:00
Vladimír Čunát
3e387c3e00
Merge branch 'staging'
...
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Данило Глинський (Danylo Hlynskyi)
a74984d660
nixpart-0.4: fix build of multipath-tools dependency ( #15359 )
2016-05-12 09:39:12 +01:00
obadz
48d760c650
dosfstools: temporarily revert upgrade that breaks tests
...
See #15394
Revert "dosfstools: Enable compat symlinks"
This reverts commit 346482c8d5
.
Revert "dosfstools: 3.0.28 -> 4.0"
This reverts commit 135fe56183
.
2016-05-12 09:26:14 +01:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Tuomas Tynkkynen
346482c8d5
dosfstools: Enable compat symlinks
...
Create these symlinks, since NixOS (and other users) can still be using
the old names:
dosfsck -> fsck.fat
dosfslabel -> fatlabel
fsck.msdos -> fsck.fat
fsck.vfat -> fsck.fat
mkdosfs -> mkfs.fat
mkfs.msdos -> mkfs.fat
mkfs.vfat -> mkfs.fat
While at it, kill the makeFlags which seems unnecessary as it seems
to use a standard Autotools build (maybe this is a new thing).
2016-05-10 08:00:16 +03:00
Tobias Geerinckx-Rice
135fe56183
dosfstools: 3.0.28 -> 4.0
2016-05-09 02:57:07 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Tobias Geerinckx-Rice
d6c3407f7b
btrfs-progs: 4.5.1 -> 4.5.2
2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice
1249a4d750
securefs: init at 0.3.1
...
Caveat, as always with such things, emptor.
2016-05-01 21:00:50 +02:00
Nikolay Amiantov
87ebab128a
replace ${stdenv.cc.cc}/lib occurences
2016-05-01 00:13:23 +03:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Michael Raskin
057bd04624
glusterfs: 3.7.8 -> 3.7.10
2016-04-13 14:47:04 +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
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
Luca Bruno
7dd90837b1
Merge pull request #14302 from Balletie/bindfs-fix
...
bindfs: Let `mount` find `bindfs` mount helper
2016-04-01 17:26:16 +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
Tobias Geerinckx-Rice
36aa19b105
btrfs-progs: 4.5 -> 4.5.1
...
Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-04-01 09:32:41 +02:00
Arseniy Seroka
ca30594c87
Merge pull request #14095 from guaraqe/grive-2
...
grive2: init at 0.5.0
2016-03-31 16:48:50 +03:00
guaraqe
1d09c97ac4
grive2: init at 0.5.0
...
grive2: update 0.5.0
grive2: various cosmetic changes
2016-03-31 15:42:45 +02:00
Michael Raskin
cdb2bc77c4
davfs2: 1.4.7 -> 1.5.2; fixes the build
2016-03-31 14:14:40 +02:00
Tuomas Tynkkynen
71d7eaf55d
ntfs-3g: 2015.3.14 -> 2016.2.22; maintain
...
Also old homepage seems to be in a redirect loop.
2016-03-30 20:57:00 +03:00
Balletie
d852a23662
bindfs: Let mount
find bindfs
mount helper
...
When mount is used with mount-type "fuse.bindfs", it cannot find the
mount helper.
If mount can't find `mount.fuse.bindfs`, it executes the `mount.fuse`
mount helper and passes `fuse.bindfs` as argument. Then `mount.fuse`
tries to execute `bindfs` on its own, but it is not found in the PATH.
By creating a `mount.fuse.bindfs` link to the `bindfs` executable, this
problem is avoided because `mount` will just execute the
`mount.fuse.bindfs` mount helper without `mount.fuse` in the middle.
2016-03-29 16:40:11 +02:00
joachifm
4989fd85d4
Merge pull request #14210 from LatitudeEngineering/latitude/topic/genromfs
...
genromfs: init at 0.5.2
2016-03-28 03:41:38 +00:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Patrick Callahan
387e15764b
genromfs: init at 0.5.2
2016-03-26 10:35:26 -07:00
Joachim Fasting
c13ddd14bd
udftools: fix gcc5 build
...
-fgnu89-inline was insufficient, revert to -std=gnu90
See https://hydra.nixos.org/build/33103604/nixlog/1/raw
Also fix various undefined reference errors by ad-hoc patching
2016-03-26 16:55:00 +01:00
Tobias Geerinckx-Rice
e2cbf68786
docker: keep using btrfs-progs 4.4.1
...
Fixes https://hydra.nixos.org/build/33510211 .
2016-03-21 16:18:33 +01:00
Tobias Geerinckx-Rice
9d629f52c8
btrfs-progs: 4.4.1 -> 4.5
...
Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-03-21 01:56:17 +01:00
Pascal Wittmann
0146e01e58
tmsu: 0.6.0 -> 0.6.1
2016-03-15 18:17:04 +01:00
Graham Christensen
e079de30ad
nixpart: pykickstart, pyblock: upgrade to sha256
2016-03-11 15:54:55 -06:00
Eelco Dolstra
dd53c65dcc
Merge remote-tracking branch 'origin/gcc-5' into staging
...
Still some breakage but no blockers:
http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
2016-03-11 16:02:38 +01:00
Eelco Dolstra
1146f460d3
mtdutils: 1.5.1 -> 1.5.2
...
Fixes gcc 5 build failure.
2016-03-11 12:52:46 +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
joachifm
78bfda9cd6
Merge pull request #13446 from k0ral/sshfs
...
sshfsFuse: 2.5 -> 2.7
2016-03-06 17:52:45 +00:00
koral
dc170b713d
sshfs: 2.6 -> 2.7
2016-03-06 18:40:26 +01:00
koral
0d45943167
sshfsFuse: 2.5 -> 2.6
2016-03-06 16:26:42 +01:00
Robin Gloster
e2372a4183
ceph: fix for zip timestamps
2016-03-04 14:15:59 +00:00