Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 38520726 1db0c42d

+18 -14
+2 -2
pkgs/development/interpreters/trealla/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "trealla"; 5 - version = "1.9.37"; 6 7 src = fetchFromGitHub { 8 owner = "infradig"; 9 repo = "trealla"; 10 rev = "v${version}"; 11 - sha256 = "sha256-0cj4FGaYKIKCgWwRyLUw1DcvNnioQPOtqZhSvWSaojU="; 12 }; 13 14 postPatch = ''
··· 2 3 stdenv.mkDerivation rec { 4 pname = "trealla"; 5 + version = "1.12.0"; 6 7 src = fetchFromGitHub { 8 owner = "infradig"; 9 repo = "trealla"; 10 rev = "v${version}"; 11 + sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; 12 }; 13 14 postPatch = ''
+4
pkgs/development/libraries/libvirt/default.nix
··· 183 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations 184 substituteInPlace src/lxc/lxc_conf.c \ 185 --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' 186 patchShebangs . 187 '' 188 + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
··· 183 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations 184 substituteInPlace src/lxc/lxc_conf.c \ 185 --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' 186 + substituteInPlace build-aux/meson.build \ 187 + --replace "gsed" "sed" \ 188 + --replace "gmake" "make" \ 189 + --replace "ggrep" "grep" 190 patchShebangs . 191 '' 192 + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
+2 -2
pkgs/development/python-modules/awkward/default.nix
··· 11 12 buildPythonPackage rec { 13 pname = "awkward"; 14 - version = "1.4.0"; 15 16 src = fetchPypi { 17 inherit pname version; 18 - sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d"; 19 }; 20 21 nativeBuildInputs = [ cmake ];
··· 11 12 buildPythonPackage rec { 13 pname = "awkward"; 14 + version = "1.5.0"; 15 16 src = fetchPypi { 17 inherit pname version; 18 + sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; 19 }; 20 21 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/python-modules/deezer-py/default.nix
··· 7 8 buildPythonPackage rec { 9 pname = "deezer-py"; 10 - version = "1.1.3"; 11 disabled = pythonOlder "3.6"; 12 13 src = fetchPypi { 14 inherit pname version; 15 - sha256 = "sha256-FdLSJFALeGcecLAHk9khJTKlMd3Mec/w/PGQOHqxYMQ="; 16 }; 17 18 propagatedBuildInputs = [ requests ];
··· 7 8 buildPythonPackage rec { 9 pname = "deezer-py"; 10 + version = "1.2.2"; 11 disabled = pythonOlder "3.6"; 12 13 src = fetchPypi { 14 inherit pname version; 15 + sha256 = "a491af5fcc9e44a2a28be8832169e703a920dae42c78539f45cad59075700ac9"; 16 }; 17 18 propagatedBuildInputs = [ requests ];
+2 -2
pkgs/development/tools/analysis/tfsec/default.nix
··· 5 6 buildGoPackage rec { 7 pname = "tfsec"; 8 - version = "0.58.6"; 9 10 src = fetchFromGitHub { 11 owner = "aquasecurity"; 12 repo = pname; 13 rev = "v${version}"; 14 - sha256 = "sha256-FTrzEVTmMxXshDOvlSmQEwekde621KIclpFm1oEduEo="; 15 }; 16 17 goPackagePath = "github.com/aquasecurity/tfsec";
··· 5 6 buildGoPackage rec { 7 pname = "tfsec"; 8 + version = "0.58.9"; 9 10 src = fetchFromGitHub { 11 owner = "aquasecurity"; 12 repo = pname; 13 rev = "v${version}"; 14 + sha256 = "1i61xls3jj5w3cliqs28m1y6p47yav24m40zxa6kf0jj4s50m1d3"; 15 }; 16 17 goPackagePath = "github.com/aquasecurity/tfsec";
+3 -3
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
··· 2 3 buildGoModule rec { 4 pname = "bazel-buildtools"; 5 - version = "4.0.1"; 6 7 src = fetchFromGitHub { 8 owner = "bazelbuild"; 9 repo = "buildtools"; 10 rev = version; 11 - sha256 = "0q7b9zh38vblqs5lwhjk28km89p706aky4wv6bwz2vg9gl6bfclq"; 12 }; 13 14 - vendorSha256 = "1w6i1lb72mfdyb901gpl9yc6ql73j5kik6li0j5jv5ab2m3j9qvf"; 15 16 preBuild = '' 17 rm -r warn/docs
··· 2 3 buildGoModule rec { 4 pname = "bazel-buildtools"; 5 + version = "4.2.0"; 6 7 src = fetchFromGitHub { 8 owner = "bazelbuild"; 9 repo = "buildtools"; 10 rev = version; 11 + sha256 = "sha256-m6jTDFgjUpQrm77tCnpIRHUFJCFl7GKwu7NoHtoLNa4="; 12 }; 13 14 + vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA="; 15 16 preBuild = '' 17 rm -r warn/docs
+3 -3
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
··· 2 rustPlatform.buildRustPackage rec { 3 pname = "system76-firmware"; 4 # Check Makefile when updating, make sure postInstall matches make install 5 - version = "1.0.28"; 6 7 src = fetchFromGitHub { 8 owner = "pop-os"; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-hv8Vdpg/Tt3eo2AdFlOEG182jH5Oy7/BX3p1EMPQjnc="; 12 }; 13 14 nativeBuildInputs = [ pkg-config makeWrapper ]; ··· 17 18 cargoBuildFlags = [ "--workspace" ]; 19 20 - cargoSha256 = "sha256-A39zvxvZB3j59giPAVeucHPzqwofnugmLweiPXh5Uzg="; 21 22 # Purposefully don't install systemd unit file, that's for NixOS 23 postInstall = ''
··· 2 rustPlatform.buildRustPackage rec { 3 pname = "system76-firmware"; 4 # Check Makefile when updating, make sure postInstall matches make install 5 + version = "1.0.29"; 6 7 src = fetchFromGitHub { 8 owner = "pop-os"; 9 repo = pname; 10 rev = version; 11 + sha256 = "sha256-4wvVls6Z42GtC/MVFTvCv1UV/w5nt4p9oTMU4Bqh4JU="; 12 }; 13 14 nativeBuildInputs = [ pkg-config makeWrapper ]; ··· 17 18 cargoBuildFlags = [ "--workspace" ]; 19 20 + cargoSha256 = "sha256-x2FO4UWtsvUeKgPxaqjdxtp9vWJq9vLIqQPyGF8nQG4="; 21 22 # Purposefully don't install systemd unit file, that's for NixOS 23 postInstall = ''