commit 0417b0e54f3055fbd5d4129b8c57811b9e228f9e · pyrox.dev/nixpkgs

+5 -2

lib/options.nix

···

       36
       36
        
         inherit (lib.types)

     

       37
       37
        
           mkOptionType

     

       38
       38
        
           ;

     

       39
       39
       +
         prioritySuggestion = ''

     

       40
       40
       +
          Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions.

     

       41
       41
       +
         '';

     

       39
       42
        
       in

     

       40
       43
        
       rec {

     

       41
       44
        
       

     
···

       184
       187
        
           if length defs == 1

     

       185
       188
        
           then (head defs).value

     

       186
       189
        
           else assert length defs > 1;

     

       187
       187
       -
             throw "The option `${showOption loc}' is defined multiple times.\n${message}\nDefinition values:${showDefs defs}";

     

       190
       190
       +
             throw "The option `${showOption loc}' is defined multiple times while it's expected to be unique.\n${message}\nDefinition values:${showDefs defs}\n${prioritySuggestion}";

     

       188
       191
        
       

     

       189
       192
        
         /* "Merge" option definitions by checking that they all have the same value. */

     

       190
       193
        
         mergeEqualOption = loc: defs:

     
···

       195
       198
        
           else if length defs == 1 then (head defs).value

     

       196
       199
        
           else (foldl' (first: def:

     

       197
       200
        
             if def.value != first.value then

     

       198
       198
       -
               throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"

     

       201
       201
       +
               throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}\n${prioritySuggestion}"

     

       199
       202
        
             else

     

       200
       203
        
               first) (head defs) (tail defs)).value;

     

       201
       204

+6

maintainers/maintainer-list.nix

···

       14428
       14428
        
           githubId = 139251;

     

       14429
       14429
        
           name = "Tom Hunger";

     

       14430
       14430
        
         };

     

       14431
       14431
       +
         tehmatt = {

     

       14432
       14432
       +
           name = "tehmatt";

     

       14433
       14433
       +
           email = "nix@programsareproofs.com";

     

       14434
       14434
       +
           github = "tehmatt";

     

       14435
       14435
       +
           githubId = 3358866;

     

       14436
       14436
       +
         };

     

       14431
       14437
        
         tejasag = {

     

       14432
       14438
        
           name = "Tejas Agarwal";

     

       14433
       14439
        
           email = "tejasagarwalbly@gmail.com";

+39 -1

nixos/modules/services/audio/ympd.nix

···

       48
       48
        
       

     

       49
       49
        
           systemd.services.ympd = {

     

       50
       50
        
             description = "Standalone MPD Web GUI written in C";

     

       51
       51
       +
       

     

       51
       52
        
             wantedBy = [ "multi-user.target" ];

     

       52
       52
       -
             serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${toString cfg.webPort} --user nobody";

     

       53
       53
       +
             after = [ "network-online.target" ];

     

       54
       54
       +
       

     

       55
       55
       +
             serviceConfig = {

     

       56
       56
       +
               ExecStart = ''

     

       57
       57
       +
                 ${pkgs.ympd}/bin/ympd \

     

       58
       58
       +
                   --host ${cfg.mpd.host} \

     

       59
       59
       +
                   --port ${toString cfg.mpd.port} \

     

       60
       60
       +
                   --webport ${toString cfg.webPort}

     

       61
       61
       +
               '';

     

       62
       62
       +
       

     

       63
       63
       +
               DynamicUser = true;

     

       64
       64
       +
               NoNewPrivileges = true;

     

       65
       65
       +
       

     

       66
       66
       +
               ProtectProc = "invisible";

     

       67
       67
       +
               ProtectSystem = "strict";

     

       68
       68
       +
               ProtectHome = "tmpfs";

     

       69
       69
       +
       

     

       70
       70
       +
               PrivateTmp = true;

     

       71
       71
       +
               PrivateDevices = true;

     

       72
       72
       +
               PrivateIPC = true;

     

       73
       73
       +
       

     

       74
       74
       +
               ProtectHostname = true;

     

       75
       75
       +
               ProtectClock = true;

     

       76
       76
       +
               ProtectKernelTunables = true;

     

       77
       77
       +
               ProtectKernelModules = true;

     

       78
       78
       +
               ProtectKernelLogs = true;

     

       79
       79
       +
               ProtectControlGroups = true;

     

       80
       80
       +
       

     

       81
       81
       +
               RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];

     

       82
       82
       +
               RestrictRealtime = true;

     

       83
       83
       +
               RestrictSUIDSGID = true;

     

       84
       84
       +
       

     

       85
       85
       +
               SystemCallFilter = [

     

       86
       86
       +
                 "@system-service"

     

       87
       87
       +
                 "~@process"

     

       88
       88
       +
                 "~@setuid"

     

       89
       89
       +
               ];

     

       90
       90
       +
             };

     

       53
       91
        
           };

     

       54
       92
        
       

     

       55
       93
        
         };

