commit db1ec4df1e56cb0ac18b6f431365f9295c21595f · pyrox.dev/nixpkgs

+5 -3

nixos/modules/services/monitoring/prometheus/exporters/kea.nix

···

       15
       15
        
             type = types.listOf types.str;

     

       16
       16
        
             example = literalExpression ''

     

       17
       17
        
               [

     

       18
       18
       -
                 "/run/kea-dhcp4/kea-dhcp4.socket"

     

       19
       19
       -
                 "/run/kea-dhcp6/kea-dhcp6.socket"

     

       18
       18
       +
                 "/run/kea/kea-dhcp4.socket"

     

       19
       19
       +
                 "/run/kea/kea-dhcp6.socket"

     

       20
       20
        
               ]

     

       21
       21
        
             '';

     

       22
       22
        
             description = lib.mdDoc ''

     
···

       31
       31
        
           ];

     

       32
       32
        
           serviceConfig = {

     

       33
       33
        
             User = "kea";

     

       34
       34
       +
             DynamicUser = true;

     

       34
       35
        
             ExecStart = ''

     

       35
       36
        
               ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \

     

       36
       37
        
                 --address ${cfg.listenAddress} \

     

       37
       38
        
                 --port ${toString cfg.port} \

     

       38
       39
        
                 ${concatStringsSep " " cfg.controlSocketPaths}

     

       39
       40
        
             '';

     

       40
       40
       -
             SupplementaryGroups = [ "kea" ];

     

       41
       41
       +
             RuntimeDirectory = "kea";

     

       42
       42
       +
             RuntimeDirectoryPreserve = true;

     

       41
       43
        
             RestrictAddressFamilies = [

     

       42
       44
        
               # Need AF_UNIX to collect data

     

       43
       45
        
               "AF_UNIX"

+10 -12

nixos/modules/services/networking/kea.nix

···

       254
       254
        
             DynamicUser = true;

     

       255
       255
        
             User = "kea";

     

       256
       256
        
             ConfigurationDirectory = "kea";

     

       257
       257
       +
             RuntimeDirectory = "kea";

     

       258
       258
       +
             RuntimeDirectoryPreserve = true;

     

       257
       259
        
             StateDirectory = "kea";

     

       258
       260
        
             UMask = "0077";

     

       259
       261
        
           };

     
···

       288
       290
        
             ];

     

       289
       291
        
       

     

       290
       292
        
             environment = {

     

       291
       291
       -
               KEA_PIDFILE_DIR = "/run/kea-ctrl-agent";

     

       292
       292
       -
               KEA_LOCKFILE_DIR = "/run/kea-ctrl-agent";

     

       293
       293
       +
               KEA_PIDFILE_DIR = "/run/kea";

     

       294
       294
       +
               KEA_LOCKFILE_DIR = "/run/kea";

     

       293
       295
        
             };

     

       294
       296
        
       

     

       295
       297
        
             restartTriggers = [

     
···

       300
       302
        
               ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}";

     

       301
       303
        
               KillMode = "process";

     

       302
       304
        
               Restart = "on-failure";

     

       303
       303
       -
               RuntimeDirectory = "kea-ctrl-agent";

     

       304
       305
        
             } // commonServiceConfig;

     

       305
       306
        
           };

     

       306
       307
        
         })

     
···

       329
       330
        
             ];

     

       330
       331
        
       

     

       331
       332
        
             environment = {

     

       332
       332
       -
               KEA_PIDFILE_DIR = "/run/kea-dhcp4";

     

       333
       333
       -
               KEA_LOCKFILE_DIR = "/run/kea-dhcp4";

     

       333
       333
       +
               KEA_PIDFILE_DIR = "/run/kea";

     

       334
       334
       +
               KEA_LOCKFILE_DIR = "/run/kea";

     

       334
       335
        
             };

     

       335
       336
        
       

     

       336
       337
        
             restartTriggers = [

     
···

       348
       349
        
                 "CAP_NET_BIND_SERVICE"

     

       349
       350
        
                 "CAP_NET_RAW"

     

       350
       351
        
               ];

     

       351
       351
       -
               RuntimeDirectory = "kea-dhcp4";

     

       352
       352
        
             } // commonServiceConfig;

     

       353
       353
        
           };

     

       354
       354
        
         })

     
