commit ca46ad37626cf20530f3b502d28d6e44a6db648c · pyrox.dev/nixpkgs

+10

nixos/modules/services/computing/foldingathome/client.nix

···

       49
       49
        
             '';

     

       50
       50
        
           };

     

       51
       51
        
       

     

       52
       52
       +
           daemonNiceLevel = mkOption {

     

       53
       53
       +
             type = types.ints.between (-20) 19;

     

       54
       54
       +
             default = 0;

     

       55
       55
       +
             description = ''

     

       56
       56
       +
               Daemon process priority for FAHClient.

     

       57
       57
       +
               0 is the default Unix process priority, 19 is the lowest.

     

       58
       58
       +
             '';

     

       59
       59
       +
           };

     

       60
       60
       +
       

     

       52
       61
        
           extraArgs = mkOption {

     

       53
       62
        
             type = types.listOf types.str;

     

       54
       63
        
             default = [];

     
···

       70
       79
        
             serviceConfig = {

     

       71
       80
        
               DynamicUser = true;

     

       72
       81
        
               StateDirectory = "foldingathome";

     

       82
       82
       +
               Nice = cfg.daemonNiceLevel;

     

       73
       83
        
               WorkingDirectory = "%S/foldingathome";

     

       74
       84
        
             };

     

       75
       85
        
           };

+12 -2

nixos/modules/services/networking/cjdns.nix