+45

pkgs/applications/audio/flac2all/default.nix

···

       1
       1
       +
       { python3Packages, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }:

     

       2
       2
       +
       

     

       3
       3
       +
       python3Packages.buildPythonApplication rec {

     

       4
       4
       +
         pname = "flac2all";

     

       5
       5
       +
         version = "5.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = python3Packages.fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
       +
           sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI=";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         # Not sure why this is needed, but setup.py expects this to be set

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           echo ${version} > ./flac2all_pkg/version

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [

     

       18
       18
       +
           python3Packages.pyzmq

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         postInstall = ''

     

       22
       22
       +
           wrapProgram $out/bin/flac2all \

     

       23
       23
       +
             --set PATH ${lib.makeBinPath [

     

       24
       24
       +
               # Hard requirements

     

       25
       25
       +
               flac

     

       26
       26
       +
               lame

     

       27
       27
       +
               # Optional deps depending on encoding types

     

       28
       28
       +
               opusTools

     

       29
       29
       +
               vorbis-tools

     

       30
       30
       +
               ffmpeg

     

       31
       31
       +
             ]}

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         # Has no standard tests, so we verify a few imports instead.

     

       35
       35
       +
         doCheck = false;

     

       36
       36
       +
         pythonImportsCheck = [ "flac2all_pkg.vorbis" "flac2all_pkg.mp3" ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "Multi process, clustered, FLAC to multi codec audio converter with tagging support";

     

       40
       40
       +
           homepage = "https://github.com/ZivaVatra/flac2all";

     

       41
       41
       +
           license = licenses.gpl3;

     

       42
       42
       +
           # TODO: This has only been tested on Linux, but may work on Mac too.

     

       43
       43
       +
           platforms = platforms.linux;

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+2 -2

pkgs/applications/misc/keepass/default.nix

···

       4
       4
        
         inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;

     

       5
       5
        
       in buildDotnetPackage rec {

     

       6
       6
        
         pname = "keepass";

     

       7
       7
       -
         version = "2.53";

     

       7
       7
       +
         version = "2.53.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";

     

       11
       11
       -
           hash = "sha256-wpXbLH9VyjJyb+KuQ8xmbik1jq+xqAFRxsxAuLM5MI0=";

     

       11
       11
       +
           hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = ".";

+2 -11

pkgs/applications/networking/browsers/chromium/common.nix

···

       150
       150
        
             libdrm wayland mesa.drivers libxkbcommon

     

       151
       151
        
             curl

     

       152
       152
        
             libepoxy

     

       153
       153
       +
             libffi

     

       153
       154
        
           ] ++ lib.optional systemdSupport systemd

     

       154
       155
        
             ++ lib.optionals cupsSupport [ libgcrypt cups ]

     

       155
       155
       -
             ++ lib.optional pulseSupport libpulseaudio

     

       156
       156
       -
             ++ lib.optional (chromiumVersionAtLeast "110") libffi;

     

       156
       156
       +
             ++ lib.optional pulseSupport libpulseaudio;

     

       157
       157
        
       

     

       158
       158
        
           patches = [

     

       159
       159
        
             # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):

     
···

       293
       293
        
             chrome_pgo_phase = 0;

     

       294
       294
        
             clang_base_path = "${llvmPackages.clang}";

     

       295
       295
        
             use_qt = false;

     

       296
       296
       -
           } // lib.optionalAttrs (!chromiumVersionAtLeast "110") {

     

       297
       297
       -
             # The default has changed to false. We'll build with libwayland from

     

       298
       298
       -
             # Nixpkgs for now but might want to eventually use the bundled libwayland

     

       299
       299
       -
             # as well to avoid incompatibilities (if this continues to be a problem

     

       300
       300
       -
             # from time to time):

     

       301
       301
       -
             use_system_libwayland = true;

     

       302
       302
       -
             # The default value is hardcoded instead of using pkg-config:

     

       303
       303
       -
             system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";

     

       304
       304
       -
           } // lib.optionalAttrs (chromiumVersionAtLeast "110") {

     

       305
       296
        
             # To fix the build as we don't provide libffi_pic.a

     

       306
       297
        
             # (ld.lld: error: unable to find library -l:libffi_pic.a):

     

       307
       298
        
             use_system_libffi = true;

+7 -7

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       45
       45
        
           }

     

       46
       46
        
         },

     

       47
       47
        
         "ungoogled-chromium": {

     

       48
       48
       -
           "version": "109.0.5414.120",

     

       49
       49
       -
           "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj",

     

       48
       48
       +
           "version": "110.0.5481.78",

     

       49
       49
       +
           "sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj",

     

       50
       50
        
           "sha256bin64": null,

     

       51
       51
        
           "deps": {

     

       52
       52
        
             "gn": {

     

       53
       53
       -
               "version": "2022-11-10",

     

       53
       53
       +
               "version": "2022-12-12",

     

       54
       54
        
               "url": "https://gn.googlesource.com/gn",

     

       55
       55
       -
               "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",

     

       56
       56
       -
               "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"

     

       55
       55
       +
               "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",

     

       56
       56
       +
               "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"

     

       57
       57
        
             },

     

       58
       58
        
             "ungoogled-patches": {

     

       59
       59
       -
               "rev": "109.0.5414.120-1",

     

       60
       60
       -
               "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3"

     

       59
       59
       +
               "rev": "110.0.5481.78-1",

     

       60
       60
       +
               "sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c"

     

       61
       61
        
             }

     

       62
       62
        
           }

     

       63
       63
        
         }

