cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-17 12:01:22 +00:00 committed by GitHub
commit 4ee4d805d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 124 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/networking/bind.nix
View file

@ -61,7 +61,7 @@ let
blackhole { badnetworks; };
forward first;
forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
directory "/run/named";
directory "${cfg.directory}";
pid-file "/run/named/named.pid";
${cfg.extraOptions}
};
@ -166,6 +166,12 @@ in
";
};
directory = mkOption {
type = types.str;
default = "/run/named";
description = "Working directory of BIND.";
};
zones = mkOption {
default = [ ];
type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions));
@ -240,6 +246,9 @@ in
${pkgs.coreutils}/bin/mkdir -p /run/named
chown ${bindUser} /run/named
${pkgs.coreutils}/bin/mkdir -p ${cfg.directory}
chown ${bindUser} ${cfg.directory}
'';
serviceConfig = {

12
pkgs/applications/editors/vscode/vscode.nix
View file

@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "06as63444m2036vk4180dfpavmp9l07qc1jfc4gg86j0apdxr6sh";
x86_64-darwin = "0dxchqwk3flv2cr542y1l7c06lak9zzj09f2kljsan6gs6zbls2b";
aarch64-linux = "0pdbganyc59mll3232b26cc6fi8a8kpvjm5qky4qr4pk4jsj2r6q";
aarch64-darwin = "00pax1hakj5l21j7fm1b05s8kkfnbvgfs9h7f27ad379n6482gxl";
armv7l-linux = "1g63xh3k1nm8kls674qavmyl7csb3m4d7ywc0512far76lw39rvr";
x86_64-linux = "049spg4c1arkw97mg0h046kiirmcrjj97sy4ldiblwldjn510acw";
x86_64-darwin = "0g6b1891ag4a6p7rlkfka5v4nbmpr4ckkmibhw8l3wa9zdzs77x6";
aarch64-linux = "1qvk6cn5v9bz4vl5ifpdgrba94v6a54xx8s3fxdkj3lqvq27kpd1";
aarch64-darwin = "1whgjkxy70ifx1vaddxr8f1xcg651fhca4x7rzidzbyyf3baghy0";
armv7l-linux = "1k45s81s4ispc0vz7i17a7gss05d82vpymxgangg6f1yxwz944r4";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.58.0";
version = "1.58.2";
pname = "vscode";
sourceExecutableName = "code";

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib;
let
version = "3.4.6";
version = "3.4.7";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0a26kcj3n1a2kw1f3fc6s1x3rw3f3bj2cq6rp7k0kc4ciwh7i9hj";
sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c";
};
cmakeFlags = [

48
pkgs/applications/science/math/pynac/default.nix
View file

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, flint
@ -11,57 +10,16 @@
}:
stdenv.mkDerivation rec {
version = "0.7.27";
version = "0.7.29";
pname = "pynac";
src = fetchFromGitHub {
owner = "pynac";
repo = "pynac";
rev = "pynac-${version}";
sha256 = "sha256-1HHCIeaNE2UsJNX92UlDGLJS8I4nC/8FnwX7Y4F9HpU=";
sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A=";
};
patches = [
# the five patches below are included with sage 9.3. since pynac
# is a self-described "Sage Math support library", we include them
# here.
# https://trac.sagemath.org/ticket/30688
(fetchpatch {
name = "power_inf_loop.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3";
sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs=";
})
# https://trac.sagemath.org/ticket/31479
(fetchpatch {
name = "disable_poly_mul_expand.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3";
sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo=";
})
# https://trac.sagemath.org/ticket/31530
(fetchpatch {
name = "too_much_sub.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3";
sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis=";
})
# https://trac.sagemath.org/ticket/31554
(fetchpatch {
name = "handle_factor.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3";
sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw=";
})
# https://trac.sagemath.org/ticket/31645
(fetchpatch {
name = "seriesbug.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3";
sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts=";
})
];
buildInputs = [
flint
gmp
@ -84,7 +42,7 @@ stdenv.mkDerivation rec {
of the full GiNaC, and it is *only* meant to be used as a Python library.
'';
homepage = "http://pynac.org";
license = licenses.gpl3;
license = licenses.gpl2Plus;
maintainers = teams.sage.members;
platforms = platforms.unix;
};

14
pkgs/development/interpreters/python/default.nix
View file

@ -239,9 +239,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
patch = "3";
patch = "5";
};
sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n";
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
@ -250,15 +250,15 @@ in {
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy36 = callPackage ./pypy {
self = pypy36;
pypy37 = callPackage ./pypy {
self = pypy37;
sourceVersion = {
major = "7";
minor = "3";
patch = "3";
patch = "5";
};
sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2";
pythonVersion = "3.6";
sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI=";
pythonVersion = "3.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;

12
pkgs/development/interpreters/python/pypy/default.nix
View file

@ -73,6 +73,8 @@ in with passthru; stdenv.mkDerivation rec {
LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
patches = [
./dont_fetch_vendored_deps.patch
(substituteAll {
src = ./tk_tcl_paths.patch;
inherit tk tcl;
@ -81,12 +83,18 @@ in with passthru; stdenv.mkDerivation rec {
tk_libprefix = tk.libPrefix;
tcl_libprefix = tcl.libPrefix;
})
(substituteAll {
src = ./sqlite_paths.patch;
inherit (sqlite) out dev;
})
];
postPatch = ''
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
buildPhase = ''

12
pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ur a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py
--- a/lib_pypy/pypy_tools/build_cffi_imports.py 2021-04-12 01:11:48.000000000 -0400
+++ b/lib_pypy/pypy_tools/build_cffi_imports.py 2021-07-16 06:37:03.000000000 -0400
@@ -225,6 +225,8 @@
print('*', ' '.join(args), file=sys.stderr)
if embed_dependencies and key in cffi_dependencies:
+ print("Nixpkgs: skipping fetching/building dependency", key)
+ elif False:
status, stdout, stderr = _build_dependency(key)
if status != 0:
failures.append((key, module))

12
pkgs/development/interpreters/python/pypy/sqlite_paths.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py
--- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400
+++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400
@@ -301,6 +301,8 @@
else:
extra_args = dict(
libraries=libraries,
+ include_dirs=['@dev@/include'],
+ library_dirs=['@out@/lib']
)
SOURCE = """

24
pkgs/development/python-modules/build/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, filelock
, flit-core
, importlib-metadata
@ -8,6 +8,7 @@
, packaging
, pep517
, pytest-mock
, pytest-rerunfailures
, pytest-xdist
, pytestCheckHook
, pythonOlder
@ -17,13 +18,14 @@
buildPythonPackage rec {
pname = "build";
version = "0.3.0";
version = "0.5.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90=";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
sha256 = "15hc9mbxsngfc9n805x8rk7yqbxnw12mpk6hfwcsldnfii1vg2ph";
};
nativeBuildInputs = [
@ -42,20 +44,18 @@ buildPythonPackage rec {
checkInputs = [
filelock
pytestCheckHook
pytest-mock
pytest-rerunfailures
pytest-xdist
pytestCheckHook
];
disabledTests = [
"test_isolation"
"test_isolated_environment_install"
"test_default_pip_is_never_too_old"
"test_build_isolated - StopIteration"
"test_build_raises_build_exception"
"test_build_raises_build_backend_exception"
"test_projectbuilder.py"
"test_projectbuilder.py"
"test_build"
"test_init"
];
pythonImportsCheck = [ "build" ];

2
pkgs/development/python-modules/convertdate/2.2.x.nix
View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "fitnr";
repo = pname;
rev = "v${version}";
sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5";
sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/liquidctl/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "liquidctl";
version = "1.7.0";
version = "1.7.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE=";
sha256 = "sha256-TNDQV1BOVVdvr0XAyWGcwgMbe4mV7J05hQeKVUqVT9s=";
};
nativeBuildInputs = [ installShellFiles ];

4
pkgs/development/python-modules/nix-prefetch-github/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "nix-prefetch-github";
version = "4.0.3";
version = "4.0.4";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "v${version}";
sha256 = "CLcmwobPrL6NiI/nw+/Dwho/r15owV16Jmt5OcfFqvo=";
sha256 = "g5G818Gq5EGyRIyg/ZW7guxMS0IyJ4nYaRjG/CtGhuc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/requests-cache/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "requests-cache";
version = "0.7.0";
version = "0.7.1";
disabled = pythonOlder "3.6";
format = "pyproject";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA=";
sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/skytemple-dtef/default.nix
View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "skytemple-dtef";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82";
sha256 = "0l2b66z5ngyas3ijbzwz2wizw46kz47f8jr729pzbg4wbqbqjihr";
};
propagatedBuildInputs = [ skytemple-files ];

6
pkgs/development/python-modules/subarulink/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "subarulink";
version = "0.3.13";
version = "0.3.14";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "G-Two";
repo = pname;
rev = "subaru-v${version}";
sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g";
rev = "v${version}";
sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/yalexs/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.11";
version = "1.1.12";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fVUYrzIcW4jbxdhS/Bh8eu+aJPFOqj0LXjoQKw+FZdg=";
sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/database/liquibase/default.nix
View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "4.4.0";
version = "4.4.1";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-iqWQAZV1H3p9Ud+6U2RwIpfFlsu+7SE96Abh3u8CCVs=";
sha256 = "sha256-2Y/eRIkskuk+7GC/br178XzWTnP4iXSFfa5ybLjvqDA=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View file

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
version = "2021-05-11";
version = "2021-07-16";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version;
sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw";
sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6";
};
installFlags = [ "DESTDIR=$(out)" ];
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a";
outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";

6
pkgs/servers/heisenbridge/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "unstable-2021-05-29";
version = "0.99.1";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7";
sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI=";
rev = "v${version}";
sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE=";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/shells/zsh/grml-zsh-config/default.nix
View file

@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "grml-zsh-config";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c=";
sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs=";
};
buildInputs = [ zsh coreutils txt2tags procps ]

6
pkgs/tools/misc/chezmoi/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4=";
sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU=";
};
vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4=";
vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8=";
doCheck = false;

13
pkgs/tools/networking/amass/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
version = "3.13.2";
version = "3.13.3";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI=";
sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY=";
};
vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h";
vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8=";
outputs = [ "out" "wordlists" ];
@ -24,6 +24,9 @@ buildGoModule rec {
gzip $wordlists/*.txt
'';
# https://github.com/OWASP/Amass/issues/640
doCheck = false;
meta = with lib; {
description = "In-Depth DNS Enumeration and Network Mapping";
longDescription = ''
@ -37,8 +40,8 @@ buildGoModule rec {
Amass ships with a set of wordlist (to be used with the amass -w flag)
that are found under the wordlists output.
'';
homepage = "https://www.owasp.org/index.php/OWASP_Amass_Project";
homepage = "https://owasp.org/www-project-amass/";
license = licenses.asl20;
maintainers = with maintainers; [ kalbasit ];
maintainers = with maintainers; [ kalbasit fab ];
};
}

14
pkgs/tools/security/dnsrecon/default.nix
View file

@ -1,8 +1,11 @@
{ lib, fetchFromGitHub, python3 }:
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
version = "0.9.1";
version = "0.10.1";
src = fetchFromGitHub {
owner = "darkoperator";
@ -19,8 +22,7 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace dnsrecon.py \
--replace "namelist.txt" "../share/namelist.txt" \
--replace "0.9.0" "${version}"
--replace "namelist.txt" "../share/namelist.txt"
'';
installPhase = ''
@ -37,8 +39,8 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "DNS Enumeration Script";
homepage = "https://github.com/darkoperator/dnsrecon";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ c0bw3b ];
maintainers = with maintainers; [ c0bw3b fab ];
};
}

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-07-14";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-s3aohQJM6oDdmzBRfiz45rqGOPl3YdjdE1XrFjBPyaw=";
sha256 = "sha256-WqLKdvJh22j9lwoO1iFIhjPCReeR4TQ91zqkVV/PN14=";
};
installPhase = ''

6
pkgs/tools/text/choose/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "choose";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "theryangeary";
repo = pname;
rev = "v${version}";
sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j";
sha256 = "sha256-QX0tAo1cGPpRhggiAPxsVhKXg6TgaVl1lcp3na7jUNw=";
};
cargoSha256 = "1fdcz7vnmrw92y7bx49napi7j2jjc41liz5k63kbijfwqnaaiswy";
cargoSha256 = "sha256-3pK7y/zC5iZkto5p5Xerlpu3yfN6sB2kjLF2fURlUj0=";
meta = with lib; {
description = "A human-friendly and fast alternative to cut and (sometimes) awk";

4
pkgs/top-level/all-packages.nix
View file

@ -12577,7 +12577,7 @@ in
python3 = python39;
pypy = pypy2;
pypy2 = pypy27;
pypy3 = pypy36;
pypy3 = pypy37;
# Python interpreter that is build with all modules, including tkinter.
# These are for compatibility and should not be used inside Nixpkgs.
@ -12633,7 +12633,7 @@ in
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python { };
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36;
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37;
# Python package sets.
python27Packages = python27.pkgs;