···

       12
       12
        
         { ... }:

     

       13
       13
        
         { options =

     

       14
       14
        
           { password = mkOption {

     

       15
       15
       -
             type = types.str;

     

       16
       16
       -
             description = "Authorized password to the opposite end of the tunnel.";

     

       15
       15
       +
               type = types.str;

     

       16
       16
       +
               description = "Authorized password to the opposite end of the tunnel.";

     

       17
       17
       +
             };

     

       18
       18
       +
             login = mkOption {

     

       19
       19
       +
               default = "";

     

       20
       20
       +
               type = types.str;

     

       21
       21
       +
               description = "(optional) name your peer has for you";

     

       22
       22
       +
             };

     

       23
       23
       +
             peerName = mkOption {

     

       24
       24
       +
               default = "";

     

       25
       25
       +
               type = types.str;

     

       26
       26
       +
               description = "(optional) human-readable name for peer";

     

       17
       27
        
             };

     

       18
       28
        
             publicKey = mkOption {

     

       19
       29
        
               type = types.str;

+20 -35

pkgs/applications/editors/bless/default.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       -
       , autoreconfHook

     

       4
       3
        
       , pkg-config

     

       5
       4
        
       , mono

     

       5
       5
       +
       , meson

     

       6
       6
       +
       , ninja

     

       6
       7
        
       , gtk-sharp-2_0

     

       7
       8
        
       , gettext

     

       8
       9
        
       , makeWrapper

     

       9
       10
        
       , glib

     

       10
       11
        
       , gtk2-x11

     

       11
       11
       -
       , gnome2

     

       12
       12
       +
       , libxslt

     

       13
       13
       +
       , docbook_xsl

     

       14
       14
       +
       , python3

     

       12
       15
        
       }:

     

       13
       16
        
       

     

       14
       17
        
       stdenv.mkDerivation rec {

     

       15
       18
        
         pname = "bless";

     

       16
       16
       -
         version = "0.6.2";

     

       19
       19
       +
         version = "0.6.3";

     

       17
       20
        
       

     

       18
       21
        
         src = fetchFromGitHub {

     

       19
       22
        
           owner = "afrantzis";

     

       20
       23
        
           repo = pname;

     

       21
       24
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1";

     

       25
       25
       +
           hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";

     

       23
       26
        
         };

     

       24
       27
        
       

     

       28
       28
       +
         postPatch = ''

     

       29
       29
       +
           sed "s|get_option('tests')|false|g" -i meson.build

     

       30
       30
       +
           patchShebangs .

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       25
       33
        
         buildInputs = [

     

       26
       34
        
           gtk-sharp-2_0

     

       27
       35
        
           mono

     

       28
       36
        
           # runtime only deps

     

       29
       37
        
           glib

     

       30
       38
        
           gtk2-x11

     

       31
       31
       -
           gnome2.libglade

     

       32
       39
        
         ];

     

       33
       40
        
       

     

       34
       41
        
         nativeBuildInputs = [

     

       35
       42
        
           pkg-config

     

       36
       36
       -
           autoreconfHook

     

       43
       43
       +
           meson

     

       44
       44
       +
           ninja

     

       37
       45
        
           gettext

     

       38
       46
        
           makeWrapper

     

       47
       47
       +
           libxslt

     

       48
       48
       +
           docbook_xsl

     

       49
       49
       +
           python3

     

       39
       50
        
         ];

     

       40
       51
        
       

     

       41
       41
       -
         configureFlags = [

     

       42
       42
       -
           # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it

     

       43
       43
       -
           # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below

     

       44
       44
       -
           "--without-scrollkeeper"

     

       45
       45
       -
         ];

     

       46
       46
       -
       

     

       47
       47
       -
         autoreconfPhase = ''

     

       48
       48
       -
           mkdir _bin

     

       49
       49
       -
       

     

       50
       50
       -
           # this fakes the scrollkeeper commands, to keep the build happy

     

       51
       51
       -
           for f in scrollkeeper-preinstall scrollkeeper-update; do

     

       52
       52
       -
             echo "true" > ./_bin/$f

     

       53
       53
       -
             chmod +x ./_bin/$f

     

       54
       54
       -
           done

     

       55
       55
       -
       

     

       56
       56
       -
           export PATH="$PWD/_bin:$PATH"

     

       57
       57
       -
       

     

       58
       58
       -
           # and it also wants to install that file

     

       59
       59
       -
           touch ./doc/user/bless-manual.omf

     

       60
       60
       -
       

     

       61
       61
       -
           # patch mono path

     

       62
       62
       -
           sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in

     

       63
       63
       -
       

     

       64
       64
       -
           ./autogen.sh

     

       65
       65
       -
           '';

     

       66
       66
       -
       

     

       67
       52
        
         preFixup = ''

     

       68
       68
       -
           MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gnome2.libglade}/lib:${gtk-sharp-2_0}/lib"

     

       69
       69
       -
           wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH"

     

       70
       70
       -
           '';

     

       53
       53
       +
           MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib"

     

       54
       54
       +
           wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]}

     

       55
       55
       +
         '';

     

       71
       56
        
       

     

       72
       57
        
         meta = with lib; {

     

       73
       58
        
           homepage = "https://github.com/afrantzis/bless";

+8 -10

pkgs/applications/graphics/fondo/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , nix-update-script

     

       4
       5
        
       , pantheon

     
···

       57
       58
        
           patchShebangs meson/post_install.py

     

       58
       59
        
         '';

     

       59
       60
        
       

     

       60
       60
       -
         passthru = {

     

       61
       61
       -
           updateScript = nix-update-script {

     

       62
       62
       -
             attrPath = pname;

     

       63
       63
       -
           };

     

       64
       64
       -
         };

     

       65
       65
       -
       

     

       66
       66
       -
       

     

       67
       61
        
         meta = with lib; {

     

       62
       62
       +
           homepage = "https://github.com/calo001/fondo";

     

       68
       63
        
           description = "Find the most beautiful wallpapers for your desktop";

     

       69
       69
       -
           homepage = "https://github.com/calo001/fondo";

     

       70
       64
        
           license = licenses.agpl3Plus;

     

       71
       71
       -
           maintainers = with maintainers; [ ];

     

       65
       65
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       72
       66
        
           platforms = platforms.linux;

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       69
       69
       +
         passthru.updateScript = nix-update-script {

     

       70
       70
       +
           attrPath = pname;

     

       73
       71
        
         };

     

       74
       72
        
       }

+30 -16

pkgs/applications/misc/notejot/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon

     

       2
       2
       -
       , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gtk4

     

       5
       5
       +
       , gtksourceview

     

       6
       6
       +
       , json-glib

     

       7
       7
       +
       , libadwaita

     

       8
       8
       +
       , libgee

     

       9
       9
       +
       , meson

     

       10
       10
       +
       , ninja

     

       11
       11
       +
       , nix-update-script

     

       12
       12
       +
       , pantheon

     

       13
       13
       +
       , pkg-config

     

       14
       14
       +
       , python3

     

       15
       15
       +
       , vala

     

       16
       16
       +
       , wrapGAppsHook

     

       17
       17
       +
       }:

     

       3
       18
        
       

     

       4
       19
        
       stdenv.mkDerivation rec {

     

       5
       20
        
         pname = "notejot";

     

       6
       6
       -
         version = "1.6.3";

     

       21
       21
       +
         version = "3.0.4";

     

       7
       22
        
       

     

       8
       23
        
         src = fetchFromGitHub {

     

       9
       24
        
           owner = "lainsce";

     

       10
       25
        
           repo = pname;

     

       11
       26
        
           rev = version;

     

       12
       12
       -
           sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8";

     

       27
       27
       +
           hash = "sha256-p8rca3PsnT/3Lp6W30VvqR9aPr6EIuNrH5gsxL0lZ0Q=";

     

       13
       28
        
         };

     

       14
       29
        
       

     

       15
       30
        
         nativeBuildInputs = [

     
···

       20
       35
        
           python3

     

       21
       36
        
           wrapGAppsHook

     

       22
       37
        
         ];

     

       23
       23
       -
       

     

       24
       38
        
         buildInputs = [

     

       25
       25
       -
           gtk3

     

       39
       39
       +
           gtk4

     

       26
       40
        
           gtksourceview

     

       27
       41
        
           json-glib

     

       42
       42
       +
           libadwaita

     

       28
       43
        
           libgee

     

       29
       44
        
           pantheon.elementary-icon-theme

     

       30
       45
        
           pantheon.granite

     

       31
       46
        
         ];

     

       32
       47
        
       

     

       33
       48
        
         postPatch = ''

     

       34
       34
       -
           patchShebangs meson/post_install.py

     

       49
       49
       +
           chmod +x build-aux/post_install.py

     

       50
       50
       +
           patchShebangs build-aux/post_install.py

     

       35
       51
        
         '';

     

       36
       52
        
       

     

       37
       37
       -
         passthru = {

     

       38
       38
       -
           updateScript = nix-update-script {

     

       39
       39
       -
             attrPath = pname;

     

       40
       40
       -
           };

     

       41
       41
       -
         };

     

       42
       42
       -
       

     

       43
       53
        
         meta = with lib; {

     

       44
       44
       -
           description = "Stupidly-simple sticky notes applet";

     

       45
       54
        
           homepage = "https://github.com/lainsce/notejot";

     

       46
       46
       -
           license = licenses.gpl2Plus;

     

       47
       47
       -
           maintainers = with maintainers; [ ];

     

       55
       55
       +
           description = "Stupidly-simple sticky notes applet";

     

       56
       56
       +
           license = licenses.gpl3Plus;

     

       57
       57
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       48
       58
        
           platforms = platforms.linux;

     

       59
       59
       +
         };

     

       60
       60
       +
       

     

       61
       61
       +
         passthru.updateScript = nix-update-script {

     

       62
       62
       +
           attrPath = pname;

     

       49
       63
        
         };

     

       50
       64
        
       }

