mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
91a1bc431e
43 changed files with 285 additions and 193 deletions
|
|
@ -80,13 +80,21 @@ in
|
|||
The name of the interface to pull the bind_addr from.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
forceAddrFamily = mkOption {
|
||||
type = types.enum [ "any" "ipv4" "ipv6" ];
|
||||
default = "any";
|
||||
description = ''
|
||||
Whether to bind ipv4/ipv6 or both kind of addresses.
|
||||
'';
|
||||
};
|
||||
|
||||
forceIpv4 = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
Deprecated: Use consul.forceAddrFamily instead.
|
||||
Whether we should force the interfaces to only pull ipv4 addresses.
|
||||
'';
|
||||
};
|
||||
|
|
@ -175,6 +183,13 @@ in
|
|||
systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
warnings = lib.flatten [
|
||||
(lib.optional (cfg.forceIpv4 != null) ''
|
||||
The option consul.forceIpv4 is deprecated, please use
|
||||
consul.forceAddrFamily instead.
|
||||
'')
|
||||
];
|
||||
|
||||
systemd.services.consul = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ] ++ systemdDevices;
|
||||
|
|
@ -196,15 +211,21 @@ in
|
|||
});
|
||||
|
||||
path = with pkgs; [ iproute2 gnugrep gawk consul ];
|
||||
preStart = ''
|
||||
preStart = let
|
||||
family = if cfg.forceAddrFamily == "ipv6" then
|
||||
"-6"
|
||||
else if cfg.forceAddrFamily == "ipv4" then
|
||||
"-4"
|
||||
else
|
||||
"";
|
||||
in ''
|
||||
mkdir -m 0700 -p ${dataDir}
|
||||
chown -R consul ${dataDir}
|
||||
|
||||
# Determine interface addresses
|
||||
getAddrOnce () {
|
||||
ip addr show dev "$1" \
|
||||
| grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \
|
||||
| awk -F '[ /\t]*' '{print $3}' | head -n 1
|
||||
ip ${family} addr show dev "$1" scope global \
|
||||
| awk -F '[ /\t]*' '/inet/ {print $3}' | head -n 1
|
||||
}
|
||||
getAddr () {
|
||||
ADDR="$(getAddrOnce $1)"
|
||||
|
|
@ -234,6 +255,11 @@ in
|
|||
};
|
||||
}
|
||||
|
||||
# deprecated
|
||||
(mkIf (cfg.forceIpv4 != null && cfg.forceIpv4) {
|
||||
services.consul.forceAddrFamily = "ipv4";
|
||||
})
|
||||
|
||||
(mkIf (cfg.alerts.enable) {
|
||||
systemd.services.consul-alerts = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.52";
|
||||
version = "1.54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A=";
|
||||
sha256 = "sha256-lNiQ0X2vvPGubb4Pde+eh0Z6ClCQgigIUM+PddaiVUg=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.43";
|
||||
version = "1.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+sHGjgDqizv/9n0dDj8knsl+4MBfO3/pMkmD+MPsuNM=";
|
||||
sha256 = "sha256-xRq37hjuMiGxsWRnZ/ryXYLvQpjbfQEjQkMjjuqL7r8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alfis";
|
||||
version = "0.6.11";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Revertron";
|
||||
repo = "Alfis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA=";
|
||||
sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA=";
|
||||
cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA=";
|
||||
|
||||
checkFlags = [
|
||||
# these want internet access, disable them
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ let
|
|||
CGO_ENABLED = 0;
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];
|
||||
src = fetchFromGitHub {
|
||||
name = "source-${rev}";
|
||||
inherit owner repo rev sha256;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
let
|
||||
pname = "zulip";
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
|
||||
hash = "sha256-hUi4t7WdZG6GmNQfUcG4E9qGJDdPIMbglJzwR7tFNVQ=";
|
||||
hash = "sha256-PJ7/KOtfjH1RHMzAKSr9Y/82Z0vL2wBy3GgI/0JrlpM=";
|
||||
name="${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
|
||||
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
|
||||
, readline, gettext, libpng, libao, gfortran, perl
|
||||
, autoreconfHook, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
|
||||
, buildPackages, readline, gettext, libpng, libao, gfortran, perl
|
||||
, enableGUI ? false, libGL, libGLU, xorg, fltk
|
||||
, enableMicroPy ? false, python3
|
||||
}:
|
||||
|
|
@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
|
||||
version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade
|
||||
version = "1.9.0-5"; # TODO try to remove preCheck phase on upgrade
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
|
||||
sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c=";
|
||||
sha256 = "sha256-EP8wRi8QZPrr1lfKN6da87s1FCy8AuDYbzcvsJCWyLE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -32,18 +32,21 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# 1.9.0-5's tarball contains a binary (src/mkjs) which is executed
|
||||
# at build time. we will delete and rebuild it.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
postPatch = ''
|
||||
for i in doc/*/Makefile* micropython*/xcas/Makefile*; do
|
||||
substituteInPlace "$i" --replace "/bin/cp" "cp";
|
||||
done;
|
||||
'' +
|
||||
# workaround for 1.6.0-47, should not be necessary in future versions
|
||||
lib.optionalString (!enableMicroPy) ''
|
||||
sed -i -e 's/micropython-[0-9.]* //' Makefile*
|
||||
rm src/mkjs
|
||||
substituteInPlace src/Makefile.am --replace "g++ mkjs.cc" \
|
||||
"${buildPackages.stdenv.cc.targetPrefix}c++ mkjs.cc"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
texlive.combined.scheme-small bison flex
|
||||
autoreconfHook texlive.combined.scheme-small bison flex
|
||||
];
|
||||
|
||||
# perl is only needed for patchShebangs fixup.
|
||||
|
|
@ -58,13 +61,6 @@ stdenv.mkDerivation rec {
|
|||
libGL libGLU fltk xorg.libX11
|
||||
] ++ lib.optional enableMicroPy python3;
|
||||
|
||||
/* fixes:
|
||||
configure:16211: checking for main in -lntl
|
||||
configure:16230: g++ -o conftest -g -O2 conftest.cpp -lntl -llapack -lblas -lgfortran -ldl -lpng16 -lm -lmpfi -lmpfr -lgmp >&5
|
||||
/nix/store/y9c1v4x7y39j2rfbg17agjwqdzxpsn18-ntl-11.3.2/lib/libntl.so: undefined reference to `pthread_key_create'
|
||||
*/
|
||||
NIX_CFLAGS_LINK="-lpthread";
|
||||
|
||||
# xcas Phys and Turtle menus are broken with split outputs
|
||||
# and interactive use is likely to need docs
|
||||
outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
|
||||
index 4c56aea078..e51a77ae8a 100644
|
||||
--- a/src/sage/misc/sagedoc.py
|
||||
+++ b/src/sage/misc/sagedoc.py
|
||||
@@ -1402,6 +1402,8 @@ class _sage_doc:
|
||||
sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
|
||||
True
|
||||
sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx
|
||||
+ ...
|
||||
+ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link".
|
||||
'...div...File:...Type:...Definition:...identity_matrix...'
|
||||
|
||||
In the 'text' version, double colons have been replaced with
|
||||
|
|
@ -13,9 +13,14 @@ let
|
|||
# Fetch a diff between `base` and `rev` on sage's git server.
|
||||
# Used to fetch trac tickets by setting the `base` to the last release and the
|
||||
# `rev` to the last commit of the ticket.
|
||||
fetchSageDiff = { base, name, rev, sha256, squashed ? false, ...}@args: (
|
||||
#
|
||||
# We don't use sage's own build system (which builds all its
|
||||
# dependencies), so we exclude changes to "build/" from patches by
|
||||
# default to avoid conflicts.
|
||||
fetchSageDiff = { base, name, rev, sha256, squashed ? false, excludes ? [ "build/*" ]
|
||||
, ...}@args: (
|
||||
fetchpatch ({
|
||||
inherit name sha256;
|
||||
inherit name sha256 excludes;
|
||||
|
||||
# There are three places to get changes from:
|
||||
#
|
||||
|
|
@ -49,11 +54,7 @@ let
|
|||
"https://github.com/sagemath/sagetrac-mirror/compare/${base}...${rev}.diff"
|
||||
]
|
||||
else [ "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" ];
|
||||
|
||||
# We don't care about sage's own build system (which builds all its dependencies).
|
||||
# Exclude build system changes to avoid conflicts.
|
||||
excludes = [ "build/*" ];
|
||||
} // builtins.removeAttrs args [ "rev" "base" "sha256" "squashed" ])
|
||||
} // builtins.removeAttrs args [ "rev" "base" "sha256" "squashed" "excludes" ])
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -172,6 +173,29 @@ stdenv.mkDerivation rec {
|
|||
rev = "8452003846a7303100847d8d0ed642fc642c11d6";
|
||||
sha256 = "sha256-A/XMouPlc2sjFp30L+56fBGJXydS2EtzfPOV98FCDqI=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/33226
|
||||
(fetchSageDiff {
|
||||
base = "9.6.beta0";
|
||||
name = "giac-1.7.0-45-update.patch";
|
||||
rev = "33ea2adf01e9e2ce9f1e33779f0b1ac0d9d1989c";
|
||||
sha256 = "sha256-DOyxahf3+IaYdkgmAReNDCorRzMgO8+yiVrJ5TW1km0=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/33398
|
||||
(fetchSageDiff {
|
||||
base = "9.6.beta4";
|
||||
name = "sympy-1.10-update.patch";
|
||||
rev = "6b7c3a28656180e42163dc10f7b4a571b93e5f27";
|
||||
sha256 = "sha256-fnUyM2yjHkCykKRfzQQ4glcUYmCS/fYzDzmCf0nuebk=";
|
||||
# The patch contains a whitespace change to a file that didn't exist in Sage 9.5.
|
||||
excludes = [ "build/*" "src/sage/manifolds/vector_bundle_fiber_element.py" ];
|
||||
})
|
||||
|
||||
# docutils 0.18.1 now triggers Sphinx warnings. tolerate them for
|
||||
# now, because patching Sphinx is not feasible.
|
||||
# https://github.com/sphinx-doc/sphinx/issues/9777#issuecomment-1104481271
|
||||
./patches/docutils-0.18.1-deprecation.patch
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qbe";
|
||||
version = "unstable-2022-03-17";
|
||||
version = "unstable-2022-04-11";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://c9x.me/qbe.git";
|
||||
rev = "c6b41eb8c8cece8266b2173a83216e1ce77eb2be";
|
||||
sha256 = "sha256-vpNZNED+C9VMzWyyyntQuBgTvbpZpJ/EwOztdOEP7vI=";
|
||||
rev = "2caa26e388b1c904d2f12fb09f84df7e761d8331";
|
||||
sha256 = "sha256-TNKHKX/PbrNIQJ+Q50KemfcigEBKe7gmJzTjB6ofYL8=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "0.35.2";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4oZglk7MInLIsvbeCfs4InAcmSmzZp16XL5+8eoYXJk=";
|
||||
sha256 = "sha256-nSA78eQRbJ5JTDquaRqRgFU0V8RVCzvWUONgHxGj+Mc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IqFOw9bGdM3IEoMeqDlxKfLnZvR80PSnwP9kr1tI/h0=";
|
||||
cargoSha256 = "sha256-/+uioJRXiugsV7SUwsDNHGaPxrxrhscQUGyXOzzwG/g=";
|
||||
|
||||
# This environment variable is required so that when wasmtime tries
|
||||
# to run tests by using the rusty_v8 crate, it does not try to
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ assert let majorIs = lib.versions.major cudatoolkit.version;
|
|||
in majorIs == "9" || majorIs == "10" || majorIs == "11";
|
||||
|
||||
let
|
||||
version = "2.5.4";
|
||||
version = "2.6.2";
|
||||
|
||||
# We define a specific set of CUDA compute capabilities here,
|
||||
# because CUDA 11 does not support compute capability 3.0. Also,
|
||||
|
|
@ -45,7 +45,7 @@ in stdenv.mkDerivation {
|
|||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
|
||||
sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p";
|
||||
hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE=";
|
||||
name = "magma-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
@ -64,23 +64,6 @@ in stdenv.mkDerivation {
|
|||
enableParallelBuilding=true;
|
||||
buildFlags = [ "magma" "magma_sparse" ];
|
||||
|
||||
# MAGMA's default CMake setup does not care about installation. So we copy files directly.
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mkdir -p $out/include
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp -a ../include/*.h $out/include
|
||||
#cp -a sparse-iter/include/*.h $out/include
|
||||
cp -a lib/*.so $out/lib
|
||||
cat ../lib/pkgconfig/magma.pc.in | \
|
||||
sed -e s:@INSTALL_PREFIX@:"$out": | \
|
||||
sed -e s:@CFLAGS@:"-I$out/include": | \
|
||||
sed -e s:@LIBS@:"-L$out/lib -lmagma -lmagma_sparse": | \
|
||||
sed -e s:@MAGMA_REQUIRED@:: \
|
||||
> $out/lib/pkgconfig/magma.pc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Matrix Algebra on GPU and Multicore Architectures";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-io";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "adafruit";
|
||||
repo = "Adafruit_IO_Python";
|
||||
rev = version;
|
||||
hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BIquSrhtRv2NEOn/G6TTfYMrL2OBwwJQYZ455fznwdU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTests = [
|
||||
"test_interact_syntax_error"
|
||||
# Output and the sandbox don't work well together
|
||||
"test_interact_multiple_indented_lines"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.31";
|
||||
version = "0.2.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-04qTjwnPckBHKBs9+BFWtTJ9uVc0U1oJAiLIE1nqQdE=";
|
||||
sha256 = "sha256-tJlgmxa6HppLLTs4ZggnJ5H6NOH3v+C9pUfLBmxr4XY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sqlalchemy
|
||||
, alembic
|
||||
, banal
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, sqlalchemy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataset";
|
||||
version = "1.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc=";
|
||||
hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sqlalchemy alembic banal
|
||||
alembic
|
||||
banal
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
# checks attempt to import nonexistent module 'test.test' and fail
|
||||
|
|
@ -30,6 +36,6 @@ buildPythonPackage rec {
|
|||
description = "Toolkit for Python-based database access";
|
||||
homepage = "https://dataset.readthedocs.io";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.xfnw ];
|
||||
maintainers = with maintainers; [ xfnw ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, dill
|
||||
, filelock
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, huggingface-hub
|
||||
, importlib-metadata
|
||||
, multiprocess
|
||||
, numpy
|
||||
, packaging
|
||||
, pandas
|
||||
, pyarrow
|
||||
, pythonOlder
|
||||
, requests
|
||||
, responses
|
||||
, tqdm
|
||||
, xxhash
|
||||
}:
|
||||
|
|
@ -17,26 +21,33 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "datasets";
|
||||
version = "1.18.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s=";
|
||||
hash = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dill
|
||||
filelock
|
||||
fsspec
|
||||
huggingface-hub
|
||||
multiprocess
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
pyarrow
|
||||
requests
|
||||
responses
|
||||
tqdm
|
||||
xxhash
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
# Tests require pervasive internet access.
|
||||
|
|
@ -45,11 +56,13 @@ buildPythonPackage rec {
|
|||
# Module import will attempt to create a cache directory.
|
||||
postFixup = "export HF_MODULES_CACHE=$TMPDIR";
|
||||
|
||||
pythonImportsCheck = [ "datasets" ];
|
||||
pythonImportsCheck = [
|
||||
"datasets"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-access datasets and evaluation metrics for natural language processing";
|
||||
homepage = "https://github.com/huggingface/datasets";
|
||||
description = "Fast, efficient, open-access datasets and evaluation metrics for natural language processing";
|
||||
changelog = "https://github.com/huggingface/datasets/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ buildPythonPackage rec {
|
|||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = version;
|
||||
sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
|
||||
hash = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
@ -94,7 +94,8 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"'
|
||||
--replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' \
|
||||
--replace 'regex = "^2021.7.6"' 'regex = "*"'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,20 +1,46 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet, setuptools }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, chardet
|
||||
, fetchPypi
|
||||
, flask
|
||||
, ldapdomaindump
|
||||
, pyasn1
|
||||
, pycryptodomex
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "impacket";
|
||||
version = "0.9.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18d557d387f4914fafa739813b9172bc3f8bd9c036e93bf589a8e0ebb7304bba";
|
||||
hash = "sha256-GNVX04f0kU+vpzmBO5FyvD+L2cA26Tv1iajg67cwS7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
flask
|
||||
ldapdomaindump
|
||||
pyasn1
|
||||
pycryptodomex
|
||||
pyopenssl
|
||||
setuptools
|
||||
six
|
||||
];
|
||||
|
||||
# fail with:
|
||||
# RecursionError: maximum recursion depth exceeded
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "impacket" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"impacket"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Network protocols Constructors and Dissectors";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, blessings
|
||||
, fetchFromGitHub
|
||||
, invoke
|
||||
, lib
|
||||
, releases
|
||||
, semantic-version
|
||||
, tabulate
|
||||
, tqdm
|
||||
, twine
|
||||
}:
|
||||
|
||||
|
|
@ -27,12 +28,22 @@ buildPythonPackage rec {
|
|||
--replace "tabulate==0.7.5" "tabulate"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ blessings invoke releases semantic-version tabulate twine ];
|
||||
propagatedBuildInputs = [
|
||||
blessings
|
||||
invoke
|
||||
releases
|
||||
semantic-version
|
||||
tabulate
|
||||
tqdm
|
||||
twine
|
||||
];
|
||||
|
||||
# There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "invocations" ];
|
||||
pythonImportsCheck = [
|
||||
"invocations"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Common/best-practice Invoke tasks and collections";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "md-toc";
|
||||
version = "8.1.2";
|
||||
version = "8.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "frnmst";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EmhCZhxUCzBMqScPeawvcWmP9rrthow1vhTZachjCDI=";
|
||||
sha256 = "sha256-/Hi2CW3aqbvCr7xGHD9lAe9U84waSjVfTfWq76NXNT4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdurl";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "hukkin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AVklWFc4o5R9OzS9BYauuOaxm89P/Ih5l3Vrb2P0El4=";
|
||||
sha256 = "sha256-SBJSs+i+I0jF90i3o6BUgLCDR6Et34fXEmQ7fbDoAbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, regex
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -10,9 +11,11 @@ buildPythonPackage rec {
|
|||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME=";
|
||||
hash = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -23,6 +26,11 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "regex>=2022.3.15" "regex"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"parsimonious"
|
||||
"parsimonious.grammar"
|
||||
|
|
@ -30,9 +38,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Arbitrary-lookahead parser";
|
||||
homepage = "https://github.com/erikrose/parsimonious";
|
||||
description = "Fast arbitrary-lookahead parser written in pure Python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policyuniverse";
|
||||
version = "1.5.0.20220416";
|
||||
version = "1.5.0.20220420";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RGXOqhXPsEQR5wcXDWz00J6KcdJOY5ZXSLVXT18wDDk=";
|
||||
sha256 = "sha256-HWyzwvsn3ikL5cbEPljMHShF2vQEOSP6umk08UZgQsI=";
|
||||
};
|
||||
|
||||
# Tests are not shipped and there are no GitHub tags
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ let
|
|||
debuggerName = lib.strings.getName debugger;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
pname = "pwntools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4=";
|
||||
sha256 = "sha256-QgUuLYg3EOTh2gQekWdabXGftOXvLdJFyyhT2hEmkpA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, selectors2
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -10,17 +10,15 @@ buildPythonPackage rec {
|
|||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
|
||||
hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
selectors2
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-python-dateutil";
|
||||
version = "2.8.11";
|
||||
version = "2.8.12";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7cBdC5MgGSirC1/ysxRBPdPSsk6xLEcCl++Sned8k+8=";
|
||||
sha256 = "sha256-7zBTt0XwHERDtRK2s9WwT7ry1HaqUDtsyTIEah7fpWo=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "dateutil-stubs" ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-decorator";
|
||||
version = "5.1.5";
|
||||
version = "5.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CrPgAZyBGRIrXzD0IlUkcbkc8xOLPI69krQb1d3h3QI=";
|
||||
sha256 = "sha256-OZ+qczvJMstRtQ08odfpV7KuAvPE1xGcdpYxKCo4aKY=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
|||
|
|
@ -1,32 +1,55 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, pytest
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xdis";
|
||||
version = "6.0.3";
|
||||
disabled = isPy27;
|
||||
version = "unstable-2022-04-13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rocky";
|
||||
repo = "python-xdis";
|
||||
rev = version;
|
||||
sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h";
|
||||
# Support for later Python releases is missing in 6.0.3
|
||||
rev = "f888df7df5cb8839927e9187c258769cc77fb7a3";
|
||||
hash = "sha256-V1ws5GibRkutFRNcjlP7aW+AshSyWavXIxuwznVbRlU=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ six click ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
six
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
make check
|
||||
'';
|
||||
pythonImportsCheck = [ "xdis" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"xdis"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Our Python release is not in the test matrix
|
||||
"test_unit/test_disasm.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_big_linenos"
|
||||
"test_basic"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python cross-version byte-code disassembler and marshal routines";
|
||||
homepage = "https://github.com/rocky/python-xdis/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1068";
|
||||
version = "2.0.1075";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-/WJiGWBGcVDoiX+FnEbIFaMRxQSnJTqLqHbKlEoCqWU=";
|
||||
hash = "sha256-5KAmIJngrs4nvjLJsaUrbgZsMFe0eTTDiwquyguvKLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "14.9.1";
|
||||
version = "14.10.0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit version;
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "1h6fyhbc154fr6a8brva3clirgvga6sal6ikylf9mbkxbh7d9rcn";
|
||||
sha256 = "033b68hwqk5hn2by4hk1z7v6p08d505grl9hrx72p4wpyk18c80l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotestsum";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotestyourself";
|
||||
repo = "gotestsum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nZaVi39dOytJTM69xpl+d9XoUt+yHdndPgY2ggfNeMQ=";
|
||||
sha256 = "sha256-6GEkuVa6RCMv0FsTYXhhscVe3Ya78qwbj7Im9AL0fOo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wP5y8Ec6eSe+rdMEQQdX0fFTQ0HWuiyBRHxGlraZd+o=";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "heroic";
|
||||
version = "2.2.1";
|
||||
version = "2.2.6";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage";
|
||||
sha256 = "sha256-zzxf3eM1fUWTVtzzABcwlmptNuCVQafvotnbOiCzu0c=";
|
||||
sha256 = "sha256-kL30/G4DpDPwGN7PvbWest7TcgL4Rd1c2OM4nRCT3bg=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.21.2";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
sha256 = "sha256-s++21feD3L2HuVYFjWhNIOGTjjX+lXwURc4PqbwFnhI=";
|
||||
sha256 = "sha256-WxULVtqKxYXMWNY4l0wvTkqcDkPrlHcS70NgQhe8nzU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kxLtbElzfimC/ZefUyTlfQiUZo4y0f1riajRm5shVdU=";
|
||||
vendorSha256 = "sha256-hdo8uiVJAMMPo1N8kLDFPSbyTr5WxNKtq8E7pj6Plak=";
|
||||
|
||||
patches = [
|
||||
# https://github.com/grafana/agent/issues/731
|
||||
./skip_test_requiring_network.patch
|
||||
tags = [
|
||||
"nonetwork"
|
||||
"nodocker"
|
||||
];
|
||||
|
||||
# uses go-systemd, which uses libsystemd headers
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/pkg/operator/selector_eventhandler_test.go b/pkg/operator/selector_eventhandler_test.go
|
||||
index 7b6ec602..e79bae0e 100644
|
||||
--- a/pkg/operator/selector_eventhandler_test.go
|
||||
+++ b/pkg/operator/selector_eventhandler_test.go
|
||||
@@ -39,6 +39,10 @@ var (
|
||||
// TestEnqueueRequestForSelector creates an example Kubenretes cluster and runs
|
||||
// EnqueueRequestForSelector to validate it works.
|
||||
func TestEnqueueRequestForSelector(t *testing.T) {
|
||||
+ // Requires network access, which is not available during
|
||||
+ // the nixpkgs sandboxed build
|
||||
+ t.Skip()
|
||||
+
|
||||
l := log.NewNopLogger()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "realvnc-vnc-viewer";
|
||||
version = "6.21.1109";
|
||||
version = "6.22.207";
|
||||
|
||||
src = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
||||
sha256 = "12zxp9kvi070nzxbrnrfsyla38ryb69zlidw6cvypmsgqnylfxj7";
|
||||
sha256 = "0jybfqj1svkb297ahyp07xf4b8qyb5h1l2kp50a50ivb6flqd3jr";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
|
||||
sha256 = "03vhdmzyd16r0kdxpkq9azyy1h705lk4sbgnbw5fr8gkifwng60f";
|
||||
sha256 = "06jmkd474nql6p3hnqwnwj5ac29m2021flnvf44mfhrhaa5wnpz6";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "melody";
|
||||
version = "0.13.9";
|
||||
version = "0.13.10";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "melody_cli";
|
||||
inherit version;
|
||||
sha256 = "1vqiciridm0pbh5yf42p2jfis908p6r9q3jaqy2hx3f5aggbf09q";
|
||||
sha256 = "05slrh5dqbpsvimdr0rlhj04kf1qzwij3zlardvbmvhvfccf4188";
|
||||
};
|
||||
|
||||
cargoSha256 = "1gf2km06qzvc0xv4vfxm6vdp3c5lgcjwwl92f4frga3cx51vbrzh";
|
||||
cargoSha256 = "0qh1byysbc6pl3cvx2vdpl8crx5id59hhrwqzk5g7091spm8wf79";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language that compiles to regular expressions";
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "1.41.0";
|
||||
version = "1.43.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-go3EXmC9Vp0xXi1mH65p85FKsTe0CbyNXw3VVRrnpeQ=";
|
||||
sha256 = "sha256-4bPxWmzlyVZrkq9qs/5t+ZOsVDkAAwYc6Mc4een4Qnw=";
|
||||
};
|
||||
|
||||
repo = fetchFromGitLab {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
|||
owner = "postmarketOS";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-7Y4rxSdJQaIlq4yiadvrEro0JM5xoHeISDKHz69T4z8=";
|
||||
sha256 = "sha256-jbTzPGrRVisLG7f4NspkDVB8NYSyyInHkhSUPO3dgU0=";
|
||||
};
|
||||
|
||||
pmb_test = "${repo}/test";
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, python2, libev, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weighttp";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.lighttpd.net/weighttp.git";
|
||||
rev = "refs/tags/weighttp-${version}";
|
||||
sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wafHook ];
|
||||
|
||||
buildInputs = [ python2 libev ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight and simple webserver benchmarking tool";
|
||||
homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.7.0";
|
||||
version = "8.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4ED7xmwbFXs6OnCtG+xrY50kBsgESxw/a8slhWOo+30=";
|
||||
sha256 = "sha256-V2wBzoU3oL/wT/pIvMxEPTuNaRLTI72OTDRgWXyzZoY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ls6zuouCAmE3y9011CK1YADy/v87Ft8tb85LyJ4bEF4=";
|
||||
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maigret";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soxoj";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XML7sb/dhMX9i8GzOezanVTFha73v2m1OVOYvSOelNQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-0Ni4rXVu3ZQyHBvD3IpV0i849CnumLj+n6/g4sMhHEs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1339,6 +1339,7 @@ mapAliases ({
|
|||
webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21
|
||||
webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22
|
||||
weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22
|
||||
weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20
|
||||
whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08
|
||||
wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11
|
||||
wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -11546,8 +11546,6 @@ with pkgs;
|
|||
|
||||
webalizer = callPackage ../tools/networking/webalizer { };
|
||||
|
||||
weighttp = callPackage ../tools/networking/weighttp { };
|
||||
|
||||
wget = callPackage ../tools/networking/wget {
|
||||
libpsl = null;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue