github-actions[bot]
880c50a133
Merge master into staging-next
2022-03-26 00:02:23 +00:00
Charlotte 🦝 Delenk
d278459294
bcachefs-tools: 2022-03-09 -> 2022-03-22
2022-03-25 19:28:17 +01:00
github-actions[bot]
c6dd9fd65d
Merge master into staging-next
2022-03-25 18:01:14 +00:00
Emery Hemingway
de23459252
littlefs-fuse: init at 2.4.1
2022-03-25 16:30:49 +00:00
7c6f434c
bf158b0f4c
Merge pull request #165391 from r-ryantm/auto-update/btrfs-progs
...
btrfs-progs: 5.16.1 -> 5.16.2
2022-03-24 06:16:25 +00:00
R. Ryantm
56f7399734
btrfs-progs: 5.16.1 -> 5.16.2
2022-03-23 06:54:09 +00:00
github-actions[bot]
e452d308f5
Merge staging-next into staging
2022-03-22 12:02:02 +00:00
Sandro
5b874cadbf
Merge pull request #163582 from Stunkymonkey/treewide-fetchFromGitHub-1
2022-03-22 07:27:54 +01:00
Vladimír Čunát
a519740b4c
Merge branch 'staging-next' into staging
2022-03-21 11:57:43 +01:00
Ruud van Asseldonk
ed81545df5
squashfsTools: 4.5 -> 4.5.1
...
The patch that was previously fetched from GitHub is now part of the
4.5.1 release, and is no longer needed. Furthermore, 4.5.1 introduces
some new scripts to build manpages, and some new build inputs are
required to make that work.
This also rebases the Darwin patch. I don't have a Mac so I can't test
this personally. There was one conflict:
diff --cc squashfs-tools/read_xattrs.c
index 2067f80,b28c3a0..0000000
--- a/squashfs-tools/read_xattrs.c
+++ b/squashfs-tools/read_xattrs.c
@@@ -36,9 -38,7 +38,7 @@@
#include "xattr.h"
#include "error.h"
- #include <stdlib.h>
-
-extern int read_fs_bytes(int, long long, int, void *);
+extern int read_fs_bytes(int, long long, long long, void *);
extern int read_block(int, long long, long long *, int, void *);
static struct hash_entry {
Resolved by updating the signature from int to long long.
2022-03-20 13:02:57 +01:00
github-actions[bot]
691557fc47
Merge staging-next into staging
2022-03-18 00:03:09 +00:00
Artturi
dd207d6bda
dosfstools: 4.1 -> 4.2 ( #163074 )
2022-03-17 21:22:35 +02:00
zowoq
6431086967
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Vladimír Čunát
f48c1fda6b
Merge branch 'master' into staging-next
...
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments. The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
Artturi
936d567665
Merge pull request #164052 from a-m-joseph/btrfs-progs-udev-not-systemd
2022-03-14 22:19:33 +02:00
Felix Buehler
6ffdc42cd0
go-mtpfs: switch to fetchFromGitHub
2022-03-14 19:32:49 +01:00
davidak
d2c95bb666
Merge pull request #163433 from JJJollyjim/bcachefs
...
bcachefs: unstable-2022-01-12 -> unstable-2022-03-09
2022-03-14 15:34:43 +01:00
Jamie McClymont
3b01bd6249
bcachefs: update maintainers
...
As requested in https://github.com/NixOS/nixpkgs/pull/163433#issuecomment-1066169644
2022-03-14 21:52:18 +13:00
Jamie McClymont
5a8602a87b
bcachefs-tools: enable parallel building
2022-03-14 21:49:24 +13:00
Jamie McClymont
db181acbf8
bcachefs-tools: unstable-2022-01-12 -> unstable-2022-03-09
2022-03-14 21:49:24 +13:00
Adam Joseph
38f7252d34
btrfs-progs: depends on udev, not systemd
...
The btrfs-progs source code does not depend on systemd. It does,
however, optionally depend on a udev implementation such as eudev or
systemd-udevd. Let's express this dependency correctly, so that
nixpkgs users who choose eudev instead of systemd-udevd don't get a
build failure.
2022-03-13 16:21:33 -07:00
github-actions[bot]
f6b4a4048a
Merge staging-next into staging
2022-03-09 12:01:59 +00:00
github-actions[bot]
201cc2f89b
Merge master into staging-next
2022-03-09 00:02:05 +00:00
Renaud
38360c933d
Merge pull request #162945 from r-ryantm/auto-update/garage
...
garage: 0.6.0 -> 0.6.1
2022-03-08 22:38:00 +01:00
github-actions[bot]
137a689db1
Merge staging-next into staging
2022-03-07 00:02:59 +00:00
github-actions[bot]
b4b1ce4d4f
Merge master into staging-next
2022-03-07 00:02:12 +00:00
R. RyanTM
ccc067fd9f
ioztat: 1.1.0 -> 2.0.1
...
* ioztat: 1.1.0 -> 2.0.1 (#162735 )
* ioztat: install bin as executable
Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
2022-03-06 19:36:54 +01:00
github-actions[bot]
69e1d85d54
Merge staging-next into staging
2022-03-06 18:01:46 +00:00
github-actions[bot]
68a45fb1f2
Merge master into staging-next
2022-03-06 18:01:10 +00:00
Bobby Rong
9df2200638
Merge pull request #162869 from r-ryantm/auto-update/lfs
...
lfs: 2.2.0 -> 2.4.0
2022-03-06 21:39:18 +08:00
R. Ryantm
64373d18f9
mtools: 4.0.37 -> 4.0.38
2022-03-06 13:17:23 +00:00
zowoq
c46399881b
Merge staging-next into staging
...
Conflicts:
pkgs/tools/security/cosign/default.nix
2022-03-06 22:06:04 +10:00
github-actions[bot]
c8add09e8f
Merge master into staging-next
2022-03-06 12:01:22 +00:00
Artturi
0ba426a475
Merge pull request #156605 from kampka/e2fsprogs-test
...
e2fsprogs: Add test
2022-03-06 11:19:48 +02:00
R. Ryantm
47b93c97a2
garage: 0.6.0 -> 0.6.1
2022-03-06 00:25:27 +00:00
R. Ryantm
1bdeae3546
lfs: 2.2.0 -> 2.4.0
2022-03-05 09:31:48 +00:00
github-actions[bot]
f831b62376
Merge staging-next into staging
2022-02-28 12:01:47 +00:00
github-actions[bot]
e71c1249e8
Merge master into staging-next
2022-02-28 12:01:10 +00:00
Sandro
c53143dd09
Merge pull request #161240 from bzizou/irods-4.2.11-fixavro
2022-02-28 11:22:42 +01:00
Jonathan Ringer
3af9faf36d
Merge pull request #133431 from Ma27/glibc-2.34
...
glibc: 2.33-108 -> 2.34-115
2022-02-27 18:07:11 -08:00
github-actions[bot]
0a79f47878
Merge master into staging-next
2022-02-27 18:01:07 +00:00
R. Ryantm
9f064b9d54
lfs: 2.1.1 -> 2.2.0
2022-02-27 09:31:06 +00:00
Maximilian Bosch
25172c97d0
securefs: fix build w/glibc-2.34
...
Tests don't work in the sandbox and vendored catch2 doesn't compile, so
we disable the tests.
Failing Hydra build: https://hydra.nixos.org/build/163981825
2022-02-27 10:27:01 +01:00
Maximilian Bosch
f31930977d
djmount: fix build w/glibc-2.34
...
Failing Hydra build: https://hydra.nixos.org/build/163123869
2022-02-27 10:26:56 +01:00
AndersonTorres
ed2b1b4b90
Merge branch 'master' into staging-next
2022-02-26 21:04:25 -03:00
Joel
35c1b68c86
lfs: 2.1.0 -> 2.1.1
2022-02-26 17:59:44 +01:00
Renaud
dfe6d47bc5
Merge pull request #161415 from c0bw3b/pkg/cryfs
...
cryfs: 0.11.1 -> 0.11.2
2022-02-26 13:56:45 +01:00
R. Ryantm
ea9a2d5871
lfs: 2.0.1 -> 2.1.0
2022-02-24 12:14:07 +00:00
Bruno Bzeznik
00725d5dd6
irods: 4.2.7 -> 4.2.11
2022-02-24 10:15:49 +01:00
github-actions[bot]
37f89e2837
Merge master into staging-next
2022-02-23 18:01:10 +00:00
