diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 8a8fc073355..b106deb074e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,12 +1,22 @@ -{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem -, enableX11 ? true}: - -let inherit (ocamlPackages) ocaml lablgtk; in - -stdenv.mkDerivation (rec { +{ lib +, stdenv +, fetchFromGitHub +, ocamlPackages +, fontschumachermisc +, xset +, makeWrapper +, ncurses +, gnugrep +, fetchpatch +, copyDesktopItems +, makeDesktopItem +, enableX11 ? true +}: +stdenv.mkDerivation rec { pname = "unison"; version = "2.51.3"; + src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; @@ -14,8 +24,9 @@ stdenv.mkDerivation (rec { sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; - nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems); - buildInputs = [ ocaml ncurses ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional enableX11 copyDesktopItems; + buildInputs = [ ocamlPackages.ocaml ncurses ]; patches = [ # Patch to fix build with ocaml 4.12. Remove in 2.51.4 @@ -27,20 +38,22 @@ stdenv.mkDerivation (rec { }) ]; - preBuild = (lib.strings.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml - '') + '' - echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile + preBuild = lib.optionalString enableX11 '' + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + '' + '' + echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" "UISTYLE=${if enableX11 then "gtk2" else "text"}" - ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; + ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; - preInstall = "mkdir -p $out/bin"; + preInstall = '' + mkdir -p $out/bin + ''; - postInstall = lib.strings.optionalString enableX11 '' + postInstall = lib.optionalString enableX11 '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" @@ -49,9 +62,9 @@ stdenv.mkDerivation (rec { install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; - dontStrip = !ocaml.nativeCompilers; + dontStrip = !ocamlPackages.ocaml.nativeCompilers; - desktopItems = lib.lists.optional enableX11 (makeDesktopItem { + desktopItems = lib.optional enableX11 (makeDesktopItem { name = pname; desktopName = "Unison"; comment = "Bidirectional file synchronizer"; @@ -59,19 +72,18 @@ stdenv.mkDerivation (rec { exec = "unison"; icon = "unison"; categories = "Utility;FileTools;GTK;"; - extraDesktopEntries={ - StartupWMClass="Unison"; - StartupNotify="true"; - X-MultipleArgs="false"; + extraDesktopEntries = { + StartupWMClass = "Unison"; + StartupNotify = "true"; + X-MultipleArgs = "false"; }; }); - meta = { + meta = with lib; { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; - -}) +} diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index f4688f34982..b0f1f0eae25 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; - patches = lib.lists.optional withTracing ./tracing.patch; + patches = lib.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 53b0dca0912..df1c6683fbc 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ]; buildInputs = - lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 - ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3; + lib.optional (gtkVersion == "2") libayatana-indicator-gtk2 + ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3; propagatedBuildInputs = - lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] - ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; + lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] + ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index c3c271c1719..f4871538eff 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ayatana-ido ] - ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ] - ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ]; + ++ lib.optionals (gtkVersion == "2") [ gtk2 ] + ++ lib.optionals (gtkVersion == "3") [ gtk3 ]; configureFlags = [ "--with-gtk=${gtkVersion}" ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix index 2d06b44b507..f89d39ae2b7 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/2.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/2.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 '' + '' # Give folders a known name diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 81aca3f3c57..84016043929 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 '' + '' # Give folders a known name diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index 7c7d6b01e40..40265dc639b 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -61,7 +61,7 @@ in buildPythonPackage rec { (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) ]; - preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2c8f5d898dc..62e7fb686c4 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -62,7 +62,7 @@ in buildPythonPackage rec { (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) ]; - preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 65ec5ff69b4..35c67af92b1 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -14,17 +14,15 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = let - goPackagePath = "github.com/prometheus/influxdb_exporter"; - in '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=unknown - -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs - -X github.com/prometheus/common/version.BuildDate=unknown - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; }; @@ -33,6 +31,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/influxdb_exporter"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index f97485f9478..7f0e5c78eba 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -19,17 +19,15 @@ buildGoModule rec { excludedPackages = [ "docs/node-mixin" ]; - buildFlagsArray = let - goPackagePath = "github.com/prometheus/node_exporter"; - in '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=unknown - -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs - -X github.com/prometheus/common/version.BuildDate=unknown - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; @@ -38,6 +36,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin Frostman ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index c432d47becd..e298751faca 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -152,7 +152,7 @@ buildEnv { ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys - ${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"} + ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"} for bin in $out/bin/* do target=$(readlink "$bin") diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix index 8979c5fd2ac..c5a4c4c1cd1 100644 --- a/pkgs/tools/networking/nttcp/default.nix +++ b/pkgs/tools/networking/nttcp/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nttcp"; version = "1.47"; src = fetchurl { - url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; + url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50"; };