diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems')
16 files changed, 124 insertions, 207 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index d0f68fac7ca..834aa7290ab 100644 --- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.3"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "0zn5fjrm9la5w1p66xhy87aasqsdky36dgc447jp2yp7nh18v339"; + sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw"; }; dontStrip = true; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 1da8470280b..e3545315d6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg"; + sha256 = "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 9c770441025..e3b1d7c661c 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -91,8 +91,9 @@ let ps.six ps.pyyaml ]); + sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.5"; + version = "14.2.6"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -100,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c"; + sha256 = "0qkyrb25r2a57n6k8ncb43x7hvhkmpi7abhfyi98mlz2lhmhzlm1"; }; patches = [ @@ -134,9 +135,10 @@ in rec { substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" # for pybind/rgw to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed - + # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others + export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages} patchShebangs src/script src/spdk src/test src/tools ''; @@ -159,6 +161,10 @@ in rec { postFixup = '' wrapPythonPrograms wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})" + + # Test that ceph-volume exists since the build system has a tendency to + # silently drop it with misconfigurations. + test -f $out/bin/ceph-volume ''; enableParallelBuilding = true; @@ -187,11 +193,11 @@ in rec { platforms = [ "x86_64-linux" ]; }; } '' - mkdir -p $out/{bin,etc,lib/python3.7/site-packages} + mkdir -p $out/{bin,etc,${sitePackages}} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/ + cp -r ${ceph}/${sitePackages} $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/etc # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch new file mode 100644 index 00000000000..3fbbc4c7d0f --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch @@ -0,0 +1,25 @@ +From 0cb1321c4cbb2978318ddad73c9ee6f2a19c55c8 Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sat, 11 Jan 2020 21:06:33 +0100 +Subject: [PATCH] umount_davfs: substitute ps command + +--- + src/umount_davfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/umount_davfs.c b/src/umount_davfs.c +index b7019c3..a278679 100644 +--- a/src/umount_davfs.c ++++ b/src/umount_davfs.c +@@ -157,7 +157,7 @@ main(int argc, char *argv[]) + } + fclose(file); + +- char *ps_command = ne_concat("ps -p ", pid, NULL); ++ char *ps_command = ne_concat("@ps@ -p ", pid, NULL); + FILE *ps_in = popen(ps_command, "r"); + if (!ps_in) { + error(0, 0, +-- +2.24.1 + diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index a0d2cfd4ef7..366db929f58 100644 --- a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, neon, zlib }: +{ stdenv +, fetchurl +, neon +, procps +, substituteAll +, zlib +}: stdenv.mkDerivation rec { name = "davfs2-1.5.6"; @@ -10,11 +16,21 @@ stdenv.mkDerivation rec { buildInputs = [ neon zlib ]; - patches = [ ./isdir.patch ./fix-sysconfdir.patch ]; + patches = [ + ./isdir.patch + ./fix-sysconfdir.patch + (substituteAll { + src = ./0001-umount_davfs-substitute-ps-command.patch; + ps = "${procps}/bin/ps"; + }) + ]; configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"]; + makeFlags = [ + "sbindir=$(out)/sbin" + "ssbindir=$(out)/sbin" + ]; meta = { homepage = https://savannah.nongnu.org/projects/davfs2; diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 0d7bcdcd0f2..8287a84d30d 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1ybrki63ixrkraynms5i4jiil9901whwxs6p61h2c2ild8w2ir8n"; + sha256 = "1xsdn16n867c7af3j02z7nxh1i71wi0g4zspnrgz1qmpxdw4aays"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index af3e9250985..f8d955dbfc1 100644 --- a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -1,22 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "gcsfuse"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "0dh01qvsjlzji2mwznykc2nghg4f1raylvgnp6sbxv9x1kpnwx71"; + sha256 = "11an7cxgg3x830mwlhyx50xkcv7zpa9aziz6gz1crwp8shr4hdik"; }; - modSha256 = "0i86xs3lq2mj22yv7jmhmb34k7lz348bakqz020xpyccllkkszy4"; + goPackagePath = "github.com/googlecloudplatform/gcsfuse"; - patches = [ - ./go.mod.patch - ./go.sum.patch - ]; + subPackages = [ "." "tools/mount_gcsfuse" ]; + + postInstall = '' + ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse + ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse + ''; meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; diff --git a/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.mod.patch b/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.mod.patch deleted file mode 100644 index fbda63432d7..00000000000 --- a/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.mod.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/go.mod 2019-10-09 22:35:05.777065057 -0400 -+++ b/go.mod 2019-10-10 21:34:15.809681738 -0400 -@@ -0,0 +1,25 @@ -+module github.com/googlecloudplatform/gcsfuse -+ -+go 1.12 -+ -+require ( -+ cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c -+ github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 -+ github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a -+ github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f -+ github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa -+ github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 -+ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd -+ github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff -+ github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 -+ github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 -+ github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb -+ github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b -+ github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 -+ github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e -+ github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 -+ golang.org/x/net v0.0.0-20170809000501-1c05540f6879 -+ golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 -+ google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 -+ google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7 -+) diff --git a/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.sum.patch b/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.sum.patch deleted file mode 100644 index d537266e3c1..00000000000 --- a/nixpkgs/pkgs/tools/filesystems/gcsfuse/go.sum.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/go.sum 2019-10-09 22:35:05.777065057 -0400 -+++ b/go.sum 2019-10-10 21:34:15.809681738 -0400 -@@ -0,0 +1,35 @@ -+cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c h1:pTb3uxaVLke7AQ/KUVTHWZmzKrKYrip7FimNb3ecAbo= -+cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -+github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 h1:PTPzzngHWcTI0ph/9I92RhVtRkdOCi37wySw/ojR5Eg= -+github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= -+github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f h1:X+tnaqoCcBgAwSTJtoYW6p0qKiuPyMfofEHEFUf2kdU= -+github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f/go.mod h1:Ip4fOwzCrnDVuluHBd7FXIMb7SHOKfkt9/UDrYSZvqI= -+github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa h1:3420E523ahKsI3tlbO0zeLvgzuTFdJoy6JoAVuShs8U= -+github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa/go.mod h1:9Aml1MG17JVeXrN4D2mtJvYHtHklJH5bESjCKNzVjFU= -+github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 h1:sfc1gTCrsJQJMySgDstAhwzogqQIrTxkwwScG4p2kbM= -+github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308/go.mod h1:3fF6sEraNZSToePaj5q+f9KSaMpuZcwccqAQmOKDv/k= -+github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= -+github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= -+github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= -+github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI= -+github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI= -+github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 h1:6GaIakaFrxn738iBykUc6fyS5sIAKRg/wafwzrzRX30= -+github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0/go.mod h1:5/sdn6lSZE5l3rXMkJGO7Y3MHJImklO43rZx9ouOWYQ= -+github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb h1:uSWBjJdMf47kQlXMwWEfmc864bA1wAC+Kl3ApryuG9Y= -+github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4= -+github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b h1:HMNP0njxow/ahg3AFKzu8HnyOUSRiVqWXm+i4VefV+Y= -+github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b/go.mod h1:mPvulh9VKXvo+yOlrD4VYOOYuLdZJ36wa/5QIrtXvWs= -+github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 h1:XKHJmHcgU9glxk3eLPiRZT5VFSHJitVTnMj/EgIoXC4= -+github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6/go.mod h1:JEWKD6V8xETMW+DEv+IQVz++f8Cn8O/X0HPeDY3qNis= -+github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e h1:BegecLAVSx5IW1bOImB8Lt6+4yiWP4t+PUeckWYzIeg= -+github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e/go.mod h1:q0HiLetNeSPHjs8ddOw9U6xahog8xR7WPp6PhzJ6wmk= -+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= -+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= -+golang.org/x/net v0.0.0-20170809000501-1c05540f6879 h1:0rFa7EaCGdQPmZVbo9F7MNF65b8dyzS6EUnXjs9Cllk= -+golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 h1:RS+wSrhdVci7CsPwJaMN8exaP3UTuQU0qB34R/E/JD0= -+golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -+google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 h1:wF/9eBxkxh3/00HWCFpF3583KFXGapuZ3EVpZIuLd4Q= -+google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -+google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= diff --git a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index b5fc12024b1..db5c469e63b 100644 --- a/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.1"; + version = "7.2"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "11v5hwijbb08xq3dd4m6bkspa3v4vjzcnw6j1qyh0gjmc7yy4ml3"; + sha256 = "0v333q217rvgh6bnmq4bcafkjz2gq0p4xqmxd3carkyl1zyyp8q5"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index da2dff6b77a..003a0e24fb5 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux.py cryptsetup + pykickstart pyparted pyblock libselinux cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix index 129283e83eb..5d7a9dd14ec 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python, buildPythonApplication +, libselinux # Propagated to blivet , useNixUdev ? true # Needed by NixOps @@ -10,10 +11,9 @@ let blivet = import ./blivet.nix { inherit stdenv fetchurl buildPythonApplication; - inherit pykickstart pyparted pyblock cryptsetup multipath_tools; + inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; inherit (pkgs) lsof utillinux systemd; - libselinux = pkgs.libselinux.override { enablePython = true; }; }; cryptsetup = import ./cryptsetup.nix { diff --git a/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix new file mode 100644 index 00000000000..996e3c52ec2 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, fuse +, unrar +}: + +stdenv.mkDerivation rec { + pname = "rar2fs"; + version = "1.28.0"; + + src = fetchFromGitHub { + owner = "hasse69"; + repo = pname; + rev = "v${version}"; + sha256 = "0fmdqrs5yvn89ngc26vj5ggnalpwrdm8pdcfszw1wflh78hvd8kb"; + }; + + postPatch = '' + substituteInPlace get-version.sh \ + --replace "which echo" "echo" + ''; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fuse unrar ]; + + configureFlags = [ + "--with-unrar=${unrar.dev}/include/unrar" + "--disable-static-unrar" + ]; + + meta = with stdenv.lib; { + description = "FUSE file system for reading RAR archives"; + homepage = https://hasse69.github.io/rar2fs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kraem ]; + platforms = with platforms; linux ++ freebsd; + }; +} diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch deleted file mode 100644 index 2834b046cef..00000000000 --- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch +++ /dev/null @@ -1,103 +0,0 @@ -From ea1bc0fcfd33191002c5d1f7072c1c02bb7ec4af Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Thu, 14 Nov 2019 15:45:46 +0000 -Subject: [PATCH] Fix build on BSD systems - -I tested FreeBSD, DragonflyBSD, NetBSD and OpenBSD and the endian -macros weren't necessary (and in fact caused errors) on all of them. - -Because OpenBSD ships with an ancient GCC that doesn't support the -checked addition/multiplication builtins, the build there would fail -unless built with CC=cc or CC=clang. I changed configure.ac to prefer -cc over gcc, so that the distribution's compiler preference is -respected. (The default is [gcc cc]). I had to move AC_PROG_CC above -LT_INIT because otherwise LT_INIT would run AC_PROG_CC first, and we -wouldn't have a chance to use non-default parameters. ---- - configure.ac | 2 +- - include/util/compat.h | 13 +++++-------- - lib/common/dirstack.c | 1 + - lib/common/mkdir_p.c | 2 +- - 4 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 018b3f6..19ea0ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,8 +3,8 @@ AC_INIT([squashfs-tools-ng], [0.7], [goliath@infraroot.at], squashfs-tools-ng) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) - AM_SILENT_RULES([yes]) -+AC_PROG_CC([cc gcc clang]) - LT_INIT --AC_PROG_CC - AC_PROG_CC_C99 - AC_PROG_INSTALL - AC_SYS_LARGEFILE -diff --git a/include/util/compat.h b/include/util/compat.h -index 74d0b6f..f53fd0e 100644 ---- a/include/util/compat.h -+++ b/include/util/compat.h -@@ -7,6 +7,10 @@ - #ifndef COMPAT_H - #define COMPAT_H - -+#ifndef __linux__ -+#define O_PATH 0 -+#endif -+ - #if defined(__APPLE__) - #include <libkern/OSByteOrder.h> - -@@ -17,14 +21,8 @@ - #define le32toh(x) OSSwapLittleToHostInt32(x) - #define le16toh(x) OSSwapLittleToHostInt16(x) - #define le64toh(x) OSSwapLittleToHostInt64(x) --#elif defined(__OpenBSD__) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/endian.h> --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) --#include <sys/endian.h> -- --#define le16toh(x) letoh16(x) --#define le32toh(x) letoh32(x) --#define le64toh(x) letoh64(x) - #elif defined(_WIN32) || defined(__WINDOWS__) - #define htole16(x) (x) - #define htole32(x) (x) -@@ -89,7 +87,6 @@ - #else - #include <sys/types.h> - #include <sys/stat.h> --#include <sys/sysmacros.h> - #endif - - #endif /* COMPAT_H */ -diff --git a/lib/common/dirstack.c b/lib/common/dirstack.c -index 8f73898..f8d1278 100644 ---- a/lib/common/dirstack.c -+++ b/lib/common/dirstack.c -@@ -5,6 +5,7 @@ - * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> - */ - #include "common.h" -+#include "util/compat.h" - - #include <string.h> - #include <stdlib.h> -diff --git a/lib/common/mkdir_p.c b/lib/common/mkdir_p.c -index cb433b3..95187ba 100644 ---- a/lib/common/mkdir_p.c -+++ b/lib/common/mkdir_p.c -@@ -7,7 +7,7 @@ - #include "common.h" - - #include <string.h> --#include <alloca.h> -+#include <stdlib.h> - #include <stdio.h> - #include <errno.h> - --- -2.23.0 - diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 727e257a486..bc8ce7b19c5 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,20 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, doxygen, graphviz, perl -, pkgconfig, lz4, xz, zlib, zstd +{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig +, lz4, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "01yn621dnsfhrah3qj1xh6ynag7r3nvihc510sa5frapkyg9nw8n"; + sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y"; }; - patches = lib.optional (!stdenv.isLinux) ./0001-Fix-build-on-BSD-systems.patch; - - nativeBuildInputs = [ doxygen graphviz pkgconfig perl ] - ++ lib.optional (!stdenv.isLinux) autoreconfHook; + nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; buildInputs = [ zlib xz lz4 zstd ]; meta = with lib; { @@ -22,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index 041d9a4e3f8..b97480d655b 100644 --- a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://help.yandex.com/disk/cli-clients.xml; + homepage = https://help.yandex.com/disk/cli-clients.xml; description = "A free cloud file storage service"; maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; |