Commit graph

1609 commits

Author SHA1 Message Date
Maximilian Bosch e96a57b4d3
udftools: fix build w/glibc-2.30 2020-01-25 19:45:54 +01:00
Maximilian Bosch be238f8aef
ext4magic: fix build w/glibc-2.30 2020-01-25 12:55:11 +01:00
Michael Weiss 7c08ba312b
Merge pull request #78189 from kraem/master
rar2fs: init at 1.28.0
2020-01-24 18:29:38 +01:00
kraem 04bf042e2f
rar2fs: init at 1.28.0 2020-01-23 21:16:20 +01:00
Maximilian Bosch eddfcc32b4
Merge branch 'staging' into glibc230 2020-01-23 11:31:13 +01:00
Florian Klink 79bf9ef3b5
Merge pull request #78243 from srhb/ceph-revert-lost-ceph-volume
ceph: Bring back ceph-volume
2020-01-22 18:00:22 +01:00
Sarah Brofeldt 585ac580df ceph: Bring back ceph-volume 2020-01-22 12:26:58 +01:00
Mario Rodas ec8fd9cc34
Merge pull request #78165 from r-ryantm/auto-update/glusterfs
glusterfs: 7.1 -> 7.2
2020-01-22 05:35:28 -05:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
R. RyanTM f0da790b6d glusterfs: 7.1 -> 7.2 2020-01-21 14:13:32 +00:00
zowoq 5679caf3ef fuse-overlayfs: 0.7.4 -> 0.7.5 2020-01-19 08:28:52 +10:00
Jan Tojnar 07b8ab4ff7
python2.pkgs.nixpart0: use correct libselinux bindings
Sine 56e557257d libselinux in pkgs defaults to Python 3 so let's use the one from python.pkgs to make sure it matches.
2020-01-18 11:20:40 +01:00
Niklas Hambüchen 8fb62abe8a
Merge pull request #77604 from srhb/ceph-14.2.6
ceph: 14.2.5 -> 14.2.6
2020-01-18 02:15:02 +01:00
Frederik Rietdijk bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
zowoq 0553f2a56b fuse-overlayfs: 0.7.3 -> 0.7.4
https://github.com/containers/fuse-overlayfs/releases/tag/v0.7.4
2020-01-17 20:56:34 +10:00
Mario Rodas af2f66e9ce
Merge pull request #77533 from zowoq/fuse-overlayfs
fuse-overlayfs: 0.7.2 -> 0.7.3
2020-01-16 20:45:52 -05:00
Mario Rodas 83ce75d4d6
Merge pull request #77723 from r-ryantm/auto-update/bindfs
bindfs: 1.14.2 -> 1.14.3
2020-01-15 19:52:25 -05:00
Mario Rodas 6e86e4059f
gcsfuse: use buildGoPackage 2020-01-15 18:18:18 -05:00
R. RyanTM b13514f964 gcsfuse: 0.28.1 -> 0.29.0 2020-01-15 13:35:49 +00:00
Anders Kaseorg 3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
R. RyanTM 50e40630ce bindfs: 1.14.2 -> 1.14.3 2020-01-15 05:38:04 +00:00
R. RyanTM 0e7417e49a btrfs-progs: 5.4 -> 5.4.1 2020-01-15 04:57:16 +00:00
Luka Blaskovic d9b726aef9 jfsutils: fix build with glibc>=2.28 2020-01-14 22:32:09 +00:00
Sarah Brofeldt fe4d213091 ceph: 14.2.5 -> 14.2.6 2020-01-13 08:57:06 +01:00
Florian Klink 1ec5d8249c davfs2: substitute ps command
umount.davfs2 uses ps to get a process list to terminate gracefully.

On NixOS, this currently fails:

```
sh: ps: command not found
/run/current-system/sw/bin/umount.davfs:
  can't find mount.davfs-process with pid 4085;
  trying to unmount anyway.
  you propably have to remove /var/run/mount.davfs/root-x.pid manually
sh: umount: command not found
```

Fix this by patching ${procps}/bin/ps into the ps_command.

Afterwards:

```
umount.davfs: waiting for mount.davfs (pid 4106) to terminate gracefully .. OK
```
2020-01-12 00:01:59 +01:00
zowoq 9ce498e301 fuse-overlayfs: 0.7.2 -> 0.7.3 2020-01-12 08:59:11 +10:00
Florian Klink 2603d15a4d
Merge pull request #77167 from srhb/ceph-14_2_5
ceph: 14.2.4 -> 14.2.5
2020-01-09 18:39:05 +01:00
Mario Rodas ef7ae51401
Merge pull request #77024 from r-ryantm/auto-update/davfs2
davfs2: 1.5.5 -> 1.5.6
2020-01-09 05:26:25 -05:00
Sarah Brofeldt c373fc3b80 ceph: 14.2.4 -> 14.2.5 2020-01-09 08:00:00 +01:00
R. RyanTM 3f1e0e6cc5 reiser4progs: 1.2.1 -> 2.0.0 2020-01-07 08:15:44 -08:00
R. RyanTM d706d39f58 davfs2: 1.5.5 -> 1.5.6 2020-01-06 00:57:30 -08:00
Michael Weiss 63834d63da
sshfs: 3.6.0 -> 3.7.0
Changelog: https://github.com/libfuse/sshfs/blob/sshfs-3.7.0/ChangeLog.rst
2020-01-04 20:07:16 +01:00
markuskowa 7e1876dc36
Merge pull request #76341 from r-ryantm/auto-update/moosefs
moosefs: 3.0.107 -> 3.0.109
2020-01-04 12:23:18 +01:00
Jan Tojnar 0c2adc0fb1
Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Robin Gloster f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster 5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Jonathan Ringer 446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Andrew Childs 93470276f9 mtdutils: fix cross build 2019-12-30 17:21:39 +01:00
Frederik Rietdijk 6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster ac8eaa8507
treewide: fix *Flags 2019-12-30 04:50:37 +01:00
Robin Gloster 8cebd2f6b7
bees: 0.6.1 -> 0.6.2
fixes build with gcc9
2019-12-27 21:54:57 +01:00
R. RyanTM 324a7ede05 moosefs: 3.0.107 -> 3.0.109 2019-12-23 17:56:07 -08:00
Michael Raskin d37b082db7
Merge pull request #76261 from r-ryantm/auto-update/glusterfs
glusterfs: 7.0 -> 7.1
2019-12-23 19:54:34 +00:00
R. RyanTM d1d2c4dce0 glusterfs: 7.0 -> 7.1 2019-12-23 05:40:24 -08:00
R. RyanTM 5ae32c796f bindfs: 1.14.1 -> 1.14.2 2019-12-22 19:47:39 -08:00
Frederik Rietdijk dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Jaka Hudoklin b090446824
Merge pull request #75556 from peterhoeg/u/overlayfs_0_7_2
fuse-overlayfs: 0.7 -> 0.7.2
2019-12-12 21:12:40 +00:00
Domen Kožar c49ca3e505
nixpart: ignore useNixUdev as it's now required by hetzner 2019-12-12 15:04:31 +01:00
Peter Hoeg af1b93f571 fuse-overlayfs: 0.7 -> 0.7.2 2019-12-12 19:41:03 +08:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
R. RyanTM 66f5b1f750 btrfs-progs: 5.3.1 -> 5.4 2019-12-07 16:44:46 -08:00
Niklas Hambüchen 3ccbce4b12
Merge pull request #74485 from malbarbo/e2fsprogs-shared
e2fsprogs: allow static build
2019-12-06 19:07:01 +01:00
Marco A L Barbosa f6ea33023e e2fsprogs: allow static build 2019-12-05 11:55:24 -03:00
R. RyanTM 1f5f6b796b grive2: 0.5.0 -> 0.5.1 2019-12-01 18:51:51 +01:00
R. RyanTM 5837214501 moosefs: 3.0.105 -> 3.0.107 (#74481) 2019-11-30 17:03:52 +01:00
Renaud f0b9bd93ec
cryfs: 0.9.10 -> 0.10.2
(#74296)
2019-11-29 22:58:38 +01:00
Dima 0541d071af samba3, fusesmb: removing
Samba 3 has been discontinued since Q1/2015. So I think it's time
to just wipe it from the pkgs. FuseSMB is pretty much abandoned,
upstream does not exist and it's also not as useful as it used to
be anyways.
2019-11-26 19:56:16 +01:00
Ryan Mulligan a024b44965
Merge pull request #74234 from r-ryantm/auto-update/fuse-overlayfs
fuse-overlayfs: 0.6.2 -> 0.7
2019-11-26 07:39:55 -08:00
R. RyanTM e17a0f3c5f gitfs: 0.5.1 -> 0.5.2 2019-11-26 00:42:45 -08:00
R. RyanTM 5d230d8c58 fuse-overlayfs: 0.6.2 -> 0.7 2019-11-25 17:35:30 -08:00
Renaud 35d99698ae
dislocker: replace polarssl with mbedtls
polarssl is an old alias to mbedtls
2019-11-24 23:16:01 +01:00
c0bw3b 0afae5c14b Treewide: fix more URL permanent redirects
Related issue: #60004
Previous PR: #73478
2019-11-21 15:37:34 -08:00
Domen Kožar c64e17b68d
nixpart0: mark as unbroken
It builds.
2019-11-21 17:39:28 +01:00
Rob Vermaas 302396fc42 nixpart0: remove broken, fix build for (local) pykickstart dep 2019-11-19 11:09:24 +01:00
Alyssa Ross 6955816811 squashfs-tools-ng: init at 0.7 2019-11-17 23:46:16 +01:00
Linus Heckemann 75667c2916 pythonPackages.nixpart: unmark broken 2019-11-15 18:00:36 +01:00
Michael Raskin e3b76760e3
Merge pull request #73168 from judaew/btrfs-progs-update
btrfs-progs: 5.2.2 -> 5.3.1
2019-11-11 23:10:49 +00:00
Florian Klink 05590b3efd ceph: fix build and cleanup expression
correct platforms. ceph currently doesn't build on aarch64-linux. So
let's not lie in meta.platforms.

ceph: fix multiple output
We currently just move $out/share/ceph/mgr to
$lib/lib/ceph, and then remove all references to $out with a find
command.

I checked $out, the only reference to $out is in
$lib/lib/ceph/libceph-common.so.0, coming from src/common/options.cc:
https://github.com/ceph/ceph/blob/master/src/common/options.cc#L5050:

>  Option("mgr_module_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
>  .set_default(CEPH_DATADIR "/mgr")
>  .add_service("mgr")
>  .set_description("Filesystem path to manager modules."),

Just removing the reference might break some behaviour - it should point
to $lib/ceph/mgr instead.

We can fix this in a much more elegant fashion by just passing a custom
CMAKE_INSTALL_DATADIR to the build system.

ceph: fix outdated Boost::python substitutions

Instead of substituting in CMakeLists.txt files, one now needs to set
MGR_PYTHON_VERSION.

ceph: clean up PYTHONPATH wrapping

Set `pythonPath` instead of exporting PYTHONPATH.

Use `toPythonPath` to construct the PYTHONPATH where we need manual
wrapping. There's no ceph-volume, only ceph-mgr.

ceph: set doCheck = false explicitly

and describe why.

ceph: patch more shebangs

ceph: use system-provided gtest and rocksdb
2019-11-11 21:47:02 +01:00
Vadim-Valdis Yudaev 9bf9370d95
btrfs-progs: 5.2.2 -> 5.3.1 2019-11-10 19:11:42 +02:00
R. RyanTM 42235323e5 mergerfs: 2.28.2 -> 2.28.3
(#72572)
2019-11-09 16:21:53 +01:00
Franz Pletz c424a9dec5
sshfs: fix fetchpatch hash 2019-11-03 14:58:56 +01:00
Michael Weiss 3f0d188f65
sshfs: 3.5.2 -> 3.6.0
The patch prevents the following error:
[2/7] Generating manpages with a custom command.
../sshfs.rst:210: (ERROR/3) Unexpected indentation.
../sshfs.rst:211: (WARNING/2) Block quote ends without a blank line; unexpected unindent.
2019-11-03 14:21:43 +01:00
Florian Klink ef2af94928
Merge pull request #72485 from charles-dyfis-net/gocryptfs-1.7.1
gocryptfs: 1.7 -> 1.7.1
2019-11-02 14:37:10 +01:00
Charles Duffy 8f285340f3
gocryptfs: 1.7 -> 1.7.1 2019-11-01 16:12:22 -05:00
Marek Mahut fd6aba3080
Merge pull request #71588 from r-ryantm/auto-update/gitfs
gitfs: 0.4.5.1 -> 0.5.1
2019-11-01 09:22:35 +01:00
Jörg Thalheim c91a1be877
nixos/orangefs: init at 2.9.7, add modules and test (#67591)
nixos/orangefs: init at 2.9.7, add modules and test
2019-10-31 09:27:14 +00:00
Marek Mahut 4a7bb2872b
Merge pull request #71883 from r-ryantm/auto-update/s3backer
s3backer: 1.5.2 -> 1.5.4
2019-10-27 13:18:21 +01:00
Renaud b74a6b11a6
lizardfs: use spdlog from nixpkgs (#71938) 2019-10-25 07:54:24 +02:00
Frederik Rietdijk 32389de159 Merge master into staging-next 2019-10-24 08:27:04 +02:00
R. RyanTM 3f8450e0df s3backer: 1.5.2 -> 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/s3backer/versions
2019-10-23 18:13:53 -07:00
Michael Raskin 7e7ef31f9e
Merge pull request #71609 from r-ryantm/auto-update/glusterfs
glusterfs: 6.5 -> 7.0
2019-10-23 18:09:33 +00:00
R. RyanTM eff7a160c2 e2fsprogs: 1.45.3 -> 1.45.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/e2fsprogs/versions
2019-10-22 09:54:48 +02:00
R. RyanTM d0899bd7ac glusterfs: 6.5 -> 7.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glusterfs/versions
2019-10-21 20:02:20 -07:00
R. RyanTM dd798feaa5 gitfs: 0.4.5.1 -> 0.5.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/gitfs/versions
2019-10-21 14:28:43 -07:00
Frederik Rietdijk 12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
Robin Gloster 5a1232908c
Merge pull request #70528 from eadwu/bcachefs/update-9
bcachefs/update-9
2019-10-16 00:28:17 +02:00
Will Dietz 62e4a35fa7 mtdutils: 1.5.2 -> 2.1.1 (#62805)
* mtdutils: 1.5.2 -> 2.1.0

http://lists.infradead.org/pipermail/linux-mtd/2019-March/088267.html

And the previous releases, hardcoded version in URL I think caused
this to be missed by auto-updaters for a while now.

1.5.2, FWIW in 2015:

http://lists.infradead.org/pipermail/linux-mtd/2015-August/060723.html

* mtd-utils: 2.1.0 -> 2.1.1

+ cleanup
+ enable tests and parallel building
+ add zstd support
2019-10-15 19:35:14 +02:00
Minijackson 6fe888466f
sshfs: add ssh program to the environment 2019-10-13 11:41:10 +02:00
Edmund Wu 05a0a6353d
bcachefs-tools: 2019-10-01 -> 2019-10-12 2019-10-12 18:24:02 -04:00
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
Markus Kowalewski 2906718bcc
orangefs: init at 2.9.7 2019-09-21 16:21:10 +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
R. RyanTM daf83f7f06 fuse-overlayfs: 0.4.1 -> 0.5.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/fuse-overlayfs/versions
2019-08-19 01:55:14 -07:00
Markus Kowalewski 830218cc64
glusterfs: 4.0 -> 6.5
* remove patches (fixed upstream)
* python2 -> python3
2019-08-18 18:57:47 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Marek Mahut 09740b8931
Merge pull request #66784 from r-ryantm/auto-update/avfs
avfs: 1.1.0 -> 1.1.1
2019-08-17 23:06:13 +02:00
R. RyanTM e7c48e998e avfs: 1.1.0 -> 1.1.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/avfs/versions
2019-08-17 12:07:57 -07:00
R. RyanTM acaacd395e btrfs-progs: 5.1.1 -> 5.2.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/btrfs-progs/versions
2019-08-17 09:48:13 -07:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00