commit b3557e8e31eb012b283bc41e65689e09706b905f · pyrox.dev/nixpkgs

+3

nixos/tests/k3s/single-node.nix

···

       77
       77
        
             machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")

     

       78
       78
        
             machine.succeed("k3s kubectl delete -f ${testPodYaml}")

     

       79
       79
        
       

     

       80
       80
       +
             # regression test for #176445

     

       81
       81
       +
             machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'")

     

       82
       82
       +
       

     

       80
       83
        
             machine.shutdown()

     

       81
       84
        
           '';

     

       82
       85
        
         })

+2

pkgs/applications/networking/cluster/k3s/1_23/default.nix

···

       4
       4
        
       , socat

     

       5
       5
        
       , iptables

     

       6
       6
        
       , iproute2

     

       7
       7
       +
       , ipset

     

       7
       8
        
       , bridge-utils

     

       8
       9
        
       , btrfs-progs

     

       9
       10
        
       , conntrack-tools

     
···

       249
       250
        
           socat

     

       250
       251
        
           iptables

     

       251
       252
        
           iproute2

     

       253
       253
       +
           ipset

     

       252
       254
        
           bridge-utils

     

       253
       255
        
           ethtool

     

       254
       256
        
           util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388

+2

pkgs/applications/networking/cluster/k3s/1_24/default.nix

···

       4
       4
        
       , socat

     

       5
       5
        
       , iptables

     

       6
       6
        
       , iproute2

     

       7
       7
       +
       , ipset

     

       7
       8
        
       , bridge-utils

     

       8
       9
        
       , btrfs-progs

     

       9
       10
        
       , conntrack-tools

     
···

       249
       250
        
           socat

     

       250
       251
        
           iptables

     

       251
       252
        
           iproute2

     

       253
       253
       +
           ipset

     

       252
       254
        
           bridge-utils

     

       253
       255
        
           ethtool

     

       254
       256
        
           util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388

+2

pkgs/applications/networking/cluster/k3s/1_25/default.nix

···

       4
       4
        
       , socat

     

       5
       5
        
       , iptables

     

       6
       6
        
       , iproute2

     

       7
       7
       +
       , ipset

     

       7
       8
        
       , bridge-utils

     

       8
       9
        
       , btrfs-progs

     

       9
       10
        
       , conntrack-tools

     
···

       249
       250
        
           socat

     

       250
       251
        
           iptables

     

       251
       252
        
           iproute2

     

       253
       253
       +
           ipset

     

       252
       254
        
           bridge-utils

     

       253
       255
        
           ethtool

     

       254
       256
        
           util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388

+2

pkgs/applications/networking/cluster/k3s/1_26/default.nix

···

       4
       4
        
       , socat

     

       5
       5
        
       , iptables

     

       6
       6
        
       , iproute2

     

       7
       7
       +
       , ipset

     

       7
       8
        
       , bridge-utils

     

       8
       9
        
       , btrfs-progs

     

       9
       10
        
       , conntrack-tools

     
···

       249
       250
        
           socat

     

       250
       251
        
           iptables

     

       251
       252
        
           iproute2

     

       253
       253
       +
           ipset

     

       252
       254
        
           bridge-utils

     

       253
       255
        
           ethtool

     

       254
       256
        
           util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388

+3 -3

pkgs/applications/version-management/git-chglog/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "git-chglog";

     

       5
       5
       -
         version = "0.15.2";

     

       5
       5
       +
         version = "0.15.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "git-chglog";

     

       9
       9
        
           repo = "git-chglog";

     

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

     

       11
       11
       -
           sha256 = "sha256-VB3JYXz50B/SkA/q1iET7p5uhArrF8JyhAWhcxLVsg8=";

     

       11
       11
       +
           sha256 = "sha256-rTJn2vUrEnmG2japqCxHv3BR9MpmMfpMLO2FBP6ONbw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-/5s9Dvce0JWu8DaUlrtnkN6N5esEmkFvOgq0tVLZGnM=";

     

       14
       14
       +
         vendorHash = "sha256-skhEHpSnxOTZrL8XLlQZL3s224mg8XRINKJnatYCQko=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ];

     

       17
       17

+3 -3

pkgs/applications/virtualization/nixpacks/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nixpacks";

     

       5
       5
       -
         version = "1.3.1";

     

       5
       5
       +
         version = "1.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "railwayapp";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-lQHJ5Y+EMhERxOX062QMNPImAX9tjamGYFXYYUmhpys=";

     

       11
       11
       +
           sha256 = "sha256-v9ycluLfkrPDzjsMXtv7w9UHgMaGzTsJw4lT/KfRAu4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-z+DQkl/7kX5tLG9igPnEgHi9sJhB4NoutfV2/BV2U6A=";

     

       14
       14
       +
         cargoHash = "sha256-wVQEa1qS+JF6PHKvRrRFbSvj2qp6j14ErOQPkxP0uuA=";

     

       15
       15
        
       

     

       16
       16
        
         # skip test due FHS dependency

     

       17
       17
        
         doCheck = false;

+4 -2

pkgs/applications/virtualization/singularity/generic.nix

···

       52
       52
        
         # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available.

     

       53
       53
        
       , enableSeccomp ? true

     

       54
       54
        
         # Whether the configure script treat SUID support as default

     

       55
       55
       +
         # When equal to enableSuid, it supress the --with-suid / --without-suid build flag

     

       56
       56
       +
         # It can be set to `null` to always pass either --with-suid or --without-suided

     

       57
       57
       +
         # Type: null or boolean

     

       55
       58
        
       , defaultToSuid ? true

     

       56
       59
        
         # Whether to compile with SUID support

     

       57
       60
        
       , enableSuid ? false

     