+3 -3

pkgs/applications/networking/cluster/terraform/default.nix

···

       168
       168
        
         mkTerraform = attrs: pluggable (generic attrs);

     

       169
       169
        
       

     

       170
       170
        
         terraform_1 = mkTerraform {

     

       171
       171
       -
           version = "1.3.7";

     

       172
       172
       -
           sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ";

     

       173
       173
       -
           vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k=";

     

       171
       171
       +
           version = "1.3.8";

     

       172
       172
       +
           sha256 = "sha256-AXLk5s3qu3QZ1aXx/FwPNq3hM26skBj0wyn/x8nVMkE=";

     

       173
       173
       +
           vendorSha256 = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY=";

     

       174
       174
        
           patches = [ ./provider-path-0_15.patch ];

     

       175
       175
        
           passthru = {

     

       176
       176
        
             inherit plugins;

+3 -3

pkgs/development/compilers/picat/default.nix

···

       9
       9
        
       in

     

       10
       10
        
       stdenv.mkDerivation {

     

       11
       11
        
         pname = "picat";

     

       12
       12
       -
         version = "3.0p4";

     

       12
       12
       +
         version = "3.3p3";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
       -
           url    = "http://picat-lang.org/download/picat30_4_src.tar.gz";

     

       16
       16
       -
           sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj";

     

       15
       15
       +
           url = "http://picat-lang.org/download/picat333_src.tar.gz";

     

       16
       16
       +
           hash = "sha256-LMmAHCGKgon/wNbrXTUH9hiHyGVwwSDpB1236xawzXs=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ zlib ];

+4 -3

pkgs/development/interpreters/trealla/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, readline, openssl, libffi, withThread ? true, withSSL ? true, xxd }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, readline, openssl, libffi, valgrind, withThread ? true, withSSL ? true, xxd }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "trealla";

     

       5
       5
       -
         version = "2.2.6";

     

       5
       5
       +
         version = "2.8.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "trealla-prolog";

     

       9
       9
        
           repo = "trealla";

     

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

     

       11
       11
       -
           sha256 = "sha256-DxlexijQPcNxlPjo/oIvsN//8nZ0injXFHc2t3n4yjg=";

     

       11
       11
       +
           sha256 = "sha256-/jB4jlYotvdU068+zj9Z+G0g75sI9dTmtgN874i0qAE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

     
···

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ xxd ];

     

       29
       29
        
         buildInputs = [ readline openssl libffi ];

     

       30
       30
       +
         checkInputs = [ valgrind ];

     

       30
       31
        
         enableParallelBuilding = true;

     

       31
       32
        
       

     

       32
       33
        
         installPhase = ''

