Commit graph

1417 commits

Author SHA1 Message Date
Colin L Rice 8ff1865855
gcsfuse: add go.mod and go.sum files.
It looks like go1.12 silently created the module, but go1.13 does not.
2019-10-11 10:09:11 +02:00
/u/leo60228 bb1e6c9936 ntfs3g: enable extras (#51514)
* ntfs-3g: enable extras
Adds a few extra utilities, most of which are useful.

* ntfs-3g: download over https
2019-10-10 22:53:15 +02:00
Linus Heckemann 5aa4b19946 treewide: mark some broken packages as broken
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
2019-10-08 17:14:26 +02:00
Renaud 1aaba2ad85
Merge pull request #68250 from jonringer/bump-gcsfuse
gcsfuse: 0.23.0 -> 0.28.1
2019-10-06 18:22:53 +02:00
Vladyslav M 2a116c3bb9
bcachefs: 2019-10-01 (#70217)
bcachefs: 2019-10-01
2019-10-05 22:48:10 +03:00
Michael Raskin 47723057e5 xtreemfs: fix build with openssl-1.1 2019-10-04 20:37:24 +02:00
worldofpeace 0137b08bd1
Merge pull request #69745 from worldofpeace/update-f2fs-tools
f2fs-tools: 1.11.0 -> 1.13.0
2019-10-04 01:08:09 +00:00
Edmund Wu a3255de8c9
bcachefs-tools: 2019-09-25 -> 2019-10-01 2019-10-01 21:33:11 -04:00
Ryan Mulligan d1288c3773
Merge pull request #69675 from r-ryantm/auto-update/mergerfs
mergerfs: 2.28.1 -> 2.28.2
2019-09-28 08:22:19 -07:00
Timo Kaufmann 7cc78d4485
Merge pull request #67696 from eadwu/bcachefs/update-7
bcachefs/update-7
2019-09-28 08:22:24 +00:00
worldofpeace 2807da5e37 f2fs-tools: 1.11.0 -> 1.13.0 2019-09-27 21:54:10 -04:00
R. RyanTM 630329f11d mergerfs: 2.28.1 -> 2.28.2
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
2019-09-27 10:39:30 -07:00
Ryan Mulligan 7c7a623e59
Merge pull request #69541 from r-ryantm/auto-update/fuse-overlayfs
fuse-overlayfs: 0.5.1 -> 0.6.2
2019-09-27 07:36:37 -07:00
Edmund Wu 5c6e9e83d3
bcachefs-tools: 2019-08-21 -> 2019-09-25 2019-09-27 09:18:56 -04:00
Michael Raskin 1d69c41848
Merge pull request #69481 from r-ryantm/auto-update/btrfs-progs
btrfs-progs: 5.2.1 -> 5.2.2
2019-09-27 10:10:58 +00:00
Sarah Brofeldt c86b52ff08
Merge pull request #69518 from johanot/ceph-14.2.4
ceph: 14.2.3 -> 14.2.4
2019-09-26 18:02:25 +02:00
R. RyanTM 994e18df0a fuse-overlayfs: 0.5.1 -> 0.6.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fuse-overlayfs/versions
2019-09-26 08:19:50 -07:00
Johan Thomsen 7a61cd29bd ceph: 14.2.3 -> 14.2.4 2019-09-26 14:52:02 +02:00
R. RyanTM bac244ab2f btrfs-progs: 5.2.1 -> 5.2.2
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
2019-09-26 01:23:35 -07:00
Robin Gloster daa724ae5a
xtreemfs: mark as broken
does not support openssl 1.1
2019-09-24 15:59:01 +02:00
Jörg Thalheim 27994da318
squashfsTools: 4.4dev_20180612 -> 4.4 (#68275)
squashfsTools: 4.4dev_20180612 -> 4.4
2019-09-20 09:57:30 +01:00
Aaron Andersen 6f24ec8827
Merge pull request #66600 from Pamplemousse/sasquatch
sasquatch: init
2019-09-15 10:16:38 -04:00
Linus Heckemann 19ca6c62b0 netatalk: use system netatalk 2019-09-13 17:14:50 +00:00
Pamplemousse d25bf0495c sasquatch: init 2019-09-12 21:28:29 -07:00
Ruud van Asseldonk f6e8ee7533 squashfsTools: use updated Darwin patch
This new patch is the patch between 4.4, and commit [1], a pull request
at [2] to upsteam Mac and BSD compatibility. That pull request is
itself a rebase of an older pull request for an earlier version of
squashfs-tools. I squashed all commits between 4.4 and [1], apart from
the BSD-specific ones, and exported the new patch from that. Attached
below is the git diff --ignore-space-change between squashfs-tools 4.4
with the previous patch applied, and with the new patch applied.

[1]: 7d31beec53e6245d3405d6ef2b96e9811ae07044
[2]: https://github.com/plougher/squashfs-tools/pull/69

---

diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
index 8efefe6..5c2f835 100644
--- a/squashfs-tools/info.c
+++ b/squashfs-tools/info.c
@@ -159,7 +159,7 @@ void *info_thrd(void *arg)
 			case EINTR:
 				continue;
 			default:
-				BAD_ERROR("sigwaitfailed "
+				BAD_ERROR("sigwait failed "
 					"because %s\n", strerror(errno));
 			}
 		}
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 67d86a5..3607448 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -35,7 +35,10 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef linux
+#ifndef linux
+#include <sys/sysctl.h>
+#else
+#include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
 #include <fcntl.h>
@@ -52,7 +55,6 @@
 #include <sys/wait.h>
 #include <limits.h>
 #include <ctype.h>
-#include <sys/sysinfo.h>

 #ifndef FNM_EXTMATCH /* glibc extension */
 	#define FNM_EXTMATCH 0
@@ -5191,7 +5193,17 @@ int parse_mode(char *arg, mode_t *res)

 int get_physical_memory()
 {
+	/*
+	 * Long longs are used here because with PAE, a 32-bit
+	 * machine can have more than 4GB of physical memory
+	 *
+	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
+	 * If it fails use sysinfo, if that fails return 0
+	 */
+	long long num_pages = sysconf(_SC_PHYS_PAGES);
+	long long page_size = sysconf(_SC_PAGESIZE);
 	int phys_mem;
+
 #ifndef linux
 	#ifdef HW_MEMSIZE
 		#define SYSCTL_PHYSMEM HW_MEMSIZE
@@ -5221,16 +5233,6 @@ int get_physical_memory()
 	}
   #undef SYSCTL_PHYSMEM
 #else
-	/*
-	 * Long longs are used here because with PAE, a 32-bit
-	 * machine can have more than 4GB of physical memory
-	 *
-	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
-	 * If it fails use sysinfo, if that fails return 0
-	 */
-	long long num_pages = sysconf(_SC_PHYS_PAGES);
-	long long page_size = sysconf(_SC_PAGESIZE);
-
 	if(num_pages == -1 || page_size == -1) {
 		struct sysinfo sys;
 		int res = sysinfo(&sys);
diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
index 88d0b5c..1beefef 100644
--- a/squashfs-tools/mksquashfs.h
+++ b/squashfs-tools/mksquashfs.h
@@ -24,7 +24,6 @@
  * mksquashfs.h
  *
  */
-#include <pthread.h>

 struct dir_info {
 	char			*pathname;
diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
index f8fd529..48e6b27 100644
--- a/squashfs-tools/pseudo.c
+++ b/squashfs-tools/pseudo.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
index 00615ce..c1a6183 100644
--- a/squashfs-tools/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -38,7 +38,6 @@
 #include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -1085,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i)
 			break;
 		case SQUASHFS_SYMLINK_TYPE:
 		case SQUASHFS_LSYMLINK_TYPE: {
-			struct timespec times[2] = {
+			struct timeval times[2] = {
 				{ i->time, 0 },
 				{ i->time, 0 }
 			};
@@ -1104,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i)
 				goto failed;
 			}

-			res = utimensat(AT_FDCWD, pathname, times,
-					AT_SYMLINK_NOFOLLOW);
+			res = lutimes(pathname, times);
 			if(res == -1) {
 				EXIT_UNSQUASH_STRICT("create_inode: failed to set time on "
 					"%s, because %s\n", pathname,
2019-09-10 21:02:51 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Ruud van Asseldonk 14d2c3669f squashfsTools: make Darwin patch apply to 4.4
I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged. It applied cleanly. Then I rebased that on top
of master, and resolved the conflicts. I'm not sure I resolved them
correctly though, I don't have access to Darwin. Somebody needs to
review this.
2019-09-07 19:16:57 +02:00
Ruud van Asseldonk a60ee9a74c squashfsTools: make alignment patch apply to 4.4
I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged (which required editing one line in the patch,
as it assumed to be applied on top of the reproducibility patches). Then
I rebased that on top of master, resolved one conflict, and I formatted
a new patch for this.
2019-09-07 18:58:31 +02:00
Ruud van Asseldonk 442cf4f783 squashfsTools: 4.4dev_20180612 -> 4.4
A new release has been made upstream. Reproducibility issues were fixed
in that release, so we no longer need those patches. For a full overview
of the changes, see the 4.4-specific readme at [1].

The alignment patch no longer applies cleanly; I disabled it for now,
and I will try to restore it in a follow-up commit.

[1]: 52eb4c279c/README-4.4
2019-09-07 16:12:07 +02:00
Jonathan Ringer 44fe29b1bb gcsfuse: 0.23.0 -> 0.28.1 2019-09-07 01:51:29 -07:00
Jan Tojnar f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Johan Thomsen 161855c033 ceph: 14.2.1 -> 14.2.3 2019-09-05 14:33:29 +02:00
Johan Thomsen fb22d67fa7 ceph: 13.2.4 -> 14.2.1
* remove kinetic
* release note
* add johanot as maintainer

nixos/ceph: create option for mgr_module_path
  - since the upstream default is no longer correct in v14

* fix module, default location for libexec has changed
* ceph: fix test
2019-09-04 16:17:18 +02:00
Kristoffer 85baedaca3 ceph: 12.2.7 -> 13.2.4
* maintain only one version
* ceph-client: init
* include ceph-volume python tool in output

nixos/ceph: extraConfig, fix test, wait for ceph-mgr to become active

* run ceph with disk group permission
* add extraConfig option for the global section
needed per cluster
* clear up how ceph.conf is generated
* fix ceph testcase
2019-09-04 16:01:42 +02:00
Franz Pletz de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
Franz Pletz 3a7a990ee9
irods: build with current version of llvm 2019-09-03 22:04:15 +02:00
Niklas Hambüchen 9e78f76ade treewide: Remove unnecessary --disable-static (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk 151f52bf96 e2fsprogs: disable failing tests (#65471)
Disable several tests that often fail on Hydra but not locally.
2019-08-31 10:27:57 +02:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Jonathan Ringer 5fe68fd142 pythonPackage.nixpart0: disable for python3 2019-08-30 12:35:42 +09:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Robin Gloster 616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Edmund Wu d8601dc4f9
bcachefs-tools: 2019-07-13 -> 2019-08-21 2019-08-23 22:38:00 -04:00
Michael Raskin 0cbeac4f66
Merge pull request #66736 from markuskowa/upd-gluster
glusterfs: 4.0 -> 6.5
2019-08-20 08:08:57 +00:00