3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

982 commits

Author SHA1 Message Date
Robert Schütz 80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Matthew Justin Bauer cc5c927aea
Merge pull request #36821 from jfrankenau/update-f3
f3: 6.0-2016.11.16-unstable -> 7.0
2018-04-09 14:08:27 -05:00
Frederik Rietdijk 595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
R. RyanTM 922fcbb310 archivemount: 0.8.9 -> 0.8.12 (#38276)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/archivemount/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12/bin/archivemount -V` and found version 0.8.12
- ran `/nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12/bin/archivemount --version` and found version 0.8.12
- found 0.8.12 with grep in /nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12
- directory tree listing: https://gist.github.com/9f95a5aa5b6c354b2dd5db0351c8fb72
2018-04-08 09:23:50 +02:00
Domen Kožar 766e48aec1
e2fsprogs: 1.43.8 -> 1.44.1
(cherry picked from commit e6114781b0)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-07 14:00:03 +01:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Ryan Mulligan b3b3205101 fatsort: 1.3.365 -> 1.4.2.439
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/fatsort/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/b33c7wq3ps8qwpx6yy05ml23k764i6cm-fatsort-1.4.2.439/bin/fatsort -h` got 0 exit code
- ran `/nix/store/b33c7wq3ps8qwpx6yy05ml23k764i6cm-fatsort-1.4.2.439/bin/fatsort --help` got 0 exit code
- directory tree listing: https://gist.github.com/9465f304d46013ae6d70d46558fd0c45
2018-03-30 10:18:30 +01:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Wout Mertens 4ba76fadeb
Merge pull request #37905 from Chiiruno/master
linux_testing_bcachefs: 4.15.2018.02.09 -> 4.15.2018.03.22
2018-03-27 14:09:18 +02:00
Jörg Thalheim 1a44de831a
Merge pull request #37597 from lejonet/ceph-#36622
ceph: Add makeWrapper to dependencies and nativeBuildInputs
2018-03-27 10:55:12 +01:00
Okina Matara 1b8d2a3119 bcachefs-tools: 2018-02-08 -> 2018-03-20 2018-03-27 04:40:44 -05:00
Will Dietz 332c90b3fb
Merge pull request #37888 from dtzWill/fix/xfsprogs-use-upstream-patch
xfsprogs: replace glibc-2.27 patch w/upstream variant
2018-03-26 16:33:10 -05:00
Will Dietz 06e093c270 xfsprogs: replace glibc-2.27 patch w/upstream variant
This version also works w/musl :)

https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/?id=8041435de7ed028a27ecca64302945ad455c69a6
2018-03-26 14:53:50 -05:00
Will Dietz da0da6177d nilfs-utils: apply upstream patches to fix w/musl 2018-03-26 13:58:44 -05:00
Will Dietz 5faa470da2 btrfs-progs: disable backtrace, fix build w/musl 2018-03-25 18:46:06 -05:00
Ryan Mulligan b189247ba0 treewide: use more HTTPS URLs
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
2018-03-24 22:04:25 -07:00
Matthew Justin Bauer d23d44374f
Merge pull request #37012 from matthewbauer/libintl-sanity
Make "localizations" sane again
2018-03-22 20:39:30 -05:00
Matthew Bauer 9109a90479 treewide: remove some more gettext references 2018-03-22 16:50:14 -05:00
Daniel Kuehn d74bcbc8ad ceph: Change hardcoded site-packages path to utilizing the python2Packages.python.sitePackages attribute instead 2018-03-22 21:08:28 +01:00
Nikolay Amiantov 26256ead32 btrfs-progs: fix build with new e2fsprogs 2018-03-22 22:16:19 +03:00
Shea Levy d0a8866622
Merge branch 'binutils-2.30' into staging 2018-03-22 07:28:10 -04:00
Daniel Kuehn a9a7580c3f ceph: Add makeWrapper to dependencies and nativeBuildInputs
The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules
that you can enable for it.
With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr
daemon so its modules can find the ceph python modules
2018-03-21 21:53:02 +01:00
Shea Levy 4250dd5de4
Merge branch 'master' into staging 2018-03-20 08:38:28 -04:00
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
Shea Levy cd843345ff
xfsprogs: Fix build on glibc-2.27 2018-03-17 21:58:14 -04: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 de529a5d2c e2fsprogs: 1.43.9 -> 1.44.0 2018-03-16 03:22:37 +02: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
Johannes Frankenau 5b1cd5d27b f3: 6.0-2016.11.16-unstable -> 7.0 2018-03-12 23:37:55 +01: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