+15 -7

pkgs/development/libraries/libpgf/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchzip, autoreconfHook }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , dos2unix

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       stdenv.mkDerivation rec {

     

       4
       9
        
         pname = "libpgf";

     

       5
       5
       -
         version = "7.21.2";

     

       10
       10
       +
         version = "7.21.7";

     

       6
       11
        
       

     

       7
       12
        
         src = fetchzip {

     

       8
       13
        
           url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip";

     

       9
       9
       -
           sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r";

     

       14
       14
       +
           hash = "sha256-TAWIuikijfyeTRetZWoMMdB/FeGAR7ZjNssVxUevlVg=";

     

       10
       15
        
         };

     

       11
       16
        
       

     

       12
       12
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       13
       13
       -
       

     

       14
       14
       -
         autoreconfPhase = ''

     

       17
       17
       +
         postPatch = ''

     

       18
       18
       +
           find . -type f | xargs dos2unix

     

       15
       19
        
           mv README.txt README

     

       16
       16
       -
           sh autogen.sh

     

       17
       20
        
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           autoreconfHook

     

       24
       24
       +
           dos2unix

     

       25
       25
       +
         ];

     

       18
       26
        
       

     

       19
       27
        
         meta = {

     

       20
       28
        
           homepage = "https://www.libpgf.org/";

+1 -1

pkgs/games/simutrans/default.nix

···

       163
       163
        
       

     

       164
       164
        
             homepage = "http://www.simutrans.com/";

     

       165
       165
        
             license = with licenses; [ artistic1 gpl1Plus ];

     

       166
       166
       -
             maintainers = with maintainers; [ phile314 ];

     

       166
       166
       +
             maintainers = with maintainers; [ ];

     

       167
       167
        
             platforms = with platforms; linux; # TODO: ++ darwin;

     

       168
       168
        
           };

     

       169
       169
        
         };

+2 -5

pkgs/os-specific/linux/kernel-headers/default.nix