···

       131
       134
        
           "--runstatedir=/var/run"

     

       132
       135
        
         ]

     

       133
       136
        
         ++ lib.optional (!enableSeccomp) "--without-seccomp"

     

       134
       134
       -
         ++ lib.optional (defaultToSuid && !enableSuid) "--without-suid"

     

       135
       135
       -
         ++ lib.optional (!defaultToSuid && enableSuid) "--with-suid"

     

       137
       137
       +
         ++ lib.optional (enableSuid != defaultToSuid) (if enableSuid then "--with-suid" else "--without-suid")

     

       136
       138
        
         ++ extraConfigureFlags

     

       137
       139
        
         ;

     

       138
       140

+4 -4

pkgs/applications/virtualization/singularity/packages.nix

···

       29
       29
        
             # Apptainer doesn't depend on conmon

     

       30
       30
        
             conmon = null;

     

       31
       31
        
       

     

       32
       32
       -
             # defaultToSuid becomes false since Apptainer 1.1.0

     

       33
       33
       -
             # https://github.com/apptainer/apptainer/pull/495

     

       34
       34
       -
             # https://github.com/apptainer/apptainer/releases/tag/v1.1.0

     

       35
       35
       -
             defaultToSuid = false;

     

       32
       32
       +
             # Apptainer builders require explicit --with-suid / --without-suid flag

     

       33
       33
       +
             # when building on a system with disabled unprivileged namespace.

     

       34
       34
       +
             # See https://github.com/NixOS/nixpkgs/pull/215690#issuecomment-1426954601

     

       35
       35
       +
             defaultToSuid = null;

     

       36
       36
        
           };

     

       37
       37
        
       

     

       38
       38
        
         singularity = callPackage

+2 -2

pkgs/data/icons/numix-icon-theme-circle/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "numix-icon-theme-circle";

     

       5
       5
       -
         version = "23.02.12";

     

       5
       5
       +
         version = "23.02.16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-gQdVmF7ZzC+KjU0uQW6+sEw9Wz5940G60ebXqKHajuY=";

     

       11
       11
       +
           sha256 = "sha256-P/lg+7hx3WOmuWUKznFVKlPIB+MqlE3Nb/n8WK8aUM8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+10 -7

pkgs/development/embedded/fpga/lattice-diamond/default.nix

···

       1
       1
        
       { lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib,

     

       2
       2
       -
           freetype, fontconfig, xorg, libusb-compat-0_1 }:

     

       2
       2
       +
           freetype, fontconfig, xorg, libusb-compat-0_1, coreutils }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         pname = "diamond";

     
···

       67
       67
        
           done

     

       68
       68
        
       

     

       69
       69
        
           # Patch executable ELFs.

     

       70
       70
       -
           for path in bin/lin64 ispfpga/bin/lin64; do

     

       70
       70
       +
           for path in bin/lin64 ispfpga/bin/lin64 synpbase/linux_a_64 synpbase/linux_a_64/mbin; do

     

       71
       71
        
               cd $out/$prefix/$path

     

       72
       72
        
               for f in *; do

     

       73
       73
        
                   if ! file $f | grep -q "ELF 64-bit LSB executable" ; then

     
···

       79
       79
        
                   # dependencies from nix.

     

       80
       80
        
                   patchelf \

     

       81
       81
        
                       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       82
       82
       -
                       --set-rpath "$libPath" --force-rpath \

     

       82
       82
       +
                       --set-rpath "$libPath:$out/$prefix/bin/lin64:$out/$prefix/ispfpga/bin/lin64" \

     

       83
       83
       +
                       --force-rpath \

     

       83
       84
        
                       $f

     

       84
       85
        
               done

     

       85
       86
        
           done

     

       87
       87
       +
       

     

       88
       88
       +
           # Patch absolute /usr/bin/id path in script

     

       89
       89
       +
           sed -i -e "s#/usr/bin/id#${coreutils}/bin/id#" $out/$prefix/synpbase/bin/config/platform_set

     

       86
       90
        
       

     

       87
       91
        
           # Remove 32-bit libz.

     

       88
       92
        
           rm $out/$prefix/bin/lin64/libz.{so,so.1}

     

       89
       93
        
       

     

       90
       90
       -
           # Make wrappers (should these target more than the 'diamond' tool?).

     

       91
       91
       -
           # The purpose of these is just to call the target program using its

     

       92
       92
       -
           # absolute path - otherwise, it will crash.

     

       94
       94
       +
           # Make wrappers. The purpose of these is just to call the target program

     

       95
       95
       +
           # using its absolute path - otherwise, it will crash.

     

       93
       96
        
           mkdir -p bin

     

       94
       94
       -
           for tool in diamond ; do

     

       97
       97
       +
           for tool in diamond pnmainc ddtcmd ; do

     

       95
       98
        
               makeWrapper $out/$prefix/bin/lin64/$tool $out/bin/$tool

     

       96
       99
        
           done

     

       97
       100
        
         '';

+3 -2

pkgs/development/libraries/librsync/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "librsync";

     

       5
       5
       -
         version = "2.3.2";

     

       5
       5
       +
         version = "2.3.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "librsync";

     

       9
       9
        
           repo = "librsync";

     

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

     

       11
       11
       -
           sha256 = "sha256-GNwOIZ2UjvsYIthotiPDBrabYzCGFG/YVEbwVa9Nwi4=";

     

       11
       11
       +
           sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

     
