Merge pull request #131944 from SuperSandro2000/cleanup
This commit is contained in:
commit
dbe5054806
|
@ -1,12 +1,22 @@
|
||||||
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem
|
{ lib
|
||||||
, enableX11 ? true}:
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
let inherit (ocamlPackages) ocaml lablgtk; in
|
, ocamlPackages
|
||||||
|
, fontschumachermisc
|
||||||
stdenv.mkDerivation (rec {
|
, xset
|
||||||
|
, makeWrapper
|
||||||
|
, ncurses
|
||||||
|
, gnugrep
|
||||||
|
, fetchpatch
|
||||||
|
, copyDesktopItems
|
||||||
|
, makeDesktopItem
|
||||||
|
, enableX11 ? true
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "unison";
|
pname = "unison";
|
||||||
version = "2.51.3";
|
version = "2.51.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bcpierce00";
|
owner = "bcpierce00";
|
||||||
repo = "unison";
|
repo = "unison";
|
||||||
|
@ -14,8 +24,9 @@ stdenv.mkDerivation (rec {
|
||||||
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
|
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);
|
nativeBuildInputs = [ makeWrapper ]
|
||||||
buildInputs = [ ocaml ncurses ];
|
++ lib.optional enableX11 copyDesktopItems;
|
||||||
|
buildInputs = [ ocamlPackages.ocaml ncurses ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
|
# 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 ''
|
preBuild = lib.optionalString enableX11 ''
|
||||||
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
|
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
|
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"INSTALLDIR=$(out)/bin/"
|
"INSTALLDIR=$(out)/bin/"
|
||||||
"UISTYLE=${if enableX11 then "gtk2" else "text"}"
|
"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
|
for i in $(cd $out/bin && ls); do
|
||||||
wrapProgram $out/bin/$i \
|
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\")"
|
--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
|
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;
|
name = pname;
|
||||||
desktopName = "Unison";
|
desktopName = "Unison";
|
||||||
comment = "Bidirectional file synchronizer";
|
comment = "Bidirectional file synchronizer";
|
||||||
|
@ -59,19 +72,18 @@ stdenv.mkDerivation (rec {
|
||||||
exec = "unison";
|
exec = "unison";
|
||||||
icon = "unison";
|
icon = "unison";
|
||||||
categories = "Utility;FileTools;GTK;";
|
categories = "Utility;FileTools;GTK;";
|
||||||
extraDesktopEntries={
|
extraDesktopEntries = {
|
||||||
StartupWMClass="Unison";
|
StartupWMClass = "Unison";
|
||||||
StartupNotify="true";
|
StartupNotify = "true";
|
||||||
X-MultipleArgs="false";
|
X-MultipleArgs = "false";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
|
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
|
||||||
description = "Bidirectional file synchronizer";
|
description = "Bidirectional file synchronizer";
|
||||||
license = lib.licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with lib.maintainers; [viric];
|
maintainers = with maintainers; [ viric ];
|
||||||
platforms = with lib.platforms; unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
}
|
||||||
})
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
|
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.lists.optional withTracing ./tracing.patch;
|
patches = lib.optional withTracing ./tracing.patch;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ opencl-headers ];
|
buildInputs = [ opencl-headers ];
|
||||||
|
|
|
@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
|
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
|
lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
|
||||||
++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
|
++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
|
lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
|
||||||
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
|
++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
|
||||||
|
|
||||||
preAutoreconf = ''
|
preAutoreconf = ''
|
||||||
gtkdocize
|
gtkdocize
|
||||||
|
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||||
|
|
||||||
buildInputs = [ ayatana-ido ]
|
buildInputs = [ ayatana-ido ]
|
||||||
++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
|
++ lib.optionals (gtkVersion == "2") [ gtk2 ]
|
||||||
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
|
++ lib.optionals (gtkVersion == "3") [ gtk3 ];
|
||||||
|
|
||||||
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
|
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'' + ''
|
'' + ''
|
||||||
# Give folders a known name
|
# Give folders a known name
|
||||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
|
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'' + ''
|
'' + ''
|
||||||
# Give folders a known name
|
# Give folders a known name
|
||||||
|
|
|
@ -61,7 +61,7 @@ in buildPythonPackage rec {
|
||||||
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
|
(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
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ in buildPythonPackage rec {
|
||||||
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
|
(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
|
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -14,17 +14,15 @@ buildGoModule rec {
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
||||||
buildFlagsArray = let
|
ldflags = [
|
||||||
goPackagePath = "github.com/prometheus/influxdb_exporter";
|
"-s"
|
||||||
in ''
|
"-w"
|
||||||
-ldflags=
|
"-X github.com/prometheus/common/version.Version=${version}"
|
||||||
-s -w
|
"-X github.com/prometheus/common/version.Revision=${rev}"
|
||||||
-X github.com/prometheus/common/version.Version=${version}
|
"-X github.com/prometheus/common/version.Branch=unknown"
|
||||||
-X github.com/prometheus/common/version.Revision=${rev}
|
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
|
||||||
-X github.com/prometheus/common/version.Branch=unknown
|
"-X github.com/prometheus/common/version.BuildDate=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; };
|
passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; };
|
||||||
|
|
||||||
|
@ -33,6 +31,5 @@ buildGoModule rec {
|
||||||
homepage = "https://github.com/prometheus/influxdb_exporter";
|
homepage = "https://github.com/prometheus/influxdb_exporter";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ hexa ];
|
maintainers = with maintainers; [ hexa ];
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,17 +19,15 @@ buildGoModule rec {
|
||||||
|
|
||||||
excludedPackages = [ "docs/node-mixin" ];
|
excludedPackages = [ "docs/node-mixin" ];
|
||||||
|
|
||||||
buildFlagsArray = let
|
ldflags = [
|
||||||
goPackagePath = "github.com/prometheus/node_exporter";
|
"-s"
|
||||||
in ''
|
"-w"
|
||||||
-ldflags=
|
"-X github.com/prometheus/common/version.Version=${version}"
|
||||||
-s -w
|
"-X github.com/prometheus/common/version.Revision=${rev}"
|
||||||
-X github.com/prometheus/common/version.Version=${version}
|
"-X github.com/prometheus/common/version.Branch=unknown"
|
||||||
-X github.com/prometheus/common/version.Revision=${rev}
|
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
|
||||||
-X github.com/prometheus/common/version.Branch=unknown
|
"-X github.com/prometheus/common/version.BuildDate=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; };
|
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
|
||||||
|
|
||||||
|
@ -38,6 +36,5 @@ buildGoModule rec {
|
||||||
homepage = "https://github.com/prometheus/node_exporter";
|
homepage = "https://github.com/prometheus/node_exporter";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ benley fpletz globin Frostman ];
|
maintainers = with maintainers; [ benley fpletz globin Frostman ];
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -152,7 +152,7 @@ buildEnv {
|
||||||
ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir
|
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 "${dsmSysCli}" $out/dsm_dir/dsm.sys
|
||||||
ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_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/*
|
for bin in $out/bin/*
|
||||||
do
|
do
|
||||||
target=$(readlink "$bin")
|
target=$(readlink "$bin")
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ lib, stdenv, fetchurl, ... }:
|
{ lib, stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nttcp";
|
pname = "nttcp";
|
||||||
version = "1.47";
|
version = "1.47";
|
||||||
|
|
||||||
src = fetchurl {
|
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";
|
sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue