commit dbe5054806f2a57e023eac29ff9284cd3f15c128 · pyrox.dev/nixpkgs

+39 -27

pkgs/applications/networking/sync/unison/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem

     

       2
       2
       -
       , enableX11 ? true}:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , ocamlPackages

     

       5
       5
       +
       , fontschumachermisc

     

       6
       6
       +
       , xset

     

       7
       7
       +
       , makeWrapper

     

       8
       8
       +
       , ncurses

     

       9
       9
       +
       , gnugrep

     

       10
       10
       +
       , fetchpatch

     

       11
       11
       +
       , copyDesktopItems

     

       12
       12
       +
       , makeDesktopItem

     

       13
       13
       +
       , enableX11 ? true

     

       14
       14
       +
       }:

     

       3
       15
        
       

     

       4
       4
       -
       let inherit (ocamlPackages) ocaml lablgtk; in

     

       5
       5
       -
       

     

       6
       6
       -
       stdenv.mkDerivation (rec {

     

       7
       7
       -
       

     

       16
       16
       +
       stdenv.mkDerivation rec {

     

       8
       17
        
         pname = "unison";

     

       9
       18
        
         version = "2.51.3";

     

       19
       19
       +
       

     

       10
       20
        
         src = fetchFromGitHub {

     

       11
       21
        
           owner = "bcpierce00";

     

       12
       22
        
           repo = "unison";

     
···

       14
       24
        
           sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";

     

       15
       25
        
         };

     

       16
       26
        
       

     

       17
       17
       -
         nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);

     

       18
       18
       -
         buildInputs = [ ocaml ncurses ];

     

       27
       27
       +
         nativeBuildInputs = [ makeWrapper ]

     

       28
       28
       +
           ++ lib.optional enableX11 copyDesktopItems;

     

       29
       29
       +
         buildInputs = [ ocamlPackages.ocaml ncurses ];

     

       19
       30
        
       

     

       20
       31
        
         patches = [

     

       21
       32
        
           # Patch to fix build with ocaml 4.12. Remove in 2.51.4

     
···

       27
       38
        
           })

     

       28
       39
        
         ];

     

       29
       40
        
       

     

       30
       30
       -
         preBuild = (lib.strings.optionalString enableX11 ''

     

       31
       31
       -
           sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml

     

       32
       32
       -
         '') + ''

     

       33
       33
       -
         echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile

     

       41
       41
       +
         preBuild = lib.optionalString enableX11 ''

     

       42
       42
       +
           sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml

     

       43
       43
       +
         '' + ''

     

       44
       44
       +
           echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile

     

       34
       45
        
         '';

     

       35
       46
        
       

     

       36
       47
        
         makeFlags = [

     

       37
       48
        
           "INSTALLDIR=$(out)/bin/"

     

       38
       49
        
           "UISTYLE=${if enableX11 then "gtk2" else "text"}"

     

       39
       39
       -
         ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false";

     

       50
       50
       +
         ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false";

     

       40
       51
        
       

     

       41
       41
       -
         preInstall = "mkdir -p $out/bin";

     

       52
       52
       +
         preInstall = ''

     

       53
       53
       +
           mkdir -p $out/bin

     

       54
       54
       +
         '';

     

       42
       55
        
       

     

       43
       43
       -
         postInstall = lib.strings.optionalString enableX11 ''

     

       56
       56
       +
         postInstall = lib.optionalString enableX11 ''

     

       44
       57
        
           for i in $(cd $out/bin && ls); do

     

       45
       58
        
             wrapProgram $out/bin/$i \

     

       46
       59
        
               --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"

     
···

       49
       62
        
           install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg

     

       50
       63
        
         '';

     

       51
       64
        
       

     

       52
       52
       -
         dontStrip = !ocaml.nativeCompilers;

     

       65
       65
       +
         dontStrip = !ocamlPackages.ocaml.nativeCompilers;

     

       53
       66
        
       

     

       54
       54
       -
         desktopItems = lib.lists.optional enableX11 (makeDesktopItem {

     

       67
       67
       +
         desktopItems = lib.optional enableX11 (makeDesktopItem {

     

       55
       68
        
           name = pname;

     

       56
       69
        
           desktopName = "Unison";

     

       57
       70
        
           comment = "Bidirectional file synchronizer";

     
···

       59
       72
        
           exec = "unison";

     

       60
       73
        
           icon = "unison";

     

       61
       74
        
           categories = "Utility;FileTools;GTK;";

     

       62
       62
       -
           extraDesktopEntries={

     

       63
       63
       -
             StartupWMClass="Unison";

     

       64
       64
       -
             StartupNotify="true";

     

       65
       65
       -
             X-MultipleArgs="false";

     

       75
       75
       +
           extraDesktopEntries = {

     

       76
       76
       +
             StartupWMClass = "Unison";

     

       77
       77
       +
             StartupNotify = "true";

     

       78
       78
       +
             X-MultipleArgs = "false";

     

       66
       79
        
           };

     

       67
       80
        
         });

     

       68
       81
        
       

     

       69
       69
       -
         meta = {

     

       82
       82
       +
         meta = with lib; {

     

       70
       83
        
           homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";

     

       71
       84
        
           description = "Bidirectional file synchronizer";

     

       72
       72
       -
           license = lib.licenses.gpl3Plus;

     

       73
       73
       -
           maintainers = with lib.maintainers; [viric];

     

       74
       74
       -
           platforms = with lib.platforms; unix;

     

       85
       85
       +
           license = licenses.gpl3Plus;

     

       86
       86
       +
           maintainers = with maintainers; [ viric ];

     

       87
       87
       +
           platforms = platforms.unix;

     

       75
       88
        
         };

     

       76
       76
       -
       

     

       77
       77
       -
       })

     

       89
       89
       +
       }

+1 -1

pkgs/development/libraries/khronos-ocl-icd-loader/default.nix

···

       11
       11
        
           sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = lib.lists.optional withTracing ./tracing.patch;

     

       14
       14
       +
         patches = lib.optional withTracing ./tracing.patch;

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake ];

     

       17
       17
        
         buildInputs = [ opencl-headers ];

+4 -4

pkgs/development/libraries/libayatana-appindicator/default.nix

···

       23
       23
        
         nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];

     

       24
       24
        
       

     

       25
       25
        
         buildInputs =

     

       26
       26
       -
           lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2

     

       27
       27
       -
           ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;

     

       26
       26
       +
           lib.optional (gtkVersion == "2") libayatana-indicator-gtk2

     

       27
       27
       +
           ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs =

     

       30
       30
       -
           lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]

     

       31
       31
       -
           ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];

     

       30
       30
       +
           lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]

     

       31
       31
       +
           ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];

     

       32
       32
        
       

     

       33
       33
        
         preAutoreconf = ''

     

       34
       34
        
           gtkdocize

+2 -2

pkgs/development/libraries/libayatana-indicator/default.nix

···

       20
       20
        
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ ayatana-ido ]

     

       23
       23
       -
           ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]

     

       24
       24
       -
           ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];

     

       23
       23
       +
           ++ lib.optionals (gtkVersion == "2") [ gtk2 ]

     

       24
       24
       +
           ++ lib.optionals (gtkVersion == "3") [ gtk3 ];

     

       25
       25
        
       

     

       26
       26
        
         configureFlags = [ "--with-gtk=${gtkVersion}" ];

     

       27
       27

+1 -1

pkgs/development/python-modules/bootstrapped-pip/2.nix

···

       32
       32
        
       

     

       33
       33
        
         dontBuild = true;

     

       34
       34
        
       

     

       35
       35
       -
         installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       35
       35
       +
         installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       36
       36
        
           export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0

     

       37
       37
        
         '' + ''

     

       38
       38
        
           # Give folders a known name

+1 -1

pkgs/development/python-modules/bootstrapped-pip/default.nix

···

       32
       32
        
       

     

       33
       33
        
         dontBuild = true;

     

       34
       34
        
       

     

       35
       35
       -
         installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       35
       35
       +
         installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       36
       36
        
           export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0

     

       37
       37
        
         '' + ''

     

       38
       38
        
           # Give folders a known name

+1 -1

pkgs/development/python-modules/setuptools/44.0.nix

···

       61
       61
        
           (setuptoolsBuildHook.override{setuptools=null; wheel=null;})

     

       62
       62
        
         ];

     

       63
       63
        
       

     

       64
       64
       -
         preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       64
       64
       +
         preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       65
       65
        
           export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0

     

       66
       66
        
         '';

     

       67
       67

+1 -1

pkgs/development/python-modules/setuptools/default.nix

···

       62
       62
        
           (setuptoolsBuildHook.override{setuptools=null; wheel=null;})

     

       63
       63
        
         ];

     

       64
       64
        
       

     

       65
       65
       -
         preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       65
       65
       +
         preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       66
       66
        
           export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0

     

       67
       67
        
         '';

     

       68
       68

+9 -12

pkgs/servers/monitoring/prometheus/influxdb-exporter.nix