···

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Implementation of the rsync remote-delta algorithm";

     

       21
       21
        
           homepage = "https://librsync.sourceforge.net/";

     

       22
       22
       +
           changelog = "https://github.com/librsync/librsync/releases/tag/v${version}";

     

       22
       23
        
           license = licenses.lgpl2Plus;

     

       23
       24
        
           mainProgram = "rdiff";

     

       24
       25
        
           platforms = platforms.unix;

+2 -2

pkgs/development/libraries/s2n-tls/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "s2n-tls";

     

       11
       11
       -
         version = "1.3.36";

     

       11
       11
       +
         version = "1.3.37";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "aws";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-IL7+f+7Igvm7KeBpDwnIoIB8IUqg3JDEtLFQslBIENE=";

     

       17
       17
       +
           sha256 = "sha256-NqOr2R61s4aUjHWI2QkyLpxUm/+c4vkAUg+UDduu3j4=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake ];

+1

pkgs/development/libraries/spandsp/default.nix

···

       10
       10
        
         outputs = [ "out" "dev" ];

     

       11
       11
        
         makeFlags = [

     

       12
       12
        
           "CC=${stdenv.cc.targetPrefix}cc"

     

       13
       13
       +
           "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"

     

       13
       14
        
         ];

     

       14
       15
        
       

     

       15
       16
        
         configureFlags = [

-1

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

···

       78
       78
        
         ];

     

       79
       79
        
       

     

       80
       80
        
         meta = with lib; {

     

       81
       81
       -
           broken = stdenv.isDarwin;

     

       82
       81
        
           description = "Asynchronous SSHv2 Python client and server library";

     

       83
       82
        
           homepage = "https://asyncssh.readthedocs.io/";

     

       84
       83
        
           changelog = "https://github.com/ronf/asyncssh/blob/v${version}/docs/changes.rst";

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "frozendict";

     

       11
       11
       -
         version = "2.3.4";

     

       11
       11
       +
         version = "2.3.5";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       17
       17
        
           owner = "Marco-Sulla";

     

       18
       18
        
           repo = "python-frozendict";

     

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

     

       20
       20
       -
           hash = "sha256-rDorFoVHiwbkRsIIA2MLKPHJ9HWJw2FKZ5iFHEiqzhg=";

     

       20
       20
       +
           hash = "sha256-IlKhqQvNaYz4+U8UJ/fGUNNTC3RjyGKCJUzJ6J431Vw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         postPatch = ''

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "gdown";

     

       15
       15
       -
         version = "4.6.2";

     

       15
       15
       +
         version = "4.6.3";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-/2pPAymq6dek2NsInD+ga+CYOTG7BPgWGNm7Iwp2GHg=";

     

       22
       22
       +
           hash = "sha256-7G6pIu9ONhagVAc2VtmqLNxxf729CpTS931S0yOUMwc=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/itanium-demangler/default.nix

···

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "whitequark";

     

       17
       17
        
           repo = "python-itanium_demangler";

     

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

     

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

     

       19
       19
        
           hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A=";

     

       20
       20
        
         };

     

       21
       21
        
       

     
