Commit graph

955 commits

Author SHA1 Message Date
Matthew Justin Bauer b5bdc5a73a
Merge pull request #34464 from Gricad/irods-4.2.2-bz
irods: 4.2.1 -> 4.2.2 + server bugfixes
2018-03-19 13:06:58 -05:00
Ryan Mulligan 8cf0f49ed2 archivemount: 0.8.7 -> 0.8.9
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9/bin/archivemount -V` and found version 0.8.9
- ran `/nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9/bin/archivemount --version` and found version 0.8.9
- found 0.8.9 with grep in /nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9
2018-03-15 19:51:20 -07:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Franz Pletz 6d6d93c8de
Merge pull request #36694 from xeji/dislocker
dislocker: 0.6.1 -> 0.7.1
2018-03-12 23:20:18 +00:00
John Ericson 62ca2316a4
Merge pull request #36885 from obsidiansystems/meta-host-prepare
treewide: Prepare for #34444
2018-03-12 19:06:35 -04:00
John Ericson 79d8353b5e treewide: Make shouldUsePackages copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
2018-03-12 18:55:41 -04:00
Vladimír Čunát 1d968d180a
Merge #36686: darling-dmg: fix build with gcc7 2018-03-12 20:29:16 +01:00
Michael Raskin 8a9db83980
Merge pull request #36813 from jfrankenau/update-mergerfs
mergerfs: 2.23.1 -> 2.24.0
2018-03-11 17:21:16 +00:00
Johannes Frankenau fa60f04a19 mergerfs: 2.23.1 -> 2.24.0 2018-03-11 17:52:07 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Bignaux Ronan 5c25232728 squashfuse: init at unstable-2018-02-20 2018-03-09 22:35:57 +01:00
Bignaux Ronan 6f8176ac43 squashfuse : init at 0.1.101-371e4be 2018-03-09 22:35:57 +01:00
xeji 2d70431553 dislocker: 0.6.1 -> 0.7.1 2018-03-09 22:35:28 +01:00
xeji 468c5f4e2a darling-dmg: fix build with gcc7 2018-03-09 21:22:18 +01:00
Eli Flanagan 4d1f618b18 tmsu: disable for darwin
Disabling until a solution comes about for osxfuse.
2018-03-09 12:47:05 -05:00
Robin Gloster fe7039b08b
grive: remove
dead and obsoleted by grive2
2018-03-05 22:00:03 +01:00
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Sander van der Burg 51857be0d5 s3fs: 1.82 -> 1.83 2018-03-02 18:16:07 +01:00
Frederik Rietdijk 810dd0f984 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-01 20:00:42 +01:00
Ryan Mulligan f41568614f reiser4progs: 1.1.0 -> 1.2.1
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -h` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --help` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -V` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -v` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --version` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -h` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --help` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -h` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --help` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -V` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -v` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --version` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -h` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --help` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -h` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --help` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -V` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -v` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --version` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -h` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --help` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -h` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --help` got 0 exit code
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -V` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -v` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --version` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -h` and found version 1.2.1
- ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --help` and found version 1.2.1
- found 1.2.1 with grep in /nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1
- found 1.2.1 in filename of file in /nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1
2018-03-01 15:42:23 +01:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Jörg Thalheim dcbb841959
Merge pull request #36017 from ryantm/auto-update/securefs-0.3.2-to-0.8.1
securefs: 0.3.2 -> 0.8.1
2018-02-28 15:19:58 +00:00
Ryan Mulligan 42eebf3a05 zerofree: 1.1.0 -> 1.1.1
Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.1.1 in filename of file in /nix/store/izfdcr9hld3rmcwcmvwfv9mc2pd414x3-zerofree-1.1.1

cc "@theuni"
2018-02-27 19:23:53 -08:00
Ryan Mulligan 54f46da6eb securefs: 0.3.2 -> 0.8.1
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/r1icgafqy02cz35kjkxr86hxj8mj1nyv-securefs-0.8.1/bin/securefs version` and found version 0.8.1
- found 0.8.1 with grep in /nix/store/r1icgafqy02cz35kjkxr86hxj8mj1nyv-securefs-0.8.1
- found 0.8.1 in filename of file in /nix/store/r1icgafqy02cz35kjkxr86hxj8mj1nyv-securefs-0.8.1
2018-02-27 15:55:24 -08:00
Frederik Rietdijk ad5127c417 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 09:18:49 +01:00
Ryan Mulligan 7506163b09 hubicfuse: 3.0.0 -> 3.0.1
Semi-automatic update. These checks were performed:

- built on NixOS
- found 3.0.1 in filename of file in /nix/store/lwcvnbi1i9w8y84zi6b2g3ayqzzyxd0p-hubicfuse-3.0.1