···

       14
       14
        
       

     

       15
       15
        
         vendorSha256 = null;

     

       16
       16
        
       

     

       17
       17
       -
         buildFlagsArray = let

     

       18
       18
       -
           goPackagePath = "github.com/prometheus/influxdb_exporter";

     

       19
       19
       -
         in ''

     

       20
       20
       -
           -ldflags=

     

       21
       21
       -
               -s -w

     

       22
       22
       -
               -X github.com/prometheus/common/version.Version=${version}

     

       23
       23
       -
               -X github.com/prometheus/common/version.Revision=${rev}

     

       24
       24
       -
               -X github.com/prometheus/common/version.Branch=unknown

     

       25
       25
       -
               -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs

     

       26
       26
       -
               -X github.com/prometheus/common/version.BuildDate=unknown

     

       27
       27
       -
         '';

     

       17
       17
       +
         ldflags = [

     

       18
       18
       +
           "-s"

     

       19
       19
       +
           "-w"

     

       20
       20
       +
           "-X github.com/prometheus/common/version.Version=${version}"

     

       21
       21
       +
           "-X github.com/prometheus/common/version.Revision=${rev}"

     

       22
       22
       +
           "-X github.com/prometheus/common/version.Branch=unknown"

     

       23
       23
       +
           "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"

     

       24
       24
       +
           "-X github.com/prometheus/common/version.BuildDate=unknown"

     

       25
       25
       +
         ];

     

       28
       26
        
       

     

       29
       27
        
         passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; };

     

       30
       28
        
       

     
···

       33
       31
        
           homepage = "https://github.com/prometheus/influxdb_exporter";

     

       34
       32
        
           license = licenses.asl20;

     

       35
       33
        
           maintainers = with maintainers; [ hexa ];

     

       36
       36
       -
           platforms = platforms.unix;

     

       37
       34
        
         };

     

       38
       35
        
       }

+9 -12

pkgs/servers/monitoring/prometheus/node-exporter.nix

···

       19
       19
        
       

     

       20
       20
        
         excludedPackages = [ "docs/node-mixin" ];

     

       21
       21
        
       

     

       22
       22
       -
         buildFlagsArray = let

     

       23
       23
       -
           goPackagePath = "github.com/prometheus/node_exporter";

     

       24
       24
       -
         in ''

     

       25
       25
       -
           -ldflags=

     

       26
       26
       -
               -s -w

     

       27
       27
       -
               -X github.com/prometheus/common/version.Version=${version}

     

       28
       28
       -
               -X github.com/prometheus/common/version.Revision=${rev}

     

       29
       29
       -
               -X github.com/prometheus/common/version.Branch=unknown

     

       30
       30
       -
               -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs

     

       31
       31
       -
               -X github.com/prometheus/common/version.BuildDate=unknown

     

       32
       32
       -
         '';

     

       22
       22
       +
         ldflags = [

     

       23
       23
       +
           "-s"

     

       24
       24
       +
           "-w"

     

       25
       25
       +
           "-X github.com/prometheus/common/version.Version=${version}"

     

       26
       26
       +
           "-X github.com/prometheus/common/version.Revision=${rev}"

     

       27
       27
       +
           "-X github.com/prometheus/common/version.Branch=unknown"

     

       28
       28
       +
           "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"

     

       29
       29
       +
           "-X github.com/prometheus/common/version.BuildDate=unknown"

     

       30
       30
       +
         ];

     

       33
       31
        
       

     

       34
       32
        
         passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };

     

       35
       33
        
       

     
···

       38
       36
        
           homepage = "https://github.com/prometheus/node_exporter";

     

       39
       37
        
           license = licenses.asl20;

     

       40
       38
        
           maintainers = with maintainers; [ benley fpletz globin Frostman ];

     

       41
       41
       -
           platforms = platforms.unix;

     

       42
       39
        
         };

     

       43
       40
        
       }

+1 -1

pkgs/tools/backup/tsm-client/default.nix

···

       152
       152
        
           ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir

     

       153
       153
        
           ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys

     

       154
       154
        
           ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys

     

       155
       155
       -
           ${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"}

     

       155
       155
       +
           ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"}

     

       156
       156
        
           for bin in $out/bin/*

     

       157
       157
        
           do

     

       158
       158
        
             target=$(readlink "$bin")

+2 -2

pkgs/tools/networking/nttcp/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, ... }:

     

       1
       1
       +
       { lib, stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "nttcp";

     

       5
       5
        
         version = "1.47";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";

     

       8
       8
       +
           url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";

     

       9
       9
        
           sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50";

     

       10
       10
        
         };

     

       11
       11