···

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         pythonImportsCheck = [

     

       31
       31
       -
           " itanium_demangler "

     

       31
       31
       +
           "itanium_demangler"

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/pulumi-aws/default.nix

···

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pulumi-aws";

     

       14
       14
        
         # Version is independant of pulumi's.

     

       15
       15
       -
         version = "5.29.1";

     

       15
       15
       +
         version = "5.30.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     
···

       21
       21
        
           owner = "pulumi";

     

       22
       22
        
           repo = "pulumi-aws";

     

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

     

       24
       24
       -
           hash = "sha256-sdefoQgZ58re2VtIvNQjbjAb9aateZlGSeTAiVO6JGo=";

     

       24
       24
       +
           hash = "sha256-XRn5kMbbbbk5+X8vah44cAHv2MMySK0ToO8ga5FWSuA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         sourceRoot = "${src.name}/sdk/python";

+4 -3

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "rokuecp";

     

       20
       20
       -
         version = "0.17.0";

     

       20
       20
       +
         version = "0.17.1";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.9";

     
···

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "ctalkington";

     

       27
       27
        
           repo = "python-rokuecp";

     

       28
       28
       -
           rev = version;

     

       29
       29
       -
           hash = "sha256-M4eZzFphhc96Pf1bspD+Hvl9SUN1N72xnxdtVFiPc78=";

     

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

     

       29
       29
       +
           hash = "sha256-3GHG4FBGMiF5kNk2gl05xiX9+5tcrUyi4SUCXTa6Qco=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     
···

       73
       73
        
         meta = with lib; {

     

       74
       74
        
           description = "Asynchronous Python client for Roku (ECP)";

     

       75
       75
        
           homepage = "https://github.com/ctalkington/python-rokuecp";

     

       76
       76
       +
           changelog = "https://github.com/ctalkington/python-rokuecp/releases/tag/${version}";

     

       76
       77
        
           license = licenses.mit;

     

       77
       78
        
           maintainers = with maintainers; [ fab ];

     

       78
       79
        
         };

+26 -17

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , python

     

       3
       3
       +
       , automat

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
       -
       , pythonOlder

     

       5
       5
       +
       , cryptography

     

       6
       6
        
       , fetchPypi

     

       7
       7
       -
       , cryptography

     

       7
       7
       +
       , GeoIP

     

       8
       8
       +
       , idna

     

       8
       9
        
       , incremental

     

       9
       9
       -
       , twisted

     

       10
       10
       -
       , automat

     

       11
       11
       -
       , zope_interface

     

       12
       12
       -
       , idna

     

       10
       10
       +
       , lsof

     

       11
       11
       +
       , mock

     

       13
       12
        
       , pyopenssl

     

       13
       13
       +
       , pytestCheckHook

     

       14
       14
       +
       , python

     

       15
       15
       +
       , pythonOlder

     

       14
       16
        
       , service-identity

     

       15
       15
       -
       , pytestCheckHook

     

       16
       16
       -
       , mock

     

       17
       17
       -
       , lsof

     

       18
       18
       -
       , GeoIP

     

       17
       17
       +
       , twisted

     

       18
       18
       +
       , zope_interface

     

       19
       19
        
       }:

     

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "txtorcon";

     

       23
       23
       -
         version = "22.0.0";

     

       23
       23
       +
         version = "23.0.0";

     

       24
       24
       +
         format = "setuptools";

     

       25
       25
       +
       

     

       26
       26
       +
         disabled = pythonOlder "3.7";

     

       24
       27
        
       

     

       25
       28
        
         src = fetchPypi {

     

       26
       29
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM=";

     

       30
       30
       +
           hash = "sha256-AiX/rWdokTeEmtmtNK21abDYj5rwRQMABnpfkB6ZQyU=";

     

       28
       31
        
         };

     

       29
       32
        
       

     

       30
       33
        
         propagatedBuildInputs = [

     
···

       35
       38
        
           zope_interface

     

       36
       39
        
         ] ++ twisted.optional-dependencies.tls;

     

       37
       40
        
       

     

       38
       38
       -
         nativeCheckInputs = [ pytestCheckHook mock lsof GeoIP ];

     

       41
       41
       +
         nativeCheckInputs = [

     

       42
       42
       +
           pytestCheckHook

     

       43
       43
       +
           mock

     

       44
       44
       +
           lsof

     

       45
       45
       +
           GeoIP

     

       46
       46
       +
         ];

     

       39
       47
        
       

     

       40
       48
        
         doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

     

       41
       49
        
       

     

       42
       42
       -
         meta = {

     

       50
       50
       +
         meta = with lib; {

     

       43
       51
        
           description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";

     

       44
       52
        
           homepage = "https://github.com/meejah/txtorcon";

     

       45
       45
       -
           maintainers = with lib.maintainers; [ jluttine exarkun ];

     

       46
       46
       -
           license = lib.licenses.mit;

     

       53
       53
       +
           changelog = "https://github.com/meejah/txtorcon/releases/tag/v${version}";

     

       54
       54
       +
           maintainers = with maintainers; [ jluttine exarkun ];

     

       55
       55
       +
           license = licenses.mit;

     

       47
       56
        
         };

     

       48
       57
        
       }

+2 -2

pkgs/development/python-modules/types-docutils/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-docutils";

     

       8
       8
       -
         version = "0.19.1.3";

     

       8
       8
       +
         version = "0.19.1.4";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-Nv4w3lbx7OGp96mQ1H2qeBta+DHSs/Lct9/QG4V8w9Q=";

     

       13
       13
       +
           hash = "sha256-G2SyG2Cf8fx3kdPZMPFLVrNq0JAp/ZfkXjTMiJ1nG18=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Module doesn't have tests

+3 -3

pkgs/development/tools/sentry-cli/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "sentry-cli";

     

       12
       12
       -
         version = "2.12.0";

     

       12
       12
       +
         version = "2.13.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "getsentry";

     

       16
       16
        
           repo = "sentry-cli";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-HkaCaOVbEEy8H6gN9hoiDEEQM+XWyUJ4gYPxTlbBGgA=";

     

       18
       18
       +
           sha256 = "sha256-U6L2JQk/fYuxmZdt3CvPSaaEDRgZby0CiPT0nJGuVwA=";

     

       19
       19
        
         };

     

       20
       20
        
         doCheck = false;

     

       21
       21
        
       

     
···

       25
       25
        
         buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

     

       26
       26
        
         nativeBuildInputs = [ pkg-config ];

     

       27
       27
        
       

     

       28
       28
       -
         cargoHash = "sha256-4RUeUwixb5omcHT4jJHJKF2lYZE/4014DnrR2j7sen0=";

     

       28
       28
       +
         cargoHash = "sha256-gF3a8oCHmnNgatvbM1DeOQknXMMcHgerx2OcDdyqC8U=";

     

       29
       29
        
       

     

       30
       30
        
         meta = with lib; {

     

       31
       31
        
           homepage = "https://docs.sentry.io/cli/";

+2 -1

pkgs/os-specific/linux/ell/default.nix

···

       28
       28
        
       

     

       29
       29
        
         enableParallelBuilding = true;

     

       30
       30
        
       

     

       31
       31
       -
         doCheck = true;

     

       31
       31
       +
         # tests sporadically fail on musl

     

       32
       32
       +
         doCheck = !stdenv.hostPlatform.isMusl;

     

       32
       33
        
       

     

       33
       34
        
         meta = with lib; {

     

       34
       35
        
           homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git";

+2 -2

pkgs/os-specific/linux/ena/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, kernel }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "2.8.2";

     

       4
       4
       +
         version = "2.8.3";

     

       5
       5
        
         name = "ena-${version}-${kernel.version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "amzn";

     

       9
       9
        
           repo = "amzn-drivers";

     

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

     

       11
       11
       -
           sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o=";

     

       11
       11
       +
           sha256 = "sha256-Z5BCqqC4FNKHqpocJ6CsHwhh5sszj5QfxiN6+Dkaqek=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         hardeningDisable = [ "pic" ];

+6

pkgs/os-specific/linux/firejail/default.nix

···

       47
       47
        
           # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file

     

       48
       48
        
           substituteInPlace src/include/common.h \

     

       49
       49
        
             --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy'

     

       50
       50
       +
       

     

       51
       51
       +
           # Workaround for regression introduced in 0.9.72 preventing usage of

     

       52
       52
       +
           # end-of-options indicator "--"

     

       53
       53
       +
           # See https://github.com/netblue30/firejail/issues/5659

     

       54
       54
       +
           substituteInPlace src/firejail/sandbox.c \

     

       55
       55
       +
             --replace " && !arg_doubledash" ""

     

       50
       56
        
         '';

     

       51
       57
        
       

     

       52
       58
        
         preConfigure = ''

+76

pkgs/servers/matrix-synapse/matrix-hookshot/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchYarnDeps

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , matrix-sdk-crypto-nodejs

     

       7
       7
       +
       , mkYarnPackage

     

       8
       8
       +
       , rust

     

       9
       9
       +
       , rustPlatform

     

       10
       10
       +
       , napi-rs-cli

     

       11
       11
       +
       , nodejs

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       let

     

       15
       15
       +
         data = lib.importJSON ./pin.json;

     

       16
       16
       +
       in

     

       17
       17
       +
       mkYarnPackage rec {

     

       18
       18
       +
         pname = "matrix-hookshot";

     

       19
       19
       +
         version = data.version;

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "matrix-org";

     

       23
       23
       +
           repo = "matrix-hookshot";

     

       24
       24
       +
           rev = data.version;

     

       25
       25
       +
           sha256 = data.srcHash;

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         packageJSON = ./package.json;

     

       29
       29
       +
       

     

       30
       30
       +
         offlineCache = fetchYarnDeps {

     

       31
       31
       +
           yarnLock = src + "/yarn.lock";

     

       32
       32
       +
           sha256 = data.yarnHash;

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       36
       36
       +
           inherit src;

     

       37
       37
       +
           name = "${pname}-${version}";

     

       38
       38
       +
           hash = "sha256-WolkDSS5wPxtltKzq4Er2nAQ0GrsF3imim3/Ge4eguQ=";

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         packageResolutions = {

     

       42
       42
       +
           "@matrix-org/matrix-sdk-crypto-nodejs" = "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs";

     

       43
       43
       +
         };

     

       44
       44
       +
       

     

       45
       45
       +
         nativeBuildInputs = [

     

       46
       46
       +
           rustPlatform.cargoSetupHook

     

       47
       47
       +
           rustPlatform.rust.cargo

     

       48
       48
       +
           rustPlatform.rust.rustc

     

       49
       49
       +
           napi-rs-cli

     

       50
       50
       +
           makeWrapper

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         buildPhase = ''

     

       54
       54
       +
           runHook preBuild

     

       55
       55
       +
           cd deps/${pname}

     

       56
       56
       +
           napi build --target ${rust.toRustTargetSpec stdenv.targetPlatform} --dts ../src/libRs.d.ts --release ./lib

     

       57
       57
       +
           yarn run build:app:fix-defs

     

       58
       58
       +
           yarn run build:app

     

       59
       59
       +
           yarn run build:web

     

       60
       60
       +
           cd ../..

     

       61
       61
       +
           runHook postBuild

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         postInstall = ''

     

       65
       65
       +
           makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-hookshot" --add-flags \

     

       66
       66
       +
               "$out/libexec/matrix-hookshot/deps/matrix-hookshot/lib/App/BridgeApp.js"

     

       67
       67
       +
         '';

     

       68
       68
       +
       

     

       69
       69
       +
         doDist = false;

     

       70
       70
       +
       

     

       71
       71
       +
         meta = with lib; {

     

       72
       72
       +
           description = "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA";

     

       73
       73
       +
           maintainers = with maintainers; [ chvp ];

     

       74
       74
       +
           license = licenses.asl20;

     

       75
       75
       +
         };

     

       76
       76
       +
       }

+111

pkgs/servers/matrix-synapse/matrix-hookshot/package.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "name": "matrix-hookshot",

     

       3
       3
       +
         "version": "2.7.0",

     

       4
       4
       +
         "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",

     

       5
       5
       +
         "main": "lib/app.js",

     

       6
       6
       +
         "repository": "https://github.com/matrix-org/matrix-hookshot",

     

       7
       7
       +
         "author": "matrix.org",

     

       8
       8
       +
         "license": "Apache-2.0",

     

       9
       9
       +
         "napi": {

     

       10
       10
       +
           "name": "matrix-hookshot-rs"

     

       11
       11
       +
         },

     

       12
       12
       +
         "engines": {

     

       13
       13
       +
           "node": ">=16"

     

       14
       14
       +
         },

     

       15
       15
       +
         "scripts": {

     

       16
       16
       +
           "build:web": "vite build",

     

       17
       17
       +
           "build:app": "tsc --project tsconfig.json",

     

       18
       18
       +
           "build:app:rs": "napi build --dts ../src/libRs.d.ts --release ./lib",

     

       19
       19
       +
           "build:app:fix-defs": "ts-node scripts/definitions-fixer.ts src/libRs.d.ts",

     

       20
       20
       +
           "build:docs": "ts-node scripts/build-metrics-docs.ts > docs/metrics.md && mdbook build",

     

       21
       21
       +
           "dev:web": "vite dev",

     

       22
       22
       +
           "build": "scripts/build-app.sh",

     

       23
       23
       +
           "clean:web": "rimraf public/",

     

       24
       24
       +
           "clean:app": "tsc --build tsconfig.json --clean",

     

       25
       25
       +
           "clean:app:rs": "rimraf src/libRs.d.ts target/",

     

       26
       26
       +
           "clean:docs": "mdbook clean",

     

       27
       27
       +
           "clean": "scripts/clean.sh",

     

       28
       28
       +
           "prepare": "yarn build",

     

       29
       29
       +
           "start": "node --require source-map-support/register lib/App/BridgeApp.js",

     

       30
       30
       +
           "start:app": "node --require source-map-support/register lib/App/BridgeApp.js",

     

       31
       31
       +
           "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js",

     

       32
       32
       +
           "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",

     

       33
       33
       +
           "test": "mocha -r ts-node/register tests/init.ts tests/*.ts  tests/**/*.ts",

     

       34
       34
       +
           "test:cover": "nyc --reporter=lcov --reporter=text yarn test",

     

       35
       35
       +
           "lint": "yarn run lint:js && yarn run lint:rs",

     

       36
       36
       +
           "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'",

     

       37
       37
       +
           "lint:rs": "cargo fmt --all -- --check",

     

       38
       38
       +
           "generate-default-config": "ts-node src/Config/Defaults.ts --config > config.sample.yml",

     

       39
       39
       +
           "validate-config": "ts-node src/Config/Config.ts"

     

       40
       40
       +
         },

     

       41
       41
       +
         "dependencies": {

     

       42
       42
       +
           "@alloc/quick-lru": "^5.2.0",

     

       43
       43
       +
           "@octokit/auth-app": "^3.3.0",

     

       44
       44
       +
           "@octokit/auth-token": "^2.4.5",

     

       45
       45
       +
           "@octokit/rest": "^18.10.0",

     

       46
       46
       +
           "@octokit/webhooks": "^9.1.2",

     

       47
       47
       +
           "ajv": "^8.11.0",

     

       48
       48
       +
           "axios": "^0.24.0",

     

       49
       49
       +
           "cors": "^2.8.5",

     

       50
       50
       +
           "express": "^4.17.3",

     

       51
       51
       +
           "figma-js": "^1.14.0",

     

       52
       52
       +
           "http-status-codes": "^2.2.0",

     

       53
       53
       +
           "ioredis": "^5.2.3",

     

       54
       54
       +
           "jira-client": "^8.0.0",

     

       55
       55
       +
           "markdown-it": "^12.3.2",

     

       56
       56
       +
           "matrix-appservice-bridge": "^6.0.0",

     

       57
       57
       +
           "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.3-element.0",

     

       58
       58
       +
           "matrix-widget-api": "^1.0.0",

     

       59
       59
       +
           "micromatch": "^4.0.4",

     

       60
       60
       +
           "mime": "^3.0.0",

     

       61
       61
       +
           "node-emoji": "^1.11.0",

     

       62
       62
       +
           "nyc": "^15.1.0",

     

       63
       63
       +
           "p-queue": "^6.6.2",

     

       64
       64
       +
           "prom-client": "^14.0.1",

     

       65
       65
       +
           "reflect-metadata": "^0.1.13",

     

       66
       66
       +
           "rss-parser": "^3.12.0",

     

       67
       67
       +
           "source-map-support": "^0.5.21",

     

       68
       68
       +
           "string-argv": "^0.3.1",

     

       69
       69
       +
           "tiny-typed-emitter": "^2.1.0",

     

       70
       70
       +
           "uuid": "^8.3.2",

     

       71
       71
       +
           "vm2": "^3.9.11",

     

       72
       72
       +
           "winston": "^3.3.3",

     

       73
       73
       +
           "xml2js": "^0.4.23",

     

       74
       74
       +
           "yaml": "^1.10.2"

     

       75
       75
       +
         },

     

       76
       76
       +
         "devDependencies": {

     

       77
       77
       +
           "@codemirror/lang-javascript": "^6.0.2",

     

       78
       78
       +
           "@napi-rs/cli": "^2.2.0",

     

       79
       79
       +
           "@preact/preset-vite": "^2.2.0",

     

       80
       80
       +
           "@tsconfig/node16": "^1.0.3",

     

       81
       81
       +
           "@types/ajv": "^1.0.0",

     

       82
       82
       +
           "@types/chai": "^4.2.22",

     

       83
       83
       +
           "@types/cors": "^2.8.12",

     

       84
       84
       +
           "@types/express": "^4.17.14",

     

       85
       85
       +
           "@types/jira-client": "^7.1.0",

     

       86
       86
       +
           "@types/markdown-it": "^12.2.3",

     

       87
       87
       +
           "@types/micromatch": "^4.0.1",

     

       88
       88
       +
           "@types/mime": "^2.0.3",

     

       89
       89
       +
           "@types/mocha": "^9.0.0",

     

       90
       90
       +
           "@types/node": "^16",

     

       91
       91
       +
           "@types/node-emoji": "^1.8.1",

     

       92
       92
       +
           "@types/uuid": "^8.3.3",

     

       93
       93
       +
           "@types/xml2js": "^0.4.11",

     

       94
       94
       +
           "@typescript-eslint/eslint-plugin": "^5.4.0",

     

       95
       95
       +
           "@typescript-eslint/parser": "^5.4.0",

     

       96
       96
       +
           "@uiw/react-codemirror": "^4.12.3",

     

       97
       97
       +
           "chai": "^4.3.4",

     

       98
       98
       +
           "eslint": "^8.3.0",

     

       99
       99
       +
           "eslint-config-preact": "^1.3.0",

     

       100
       100
       +
           "eslint-plugin-mocha": "^9.0.0",

     

       101
       101
       +
           "mini.css": "^3.0.1",

     

       102
       102
       +
           "mocha": "^8.2.1",

     

       103
       103
       +
           "preact": "^10.5.15",

     

       104
       104
       +
           "rimraf": "^3.0.2",

     

       105
       105
       +
           "sass": "^1.51.0",

     

       106
       106
       +
           "ts-node": "^10.4.0",

     

       107
       107
       +
           "typescript": "^4.5.2",

     

       108
       108
       +
           "vite": "^2.9.13",

     

       109
       109
       +
           "vite-svg-loader": "^3.4.0"

     

       110
       110
       +
         }

     

       111
       111
       +
       }

+5

pkgs/servers/matrix-synapse/matrix-hookshot/pin.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "version": "2.7.0",

     

       3
       3
       +
         "srcHash": "rW5fqKshnF2S4w55V2GaAa2RFVM+YbwRum9OwTTpYuA=",

     

       4
       4
       +
         "yarnHash": "0q71901ra9m9rbbczal1imqfba4b07bpr8hkpw1d1r9ghc2xjay4"

     

       5
       5
       +
       }

+35

pkgs/servers/matrix-synapse/matrix-hookshot/update.sh

···

       1
       1
       +
       #!/usr/bin/env -S nix shell nixpkgs#nix nixpkgs#curl nixpkgs#jq nixpkgs#prefetch-yarn-deps nixpkgs#nix-prefetch-github nixpkgs#nix-prefetch-git --command bash

     

       2
       2
       +
       

     

       3
       3
       +
       if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then

     

       4
       4
       +
         echo "Regenerates packaging data for matrix-hookshot."

     

       5
       5
       +
         echo "Usage: $0 [git release tag]"

     

       6
       6
       +
         exit 1

     

       7
       7
       +
       fi

     

       8
       8
       +
       

     

       9
       9
       +
       version="$1"

     

       10
       10
       +
       

     

       11
       11
       +
       set -euo pipefail

     

       12
       12
       +
       

     

       13
       13
       +
       if [ -z "$version" ]; then

     

       14
       14
       +
         version="$(curl "https://api.github.com/repos/matrix-org/matrix-hookshot/releases?per_page=1" | jq -r '.[0].tag_name')"

     

       15
       15
       +
       fi

     

       16
       16
       +
       

     

       17
       17
       +
       src="https://raw.githubusercontent.com/matrix-org/matrix-hookshot/$version"

     

       18
       18
       +
       src_hash=$(nix-prefetch-github matrix-org matrix-hookshot --rev ${version} | jq -r .sha256)

     

       19
       19
       +
       

     

       20
       20
       +
       tmpdir=$(mktemp -d)

     

       21
       21
       +
       trap 'rm -rf "$tmpdir"' EXIT

     

       22
       22
       +
       

     

       23
       23
       +
       pushd $tmpdir

     

       24
       24
       +
       curl -O "$src/yarn.lock"

     

       25
       25
       +
       yarn_hash=$(prefetch-yarn-deps yarn.lock)

     

       26
       26
       +
       popd

     

       27
       27
       +
       

     

       28
       28
       +
       curl -O "$src/package.json"

     

       29
       29
       +
       cat > pin.json << EOF

     

       30
       30
       +
       {

     

       31
       31
       +
         "version": "$version",

     

       32
       32
       +
         "srcHash": "$src_hash",

     

       33
       33
       +
         "yarnHash": "$yarn_hash"

     

       34
       34
       +
       }

     

       35
       35
       +
       EOF

+3 -3

pkgs/tools/admin/syft/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "syft";

     

       5
       5
       -
         version = "0.71.0";

     

       5
       5
       +
         version = "0.72.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "anchore";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-Q02WBUMwboGkXrSjCT2C3vLYH4UlnavIudvOSb5g2bA=";

     

       11
       11
       +
           hash = "sha256-WpAD7/GiKD5+f9uqfRL5b3gMeUNaYHsosoNi0KdoBa0=";

     

       12
       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
       14
        
           leaveDotGit = true;

     
···

       22
       22
        
         };

     

       23
       23
        
         # hash mismatch with darwin

     

       24
       24
        
         proxyVendor = true;

     

       25
       25
       -
         vendorHash = "sha256-bUSQk4uJ4TAhjLS8pjqC486sa31z/MyZf5jDsnxhtSM=";

     

       25
       25
       +
         vendorHash = "sha256-8ArooLNyabjFTXYlfYTn63CewtPCT+p4+DNsebFoTj4=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ installShellFiles ];

     

       28
       28