+31 -18

pkgs/applications/networking/ftp/taxi/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, vala

     

       2
       2
       -
       , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gobject-introspection

     

       5
       5
       +
       , gtk3

     

       6
       6
       +
       , libgee

     

       7
       7
       +
       , libsecret

     

       8
       8
       +
       , libsoup

     

       9
       9
       +
       , meson

     

       10
       10
       +
       , ninja

     

       11
       11
       +
       , nix-update-script

     

       12
       12
       +
       , pantheon

     

       13
       13
       +
       , pkg-config

     

       14
       14
       +
       , python3

     

       15
       15
       +
       , vala

     

       16
       16
       +
       , wrapGAppsHook

     

       17
       17
       +
       }:

     

       3
       18
        
       

     

       4
       19
        
       stdenv.mkDerivation rec {

     

       5
       20
        
         pname = "taxi";

     

       6
       6
       -
         version = "0.0.1";

     

       21
       21
       +
         version = "0.0.1-unstable=2020-09-03";

     

       7
       22
        
       

     

       8
       23
        
         src = fetchFromGitHub {

     

       9
       24
        
           owner = "Alecaddd";

     

       10
       25
        
           repo = pname;

     

       11
       11
       -
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "01c552w68576pnsyqbwy3hjhbww6vys3r3s0wxjdiscjqj1aawqg";

     

       26
       26
       +
           rev = "74aade67fd9ba9e5bc10c950ccd8d7e48adc2ea1";

     

       27
       27
       +
           sha256 = "sha256-S/FeKJxIdA30CpfFVrQsALdq7Gy4F4+P50Ky5tmqKvM=";

     

       13
       28
        
         };

     

       14
       29
        
       

     

       15
       30
        
         nativeBuildInputs = [

     

       16
       16
       -
           vala

     

       17
       31
        
           gobject-introspection

     

       18
       32
        
           meson

     

       19
       33
        
           ninja

     

       20
       34
        
           pkg-config

     

       21
       35
        
           python3

     

       36
       36
       +
           vala

     

       22
       37
        
           wrapGAppsHook

     

       23
       38
        
         ];

     

       24
       39
        
       

     

       25
       40
        
         buildInputs = [

     

       26
       26
       -
           pantheon.granite

     

       27
       27
       -
           libgee

     

       28
       41
        
           gtk3

     

       42
       42
       +
           libgee

     

       29
       43
        
           libsecret

     

       30
       44
        
           libsoup

     

       45
       45
       +
           pantheon.granite

     

       31
       46
        
         ];

     

       32
       47
        
       

     

       33
       48
        
         postPatch = ''

     

       34
       49
        
           chmod +x meson/post_install.py

     

       35
       50
        
           patchShebangs meson/post_install.py

     

       36
       51
        
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         passthru = {

     

       39
       39
       -
           updateScript = nix-update-script {

     

       40
       40
       -
             attrPath = pname;

     

       41
       41
       -
           };

     

       42
       42
       -
         };

     

       43
       52
        
       

     

       44
       53
        
         meta = with lib; {

     

       54
       54
       +
           homepage = "https://github.com/Alecaddd/taxi";

     

       45
       55
        
           description = "The FTP Client that drives you anywhere";

     

       46
       46
       -
           homepage    = "https://github.com/Alecaddd/taxi";

     

       47
       47
       -
           license     = licenses.gpl3Plus;

     

       48
       48
       -
           maintainers = with maintainers; [ ];

     

       49
       49
       -
           platforms   = platforms.linux;

     

       56
       56
       +
           license = licenses.lgpl3Plus;

     

       57
       57
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       58
       58
       +
           platforms = platforms.linux;

     

       59
       59
       +
         };

     

       60
       60
       +
       

     

       61
       61
       +
         passthru.updateScript = nix-update-script {

     

       62
       62
       +
           attrPath = pname;

     

       50
       63
        
         };

     

       51
       64
        
       }

