BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
181895 commits 1 branch 0 tags 3.8 GiB
Commit graph

1307 commits

Author SHA1 Message Date
worldofpeace
3bb9b102e5
Merge pull request #54366 from thefloweringash/gocryptfs-update 
gocryptfs: 1.5 -> 1.6.1
 2019-01-23 18:31:46 -05:00
Robert Schütz
8c57113e14 python.pkgs.argparse: remove 
argparse is part of stdlib in 2.7 and 3.2+
 2019-01-22 12:43:07 +01:00
Andrew Childs
28b45f6e65 gocryptfs: 1.5 -> 1.6.1 2019-01-20 19:10:14 +09:00
Will Dietz
c6c38b61a8 bcachefs-tools: 2018-10-12 -> 2019-01-13 (fix w/attr bump, touchups) 2019-01-13 20:45:01 -06:00
Vladimír Čunát
287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
Orivej Desh
654f3c467c go-mtpfs: 20150917 -> 2018-02-09 2019-01-09 18:46:41 +00:00
Matthew Bauer
d2e74263ac
Merge pull request #53072 from furrycatherder/fuse-overlayfs 
fuse-overlayfs: init at 0.2
 2019-01-07 12:41:21 -06:00
Matthew Bauer
7b207060f1
Merge pull request #52965 from danbst/squashfs-zstd 
squashfs: 4.4dev -> 4.4dev-20180612
 2019-01-06 22:37:37 -06:00
Piotr Bogdan
19061fb79e svnfs: link with libsvn_subr-1 explicitly 2019-01-04 21:44:21 +00:00
Frederik Rietdijk
19905c4c9a Merge staging-next into staging 2018-12-31 14:21:42 +01:00
Frederik Rietdijk
070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Will Dietz
8cd0dd21ba e2fsprogs: update glibcism (musl) patch, fix 2018-12-30 22:49:49 -06:00
Sean Haugh
f1f9543768 fuse-overlayfs: init at 0.2 2018-12-30 06:44:33 -06:00
R. RyanTM
614e10a686 e2fsprogs: 1.44.4 -> 1.44.5 (#52899) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/e2fsprogs/versions
 2018-12-29 20:40:36 +01:00
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
danbst
2aafeedd15 squashfs: 4.4dev -> 4.4dev-20180612 
This squashfstools release finally has `zstd` support.
 2018-12-27 15:13:48 +02:00
R. RyanTM
b32c357ea9 netatalk: 3.1.11 -> 3.1.12 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/netatalk/versions
 2018-12-25 05:46:49 -08:00
R. RyanTM
090bc5b85e mtools: 4.0.22 -> 4.0.23 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
 2018-12-25 02:40:06 -08:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Jan Tojnar
9086af1a77
Merge pull request #52702 from jtojnar/boo-destdir 
Boo destdir
 2018-12-22 23:02:23 +01:00
Jan Tojnar
8d42600921
duperemove: Do not abuse DESTDIR 2018-12-22 22:33:33 +01:00
Michael Weiss
bacc8e6a54 sshfs: 3.5.0 -> 3.5.1 2018-12-22 17:56:42 +01:00
volth
fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
markuskowa
adec549df5
Merge pull request #52186 from r-ryantm/auto-update/mergerfs 
mergerfs: 2.24.2 -> 2.25.1
 2018-12-16 20:01:42 +01:00
R. RyanTM
c5c2924e92 duperemove: 0.11 -> 0.11.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duperemove/versions
 2018-12-16 17:26:55 +01:00
R. RyanTM
60b6c93f51 mergerfs: 2.24.2 -> 2.25.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mergerfs/versions
 2018-12-15 00:25:19 -08:00
volth
bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Frederik Rietdijk
3e950d584c Merge staging-next into master 2018-12-08 16:29:21 +01:00
Will Dietz
41194fc19c mtools: 4.0.21 -> 4.0.22 
https://lists.gnu.org/archive/html/info-gnu/2018-12/msg00000.html
 2018-12-07 21:55:00 -06:00
Frederik Rietdijk
5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Spencer Janssen
67aa6cd877 btrfs-progs: 4.19 -> 4.19.1 
Fixes build of snapper
 2018-12-06 15:14:28 -06:00
Frederik Rietdijk
a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Jörg Thalheim
713f5e270b
Revert "btrfs-progs: fix on cross compilation" 
This reverts commit 820927cb2c.

Broke the native build: 820927cb2c (commitcomment-31529024)
 2018-12-02 23:30:27 +00:00
Matthew Bauer
973781444a Merge branch 'darwin-fixes2' 2018-12-02 14:15:05 -06:00
Matthew Bauer
820927cb2c btrfs-progs: fix on cross compilation 
Fixes #50925

(cherry picked from commit 04978d152e8e8e0c2f82cbb8c2addc4ecc93c79c)
 2018-12-02 14:12:42 -06:00
Silvan Mosberger
4afae70e2b
Merge pull request #48423 from charles-dyfis-net/bees 
bees: init at 0.6.1; nixos/modules: services.bees init
 2018-12-02 18:38:47 +01:00
John Ericson
24270193b7 Merge remote-tracking branch 'upstream/staging' into fix/cross-xfsprogs 2018-12-02 12:32:03 -05:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains 
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
 2018-12-02 15:51:59 +01:00
c0bw3b
a04a512f34 Treewide: use HTTPS on NonGNU domains 2018-12-02 15:21:04 +01:00
eburimu
0b695faa07 xfsprogs: fix cross compilation 2018-12-02 00:44:25 -05:00
Ivan Kozik
77255a3cd7 xfsprogs: 4.14.0 -> 4.19.0 
xfsprogs started using icu in bff5d1a4e8df8a23957e5739850754991ad2b9c8, part of v4.16.0

xfsprogs-4.15.0-docdir.patch is needed to avoid cyclic references in the outputs.

./glibc-2.27.patch is no longer necessary as it was included in xfsprogs 8041435de7ed028a27ecca64302945ad455c69a6
 2018-12-02 02:12:45 +00:00
Jan Tojnar
c5881ec2c9
Merge remote-tracking branch 'upstream/master' into staging 2018-11-30 20:09:45 +01:00
Charles Duffy
7df55477fd
bees: init at 0.6.1 
Introduce an extent-layer (as opposed to the existing file-level) deduplication
system for btrfs. This provides a means of finding similarities within
non-identical files, when they contain identical, aligned blocks.
 2018-11-29 20:27:44 -06:00
John Ericson
071eba26a4
Merge pull request #51204 from eburimu/fix/cross-f2fs-tools 
f2fs-tools: fix cross compilation
 2018-11-29 15:26:27 -05:00
eburimu
cfb184f2cb
fix reiserfsprogs cross compilation 2018-11-29 17:52:20 +00:00
eburimu
98a2a5b537
fix jfsutils cross compilation 2018-11-29 10:14:02 +00:00
eburimu
d8e73253a4 f2fs-tools: fix cross compilation 2018-11-29 05:11:57 +03:00
Renaud
6a5fff3741
Merge pull request #51001 from c0bw3b/cleanup/more-https 
Treewide: use more HTTPS-enabled sources
 2018-11-25 16:22:34 +01:00
markuskowa
3a393eecaf
Merge pull request #50904 from Pneumaticat/lizardfs-update 
LizardFS: 3.11.3 -> 3.12.0, add Berkeley DB support
 2018-11-25 02:38:57 +01:00
Kevin Liu
34f2931037
lizardfs: enable Berkeley DB support 2018-11-24 19:43:25 -05:00
Kevin Liu
4bbc1a6ce3
lizardfs: 3.11.3 -> 3.12.0 2018-11-24 19:43:03 -05:00
c0bw3b
126f94d808 Treewide: use https for people.redhat.com 2018-11-24 23:56:37 +01:00
c0bw3b
dd3e576654 Treewide: use https for src.fedoraproject.org 2018-11-24 23:53:27 +01:00
Will Dietz
51b526d86e mtools: 4.0.20 -> 4.0.21 
* mtools: 4.0.20 -> 4.0.21 (#50993)

https://lists.gnu.org/archive/html/info-mtools/2018-11/msg00009.html

* mtools: homepage is https-capable
 2018-11-24 22:34:57 +01:00
c0bw3b
0ea604ac1d Treewide: use https for SourceForge 2018-11-24 19:58:03 +01:00
Peter Hoeg
0379c1c8e9
Merge pull request #50818 from r-ryantm/auto-update/android-file-transfer 
android-file-transfer: 3.6 -> 3.7
 2018-11-20 21:24:14 +08:00
R. RyanTM
92b16eef4d android-file-transfer: 3.6 -> 3.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/android-file-transfer/versions
 2018-11-19 18:38:58 -08:00
Ryan Mulligan
3ad838adcf
Merge pull request #50764 from r-ryantm/auto-update/f3 
f3: 7.0 -> 7.1
 2018-11-19 14:59:42 -08:00
R. RyanTM
ae9a72418f f3: 7.0 -> 7.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/f3/versions
 2018-11-19 10:04:52 -08:00
Jörg Thalheim
47a239a240
mtools: fix darwin build 2018-11-19 10:19:19 +00:00
R. RyanTM
4f99f26f9b mtools: 4.0.19 -> 4.0.20 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
 2018-11-18 23:18:55 -08:00
Peter Simons
b3eb903b48
Merge pull request #50540 from r-ryantm/auto-update/davfs2 
davfs2: 1.5.3 -> 1.5.4
 2018-11-18 13:48:52 +01:00
Jörg Thalheim
95eeb82923
Merge pull request #50564 from r-ryantm/auto-update/rdfind 
rdfind: 1.3.5 -> 1.4.1
 2018-11-18 10:46:35 +00:00
R. RyanTM
2e0f2b4fb9 rdfind: 1.3.5 -> 1.4.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rdfind/versions
 2018-11-18 00:47:21 -08:00
R. RyanTM
c5f7204aff davfs2: 1.5.3 -> 1.5.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/davfs2/versions
 2018-11-17 20:35:44 -08:00
Charles Duffy
9eefb443f3 squashfsTools: incorporate 4k-alignment option patch (#49200) 2018-11-17 15:44:19 +00:00
Michael Raskin
0ae3b49bb4
Merge pull request #50175 from r-ryantm/auto-update/btrfs-progs 
btrfs-progs: 4.17.1 -> 4.19
 2018-11-11 06:34:34 +00:00
Silvan Mosberger
e888a997d0
Merge pull request #49743 from nh2/glusterfs-4.0.0 
glusterfs: 3.12.12 -> 4.0.0
 2018-11-11 01:42:48 +01:00
R. RyanTM
ec49036267 btrfs-progs: 4.17.1 -> 4.19 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/btrfs-progs/versions
 2018-11-10 06:05:16 -08:00
Jörg Thalheim
5071475653
Merge pull request #50144 from r-ryantm/auto-update/disorderfs 
disorderfs: 0.5.4 -> 0.5.5
 2018-11-10 12:29:00 +00:00
Dominik Xaver Hörl
23e66b362d android-file-transfer: 3.5 -> 3.6 2018-11-10 11:27:28 +01:00
R. RyanTM
c6ddd51854 disorderfs: 0.5.4 -> 0.5.5 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/disorderfs/versions
 2018-11-09 23:51:17 -08:00
R. RyanTM
20938b4264 snapraid: 11.2 -> 11.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snapraid/versions
 2018-11-08 12:11:50 -08:00
Niklas Hambüchen
c3cddfcef1 glusterfs: 3.12.2 -> 4.0.0 2018-11-04 11:18:15 +01:00
Tim Steinbach
5de8517292
btrfs-progs: 4.15.1 -> 4.17.1 2018-10-23 19:55:08 -04:00
隠岐奈
0c4a7a86fd bcachefs-tools: 2018-08-22 -> 2018-10-12 2018-10-16 18:31:53 -05:00
Rob Vermaas
34ea15f5e4 nixpart0.blivet: fix reference to selinux python modules 
(cherry picked from commit 71941853a13878e5cc17b493f3791db7d4b29e51)
 2018-10-16 17:13:09 +02:00
Jörg Thalheim
daad7af224
Merge pull request #48556 from r-ryantm/auto-update/bindfs 
bindfs: 1.13.9 -> 1.13.10
 2018-10-16 16:11:52 +01:00
R. RyanTM
ddaefd444e bindfs: 1.13.9 -> 1.13.10 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bindfs/versions
 2018-10-16 04:38:35 -07:00
R. RyanTM
3da7fc8a57 fatsort: 1.4.2.439 -> 1.5.0.456 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fatsort/versions
 2018-10-15 22:22:56 -07:00
Benjamin Hipple
11c0d07761 f2fs-tools: fetch src from HTTPS instead of SSH (#48110) 
All users can use HTTPS, but some enterprise users may not be able to access
external SSH endpoints behind corporate firewalls.
 2018-10-09 22:37:18 +02:00
Renaud
e82162c262
Merge pull request #47750 from r-ryantm/auto-update/mtools 
mtools: 4.0.18 -> 4.0.19
 2018-10-06 12:58:35 +02:00
R. RyanTM
f4c968eaef disorderfs: 0.5.3 -> 0.5.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/disorderfs/versions
 2018-10-03 14:07:48 -07:00
R. RyanTM
aee3689349 mtools: 4.0.18 -> 4.0.19 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
 2018-10-03 05:36:40 -07:00
Daiderd Jordan
1383c08f2c
Merge branch 'master' into staging-next 2018-10-01 19:42:07 +02:00
haslersn
62bf19d2fc mkspiffs: init at 0.2.3 (#46674) 2018-10-01 14:49:02 +00:00
Tuomas Tynkkynen
5e84926a66 treewide: Replace meta.available checks in shouldUsePackages copypasta 
This reverts commit 79d8353b5e.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
 2018-09-28 15:01:00 +03:00
Will Dietz
df1dcbf07f e2fsprogs: patch out glibc instead of local fix so headers are usable 2018-09-24 10:50:39 -05:00
John Ericson
7319013ea1 Merge remote-tracking branch 'upstream/master' into staging 2018-09-18 16:55:42 -04:00
Frederik Rietdijk
de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Pascal Wittmann
c314092164
tmsu: 0.7.0 -> 0.7.1 2018-09-16 19:20:32 +02:00
Vladyslav Mykhailichenko
b7fe4f1039 exfat: 1.2.8 -> 1.3.0 2018-09-15 11:46:04 +03:00
Uli Baum
1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
Vladyslav Mykhailichenko
1f2babe59f android-file-transfer: 3.4 -> 3.5 2018-09-12 14:47:45 +03:00
R. RyanTM
65f41e1bc0 avfs: 1.0.5 -> 1.0.6 (#46306) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/avfs/versions
 2018-09-11 23:27:47 +02:00
Jan Malakhovski
b7bd0561be Merge branch 'master' into staging 2018-09-08 22:08:32 +00:00
Markus Kowalewski
0f61edc465
wfds: add license 2018-09-07 23:48:26 +02:00
Markus Kowalewski
9a46c0f384
relfs: add license 2018-09-07 23:48:21 +02:00
Markus Kowalewski
fa6bfc5974
reiser4progs: add license, update homepage 2018-09-07 23:48:19 +02:00
Markus Kowalewski
aae4e1ddc2
nilfs-utils: add licenses 2018-09-07 23:48:19 +02:00
Markus Kowalewski
d3485885b2
mtpfs: add licenses 2018-09-07 23:48:18 +02:00
Markus Kowalewski
4f83467ba4
mtools: add license 2018-09-07 23:48:17 +02:00
Markus Kowalewski
4516ca5480
jfsutils: add license + homepage 2018-09-07 23:48:17 +02:00
Markus Kowalewski
5f2d66ccc6
fatresize: add license 2018-09-07 23:48:16 +02:00
Markus Kowalewski
8060dadf69
curlftpfs: update meta data 2018-09-07 23:48:10 +02:00
Markus Kowalewski
735a7de051
bashmount: add license 2018-09-07 22:15:14 +02:00
Vladimír Čunát
1428d00aa4
Merge branch 'master' into staging-next 
Hydra: ?compare=1477053
 2018-09-04 13:06:45 +02:00
Vladimír Čunát
0d388e1bb6
aefs: fix meta.homepage 2018-09-03 16:29:35 +02:00
Vladimír Čunát
2d6179d1e8
Merge branch 'master' into staging 
A few trivial conflicts due to *Platforms mass replace.
 2018-09-01 17:38:18 +02:00
Vladimír Čunát
342d3db703
Merge branch 'staging-next' 
The failure diff seems good-enough on Hydra now.
 2018-09-01 17:02:15 +02:00
Vladimír Čunát
9b0649ae3e
Merge #45774: linux_testing_bcachefs: upgrade, add tests 2018-09-01 11:06:29 +02:00
Okina Matara
f7d1953d8f bcachefs-tools: 2018-07-21 -> 2018-08-22 2018-08-31 21:19:43 -05:00
Robert Schütz
93550cbddf Merge branch 'master' into staging-next 2018-08-31 17:32:48 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Robert Schütz
a9780a095b Merge branch 'master' into staging-next 2018-08-30 21:56:13 +02:00
Robert Schütz
4b4c871401 buttersink: move out of pythonPackages (#45783) 2018-08-30 16:33:53 +02:00
Vladimír Čunát
19c68fe28c
Merge branch 'master' into staging 2018-08-30 12:25:43 +02:00
Frederik Rietdijk
6038628ea5 Merge master into staging-next 2018-08-29 20:54:55 +02:00
Jörg Thalheim
c748ac5bdd
Merge pull request #45721 from Mic92/remove-hurd 
hurd: cleanup unmaintained target
 2018-08-28 23:32:39 +01:00
Jörg Thalheim
9efffe0135 hurd: cleanup unmaintained target 
This has been not touched in 6 years. Let's remove it to cause less
problems when adding new cross-compiling infrastructure.
This also simplify gcc significantly.
 2018-08-28 22:18:02 +01:00
Michael Weiss
98fbb44114 sshfs: 3.4.0 -> 3.5.0 2018-08-28 18:01:35 +02:00
Will Dietz
4c2d822fad
Merge pull request #45703 from dtzWill/fix/e2fsprogs-musl 
e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism
 2018-08-28 09:15:28 -05:00
Will Dietz
a3f8a2c56f e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism 
Fixes compilation on non-glibc at minor cost since these are only
used to guard the use of pragmas selectively disabling warnings
based on the GCC version used.
 2018-08-28 08:34:52 -05:00
David Guibert
2f6cc89787 udftools: 1.0.0b3 -> 2.0 (#45583) 
This path also migrates to the github repo.
 2018-08-27 10:15:23 +02:00
Frederik Rietdijk
7945295410 Merge master into staging 2018-08-27 08:21:50 +02:00
R. RyanTM
0e530b037d e2fsprogs: 1.44.3 -> 1.44.4 (#45602) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/e2fsprogs/versions.
 2018-08-27 02:09:44 +02:00
Uli Baum
cd8bcb5f9f ceph: fix build, 12.2.2 -> 12.2.7 
Since 772eef9168, Boost
doesn't support by python by default, which broke ceph.

Also bump to 12.2.7, the latest release of ceph 12.
 2018-08-26 13:11:57 +02:00
Jörg Thalheim
74d1acd762
Merge pull request #45336 from Mic92/licenses 
Add licenses
 2018-08-23 10:58:18 +01:00
Jörg Thalheim
229a2332f6 aefs: add license 2018-08-23 10:44:46 +01:00
Jörg Thalheim
af3e44722d _9pfs: add license + homepage 2018-08-23 10:44:35 +01:00
Michael Raskin
719140f840 fusesmb: mark as broken 2018-08-21 17:30:59 +03:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next' 
Security fixes for a few packages are included.
 2018-08-21 15:36:02 +02:00
Markus Kowalewski
06aabd8ef2
glusterfs: add license + homepage 2018-08-20 21:15:16 +02:00
Jörg Thalheim
d73e7efd5b
Merge pull request #45349 from zimbatm/fix-nixpart0-nixops 
pythonPackages.nixpart0: fix nixops deploy
 2018-08-20 12:25:32 +01:00
Markus Kowalewski
a16062720d
fusesmb: add license, remove dead homepage link 2018-08-20 00:52:39 +02:00
zimbatm
2c35ea0412 pythonPackages.nixpart0: fix nixops deploy 
re-introduce the unused "udevSoMajor" variable for nixops
backward-compatibilty.

This was removed by the treewide 52f53c69ce cleanup
 2018-08-19 20:59:52 +01:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next 
Hydra: ?compare=1473892
 2018-08-17 13:45:21 +02:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging 
Commits from master, conflict resolutions, etc.
 2018-08-13 20:57:50 +02:00
worldofpeace
098da6633e ifuse: rework expression 2018-08-13 00:49:17 -04:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next 
Hydra: ?compare=1472947
 2018-08-12 10:33:41 +02:00
Timo Kaufmann
921e5ceef3
Merge pull request #44894 from markuskowa/sqlite-lic 
Fix licenses (#43716)
 2018-08-11 15:31:29 +02:00
Markus Kowalewski
4622596d63
sshfs-fuse: add license 2018-08-11 14:33:17 +02:00
Jan Malakhovski
2a5d7d7727 e2fsprogs: make tests run, but disable 2018-08-11 09:35:33 +00:00
Jan Malakhovski
15e96bd4d2 sshfs-fuse: use checkInputs, fix tests 2018-08-11 09:35:28 +00:00
Jan Malakhovski
fd056d838e pythonPackages.nixpart: use checkInputs 2018-08-11 09:35:27 +00:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann
af8cd3c74e
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2018-08-09 13:10:27 +02:00
Okina Matara
2d82b2625f bcachefs-tools: 2018-04-10 -> 2018-07-21 2018-08-06 08:58:12 -05:00
Pascal Wittmann
f7be21f4c9
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
 2018-08-06 12:04:52 +02:00