+2 -2

pkgs/tools/filesystems/btrfs-progs/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "btrfs-progs";

     

       12
       12
       -
         version = "6.1.2";

     

       12
       12
       +
         version = "6.1.3";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";

     

       16
       16
       -
           sha256 = "sha256-a+Zn2X89ZcC6V8MxyYsL07E89g2NMfqK0liCqtnXnXo=";

     

       16
       16
       +
           sha256 = "sha256-03/J7E+ld4sgqnVI/nBus6MAM4wUczGCca5UAk2scWc=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+1 -1

pkgs/tools/misc/debian-devscripts/default.nix

···

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ makeWrapper pkg-config ];

     

       29
       29
        
         buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils bash-completion help2man ] ++

     

       30
       30
       -
           (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);

     

       30
       30
       +
           (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps Moo FileHomeDir IPCRun FileDirList FileTouch ]);

     

       31
       31
        
       

     

       32
       32
        
         preConfigure = ''

     

       33
       33
        
           export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";

+2 -2

pkgs/tools/misc/tea/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tea";

     

       5
       5
       -
         version = "0.9.0";

     

       5
       5
       +
         version = "0.9.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitea {

     

       8
       8
        
           domain = "gitea.com";

     

       9
       9
        
           owner = "gitea";

     

       10
       10
        
           repo = "tea";

     

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

     

       12
       12
       -
           sha256 = "sha256-Bvee8m/BXvPtaaD8xjVg9qzorO0ln6xHP1upPgWoD+A=";

     

       12
       12
       +
           sha256 = "sha256-sZfg8+LIu1Ejvmr/o4X3EOz3fv+RvLhrGRf2yy+6t8c=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         vendorSha256 = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w=";