···

       1
       1
        
       { stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header

     

       2
       2
       -
       , bison ? null, flex ? null, python ? null, rsync ? null

     

       2
       2
       +
       , bison, flex, rsync

     

       3
       3
        
       , writeTextFile

     

       4
       4
        
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       assert stdenvNoCC.hostPlatform.isAndroid ->

     

       7
       7
       -
         (flex != null && bison != null && python != null && rsync != null);

     

       8
       5
        
       

     

       9
       6
        
       let

     

       10
       7
        
       

     
···

       50
       47
        
           nativeBuildInputs = [

     

       51
       48
        
             perl elf-header

     

       52
       49
        
           ] ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [

     

       53
       53
       -
             flex bison python rsync

     

       50
       50
       +
             bison flex rsync

     

       54
       51
        
           ] ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin &&

     

       55
       52
        
                               stdenvNoCC.hostPlatform.isMips) [

     

       56
       53
        
             darwin-endian-h

+18 -8

pkgs/servers/filtron/default.nix

···

       1
       1
       -
       { lib, buildGoPackage, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoPackage rec {

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
        
         pname = "filtron";

     

       5
       5
        
         version = "0.2.0";

     

       6
       6
        
       

     

       7
       7
       -
         goPackagePath = "github.com/asciimoo/filtron";

     

       8
       8
       -
       

     

       9
       7
        
         src = fetchFromGitHub {

     

       10
       8
        
           owner = "asciimoo";

     

       11
       9
        
           repo = "filtron";

     

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

     

       13
       13
       -
           sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26";

     

       11
       11
       +
           hash = "sha256-RihxlJvbHq5PaJz89NHl/wyXrKjSiC4XYAs7LSKAo6E=";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       16
       -
         goDeps = ./deps.nix;

     

       14
       14
       +
         vendorHash = "sha256-1DRR16WiBGvhOpq12L5njJJRRCIA7ajs1Py9j/3cWPE=";

     

       17
       15
        
       

     

       18
       18
       -
         # The upstream test checks are obsolete/unmaintained.

     

       19
       19
       -
         doCheck = false;

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           # Update golang version in go.mod

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             url = "https://github.com/asciimoo/filtron/commit/365a0131074b3b12aaa65194bfb542182a63413c.patch";

     

       20
       20
       +
             hash = "sha256-QGR6YetEzA/b6tC4uD94LBkWv0+9PG7RD72Tpkn2gQU=";

     

       21
       21
       +
           })

     

       22
       22
       +
           # Add missing go.sum file

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             url = "https://github.com/asciimoo/filtron/commit/077769282b4e392e96a194c8ae71ff9f693560ea.patch";

     

       25
       25
       +
             hash = "sha256-BhHbXDKiRjSzC6NKhKUiH6rjt/EgJcEprHMMJ1x/wiQ=";

     

       26
       26
       +
           })

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         ldflags = [ "-s" "-w" ];

     

       20
       30
        
       

     

       21
       31
        
         meta = with lib; {

     

       22
       32
        
           description = "Reverse HTTP proxy to filter requests by different rules.";

-41

pkgs/servers/filtron/deps.nix

···

       1
       1
       -
       [

     

       2
       2
       -
         {

     

       3
       3
       -
           goPackagePath = "github.com/valyala/fasthttp";

     

       4
       4
       -
           fetch = {

     

       5
       5
       -
             type = "git";

     

       6
       6
       -
             url = "https://github.com/valyala/fasthttp";

     

       7
       7
       -
             rev = "v1.41.0";

     

       8
       8
       -
             sha256 = "sha256-lV9FP7GjnQk/kJACE9l5CZ/8kzORdNpYS5lPokEYrZM=";

     

       9
       9
       -
           };

     

       10
       10
       -
         }

     

       11
       11
       -
       

     

       12
       12
       -
         {

     

       13
       13
       -
           goPackagePath = "github.com/klauspost/compress";

     

       14
       14
       -
           fetch = {

     

       15
       15
       -
             type = "git";

     

       16
       16
       -
             url = "https://github.com/klauspost/compress";

     

       17
       17
       -
             rev = "v1.15.12";

     

       18
       18
       -
             sha256 = "sha256-D41sCSbaqX9tXIRcTU9TYyjPyZpuKLDeQMXETE2ulbM=";

     

       19
       19
       -
           };

     

       20
       20
       -
         }

     

       21
       21
       -
       

     

       22
       22
       -
         {

     

       23
       23
       -
           goPackagePath = "github.com/valyala/bytebufferpool";

     

       24
       24
       -
           fetch = {

     

       25
       25
       -
             type = "git";

     

       26
       26
       -
             url = "https://github.com/valyala/bytebufferpool";

     

       27
       27
       -
             rev = "v1.0.0";

     

       28
       28
       -
             sha256 = "sha256-I9FPZ3kCNRB+o0dpMwBnwZ35Fj9+ThvITn8a3Jr8mAY=";

     

       29
       29
       -
           };

     

       30
       30
       -
         }

     

       31
       31
       -
       

     

       32
       32
       -
         {

     

       33
       33
       -
           goPackagePath = "github.com/andybalholm/brotli";

     

       34
       34
       -
           fetch = {

     

       35
       35
       -
             type = "git";

     

       36
       36
       -
             url = "https://github.com/andybalholm/brotli";

     

       37
       37
       -
             rev = "v1.0.4";

     

       38
       38
       -
             sha256 = "sha256-gAnPRdGP4yna4hiRIEDyBtDOVJqd7RU27wlPu96Rdf8=";

     

       39
       39
       -
           };

     

       40
       40
       -
         }

     

       41
       41
       -
       ]

+9 -6

pkgs/servers/nosql/ferretdb/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "ferretdb";

     

       8
       8
       -
         version = "0.7.1";

     

       8
       8
       +
         version = "0.9.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "FerretDB";

     

       12
       12
        
           repo = "FerretDB";

     

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

     

       14
       14
       -
           sha256 = "sha256-i3XCYVJfZ2sF4XGOxaBZqBOw7nRdzcGKhNNdqQMccPU=";

     

       14
       14
       +
           sha256 = "sha256-+tmClWkW3uhBXuQzuSMJnzeA1rrkpLV0QLCzcKhbThw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

     

       18
       18
       -
           echo ${version} > internal/util/version/gen/version.txt

     

       18
       18
       +
           echo v${version} > build/version/version.txt

     

       19
       19
       +
           echo nixpkgs     > build/version/package.txt

     

       19
       20
        
         '';

     

       20
       21
        
       

     

       21
       21
       -
         vendorSha256 = "sha256-qyAc5EVg8QPTnXQjqJGpT3waDrfn8iXz+O1iESCzCIc=";

     

       22
       22
       +
         vendorSha256 = "sha256-43FxDRcif8FDHyXdNL/FJEt5ZnCQ8r7d5Red3l9442Q=";

     

       22
       23
        
       

     

       23
       24
        
         CGO_ENABLED = 0;

     

       24
       25
        
       

     

       25
       26
        
         subPackages = [ "cmd/ferretdb" ];

     

       26
       27
        
       

     

       28
       28
       +
         tags = [ "ferretdb_tigris" ];

     

       29
       29
       +
       

     

       27
       30
        
         meta = with lib; {

     

       28
       31
        
           description = "A truly Open Source MongoDB alternative";

     

       29
       29
       -
           homepage = "https://github.com/FerretDB/FerretDB";

     

       32
       32
       +
           homepage = "https://www.ferretdb.io/";

     

       30
       33
        
           license = licenses.asl20;

     

       31
       31
       -
           maintainers = with maintainers; [ dit7ya ];

     

       34
       34
       +
           maintainers = with maintainers; [ dit7ya noisersup ];

     

       32
       35
        
         };

     

       33
       36
        
       }

