From e1da8ae536f606aac84cec772a13ec6a52eef22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:53:19 +0100 Subject: [PATCH 01/20] cloud-init: remove unused input, cleanup --- pkgs/tools/virtualization/cloud-init/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 24ecb7f99c3..dfd3321b6b6 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -8,7 +8,6 @@ , requests , jsonschema , jsonpatch -, pytest , httpretty , dmidecode , pytestCheckHook @@ -17,11 +16,9 @@ , openssh }: -let version = "20.3"; - -in buildPythonApplication { +buildPythonApplication rec { pname = "cloud-init"; - inherit version; + version = "20.3"; namePrefix = ""; src = fetchFromGitHub { @@ -81,10 +78,10 @@ in buildPythonApplication { export TMPDIR=/tmp ''; - meta = { + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ madjar phile314 ]; + platforms = platforms.all; }; } From 25aa76bb6bdc5f9fc2500618d2e924cb2ff12a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:54:02 +0100 Subject: [PATCH 02/20] cloud-utils: remove unused inputs --- pkgs/tools/misc/cloud-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index b10259f24fc..32ef248ca85 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file -, wget, python3, qemu-utils, euca2ools +, wget, python3, qemu-utils , e2fsprogs, cdrkit , gptfdisk }: From 993fb95e7832e62e8de93735ffcd2006bc693fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:56:43 +0100 Subject: [PATCH 03/20] qemu: remove not require enableParallelBuild --- pkgs/applications/virtualization/qemu/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4b16e21689..4124b8e111f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { ++ optionals libiscsiSupport [ libiscsi ] ++ optionals smbdSupport [ samba ]; - enableParallelBuilding = true; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; From 238ce01f85af26ffa020647198f6275a115f06bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:56:53 +0100 Subject: [PATCH 04/20] qtemu: remove unused input --- pkgs/applications/virtualization/qtemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 3a5f26bfcc8..9568a0bb695 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }: mkDerivation rec { pname = "qtemu"; From 56c756d851f52af33f305b28a2c9f113fa50f597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:57:01 +0100 Subject: [PATCH 05/20] pythonPackages.cot: remove unused inputs --- pkgs/development/python-modules/cot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a6de8321dc0..607057b73f2 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k -, argcomplete, colorlog, pyvmomi, requests, verboselogs +, colorlog, pyvmomi, requests, verboselogs , psutil, pyopenssl, setuptools -, mock, pytest, pytest-mock, pytestCheckHook, qemu +, mock, pytest-mock, pytestCheckHook, qemu }: buildPythonPackage rec { pname = "cot"; version = "2.2.1"; - disabled = !isPy3k; src = fetchPypi { From c1edda834257fa659ae794f7b9ca1f4543e08235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:57:24 +0100 Subject: [PATCH 06/20] vagrant: remove unused input --- pkgs/development/tools/vagrant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 701b973ad4f..34662498f23 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let From 0f78e1772fbc2a97f6620381b222541ab97ed0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 16:59:28 +0100 Subject: [PATCH 07/20] aqemu: mark broken --- pkgs/applications/virtualization/aqemu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 2d865f41818..13b27c7d6cc 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -22,5 +22,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; + broken = true; }; } From bbc7926c372a09f6afcf9dbd6415fa293854b676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Mar 2021 23:50:44 +0100 Subject: [PATCH 08/20] crystal2nix: remove unused input --- pkgs/development/compilers/crystal2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix index 25cbbd4d01a..0f4909f5e15 100644 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ b/pkgs/development/compilers/crystal2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }: +{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }: crystal.buildCrystalPackage rec { pname = "crystal2nix"; From a59de3b3f4eae272fff6036997e016f16aaf1c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:27 +0100 Subject: [PATCH 09/20] libnixxml: cleanup --- .../libraries/libnixxml/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index abbffcf0f94..40459dbca22 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,25 +1,31 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { - name = "libnixxml"; + pname = "libnixxml"; + version = "unstable-2020-06-25"; + src = fetchFromGitHub { owner = "svanderburg"; repo = "libnixxml"; rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - configureFlags = [ "--with-gd" "--with-glib" ]; - CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; - doCheck = false; - postPatch = '' + + preConfigure = '' ./bootstrap ''; + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = "-Wall"; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + + doCheck = false; + meta = with lib; { description = "XML-based Nix-friendly data integration library"; - homepage = https://github.com/svanderburg/libnixxml; + homepage = "https://github.com/svanderburg/libnixxml"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; platforms = platforms.unix; From e14161d3b7904222754aeca4dd65a455885cb7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:33 +0100 Subject: [PATCH 10/20] pythonPackages.gradient_statsd: remove unused input --- pkgs/development/python-modules/gradient_statsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index ada005d14f8..180e20c9f56 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, boto3, requests, datadog, configparser, python +, requests, datadog, configparser, python }: buildPythonPackage rec { From e3dbed8e382b5eb13f72151898c1b4995471a6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 01:56:40 +0100 Subject: [PATCH 11/20] pythonPackages.pysvn: mark broken on darwin, use https for download --- pkgs/development/python-modules/pysvn/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 9e994860709..37e3490a54c 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; + url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; }; @@ -79,5 +79,7 @@ buildPythonPackage rec { description = "Python bindings for Subversion"; homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; + # g++: command not found + broken = stdenv.isDarwin; }; } From c2d20af5e5ca8d4ee6256a69fd2899f9a851ebdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 02:01:44 +0100 Subject: [PATCH 12/20] serf: switch to pname + version --- pkgs/development/libraries/serf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 092ab62ed7c..5b603e6a0c7 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -2,10 +2,11 @@ , pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "serf-1.3.9"; + pname = "serf"; + version = "1.3.9"; src = fetchurl { - url = "https://www.apache.org/dist/serf/${name}.tar.bz2"; + url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2"; sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; From bc4afe3260ebdbebe69c7707c582bc97cfe2f4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 04:58:40 +0100 Subject: [PATCH 13/20] calligra: remove unused input --- pkgs/applications/office/calligra/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index a8ca37df36a..e54a3cbad4c 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,15 +1,14 @@ -{ - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared-mime-info, - breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, - kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, - kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, - knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, - kwindowsystem, kxmlgui, sonnet, threadweaver, - kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, - librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, - poppler, pstoedit, qca-qt5, vc +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +, boost, qtwebkit, qtx11extras, shared-mime-info +, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets +, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n +, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross +, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, sonnet, threadweaver +, kcontacts, akonadi, akonadi-calendar, akonadi-contacts +, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen +, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon +, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: From e19f06147670c7bd5538ad0b32eb64a63a9518bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 04:59:48 +0100 Subject: [PATCH 14/20] calamares: remove enableParallelBuilding, remove unused input --- pkgs/tools/misc/calamares/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e79774da917..90abc765920 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata +, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation }: @@ -21,8 +21,6 @@ mkDerivation rec { qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; - enableParallelBuilding = false; - cmakeFlags = [ "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" From b1e42ebb1fe07fa47af0b9fa7d0ba5afbf55b437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:04 +0100 Subject: [PATCH 15/20] noto-fonts: remove unused input --- pkgs/data/fonts/noto-fonts/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d93e5885401..530cfca7424 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config From c4d6162d67620d126174d9ebdac3cfb1bb8200b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:11 +0100 Subject: [PATCH 16/20] noto-fonts: remove unused input --- pkgs/data/fonts/noto-fonts/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfb..c43ff3a313f 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click -, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli , pillow, six, bash, setuptools_scm }: From 7738719171b6a52d930e1ba7140ee3fdaf2df3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 13:50:53 +0100 Subject: [PATCH 17/20] awsebcli: mark broken --- pkgs/tools/virtualization/awsebcli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 796ea36eacf..1c9e8149232 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec { description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; + broken = true; }; } From 5d14b8fa53155430e75deae19cf94c4532c1d052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 14:24:34 +0100 Subject: [PATCH 18/20] pythonPackages.w3lib: disable broken test, switch to pytestCheckHook, cleanup --- pkgs/development/python-modules/w3lib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 0c80423e36a..a626bdd6ec0 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,7 +14,14 @@ buildPythonPackage rec { sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; }; - buildInputs = [ six pytest ]; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "w3lib" ]; + + disabledTests = [ + "test_add_or_replace_parameter" + ]; meta = with lib; { description = "A library of web-related functions"; @@ -22,5 +29,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; }; - } From 8796a2e176a871ecf993283e15ce888d1131104d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 15:05:04 +0100 Subject: [PATCH 19/20] squashfs: cleanup, update homepage --- pkgs/tools/filesystems/squashfs/default.nix | 34 +++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 3c38341554a..cddb1722584 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, zlib, xz +{ lib +, stdenv +, fetchFromGitHub +, zlib +, xz , lz4 , lzo , zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "squashfs"; version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; + rev = version; sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; - # Tag "4.4" points to this commit. - rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ @@ -28,17 +31,24 @@ stdenv.mkDerivation { buildInputs = [ zlib xz zstd lz4 lzo ]; - preBuild = "cd squashfs-tools"; + preBuild = '' + cd squashfs-tools + '' ; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" "LZO_SUPPORT=1"]; + makeFlags = [ + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZO_SUPPORT=1" + ]; - meta = { - homepage = "http://squashfs.sourceforge.net/"; + meta = with lib; { + homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ruuda ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ruuda ]; }; } From 2dabf9695316706134296c390290f590b2fccb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 16:26:24 +0100 Subject: [PATCH 20/20] lizardfs: mark broken --- pkgs/tools/filesystems/lizardfs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 766ac1f82ea..a9e0cd12d9d 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -45,5 +46,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem shamilton ]; + # 'fprintf' was not declared in this scope + broken = true; }; }