+2 -2

pkgs/tools/misc/vtm/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "vtm";

     

       9
       9
       -
         version = "0.9.8t";

     

       9
       9
       +
         version = "0.9.8v";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "netxs-group";

     

       13
       13
        
           repo = "vtm";

     

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

     

       15
       15
       -
           sha256 = "sha256-Q6kwGmxDThsaGIzSPhxd/kKz0nORf6K9lUJMU9CdIXU=";

     

       15
       15
       +
           sha256 = "sha256-7ECYbw51MXhYsbQxnuS4QUr5HN0cIUqgMx7V7D/kYTg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake ];

+3 -3

pkgs/tools/security/fulcio/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fulcio";

     

       5
       5
       -
         version = "1.0.0";

     

       5
       5
       +
         version = "1.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sigstore";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-djnDHRD/vHfsem03896qcEb6uzgW3OCMBLqMDHca9vY=";

     

       11
       11
       +
           sha256 = "sha256-b2rn4et7Ze8XRc1Oa/DCfpva/rihtBLapbGlpYGvOjc=";

     

       12
       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
       14
        
           leaveDotGit = true;

     
···

       20
       20
        
             find "$out" -name .git -print0 | xargs -0 rm -rf

     

       21
       21
        
           '';

     

       22
       22
        
         };

     

       23
       23
       -
         vendorSha256 = "sha256-X+M/E1kWhgS408PHwMg5jnDn2ad1NW6xvlLucuOLAeg=";

     

       23
       23
       +
         vendorHash = "sha256-8iNXBSEaKApu+qjGIYOLU6z/sxIVQhltgBRG9eN4RXw=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ installShellFiles ];

     

       26
       26