···

       377
       377
        
             ];

     

       378
       378
        
       

     

       379
       379
        
             environment = {

     

       380
       380
       -
               KEA_PIDFILE_DIR = "/run/kea-dhcp6";

     

       381
       381
       -
               KEA_LOCKFILE_DIR = "/run/kea-dhcp6";

     

       380
       380
       +
               KEA_PIDFILE_DIR = "/run/kea";

     

       381
       381
       +
               KEA_LOCKFILE_DIR = "/run/kea";

     

       382
       382
        
             };

     

       383
       383
        
       

     

       384
       384
        
             restartTriggers = [

     
···

       394
       394
        
               CapabilityBoundingSet = [

     

       395
       395
        
                 "CAP_NET_BIND_SERVICE"

     

       396
       396
        
               ];

     

       397
       397
       -
               RuntimeDirectory = "kea-dhcp6";

     

       398
       397
        
             } // commonServiceConfig;

     

       399
       398
        
           };

     

       400
       399
        
         })

     
···

       423
       422
        
             ];

     

       424
       423
        
       

     

       425
       424
        
             environment = {

     

       426
       426
       -
               KEA_PIDFILE_DIR = "/run/kea-dhcp-ddns";

     

       427
       427
       -
               KEA_LOCKFILE_DIR = "/run/kea-dhcp-ddns";

     

       425
       425
       +
               KEA_PIDFILE_DIR = "/run/kea";

     

       426
       426
       +
               KEA_LOCKFILE_DIR = "/run/kea";

     

       428
       427
        
             };

     

       429
       428
        
       

     

       430
       429
        
             restartTriggers = [

     
···

       439
       438
        
               CapabilityBoundingSet = [

     

       440
       439
        
                 "CAP_NET_BIND_SERVICE"

     

       441
       440
        
               ];

     

       442
       442
       -
               RuntimeDirectory = "kea-dhcp-ddns";

     

       443
       441
        
             } // commonServiceConfig;

     

       444
       442
        
           };

     

       445
       443
        
         })

+2 -2

nixos/tests/prometheus-exporters.nix