pkgs/applications/science/biology/samblaster/default.nix

···

       11
       11
        
           sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         makeFlags = [ "CPP=${stdenv.cc.targetPrefix}c++" ];

     

       15
       15
       +
       

     

       14
       16
        
         installPhase = ''

     

       15
       17
        
           mkdir -p $out/bin

     

       16
       18
        
           cp samblaster $out/bin

+25 -27

pkgs/applications/video/celluloid/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       3
       -
       , nix-update-script

     

       4
       4
       -
       , meson

     

       5
       5
       -
       , ninja

     

       6
       6
       -
       , python3

     

       7
       7
       -
       , gettext

     

       8
       8
       -
       , pkg-config

     

       4
       4
       +
       , appstream-glib

     

       9
       5
        
       , desktop-file-utils

     

       10
       10
       -
       , wrapGAppsHook

     

       11
       11
       -
       , appstream-glib

     

       12
       6
        
       , epoxy

     

       7
       7
       +
       , gettext

     

       13
       8
        
       , glib

     

       14
       9
        
       , gtk3

     

       10
       10
       +
       , meson

     

       15
       11
        
       , mpv

     

       12
       12
       +
       , ninja

     

       13
       13
       +
       , nix-update-script

     

       14
       14
       +
       , pkg-config

     

       15
       15
       +
       , python3

     

       16
       16
       +
       , wrapGAppsHook

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       stdenv.mkDerivation rec {

     

       19
       20
        
         pname = "celluloid";

     

       20
       20
       -
         version = "0.20";

     

       21
       21
       +
         version = "0.21";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "celluloid-player";

     

       24
       25
        
           repo = "celluloid";

     

       25
       26
        
           rev = "v${version}";

     

       26
       26
       -
           hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA=";

     

       27
       27
       +
           hash = "sha256-1Jeg1uqWxURGKR/Xg4j4roZ9Pg5MR7geyttdzlOU+rA=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       30
        
         nativeBuildInputs = [

     

       30
       30
       -
           meson

     

       31
       31
       -
           ninja

     

       32
       32
       -
           python3

     

       33
       31
        
           appstream-glib

     

       32
       32
       +
           desktop-file-utils

     

       34
       33
        
           gettext

     

       34
       34
       +
           meson

     

       35
       35
       +
           ninja

     

       35
       36
        
           pkg-config

     

       36
       36
       -
           desktop-file-utils

     

       37
       37
       +
           python3

     

       37
       38
        
           wrapGAppsHook

     

       38
       39
        
         ];

     

       39
       39
       -
       

     

       40
       40
        
         buildInputs = [

     

       41
       41
        
           epoxy

     

       42
       42
        
           glib

     
···

       50
       50
        
       

     

       51
       51
        
         doCheck = true;

     

       52
       52
        
       

     

       53
       53
       -
         passthru = {

     

       54
       54
       -
           updateScript = nix-update-script {

     

       55
       55
       -
             attrPath = pname;

     

       56
       56
       -
           };

     

       57
       57
       -
         };

     

       58
       58
       -
       

     

       59
       53
        
         meta = with lib; {

     

       54
       54
       +
           homepage = "https://github.com/celluloid-player/celluloid";

     

       60
       55
        
           description = "Simple GTK frontend for the mpv video player";

     

       61
       56
        
           longDescription = ''

     

       62
       62
       -
             GNOME MPV interacts with mpv via the client API exported by libmpv,

     

       63
       63
       -
             allowing access to mpv's powerful playback capabilities through an

     

       64
       64
       -
             easy-to-use user interface.

     

       57
       57
       +
             Celluloid (formerly GNOME MPV) is a simple GTK+ frontend for mpv.

     

       58
       58
       +
             Celluloid interacts with mpv via the client API exported by libmpv,

     

       59
       59
       +
             allowing access to mpv's powerful playback capabilities.

     

       65
       60
        
           '';

     

       66
       66
       -
           homepage = "https://github.com/celluloid-player/celluloid";

     

       67
       61
        
           license = licenses.gpl3Plus;

     

       68
       68
       -
           maintainers = with maintainers; [ ];

     

       62
       62
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       69
       63
        
           platforms = platforms.linux;

     

       64
       64
       +
         };

     

       65
       65
       +
       

     

       66
       66
       +
         passthru.updateScript = nix-update-script {

     

       67
       67
       +
           attrPath = pname;

     

       70
       68
        
         };

     

       71
       69
        
       }

pkgs/desktops/lxqt/lxqt-build-tools/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , mkDerivation

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , cmake

     
···

       20
       21
        
           rev = version;

     

       21
       22
        
           sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l";

     

       22
       23
        
         };

     

       24
       24
       +
       

     

       25
       25
       +
         # Nix clang on darwin identifies as 'Clang', not 'AppleClang'

     

       26
       26
       +
         # Without this, dependants fail to link.

     

       27
       27
       +
         postPatch = ''

     

       28
       28
       +
           substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \

     

       29
       29
       +
             --replace AppleClang Clang

     

       30
       30
       +
         '';

     

       23
       31
        
       

     

       24
       32
        
         nativeBuildInputs = [

     

       25
       33
        
           cmake

+5 -3

pkgs/development/libraries/libtomcrypt/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, libtool }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, libtool, libtommath }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libtomcrypt";

     
···

       17
       17
        
           })

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ libtool ];

     

       20
       20
       +
         nativeBuildInputs = [ libtool libtommath ];

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     

       23
       23
        
           substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool"

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         preBuild = ''

     

       27
       27
       -
           makeFlagsArray=(PREFIX=$out \

     

       27
       27
       +
           makeFlagsArray+=(PREFIX=$out \

     

       28
       28
       +
             CFLAGS="-DUSE_LTM -DLTM_DESC -DLTC_PTHREAD" \

     

       29
       29
       +
             EXTRALIBS=\"-ltommath\" \

     

       28
       30
        
             INSTALL_GROUP=$(id -g) \

     

       29
       31
        
             INSTALL_USER=$(id -u))

     

       30
       32
        
         '';

+2 -2

pkgs/development/ocaml-modules/containers/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildDunePackage rec {

     

       8
       8
       -
         version = "3.0.1";

     

       8
       8
       +
         version = "3.4";

     

       9
       9
        
         pname = "containers";

     

       10
       10
        
       

     

       11
       11
        
         useDune2 = true;

     
···

       14
       14
        
           owner = "c-cube";

     

       15
       15
        
           repo = "ocaml-containers";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "1m19cfcwks3xcj16nqldfb49dg0vdc7by1q1j8bpac3z2mjvks0l";

     

       17
       17
       +
           sha256 = "0ixpy81p6rc3lq71djfndb2sg2hfj20j1jbzzrrmgqsysqdjsgzz";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ dune-configurator ];

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pyatmo";

     

       15
       15
       -
         version = "4.2.2";

     

       15
       15
       +
         version = "4.2.3";

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "jabesq";

     

       20
       20
        
           repo = "pyatmo";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I=";

     

       22
       22
       +
           sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+13 -10

pkgs/development/tools/misc/ccache/default.nix

···

       7
       7
        
       , cmake

     

       8
       8
        
       , perl

     

       9
       9
        
       , zstd

     

       10
       10
       +
       , bashInteractive

     

       10
       11
        
       , xcodebuild

     

       11
       12
        
       , makeWrapper

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       let ccache = stdenv.mkDerivation rec {

     

       15
       16
        
         pname = "ccache";

     

       16
       16
       -
         version = "4.2.1";

     

       17
       17
       +
         version = "4.3";

     

       17
       18
        
       

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = pname;

     

       20
       21
        
           repo = pname;

     

       21
       22
        
           rev = "v${version}";

     

       22
       22
       -
           hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA=";

     

       23
       23
       +
           hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       25
       -
         patches = [

     

       26
       26
       -
           # test/run use compgen to get environment variable names, but

     

       27
       27
       -
           # compgen isn't available in non-interactive bash.

     

       28
       28
       -
           ./env-instead-of-compgen.patch

     

       26
       26
       +
         outputs = [ "out" "man" ];

     

       29
       27
        
       

     

       28
       28
       +
         patches = [

     

       30
       29
        
           # When building for Darwin, test/run uses dwarfdump, whereas on

     

       31
       30
        
           # Linux it uses objdump. We don't have dwarfdump packaged for

     

       32
       31
        
           # Darwin, so this patch updates the test to also use objdump on

     
···

       38
       37
        
         ];

     

       39
       38
        
       

     

       40
       39
        
         nativeBuildInputs = [ asciidoc cmake perl ];

     

       41
       41
       -
       

     

       42
       40
        
         buildInputs = [ zstd ];

     

       43
       41
        
       

     

       44
       44
       -
         outputs = [ "out" "man" ];

     

       42
       42
       +
         doCheck = true;

     

       43
       43
       +
         checkInputs = [

     

       44
       44
       +
           # test/run requires the compgen function which is available in

     

       45
       45
       +
           # bashInteractive, but not bash.

     

       46
       46
       +
           bashInteractive

     

       47
       47
       +
         ] ++ lib.optional stdenv.isDarwin xcodebuild;

     

       45
       48
        
       

     

       46
       46
       -
         doCheck = true;

     

       47
       47
       -
         checkInputs = lib.optional stdenv.isDarwin xcodebuild;

     

       48
       49
        
         checkPhase = ''

     

       50
       50
       +
           runHook preCheck

     

       49
       51
        
           export HOME=$(mktemp -d)

     

       50
       52
        
           ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''

     

       51
       53
        
             -E '^(test.nocpp2|test.basedir|test.multi_arch)$'

     

       52
       54
        
           ''}

     

       55
       55
       +
           runHook postCheck

     

       53
       56
        
         '';

     

       54
       57
        
       

     

       55
       58
        
         passthru = {

-18

pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch

···

       1
       1
       -
       diff --git a/test/run b/test/run

     

       2
       2
       -
       index cbdd98f0..bc930200 100755

     

       3
       3
       -
       --- a/test/run

     

       4
       4
       -
       +++ b/test/run

     

       5
       5
       -
       @@ -346,11 +346,11 @@ expect_perm() {

     

       6
       6
       -
        }

     

       7
       7
       -
        

     

       8
       8
       -
        reset_environment() {

     

       9
       9
       -
       -    while IFS= read -r name; do

     

       10
       10
       -
       +    while IFS='=' read -r name value; do

     

       11
       11
       -
                if [[ $name =~ ^CCACHE_[A-Z0-9_]*$ ]]; then

     

       12
       12
       -
                    unset $name

     

       13
       13
       -
                fi

     

       14
       14
       -
       -    done < <(compgen -e)

     

       15
       15
       -
       +    done < <(env)

     

       16
       16
       -
        

     

       17
       17
       -
            unset GCC_COLORS

     

       18
       18
       -
            unset TERM

+65 -72

pkgs/servers/firebird/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchurl, libedit, automake, autoconf, libtool

     

       2
       2
       -
       ,

     

       3
       3
       -
         # icu = null: use icu which comes with firebird

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libedit, autoreconfHook, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }:

     

       2
       2
       +
       

     

       3
       3
       +
       let base = {

     

       4
       4
       +
         pname = "firebird";

     

       5
       5
       +
       

     

       6
       6
       +
         meta = with lib; {

     

       7
       7
       +
           description = "SQL relational database management system";

     

       8
       8
       +
           homepage = "https://firebirdsql.org/";

     

       9
       9
       +
           changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";

     

       10
       10
       +
           license = [ "IDPL" "Interbase-1.0" ];

     

       11
       11
       +
           platforms = platforms.linux;

     

       12
       12
       +
           maintainers = with maintainers; [ marcweber ];

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       4
       16
        
       

     

       5
       5
       -
         # icu = pkgs.icu => you may have trouble sharing database files with windows

     

       6
       6
       -
         # users if "Collation unicode" columns are being used

     

       7
       7
       -
         # windows icu version is *30.dll, however neither the icu 3.0 nor the 3.6

     

       8
       8
       -
         # sources look close to what ships with this package.

     

       9
       9
       -
         # Thus I think its best to trust firebird devs and use their version

     

       17
       17
       +
         buildInputs = [ libedit icu ];

     

       10
       18
        
       

     

       11
       11
       -
         # icu version missmatch may cause such error when selecting from a table:

     

       12
       12
       -
         # "Collation unicode for character set utf8 is not installed"

     

       19
       19
       +
         LD_LIBRARY_PATH = lib.makeLibraryPath [ icu ];

     

       13
       20
        
       

     

       14
       14
       -
         # icu 3.0 can still be built easily by nix (by dropping the #elif case and

     

       15
       15
       -
         # make | make)

     

       16
       16
       -
         icu ? null

     

       21
       21
       +
         configureFlags = [

     

       22
       22
       +
           "--with-system-editline"

     

       23
       23
       +
         ] ++ (lib.optional superServer "--enable-superserver");

     

       17
       24
        
       

     

       18
       18
       -
       , superServer ? false

     

       19
       19
       -
       , port ? 3050

     

       20
       20
       -
       , serviceName ? "gds_db"

     

       21
       21
       -
       }:

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           runHook preInstall

     

       27
       27
       +
           mkdir -p $out

     

       28
       28
       +
           cp -r gen/Release/firebird/* $out

     

       29
       29
       +
           runHook postInstall

     

       30
       30
       +
         '';

     

       22
       31
        
       

     

       23
       23
       -
       /*

     

       24
       24
       -
          there are 3 ways to use firebird:

     

       25
       25
       -
          a) superserver

     

       26
       26
       -
           - one process, one thread for each connection

     

       27
       27
       -
          b) classic

     

       28
       28
       -
           - is built by default

     

       29
       29
       -
           - one process for each connection

     

       30
       30
       -
           - on linux direct io operations (?)

     

       31
       31
       -
          c) embedded.

     

       32
       32
       +
       }; in {

     

       32
       33
        
       

     

       33
       33
       -
          manual says that you usually don't notice the difference between a and b.

     

       34
       34
       +
         firebird_2_5 = stdenv.mkDerivation (base // rec {

     

       35
       35
       +
           version = "2.5.9";

     

       34
       36
        
       

     

       35
       35
       -
          I'm only interested in the embedder shared libary for now.

     

       36
       36
       -
          So everything isn't tested yet

     

       37
       37
       +
           src = fetchFromGitHub {

     

       38
       38
       +
             owner = "FirebirdSQL";

     

       39
       39
       +
             repo = "firebird";

     

       40
       40
       +
             rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";

     

       41
       41
       +
             sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM=";

     

       42
       42
       +
           };

     

       37
       43
        
       

     

       38
       38
       -
       */

     

       44
       44
       +
           configureFlags = base.configureFlags ++ [ "--with-system-icu" ];

     

       39
       45
        
       

     

       40
       40
       -
       stdenv.mkDerivation rec {

     

       41
       41
       -
         version = "2.5.7.27050-0";

     

       42
       42
       -
         pname = "firebird";

     

       46
       46
       +
           installPhase = ''

     

       47
       47
       +
             runHook preInstall

     

       48
       48
       +
             mkdir -p $out

     

       49
       49
       +
             cp -r gen/firebird/* $out

     

       50
       50
       +
             runHook postInstall

     

       51
       51
       +
           '';

     

       43
       52
        
       

     

       44
       44
       -
         # enableParallelBuilding = false; build fails

     

       53
       53
       +
           meta = base.meta // { platforms = [ "x86_64-linux" ]; };

     

       54
       54
       +
         });

     

       45
       55
        
       

     

       46
       46
       -
         # http://tracker.firebirdsql.org/browse/CORE-3246

     

       47
       47
       -
         preConfigure = ''

     

       48
       48
       -
           makeFlags="$makeFlags CPU=$NIX_BUILD_CORES"

     

       49
       49
       -
         '';

     

       56
       56
       +
         firebird_3 = stdenv.mkDerivation (base // rec {

     

       57
       57
       +
           version = "3.0.7";

     

       50
       58
        
       

     

       51
       51
       -
         configureFlags =

     

       52
       52
       -
           [ "--with-serivec-port=${builtins.toString port}"

     

       53
       53
       -
             "--with-service-name=${serviceName}"

     

       54
       54
       -
             "--with-system-editline"

     

       55
       55
       -
             "--with-fblog=/var/log/firebird"

     

       56
       56
       -
             "--with-fbconf=/etc/firebird"

     

       57
       57
       -
             "--with-fbsecure-db=/var/db/firebird/system"

     

       58
       58
       -
           ]

     

       59
       59
       -
           ++ (lib.optional  (icu != null) "--with-system-icu")

     

       60
       60
       -
           ++ (lib.optional superServer "--enable-superserver");

     

       59
       59
       +
           src = fetchFromGitHub {

     

       60
       60
       +
             owner = "FirebirdSQL";

     

       61
       61
       +
             repo = "firebird";

     

       62
       62
       +
             rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";

     

       63
       63
       +
             sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs=";

     

       64
       64
       +
           };

     

       61
       65
        
       

     

       62
       62
       -
         src = fetchurl {

     

       63
       63
       -
           url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";

     

       64
       64
       -
           sha256 = "06hp6bq5irqvm3h03s79qjgcc3jsjpq150y9aq7anklx9v4nhfqa";

     

       65
       65
       -
         };

     

       66
       66
       +
           buildInputs = base.buildInputs ++ [ zlib libtommath ];

     

       66
       67
        
       

     

       67
       67
       -
         hardeningDisable = [ "format" ];

     

       68
       68
       +
           meta = base.meta // { platforms = [ "x86_64-linux" ]; };

     

       69
       69
       +
         });

     

       68
       70
        
       

     

       69
       69
       -
         # configurePhase = ''

     

       70
       70
       -
         #   sed -i 's@cp /usr/share/automake-.*@@' autogen.sh

     

       71
       71
       -
         #   sh autogen.sh $configureFlags --prefix=$out

     

       72
       72
       -
         # '';

     

       73
       73
       -
         buildInputs = [libedit icu automake autoconf libtool];

     

       71
       71
       +
         firebird_4 = stdenv.mkDerivation (base // rec {

     

       72
       72
       +
           version = "4.0.0-rc1";

     

       74
       73
        
       

     

       75
       75
       -
         # TODO: Probably this hase to be tidied up..

     

       76
       76
       -
         # make install requires beeing. disabling the root checks

     

       77
       77
       -
         # dosen't work. Copying the files manually which can be found

     

       78
       78
       -
         # in ubuntu -dev -classic, -example packages:

     

       79
       79
       -
         # maybe some of those files can be removed again

     

       80
       80
       -
         installPhase = "cp -r gen/firebird $out";

     

       74
       74
       +
           src = fetchFromGitHub {

     

       75
       75
       +
             owner = "FirebirdSQL";

     

       76
       76
       +
             repo = "firebird";

     

       77
       77
       +
             rev = "T4_0_0_RC1";

     

       78
       78
       +
             sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4=";

     

       79
       79
       +
           };

     

       81
       80
        
       

     

       82
       82
       -
         meta = {

     

       83
       83
       -
           description = "SQL relational database management system";

     

       84
       84
       -
           homepage = "https://www.firebirdnews.org";

     

       85
       85
       -
           license = ["IDPL" "Interbase-1.0"];

     

       86
       86
       -
           maintainers = [lib.maintainers.marcweber];

     

       87
       87
       -
           platforms = lib.platforms.linux;

     

       88
       88
       -
           broken = true;

     

       89
       89
       -
         };

     

       81
       81
       +
           buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];

     

       82
       82
       +
         });

     

       90
       83
        
       

     

       91
       84
        
       }

+3 -2

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

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests, Security }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "unbound-telemetry";

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ openssl ];

     

       18
       18
       +
         buildInputs = [ openssl ]

     

       19
       19
       +
           ++ lib.optional stdenv.isDarwin Security;

     

       19
       20
        
       

     

       20
       21
        
         passthru.tests = {

     

       21
       22
        
           inherit (nixosTests.prometheus-exporters) unbound;

+2 -2

pkgs/servers/simple-http-server/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "simple-http-server";

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ openssl ];

     

       18
       18
       +
         buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];

     

       19
       19
        
       

     

       20
       20
        
         # Currently no tests are implemented, so we avoid building the package twice

     

       21
       21
        
         doCheck = false;

pkgs/tools/misc/rig/default.nix

···

       13
       13
        
         # http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz

     

       14
       14
        
         patches = [ ./rig_1.11-1.diff ];

     

       15
       15
        
       

     

       16
       16
       +
         makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];

     

       17
       17
       +
       

     

       16
       18
        
         meta = {

     

       17
       19
        
           homepage = "http://rig.sourceforge.net/";

     

       18
       20
        
           description = "Random identity generator";

+2 -1

pkgs/tools/misc/silicon/default.nix

···

       9
       9
        
       , freetype

     

       10
       10
        
       , libxcb

     

       11
       11
        
       , python3

     

       12
       12
       +
       , libiconv

     

       12
       13
        
       , AppKit

     

       13
       14
        
       , CoreText

     

       14
       15
        
       , Security

     
···

       29
       30
        
       

     

       30
       31
        
         buildInputs = [ llvmPackages.libclang expat freetype ]

     

       31
       32
        
           ++ lib.optionals stdenv.isLinux [ libxcb ]

     

       32
       32
       -
           ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ];

     

       33
       33
       +
           ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ];

     

       33
       34
        
       

     

       34
       35
        
         nativeBuildInputs = [ cmake pkg-config ]

     

       35
       36
        
           ++ lib.optionals stdenv.isLinux [ python3 ];

+3 -3

pkgs/tools/package-management/cargo-release/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-release";

     

       5
       5
       -
         version = "0.13.10";

     

       5
       5
       +
         version = "0.13.11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sunng87";

     

       9
       9
        
           repo = "cargo-release";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s=";

     

       11
       11
       +
           sha256 = "sha256-v0XKLwxUIxBt9hIUzprz+VsxCRifH1/SbNcI0sH2ENM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-W+/owW9Hl1cSBlfSN8Gea575tkjmZlwa5X6TCYyaLsM=";

     

       14
       14
       +
         cargoSha256 = "sha256-zbET6UsV29hAL83rw3XRgrcM5FABFNI3w3Kbd61FS7E=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17
        
         buildInputs = [ openssl ]

+13 -9

pkgs/top-level/all-packages.nix

···

       12839
       12839
        
             inherit (stdenv) cc;

     

       12840
       12840
        
           };

     

       12841
       12841
        
       

     

       12842
       12842
       -
         ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }:

     

       12843
       12843
       -
           overrideCC stdenv (buildPackages.ccacheWrapper.override {

     

       12844
       12844
       -
             inherit extraConfig;

     

       12842
       12842
       +
         ccacheStdenv = lowPrio (makeOverridable ({ stdenv, ... } @ extraArgs:

     

       12843
       12843
       +
           overrideCC stdenv (buildPackages.ccacheWrapper.override ({

     

       12845
       12844
        
             inherit (stdenv) cc;

     

       12846
       12846
       -
           })) {

     

       12847
       12847
       -
             extraConfig = "";

     

       12845
       12845
       +
           } // lib.optionalAttrs (builtins.hasAttr "extraConfig" extraArgs) {

     

       12846
       12846
       +
             extraConfig = extraArgs.extraConfig;

     

       12847
       12847
       +
           }))) {

     

       12848
       12848
        
             inherit stdenv;

     

       12849
       12849
        
           });

     

       12850
       12850
        
       

     
···

       18932
       18932
        
       

     

       18933
       18933
        
         fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };

     

       18934
       18934
        
       

     

       18935
       18935
       -
         firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ };

     

       18936
       18936
       -
         firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ };

     

       18935
       18935
       +
         inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5;

     

       18936
       18936
       +
         firebird = firebird_3;

     

       18937
       18937
        
       

     

       18938
       18938
        
         freeradius = callPackage ../servers/freeradius { };

     

       18939
       18939
        
       

     
···

       19533
       19533
        
         prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };

     

       19534
       19534
        
         prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };

     

       19535
       19535
        
         prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };

     

       19536
       19536
       -
         prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };

     

       19536
       19536
       +
         prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix {

     

       19537
       19537
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       19538
       19538
       +
         };

     

       19537
       19539
        
         prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };

     

       19538
       19540
        
         prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };

     

       19539
       19541
        
         prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix {  };

     
···

       31422
       31424
        
       

     

       31423
       31425
        
         simplehttp2server = callPackage ../servers/simplehttp2server { };

     

       31424
       31426
        
       

     

       31425
       31425
       -
         simple-http-server = callPackage ../servers/simple-http-server { };

     

       31427
       31427
       +
         simple-http-server = callPackage ../servers/simple-http-server {

     

       31428
       31428
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       31429
       31429
       +
         };

     

       31426
       31430
        
       

     

       31427
       31431
        
         diceware = with python3Packages; toPythonApplication diceware;

     

       31428
       31432