+3 -3

pkgs/tools/system/erdtree/default.nix

···

       5
       5
        
       

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "erdtree";

     

       8
       8
       -
         version = "1.0.0";

     

       8
       8
       +
         version = "1.1.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "solidiquis";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           hash = "sha256-gZC90flsfH03Grc1netzlv/iX/9DH+rpaSstfXFearc=";

     

       14
       14
       +
           hash = "sha256-W9rTsumZZ3O0kOc+dT9TC/Z/Katb3q6yFreAVCvX5qo=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoHash = "sha256-0I60lUYyR4Za2Q3FqcdqJhUKFjX5+PE88G6JxxxiBXw=";

     

       17
       17
       +
         cargoHash = "sha256-6jFBNkiCFBQbpiYkNZ6dyXH/ZnFHZYFliMZFlE/DodM=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "File-tree visualizer and disk usage analyzer";

+2

pkgs/top-level/all-packages.nix

···

       9070
       9070
        
       

     

       9071
       9071
        
         matrix-corporal = callPackage ../servers/matrix-corporal { };

     

       9072
       9072
        
       

     

       9073
       9073
       +
         matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot {};

     

       9074
       9074
       +
       

     

       9073
       9075
        
         mautrix-facebook = callPackage ../servers/mautrix-facebook { };

     

       9074
       9076
        
       

     

       9075
       9077
        
         mautrix-googlechat = callPackage ../servers/mautrix-googlechat { };

+16

pkgs/top-level/perl-packages.nix

···

       9139
       9139
        
           };

     

       9140
       9140
        
         };

     

       9141
       9141
        
       

     

       9142
       9142
       +
         FileDirList = buildPerlPackage {

     

       9143
       9143
       +
           version = "0.05";

     

       9144
       9144
       +
           pname = "File-DirList";

     

       9145
       9145
       +
           src = fetchurl {

     

       9146
       9146
       +
             url = "mirror://cpan/authors/id/T/TP/TPABA/File-DirList/File-DirList-0.05.tar.gz";

     

       9147
       9147
       +
             sha256 = "sha256-mTt9dmLlV5hEih7azLmr0oHSvSO+fquZ9Wm44pYtO8M=";

     

       9148
       9148
       +
           };

     

       9149
       9149
       +
           preCheck = ''

     

       9150
       9150
       +
             export HOME="$TMPDIR"

     

       9151
       9151
       +
           '';

     

       9152
       9152
       +
           meta = {

     

       9153
       9153
       +
             description = "Provide a sorted list of directory content";

     

       9154
       9154
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       9155
       9155
       +
           };

     

       9156
       9156
       +
         };

     

       9157
       9157
       +
       

     

       9142
       9158
        
         FileFindIterator = buildPerlPackage {

     

       9143
       9159
        
           pname = "File-Find-Iterator";

     

       9144
       9160
        
           version = "0.4";