···

       431
       431
        
           };

     

       432
       432
        
       

     

       433
       433
        
           kea = let

     

       434
       434
       -
             controlSocketPathV4 = "/run/kea-dhcp4/dhcp4.sock";

     

       435
       435
       -
             controlSocketPathV6 = "/run/kea-dhcp6/dhcp6.sock";

     

       434
       434
       +
             controlSocketPathV4 = "/run/kea/dhcp4.sock";

     

       435
       435
       +
             controlSocketPathV6 = "/run/kea/dhcp6.sock";

     

       436
       436
        
           in

     

       437
       437
        
           {

     

       438
       438
        
             exporterConfig = {

+2 -2

pkgs/applications/blockchains/ergo/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ergo";

     

       5
       5
       -
         version = "5.0.16";

     

       5
       5
       +
         version = "5.0.18";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";

     

       9
       9
       -
           sha256 = "sha256-20k2/701CqNJS2nFDCCeCzr1s/Rh2VB2g5KcU5XmsFQ=";

     

       9
       9
       +
           sha256 = "sha256-WwchK7qyy+J7TiWj4exBMLGkLmbPFDA7yNQVZ779nmk=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/applications/science/logic/cadical/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cadical";

     

       5
       5
       -
         version = "1.9.1";

     

       5
       5
       +
         version = "1.9.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "arminbiere";

     

       9
       9
        
           repo = "cadical";

     

       10
       10
        
           rev = "rel-${version}";

     

       11
       11
       -
           sha256 = "sha256-WQNaRkjJyWc3PDkK5uwLHEymlnpytVkbJqIVbc7HgZY=";

     

       11
       11
       +
           sha256 = "sha256-kjvbWFcoEe7Df2HDKKc2txrxpS8/StwiCLbS2RqnkyE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" "dev" "lib" ];

+9 -4

pkgs/by-name/bi/bitmagnet/package.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildGoModule

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , nix-update-script

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       buildGoModule rec {

     

       7
       8
        
         pname = "bitmagnet";

     

       8
       8
       -
         version = "0.0.6";

     

       9
       9
       +
         version = "0.4.1";

     

       9
       10
        
       

     

       10
       11
        
         src = fetchFromGitHub {

     

       11
       12
        
           owner = "bitmagnet-io";

     

       12
       13
        
           repo = "bitmagnet";

     

       13
       14
        
           rev = "v${version}";

     

       14
       14
       -
           hash = "sha256-+KAIHg8M2CM+GRRv+htmev8MFe/Y1sJ8p+um/c7kI7c=";

     

       15
       15
       +
           hash = "sha256-Geukd4JYwmdG7M+HDCCqpiUjor1TWsqBY42ACd+LasU=";

     

       15
       16
        
         };

     

       16
       17
        
       

     

       17
       17
       -
         vendorHash = "sha256-ydiZ3KMEiVkmdzhHjYYLJ7wuiKmwlMEn4OWrKSOnaSo=";

     

       18
       18
       +
         vendorHash = "sha256-TbfbrvXbO+eOb1Ot/gWRBjggTj9jkSGulHIJdziqsVc=";

     

       18
       19
        
       

     

       19
       20
        
         ldflags = [ "-s" "-w" ];

     

       20
       21
        
       

     

       22
       22
       +
         passthru = {

     

       23
       23
       +
           updateScript = nix-update-script { };

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       21
       26
        
         meta = {

     

       22
       27
        
           description = "A self-hosted BitTorrent indexer, DHT crawler, and torrent search engine";

     

       23
       28
        
           longDescription = ''

     
···

       25
       30
        
           '';

     

       26
       31
        
           homepage = "https://bitmagnet.io/";

     

       27
       32
        
           license = lib.licenses.mit;

     

       28
       28
       -
           maintainers = with lib.maintainers; [ eclairevoyant ];

     

       33
       33
       +
           maintainers = with lib.maintainers; [ eclairevoyant viraptor ];

     

       29
       34
        
           mainProgram = "bitmagnet";

     

       30
       35
        
         };

     

       31
       36
        
       }

+2 -2

pkgs/development/compilers/julia/1.6-bin.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "julia-bin";

     

       5
       5
       -
         version = "1.6.6";

     

       5
       5
       +
         version = "1.6.7";

     

       6
       6
        
       

     

       7
       7
        
         src = {

     

       8
       8
        
           x86_64-linux = fetchurl {

     

       9
       9
        
             url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";

     

       10
       10
       -
             sha256 = "0ia9a4h7w0n5rg57fkl1kzcyj500ymfwq3qsd2r7l82288dgfpy2";

     

       10
       10
       +
             sha256 = "sha256-bEUi1ZXky80AFXrEWKcviuwBdXBT0gc/mdqjnkQrKjY=";

     

       11
       11
        
           };

     

       12
       12
        
         }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       13
       13

+2 -2

pkgs/development/libraries/cjson/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cjson";

     

       5
       5
       -
         version = "1.7.16";

     

       5
       5
       +
         version = "1.7.17";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "DaveGamble";

     

       9
       9
        
           repo = "cJSON";

     

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

     

       11
       11
       -
           sha256 = "sha256-sdhnDpaAO9Fau4uMzNXrbOJ2k0b8+MdhKh6rpFMUwaQ=";

     

       11
       11
       +
           sha256 = "sha256-jU9UbXvdXiNXFh7c9p/LppMsuqryFK40NTTyQGbNU84=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+63

pkgs/development/python-modules/fhir-py/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , flit-core

     

       6
       6
       +
       , aiohttp

     

       7
       7
       +
       , pytz

     

       8
       8
       +
       , requests

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , pytest-asyncio

     

       11
       11
       +
       , responses

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "fhir-py";

     

       16
       16
       +
         version = "1.4.2";

     

       17
       17
       +
         pyproject = true;

     

       18
       18
       +
       

     

       19
       19
       +
         disabled = pythonOlder "3.8";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "beda-software";

     

       23
       23
       +
           repo = "fhir-py";

     

       24
       24
       +
           rev = "refs/tags/v${version}";

     

       25
       25
       +
           hash = "sha256-kYqoRso1ypN5novRxMMzz1h2NGNybbw5lK4+HErG79I=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         preBuild = ''

     

       29
       29
       +
           substituteInPlace pyproject.toml  \

     

       30
       30
       +
             --replace "--cov=fhirpy" ""  \

     

       31
       31
       +
             --replace "--cov-report=xml" ""

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         nativeBuildInputs = [

     

       35
       35
       +
           flit-core

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         propagatedBuildInputs = [

     

       39
       39
       +
           aiohttp

     

       40
       40
       +
           pytz

     

       41
       41
       +
           requests

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         nativeCheckInputs = [

     

       45
       45
       +
           pytestCheckHook

     

       46
       46
       +
           pytest-asyncio

     

       47
       47
       +
           responses

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         # sync/async test cases require docker-compose to set up services, so disable:

     

       51
       51
       +
         disabledTestPaths = [ "tests/test_lib_sync.py" ];

     

       52
       52
       +
         disabledTests = [ "TestLibAsyncCase" ];

     

       53
       53
       +
       

     

       54
       54
       +
         pythonImportsCheck = [ "fhirpy" ];

     

       55
       55
       +
       

     

       56
       56
       +
         meta = with lib; {

     

       57
       57
       +
           description = "Async/sync API for FHIR resources";

     

       58
       58
       +
           homepage = "https://github.com/beda-software/fhir-py";

     

       59
       59
       +
           changelog = "https://github.com/beda-software/fhir-py/blob/${src.rev}/CHANGELOG.md";

     

       60
       60
       +
           license = licenses.mit;

     

       61
       61
       +
           maintainers = with maintainers; [ bcdarwin ];

     

       62
       62
       +
         };

     

       63
       63
       +
       }

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "idasen";

     

       15
       15
       -
         version = "0.10.3";

     

       15
       15
       +
         version = "0.11.0";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.8";

     
···

       21
       21
        
           owner = "newAM";

     

       22
       22
        
           repo = "idasen";

     

       23
       23
        
           rev = "refs/tags/v${version}";

     

       24
       24
       -
           hash = "sha256-mAczHrFEH1LEH1IEUc7ZXTWtaPBrvIdSvkUqOCupyRs=";

     

       24
       24
       +
           hash = "sha256-ybM3dQhTogjhtIO5daWMXpnxUM7uWYnKONMOEx3u+58=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+5 -5

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/cstrahan/tree-sitter-nix",

     

       3
       3
       -
         "rev": "66e3e9ce9180ae08fc57372061006ef83f0abde7",

     

       4
       4
       -
         "date": "2023-07-13T16:23:24+12:00",

     

       5
       5
       -
         "path": "/nix/store/s4wax7d0axrm8npq02lk4n1g75hzjhp0-tree-sitter-nix",

     

       6
       6
       -
         "sha256": "06671j6kx0b5z35mkmyygvxmjd8af9ac7kbl0w1bfwk177arz3zs",

     

       7
       7
       -
         "hash": "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg=",

     

       3
       3
       +
         "rev": "763168fa916a333a459434f1424b5d30645f015d",

     

       4
       4
       +
         "date": "2023-12-26T15:36:50+13:00",

     

       5
       5
       +
         "path": "/nix/store/wvnrjnrb3dgc5pg5n8nkwxm43478nk2k-tree-sitter-nix",

     

       6
       6
       +
         "sha256": "0nn3ij8k6wkbf3kcvkyyp0vhfjcksi31wyyfwmsbx66maf2xgaii",

     

       7
       7
       +
         "hash": "sha256-MarXhVPVmL505c57HkbUk0kHN7jez83mcGtyM5GMw1o=",

     

       8
       8
        
         "fetchLFS": false,

     

       9
       9
        
         "fetchSubmodules": false,

     

       10
       10
        
         "deepClone": false,

+2 -2

pkgs/servers/home-automation/evcc/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildGoModule rec {

     

       18
       18
        
         pname = "evcc";

     

       19
       19
       -
         version = "0.123.0";

     

       19
       19
       +
         version = "0.123.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "evcc-io";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           hash = "sha256-jqlGjDwi+QGh5gmYVoSlxQjyKvNrE9nmSfh1cOlwnoM=";

     

       25
       25
       +
           hash = "sha256-12xRdyBil5sTUqxmjw3af9bLdO+LTI+8qwnDQYYm9NA=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU=";

+3 -3

pkgs/tools/misc/goreleaser/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "goreleaser";

     

       12
       12
       -
         version = "1.22.1";

     

       12
       12
       +
         version = "1.23.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "goreleaser";

     

       16
       16
        
           repo = pname;

     

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

     

       18
       18
       -
           hash = "sha256-Okuiicq1CAVrE3YPe/aF/HZbf23p6ulz//BRGX77cnw=";

     

       18
       18
       +
           hash = "sha256-b3yXabHqpw0npkTlO4eKy41agtDV1QnpfctBYv4BV/Q=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-+ac4q820gETsNRVpW2u0MXU6HfoztLdsWK2HYqJ4mqo=";

     

       21
       21
       +
         vendorHash = "sha256-c9fygb6ywTUwcF1jbgr8YQ0SR7u36C0bRDljakQRdGA=";

     

       22
       22
        
       

     

       23
       23
        
         ldflags =

     

       24
       24
        
           [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ];

+3 -3

pkgs/tools/security/spire/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "spire";

     

       5
       5
       -
         version = "1.8.3";

     

       5
       5
       +
         version = "1.8.7";

     

       6
       6
        
       

     

       7
       7
        
         outputs = [ "out" "agent" "server" ];

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "spiffe";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "sha256-xfSOmUfBoIQSI9u2YD3CxBIOiT7QxMi3fJZUVeZo39o=";

     

       13
       13
       +
           sha256 = "sha256-D6NNG//1rM7EIzawKdMA/8nloqMNAkF75YyFpHvxUkI=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         vendorHash = "sha256-9j/EZntVW40QHYJi9NvAKX/4uGxLolk75GNennQ6ymY=";

     

       16
       16
       +
         vendorHash = "sha256-bSQitqXTY1LMnpGkXAmDiDsMd0xZHrcr/Ms1F6avBKM=";

     

       17
       17
        
       

     

       18
       18
        
         subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];

     

       19
       19

+2

pkgs/top-level/python-packages.nix

···

       3959
       3959
        
       

     

       3960
       3960
        
         ffmpy = callPackage ../development/python-modules/ffmpy { };

     

       3961
       3961
        
       

     

       3962
       3962
       +
         fhir-py = callPackage ../development/python-modules/fhir-py { };

     

       3963
       3963
       +
       

     

       3962
       3964
        
         fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { };

     

       3963
       3965
        
       

     

       3964
       3966
        
         fido2 = callPackage ../development/python-modules/fido2 { };