cc "@jpierre03"
2018-02-26 18:45:05 -08:00
Jörg Thalheim 0db6ad2da3
Merge pull request #35479 from lejonet/ceph-patch-python-env
ceph: Modify ceph package so that it compiles and runs fine on nixos
2018-02-26 22:34:50 +00:00
Vladimír Čunát f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Frederik Rietdijk fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
adisbladis 14749b29a4
Merge pull request #35634 from ryantm/auto-update/encfs-1.9.2-to-1.9.4
encfs: 1.9.2 -> 1.9.4
2018-02-26 16:26:16 +08:00
Ryan Mulligan bfacbc52a2 encfs: 1.9.2 -> 1.9.4
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/cfhzvmll3rjhgrhl4ypv40ap726dlgh2-encfs-1.9.4/bin/encfs --version` and found version 1.9.4
- ran `/nix/store/cfhzvmll3rjhgrhl4ypv40ap726dlgh2-encfs-1.9.4/bin/encfsctl --version` and found version 1.9.4
- found 1.9.4 with grep in /nix/store/cfhzvmll3rjhgrhl4ypv40ap726dlgh2-encfs-1.9.4
- found 1.9.4 in filename of file in /nix/store/cfhzvmll3rjhgrhl4ypv40ap726dlgh2-encfs-1.9.4
2018-02-25 20:48:37 -08:00
Ryan Mulligan d7b151c54e btrfs-progs: 4.14.1 -> 4.15.1
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs --version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs -V` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs --version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-debug-tree help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-image --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-find-root --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfstune --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-convert --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/fsck.btrfs -h` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/fsck.btrfs --help` got 0 exit code
- found 4.15.1 with grep in /nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1
- found 4.15.1 in filename of file in /nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1
2018-02-25 13:25:34 -08:00
Ryan Mulligan 93268fc9f9 bindfs: 1.12.6 -> 1.13.9
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/56lvl3w77zgwsk1v618bklq10aq7fp17-bindfs-1.13.9/bin/bindfs -h` got 0 exit code
- ran `/nix/store/56lvl3w77zgwsk1v618bklq10aq7fp17-bindfs-1.13.9/bin/bindfs --help` got 0 exit code
- ran `/nix/store/56lvl3w77zgwsk1v618bklq10aq7fp17-bindfs-1.13.9/bin/bindfs -V` and found version 1.13.9
- ran `/nix/store/56lvl3w77zgwsk1v618bklq10aq7fp17-bindfs-1.13.9/bin/bindfs --version` and found version 1.13.9
- found 1.13.9 with grep in /nix/store/56lvl3w77zgwsk1v618bklq10aq7fp17-bindfs-1.13.9
2018-02-25 09:19:50 -08:00
Daniel Kuehn 987cad84ce ceph: Modify ceph package so that it compiles and runs fine on nixos
With adding a patch that makes 2 absolute paths into 2 relative paths, ensuring the third-party libraries are available
in the python environment used and wrapping the python tools with wrapPrograms does so that the fixed ceph pkg can
compile and run as intended on NixOS.
2018-02-24 18:56:25 +01:00
Shea Levy c2911034c3
btrfs-progs: Fix cross-compiling 2018-02-24 08:23:10 -05:00
Tuomas Tynkkynen 102ed109c4 e2fsprogs: 1.43.8 -> 1.43.9 2018-02-22 04:39:41 +02:00
Jörg Thalheim f0466c47ab
Merge pull request #33894 from adevress/master
ceph: 9.2.0 -> 12.2.2
2018-02-21 16:45:33 +00:00
Johannes Frankenau ac64f9ce70 snapraid: 11.1 -> 11.2 2018-02-21 16:22:35 +01:00
Johannes Frankenau c5a5d22ebf mergerfs: 2.23.0 -> 2.23.1 2018-02-20 19:52:01 +01:00
Bignaux Ronan 5088917402 fixing tab and maintainers 2018-02-17 08:20:00 +01:00
Bignaux Ronan fed67dcbf9 fix tab 2018-02-16 22:15:45 +01:00
Bignaux Ronan d93933e434 fixes according to PR 2018-02-16 21:14:56 +01:00
Bignaux Ronan ab1a1c621b idsk : init at 0.16-1846729 2018-02-16 16:37:10 +01:00
Graham Christensen 567a72a161
perl.FileRename: fixup meta 2018-02-12 10:30:27 -05:00
Peter Hoeg 8016f9b4c9
Merge pull request #34611 from peterhoeg/p/descent
descent 1 & 2: use assets from gog.com with the dxx-rebirth project
2018-02-12 22:31:41 +08:00
Peter Hoeg 646abe9b29 perl.FileRename: init at 0.20 2018-02-12 22:28:02 +08:00
Jörg Thalheim 3b8bb02f68
Merge pull request #34792 from dywedir/bcachefs
linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09
2018-02-10 08:20:35 +00:00
Jörg Thalheim 2941217227 Revert "squashfuse: init at 0.1.101"
This reverts commit 17210fee46.
2018-02-10 01:03:42 +01:00
dywedir 2f0e3327ea bcachefs-tools: 2017-08-28 -> 2018-02-08 2018-02-10 00:40:03 +02:00