+3 -3

pkgs/servers/tailscale/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tailscale";

     

       5
       5
       -
         version = "1.36.0";

     

       5
       5
       +
         version = "1.36.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tailscale";

     

       9
       9
        
           repo = "tailscale";

     

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

     

       11
       11
       -
           sha256 = "sha256-hNyEABs/GdfOx6vLTVBgbOzkbFvEDYZ0y1y0a0mIsfA=";

     

       11
       11
       +
           sha256 = "sha256-xTfMq8n9Io99qg/cc7SAWelcxXaWr21IQhsICeDCDNU=";

     

       12
       12
        
         };

     

       13
       13
       -
         vendorSha256 = "sha256-Jy3kjUA8qLhcw9XLw4Xo1zhD+IWZrDNM79TsbnKpx/g=";

     

       13
       13
       +
         vendorSha256 = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s=";

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

     

       16
       16

+25 -14

pkgs/tools/graphics/pgf/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , dos2unix

     

       6
       6
       +
       , doxygen

     

       7
       7
       +
       , freeimage

     

       8
       8
       +
       , libpgf

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       stdenv.mkDerivation rec {

     

       4
       12
        
         pname = "pgf";

     

       5
       5
       -
         version = "6.14.12";

     

       13
       13
       +
         version = "7.21.7";

     

       6
       14
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0";

     

       15
       15
       +
         src = fetchzip {

     

       16
       16
       +
           url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip";

     

       17
       17
       +
           hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0=";

     

       10
       18
        
         };

     

       11
       19
        
       

     

       12
       12
       -
         nativeBuildInputs = [ autoconf automake ];

     

       13
       13
       -
         buildInputs = [ libtool dos2unix libpgf freeimage doxygen ];

     

       14
       14
       -
       

     

       15
       15
       -
         patchPhase = ''

     

       16
       16
       -
             sed 1i'#include <inttypes.h>' -i src/PGF.cpp

     

       17
       17
       -
             sed s/__int64/int64_t/g -i src/PGF.cpp

     

       18
       18
       -
             rm include/FreeImage.h include/FreeImagePlus.h

     

       20
       20
       +
         postPatch = ''

     

       21
       21
       +
           find . -type f | xargs dos2unix

     

       22
       22
       +
           mv README.txt README

     

       19
       23
        
         '';

     

       20
       24
        
       

     

       21
       21
       -
         preConfigure = "dos2unix configure.ac; sh autogen.sh";

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           autoreconfHook

     

       27
       27
       +
           dos2unix

     

       28
       28
       +
           doxygen

     

       29
       29
       +
         ];

     

       22
       30
        
       

     

       23
       23
       -
       # configureFlags = optional static "--enable-static --disable-shared";

     

       31
       31
       +
         buildInputs = [

     

       32
       32
       +
           freeimage

     

       33
       33
       +
           libpgf

     

       34
       34
       +
         ];

     

       24
       35
        
       

     

       25
       36
        
         meta = {

     

       26
       37
        
           homepage = "https://www.libpgf.org/";

+5 -6

pkgs/tools/system/netdata/go.d.plugin.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildGoModule rec {

     

       1
       1
       +
       { lib, fetchFromGitHub, buildGo119Module }:

     

       2
       2
       +
       buildGo119Module rec {

     

       4
       3
        
         pname = "netdata-go.d.plugin";

     

       5
       5
       -
         version = "0.32.3";

     

       4
       4
       +
         version = "0.50.0";

     

       6
       5
        
       

     

       7
       6
        
         src = fetchFromGitHub {

     

       8
       7
        
           owner = "netdata";

     

       9
       8
        
           repo = "go.d.plugin";

     

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

     

       11
       11
       -
           sha256 = "sha256-SayFqr6n6OLLUXseYiR8iBIf2xeDEHXHD0qBrgHY6+o=";

     

       10
       10
       +
           sha256 = "5kDc6zszVuFTDkNMuHBRwrfDnH+AdD6ULzmywtvL8iA=";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-tIuHWfAjvr5s2nJSnhnMZIjyy77BbobwgQoDOy4gdGI=";

     

       13
       13
       +
         vendorSha256 = "sha256-Wv6xqzpQxlZCrVnS+g9t1qiYCkm3NfXfW8XDYA9Txxs=";

     

       15
       14
        
       

     

       16
       15
        
         doCheck = false;

     

       17
       16

+13 -2

pkgs/tools/system/rex/default.nix

···

       1
       1
       -
       { pkgs, lib, fetchurl, perlPackages, rsync, ... }:

     

       1
       1
       +
       { pkgs, lib, fetchurl, perlPackages, rsync, installShellFiles, ... }:

     

       2
       2
        
       

     

       3
       3
        
       perlPackages.buildPerlPackage rec {

     

       4
       4
        
         pname = "Rex";

     
···

       18
       18
        
           rsync

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = with perlPackages; [ ParallelForkManager ];

     

       21
       21
       +
         nativeBuildInputs = with perlPackages; [ installShellFiles ParallelForkManager ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = with perlPackages; [

     

       24
       24
        
           AWSSignature4

     
···

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         doCheck = false;

     

       46
       46
       +
       

     

       47
       47
       +
         outputs = [ "out" ];

     

       48
       48
       +
       

     

       49
       49
       +
         fixupPhase = ''

     

       50
       50
       +
           for sh in bash zsh; do

     

       51
       51
       +
             substituteInPlace ./share/rex-tab-completion.$sh \

     

       52
       52
       +
               --replace 'perl' "${pkgs.perl.withPackages (ps: [ ps.YAML ])}/bin/perl"

     

       53
       53
       +
           done

     

       54
       54
       +
           installShellCompletion --name _rex --zsh ./share/rex-tab-completion.zsh

     

       55
       55
       +
           installShellCompletion --name rex --bash ./share/rex-tab-completion.bash

     

       56
       56
       +
         '';

     

       46
       57
        
       

     

       47
       58
        
         meta = {

     

       48
       59
        
           homepage = "https://www.rexify.org";

+2 -2

pkgs/tools/text/epubcheck/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "epubcheck";

     

       6
       6
       -
         version = "4.2.6";

     

       6
       6
       +
         version = "5.0.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchzip {

     

       9
       9
        
           url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";

     

       10
       10
       -
           sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278=";

     

       10
       10
       +
           sha256 = "sha256-Lcd+rLO4G2i5FTq/okjKQ1+EIfuZ8khkCijgeDxxwq8=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/tools/text/mawk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "mawk";

     

       5
       5
       -
         version = "1.3.4-20200120";

     

       5
       5
       +
         version = "1.3.4-20230203";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           urls = [

     

       9
       9
        
             "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz"

     

       10
       10
        
             "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz"

     

       11
       11
        
           ];

     

       12
       12
       -
           sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z";

     

       12
       12
       +
           sha256 = "sha256-bbejKsecURB60xpAfU+SxrhC3eL2inUztOe3sD6JAL4=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         meta = with lib; {

+1 -1

pkgs/tools/virtualization/cloud-init/default.nix

···

       118
       118
        
           homepage = "https://cloudinit.readthedocs.org";

     

       119
       119
        
           description = "Provides configuration and customization of cloud instance";

     

       120
       120
        
           license = with licenses; [ asl20 gpl3Plus ];

     

       121
       121
       -
           maintainers = with maintainers; [ phile314 illustris ];

     

       121
       121
       +
           maintainers = with maintainers; [ illustris ];

     

       122
       122
        
           platforms = platforms.all;

     

       123
       123
        
         };

     

       124
       124
        
       }

+2

pkgs/top-level/all-packages.nix

···

       39078
       39078
        
       

     

       39079
       39079
        
         alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { };

     

       39080
       39080
        
       

     

       39081
       39081
       +
         flac2all = callPackage ../applications/audio/flac2all {};

     

       39082
       39082
       +
       

     

       39081
       39083
        
         tuner = callPackage ../applications/audio/tuner { };

     

       39082
       39084
        
       

     

       39083
       39085
        
         locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { };