From a3f8a2c56f8e40be638d6b5b9df54dab1d8b4ba4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 Aug 2018 06:45:52 -0500 Subject: 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. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d5f43e317024..e2b87007b09f 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libuuid gettext ]; + # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc + NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") + "-D__GNUC_PREREQ(maj,min)=0"; + configureFlags = if stdenv.isLinux then [ "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" -- cgit 1.4.1 From 0d388e1bb6981ccffe08920e22000bee80a44446 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 3 Sep 2018 16:29:35 +0200 Subject: aefs: fix meta.homepage --- pkgs/tools/filesystems/aefs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 9ea4d092548f..9344ada8f93e 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; meta = with stdenv.lib; { - homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/; + homepage = https://nixos.org/~edolstra/aefs/; description = "A cryptographic filesystem implemented in userspace using FUSE"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; -- cgit 1.4.1 From 735a7de05164ce5238261f5fbb625fb5a109debc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:15:14 +0200 Subject: bashmount: add license --- pkgs/tools/filesystems/bashmount/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 579258f63f98..cd0f3ea23229 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jamielinux/bashmount; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; + license = licenses.gpl2; platforms = platforms.all; }; } -- cgit 1.4.1 From 8060dadf69b99305d9f723894303d825a604a722 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:17:34 +0200 Subject: curlftpfs: update meta data --- pkgs/tools/filesystems/curlftpfs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 4af7c9fb8c26..5636909093e6 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { doCheck = false; # fails, doesn't work well too, btw - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; + homepage = http://curlftpfs.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.linux; + }; } -- cgit 1.4.1 From 5f2d66ccc6e39cb0fee97b94b915d4e8e59b35ca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:19:35 +0200 Subject: fatresize: add license --- pkgs/tools/filesystems/fatresize/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 9af14b051261..7bb5dd415a6a 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { - + version = "1.0.2"; name = "fatresize-${version}"; @@ -9,31 +9,32 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; }; - + buildInputs = [ parted utillinux ]; - + # This patch helps this unmantained piece of software to be built against recent parted # It basically modifies the detection scheme for parted version (the current one has no micro version defined) # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params patches = [ ./fatresize_parted_nix.patch ]; - + preConfigure = '' echo "Replacing calls to ped_free with free ..." substituteInPlace ./fatresize.c --replace ped_free free ''; - + # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG makeFlags = '' LDFLAGS=-lparted-fs-resize ''; - + propagatedBuildInputs = [ parted utillinux ]; - - meta = { + + meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; homepage = https://sourceforge.net/projects/fatresize; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } -- cgit 1.4.1 From 4516ca5480dc19bd41ea88b34a8dfa24034ea59d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:22:13 +0200 Subject: jfsutils: add license + homepage --- pkgs/tools/filesystems/jfsutils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 244f3e294a86..acc7a91d93f5 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { description = "IBM JFS utilities"; - platforms = stdenv.lib.platforms.linux; + homepage = http://jfs.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 4f83467ba42b00714f317fd56987fbc6a38b96a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:23:41 +0200 Subject: mtools: add license --- pkgs/tools/filesystems/mtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index e7a9963f6501..f153e59019e3 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.gpl3; }; } -- cgit 1.4.1 From d3485885b208c6992d3c318a723716196ac26145 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:25:24 +0200 Subject: mtpfs: add licenses --- pkgs/tools/filesystems/mtpfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index afe51caa8772..bf048113714f 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = [ maintainers.qknight ]; }; } -- cgit 1.4.1 From aae4e1ddc20bc30a395198cad44859bc367d8284 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:29:04 +0200 Subject: nilfs-utils: add licenses --- pkgs/tools/filesystems/nilfs-utils/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 6b56a8aadfa0..eccd72ceb238 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation rec { find . -name .libs | xargs rm -rf ''; - meta = { + meta = with stdenv.lib; { description = "NILFS utilities"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; updateWalker = true; }; -- cgit 1.4.1 From fa6bfc59746533c559382218c99e264a97c98120 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:32:12 +0200 Subject: reiser4progs: add license, update homepage --- pkgs/tools/filesystems/reiser4progs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 59d8e8aa4389..967a8ee43bef 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace ./run-ldconfig true ''; - meta = { + meta = with stdenv.lib; { inherit version; - homepage = http://www.namesys.com/; + homepage = https://sourceforge.net/projects/reiser4/; description = "Reiser4 utilities"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 9a46c0f384fc2025d69cea4ab2ea4a3625738710 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:34:31 +0200 Subject: relfs: add license --- pkgs/tools/filesystems/relfs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 9a8c3ecb0fc8..04a15dfa22be 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -40,10 +40,12 @@ stdenv.mkDerivation rec { chmod a+x \$out/bin/relfs_grant; ''; - meta = { + meta = with stdenv.lib; { description = "A relational filesystem on top of FUSE"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = http://relfs.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; broken = true; }; } -- cgit 1.4.1 From 0f61edc465a643d48471a0b96b362694419f3ecb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Sep 2018 22:38:03 +0200 Subject: wfds: add license --- pkgs/tools/filesystems/wdfs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index dc725b5078f0..135373e09f42 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [fuse glib neon]; - meta = { + + meta = with stdenv.lib; { homepage = http://noedler.de/projekte/wdfs/; + license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 65f41e1bc0394dfe14d9541aa9a88ea67ff65260 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Sep 2018 14:27:47 -0700 Subject: 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 --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 3f596947f883..5c44ef239630 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "0xh1wpd8z3m5jmmv24fg4pvqhpnhygs2385qn5473hwk84gnpkp5"; + sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 1f2babe59f1f5b77e049063b05885d88a668cc62 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 12 Sep 2018 14:47:45 +0300 Subject: android-file-transfer: 3.4 -> 3.5 --- pkgs/tools/filesystems/android-file-transfer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 40725defbed9..336dc785bbfd 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "android-file-transfer-${version}"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc"; + sha256 = "036hca41ikgnw4maykjdp53l31rm01mgamy9y56i5qqh84cwmls2"; }; buildInputs = [ cmake fuse readline pkgconfig qtbase ]; buildPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; - homepage = http://whoozle.github.io/android-file-transfer-linux/; + homepage = https://whoozle.github.io/android-file-transfer-linux/; license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; -- cgit 1.4.1 From b7fe4f1039d145bc5cbf58dfce142dbe313c6740 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sat, 15 Sep 2018 11:46:04 +0300 Subject: exfat: 1.2.8 -> 1.3.0 --- pkgs/tools/filesystems/exfat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 47ff22ae20dd..97a96651a68e 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "relan"; repo = "exfat"; rev = "v${version}"; - sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9"; + sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From c314092164c0f192bbad73433e44eab338a8f9d8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 16 Sep 2018 19:20:32 +0200 Subject: tmsu: 0.7.0 -> 0.7.1 --- pkgs/tools/filesystems/tmsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 359653465059..3c6dd2648ef6 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.7.0"; + version = "0.7.1"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64"; + sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg"; }; buildInputs = [ go fuse ]; -- cgit 1.4.1 From df1dcbf07fb91b9b9ecf676d57682e310625f2fe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 24 Sep 2018 10:39:35 -0500 Subject: e2fsprogs: patch out glibc instead of local fix so headers are usable --- pkgs/tools/filesystems/e2fsprogs/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index e2b87007b09f..168bf7d076ce 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo, perl }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: stdenv.mkDerivation rec { name = "e2fsprogs-1.44.4"; @@ -15,8 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid gettext ]; # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc - NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") - "-D__GNUC_PREREQ(maj,min)=0"; + patches = if stdenv.hostPlatform.libc == "glibc" then null + else [ + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/1f3b51493031cc0309009804475e3db572fc89ad/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; + sha256 = "1q7y8nhsfwl9r1q7nhrlikazxxj97p93kgz5wh7723cshlji2vaa"; + extraPrefix = ""; + }) + ]; configureFlags = if stdenv.isLinux then [ -- cgit 1.4.1 From 5e84926a667d496d1c09d00df260299e853cdd03 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 29 Aug 2018 01:20:54 +0300 Subject: treewide: Replace meta.available checks in `shouldUsePackages` copypasta This reverts commit 79d8353b5e4bb98f1b51ab32b9b26df81bb7e106. This sort of code breaks config.{allowBroken, allowUnsupportedSystem} = true by making them do unpredictable things. --- pkgs/development/libraries/wiredtiger/default.nix | 2 +- pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 2 +- pkgs/os-specific/linux/ffado/default.nix | 2 +- pkgs/servers/shishi/default.nix | 2 +- pkgs/tools/filesystems/ceph/generic.nix | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c4d94af850dd..56068c435d80 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 391ac107ab71..efd5aa4e9194 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let inherit (python2Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index c11be4ad0c0c..2e349cf691c9 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 4e3e373d244c..85218042cf76 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -11,7 +11,7 @@ let - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 1540a6f1fd18..b066ff18bfdc 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 14fedd6610e1..c4856d925299 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -37,7 +37,8 @@ with stdenv.lib; let shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value; - in if pkg.meta.available or false then pkg else null; + in if lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms + then pkg else null; optYasm = shouldUsePkg yasm; optFcgi = shouldUsePkg fcgi; -- cgit 1.4.1 From 62bf19d2fcd1ebd7de0381f95c17bcc802b08483 Mon Sep 17 00:00:00 2001 From: haslersn <33969028+haslersn@users.noreply.github.com> Date: Mon, 1 Oct 2018 16:49:02 +0200 Subject: mkspiffs: init at 0.2.3 (#46674) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/filesystems/mkspiffs/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/tools/filesystems/mkspiffs/presets.nix | 20 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 61 insertions(+) create mode 100644 pkgs/tools/filesystems/mkspiffs/default.nix create mode 100644 pkgs/tools/filesystems/mkspiffs/presets.nix (limited to 'pkgs/tools/filesystems') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7178c8c0a1e1..3b7329a8d790 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1640,6 +1640,11 @@ github = "hamhut1066"; name = "Hamish Hutchings"; }; + haslersn = { + email = "haslersn@fius.informatik.uni-stuttgart.de"; + github = "haslersn"; + name = "Sebastian Hasler"; + }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix new file mode 100644 index 000000000000..48f13925ab08 --- /dev/null +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, git }: + +# Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by +# overriding the same-named attributes. See ./presets.nix for examples. + +stdenv.mkDerivation rec { + name = "mkspiffs-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "igrr"; + repo = "mkspiffs"; + rev = version; + fetchSubmodules = true; + sha256 = "1fgw1jqdlp83gv56mgnxpakky0q6i6f922niis4awvxjind8pbm1"; + }; + + nativeBuildInputs = [ git ]; + buildFlags = [ "dist" ]; + installPhase = '' + mkdir -p $out/bin + cp mkspiffs $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool to build and unpack SPIFFS images"; + license = licenses.mit; + homepage = https://github.com/igrr/mkspiffs; + maintainers = with maintainers; [ haslersn ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix new file mode 100644 index 000000000000..c0b74d9cf1b7 --- /dev/null +++ b/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -0,0 +1,20 @@ +{ lib, mkspiffs }: + +# We provide the same presets as the upstream + +lib.mapAttrs ( + name: { CPPFLAGS }: + mkspiffs.overrideAttrs (drv: { + inherit CPPFLAGS; + BUILD_CONFIG_NAME = "-${name}"; + }) +) { + arduino-esp8266.CPPFLAGS = [ + "-DSPIFFS_USE_MAGIC_LENGTH=0" + "-DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1" + ]; + + arduino-esp32.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ]; + + esp-idf.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33a2b6455a23..e413e0dcf269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1460,6 +1460,10 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; + + mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + monetdb = callPackage ../servers/sql/monetdb { }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; -- cgit 1.4.1 From aee3689349c3ba13422c4c63de82dd6902abbb1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 05:36:40 -0700 Subject: 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 --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f153e59019e3..762368651d70 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.18"; + name = "mtools-4.0.19"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; + sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v"; }; # Prevents errors such as "mainloop.c:89:15: error: expected ')'" -- cgit 1.4.1 From f4c968eaefc86a14daaa5ad850fa3ceff79ad007 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 14:07:48 -0700 Subject: 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 --- pkgs/tools/filesystems/disorderfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 0bde9b0b26e1..138f727c3d30 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq"; + sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; -- cgit 1.4.1 From 11c0d07761f692e2bc1285d7f45a57e99a9cf0c7 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 16:37:18 -0400 Subject: 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. --- pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 20e1853a3af6..a1428a257742 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; -- cgit 1.4.1 From 3da7fc8a5749077c3932484829f5901120013746 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:22:56 -0700 Subject: 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 --- pkgs/tools/filesystems/fatsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 75a94400627d..18d9097dacbc 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.4.2.439"; + version = "1.5.0.456"; name = "fatsort-${version}"; src = fetchurl { url = "mirror://sourceforge/fatsort/${name}.tar.xz"; - sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x"; + sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; }; patches = [ ./fatsort-Makefiles.patch ]; -- cgit 1.4.1 From ddaefd444e622f7cf4426d1dd5e64760cfb45fec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:38:35 -0700 Subject: 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 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 1499e81b624e..a674de9ac49b 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.13.9"; + version = "1.13.10"; name = "bindfs-${version}"; src = fetchurl { url = "https://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; + sha256 = "14wfp2dcjm0f1pmqqvkf94k7pijbi8ka395cm3hryqpi4k0w3f4j"; }; dontStrip = true; -- cgit 1.4.1 From 34ea15f5e401b93aefe2f98057a6ecd79b63f5a2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Oct 2018 17:12:05 +0200 Subject: nixpart0.blivet: fix reference to selinux python modules (cherry picked from commit 71941853a13878e5cc17b493f3791db7d4b29e51) --- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 5879fd9d0821..24aab7dc6dd4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux cryptsetup + pykickstart pyparted pyblock libselinux.py cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream -- cgit 1.4.1 From 0c4a7a86fd26a45c44c258181f7e2d977071b95a Mon Sep 17 00:00:00 2001 From: 隠岐奈 Date: Tue, 16 Oct 2018 18:31:53 -0500 Subject: bcachefs-tools: 2018-08-22 -> 2018-10-12 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ee1ee2e61789..75737e2da7fc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,12 +2,12 @@ , liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-08-22"; + name = "bcachefs-tools-unstable-2018-10-12"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081"; - sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld"; + rev = "55fbb25501330038e1714905b9ddeb25d875c11c"; + sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 5de85172926ef93060086b204270bfa263b4895c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Oct 2018 19:55:08 -0400 Subject: btrfs-progs: 4.15.1 -> 4.17.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e84260052a41..42f27e69f38e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages }: stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.15.1"; + version = "4.17.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; + sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz"; }; - patches = [ - # Fix build with e2fsprogs 1.44.0 - (fetchpatch { - url = "https://patchwork.kernel.org/patch/10281327/raw/"; - sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf"; - }) - ]; - nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools ]; buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; -- cgit 1.4.1