gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-02-16 12:01:20 +00:00
committed by GitHub
parent bcb76b1538 3cb97b9715
commit 0ec5bef772
59 changed files with 1326 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/systemd/oomd.nix
+3 -3
View File
@@ -49,15 +49,15 @@ in {
systemd.slices."-".sliceConfig = lib.mkIf cfg.enableRootSlice {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.slices."system".sliceConfig = lib.mkIf cfg.enableSystemSlice {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices {
text = ''
pkgs/applications/emulators/retroarch/cores.nix
+9 -7
View File
@@ -48,13 +48,15 @@ let
getCore = repo: (lib.getAttr repo hashesFile);
getCoreSrc = repo:
(lib.pipe repo [
getCore
(x: builtins.removeAttrs x [ "date" ])
fetchFromGitHub
]);
let
inherit (getCore repo) src fetcher;
fetcherFn = {
inherit fetchFromGitHub;
}.${fetcher} or (throw "Unknown fetcher: ${fetcher}");
in
fetcherFn src;
getCoreDate = repo: (getCore repo).date or "unstable-1970-01-01";
getCoreVersion = repo: (getCore repo).version;
mkLibretroCore =
# Sometimes core name != repo name, so you may need to set them differently
@@ -67,7 +69,7 @@ let
{ core
, repo ? core
, src ? (getCoreSrc repo)
, version ? (getCoreDate repo)
, version ? (getCoreVersion repo)
, ...
}@args:
import ./mkLibretroCore.nix ({
pkgs/applications/emulators/retroarch/hashes.json
+713 -448
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/emulators/retroarch/update_cores.py
+26 -42
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" -p git -p nix-prefetch-github
#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts
import json
import os
@@ -8,8 +8,6 @@ import sys
from concurrent.futures import ThreadPoolExecutor
from pathlib import Path
import requests
SCRIPT_PATH = Path(__file__).absolute().parent
HASHES_PATH = SCRIPT_PATH / "hashes.json"
GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8))
@@ -19,10 +17,13 @@ GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8))
# You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to
# `True` and they're similar to `fetchgit` options. Also if for some reason you
# need to pin a specific revision, set `rev` to a commit.
# To generate the hash file for your new core, you can run `update_cores.py
# <core>`. The script needs to be run from the root of your `nixpkgs` clone.
# Do not forget to add your core to `cores.nix` file with the proper overrides
# so the core can be build.
# There is also a `fetcher` option that for now only supports `fetchFromGitHub`
# (see `get_repo_hash()`), but it may be extended in the future if there is a
# need to support fetchers from other source hubs.
# To generate the hash file for your new core, you can run
# `<nixpkgs>/pkgs/applications/emulators/retroarch/update_cores.py <core>`. Do
# not forget to add your core to `cores.nix` file with the proper overrides so
# the core can be build.
CORES = {
"2048": {"repo": "libretro-2048"},
"atari800": {"repo": "libretro-atari800"},
@@ -128,30 +129,6 @@ def info(*msg):
print(*msg, file=sys.stderr)
def get_rev_date_fetchFromGitHub(repo, owner, rev):
# https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#get-a-commit
url = f"https://api.github.com/repos/{owner}/{repo}/commits/{rev}"
headers = {
"Accept": "application/vnd.github+json",
"X-GitHub-Api-Version": "2022-11-28",
}
if token := os.environ.get("GITHUB_TOKEN"):
headers["Authorization"] = f"Bearer {token}"
r = requests.get(url, headers=headers)
try:
j = r.json()
except requests.exceptions.JSONDecodeError:
return None
date = j.get("commit", {}).get("committer", {}).get("date")
if date:
# Date format returned by API: 2023-01-30T06:29:13Z
return f"unstable-{date[:10]}"
else:
return None
def get_repo_hash_fetchFromGitHub(
repo,
owner="libretro",
@@ -176,18 +153,24 @@ def get_repo_hash_fetchFromGitHub(
if rev:
extra_args.append("--rev")
extra_args.append(rev)
result = subprocess.run(
["nix-prefetch-github", owner, repo, *extra_args],
check=True,
capture_output=True,
text=True,
)
try:
result = subprocess.run(
["nix-prefetch-github", owner, repo, "--meta", *extra_args],
check=True,
capture_output=True,
text=True,
)
except subprocess.CalledProcessError as ex:
info(f"Error while updating {owner}/{repo}:", ex.stderr)
raise ex
j = json.loads(result.stdout)
date = get_rev_date_fetchFromGitHub(repo, owner, j["rev"])
if date:
j["date"] = date
# Remove False values
return {k: v for k, v in j.items() if v}
return {
"fetcher": "fetchFromGitHub",
# Remove False values
"src": {k: v for k, v in j["src"].items() if v},
"version": f"unstable-{j['meta']['commitDate']}",
}
def get_repo_hash(fetcher="fetchFromGitHub", **kwargs):
@@ -229,6 +212,7 @@ def main():
cores = {core: repo for core, repo in CORES.items() if core in cores_to_update}
repo_hashes = get_repo_hashes(cores)
repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!"
info(f"Generating '{HASHES_PATH}'...")
with open(HASHES_PATH, "w") as f:
f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4))
pkgs/applications/misc/qcad/default.nix
+13 -12
View File
@@ -18,14 +18,14 @@
mkDerivation rec {
pname = "qcad";
version = "3.29.3.1";
version = "3.29.4.1";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
sha256 = "sha256-QPBiEoOseNUzAWQHPEBq6O0jg8ed5dH+8xlyRCct0g4=";
hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U=";
};
patches = [
@@ -65,23 +65,23 @@ mkDerivation rec {
"MUPARSER_DIR=${muparser}"
"INSTALLROOT=$(out)"
"BOOST_DIR=${boost.dev}"
"QMAKE_CXXFLAGS=-std=c++14"
];
qtWrapperArgs =
lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" ]
++
lib.optionals stdenv.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ];
qtWrapperArgs = lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib"
] ++ lib.optionals stdenv.isDarwin [
"--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib"
];
installPhase = ''
runHook preInstall
'' + lib.optionalString stdenv.isLinux ''
install -Dm555 release/qcad-bin $out/bin/qcad
'' + lib.optionalString stdenv.isDarwin ''
install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
mkdir -p $out/lib
'' +
''
'' + ''
install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary}
install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary}
install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary}
@@ -121,11 +121,12 @@ mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
meta = {
description = "2D CAD package based on Qt";
homepage = "https://qcad.org";
license = licenses.gpl3Only;
maintainers = with maintainers; [ yvesf ];
license = lib.licenses.gpl3Only;
mainProgram = "qcad";
maintainers = with lib.maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
};
}
pkgs/applications/office/homebank/default.nix
+2 -2
View File
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "homebank";
version = "5.7.3";
version = "5.7.4";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU=";
hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
pkgs/applications/science/logic/potassco/clingo.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "clingo";
version = "5.6.2";
version = "5.7.0";
src = fetchFromGitHub {
owner = "potassco";
repo = "clingo";
rev = "v${version}";
sha256 = "sha256-2vOscD5jengY3z9gHoY9y9y6RLfdzUj7BNKLyppNRac=";
sha256 = "sha256-mXexFRPC/+5mNRVZqzsLJKiRkKA009OQrEhOAg8M38k=";
};
nativeBuildInputs = [ cmake ];
pkgs/build-support/php/build-composer-project.nix
+2 -2
View File
@@ -57,9 +57,9 @@ let
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase = previousAttrs.installCheckPhase or ''
runHook preCheckInstall
runHook preInstallCheck
runHook postCheckInstall
runHook postInstallCheck
'';
composerRepository = phpDrv.mkComposerRepository {
pkgs/build-support/php/build-composer-repository.nix
+2 -2
View File
@@ -78,9 +78,9 @@ let
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase = previousAttrs.installCheckPhase or ''
runHook preCheckInstall
runHook preInstallCheck
runHook postCheckInstall
runHook postInstallCheck
'';
COMPOSER_CACHE_DIR = "/dev/null";
pkgs/by-name/el/elvish/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
let
pname = "elvish";
version = "0.20.0";
version = "0.20.1";
in
buildGoModule {
inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule {
owner = "elves";
repo = "elvish";
rev = "v${version}";
hash = "sha256-aaj2P1V31FnRehrUh+aqpPa8QwRrUezKwAa8WBa4X0w=";
hash = "sha256-lKrX38gVUhYwwuNF25LcZ+TytP4vx/GO7ay6Au4BBZA=";
};
vendorHash = "sha256-sgVGqpncV7Ylok5FRcV01a3MCX6UdZvTt3nfVh5L2so=";
pkgs/by-name/er/eris-go/package.nix
+4 -4
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "eris-go";
version = "20231219";
version = "20240128";
outputs = [ "out" "man" ];
src = fetchFromGitea {
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "eris";
repo = "eris-go";
rev = version;
hash = "sha256-eXLfBkJgG51ZjR1qXRE2BgTrIpQsPW5SKeMlGd3J1NE=";
hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc=";
};
vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M=";
@@ -23,10 +23,10 @@ buildGoModule rec {
'';
postBuild = "tupBuild";
postInstall = ''
install -D *.1.man -t $man/share/man/man1
install -D *.1.gz -t $man/share/man/man1
'';
skipNetworkTests = true;
env.skipNetworkTests = true;
passthru.tests = { inherit (nixosTests) eris-server; };
pkgs/by-name/ph/phel/package.nix
+1 -1
View File
@@ -17,7 +17,7 @@ php.buildComposerProject (finalAttrs: {
vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA=";
doInstallCheck = true;
postCheckInstall = ''
postInstallCheck = ''
$out/bin/phel --version
'';
pkgs/by-name/uv/uv/Cargo.lock
Generated
+1 -1
View File
@@ -4062,7 +4062,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]]
name = "uv"
version = "0.1.0"
version = "0.1.2"
dependencies = [
"anstream",
"anyhow",
pkgs/by-name/uv/uv/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "uv";
version = "0.1.0";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
hash = "sha256-FlrBanX6ioLRUVEUGYUrJgt6elKg5nr8/sMAUQ/LljM=";
hash = "sha256-ZrXWipg3m5T3PiUF7IgAxtw1GGnzVZTZdodFwNCu054=";
};
cargoDeps = rustPlatform.importCargoLock {
pkgs/development/compilers/koka/default.nix
+2 -2
View File
@@ -31,12 +31,12 @@
}:
let
version = "3.0.4";
version = "3.1.0";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k=";
sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
pkgs/development/coq-modules/coq-lsp/default.nix
+2
View File
@@ -10,12 +10,14 @@ mkCoqDerivation rec {
release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo=";
release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ=";
release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s=";
release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isEq "8.16"; out = "0.1.8+8.16"; }
{ case = isEq "8.17"; out = "0.1.8+8.17"; }
{ case = isEq "8.18"; out = "0.1.8+8.18"; }
{ case = isEq "8.19"; out = "0.1.8+8.19"; }
] null;
nativeBuildInputs = [ makeWrapper ];
pkgs/development/coq-modules/serapi/default.nix
+2
View File
@@ -2,6 +2,7 @@
let
release = {
"8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y=";
"8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo=";
"8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI=";
"8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc=";
@@ -20,6 +21,7 @@ in
defaultVersion = with versions;
lib.switch coq.version [
{ case = isEq "8.19"; out = "8.19.0+0.19.0"; }
{ case = isEq "8.18"; out = "8.18.0+0.18.0"; }
{ case = isEq "8.17"; out = "8.17.0+0.17.0"; }
{ case = isEq "8.16"; out = "8.16.0+0.16.3"; }
pkgs/development/libraries/cxxopts/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "cxxopts";
version = "3.1.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "jarro2783";
repo = "cxxopts";
rev = "v${version}";
sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ=";
sha256 = "sha256-tOO0YCIG3MxSJZhurNcDR1pWIUEO/Har9mrCrZs3iVk=";
};
buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ];
pkgs/development/libraries/nss/latest.nix
+2 -2
View File
@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.97";
hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw=";
version = "3.98";
hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc=";
}
pkgs/development/libraries/opensubdiv/default.nix
+4 -2
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0=";
};
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "static" ];
nativeBuildInputs = [
cmake
@@ -65,7 +65,9 @@ stdenv.mkDerivation rec {
NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
'';
postInstall = "rm $out/lib/*.a";
postInstall = ''
moveToOutput "lib/*.a" $static
'';
meta = {
description = "An Open-Source subdivision surface library";
pkgs/development/python-modules/awsiotpythonsdk/default.nix
+10 -4
View File
@@ -2,12 +2,13 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "AWSIoTPythonSDK";
version = "1.5.2";
format = "setuptools";
pname = "awsiotpythonsdk";
version = "1.5.4";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -15,9 +16,13 @@ buildPythonPackage rec {
owner = "aws";
repo = "aws-iot-device-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs=";
hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM=";
};
nativeBuildInputs = [
setuptools
];
# Module has no tests
doCheck = false;
@@ -28,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SDK for connecting to AWS IoT";
homepage = "https://github.com/aws/aws-iot-device-sdk-python";
changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/essentials-openapi/default.nix
+65
View File
@@ -0,0 +1,65 @@
{
buildPythonPackage,
fetchFromGitHub,
lib,
click,
essentials,
flask,
hatchling,
httpx,
jinja2,
markupsafe,
pydantic,
pytestCheckHook,
pythonImportsCheckHook,
pyyaml,
rich,
setuptools
}:
buildPythonPackage rec {
pname = "essentials-openapi";
version = "1.0.7";
pyproject = true;
src = fetchFromGitHub {
owner = "Neoteroi";
repo = "essentials-openapi";
rev = "v${version}";
hash = "sha256-j0vEMNXZ9TrcFx8iIyTFQIwF49LEincLmnAt+qodYmA=";
};
nativeBuildInputs = [
hatchling
];
nativeCheckInputs = [
flask
httpx
pydantic
pytestCheckHook
rich
setuptools
];
propagatedBuildInputs = [
pyyaml
essentials
markupsafe
];
passthru.optional-dependencies = {
full = [ click jinja2 rich httpx ];
};
pythonImportsCheck = [
"openapidocs"
];
meta = with lib; {
homepage = "https://github.com/Neoteroi/essentials-openapi";
description = "Functions to handle OpenAPI Documentation";
changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}";
license = licenses.mit;
maintainers = with maintainers; [aldoborrero zimbatm];
};
}
pkgs/development/python-modules/essentials/default.nix
+38
View File
@@ -0,0 +1,38 @@
{
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
pythonImportsCheckHook,
lib,
}:
buildPythonPackage rec {
pname = "essentials";
version = "1.1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Neoteroi";
repo = "essentials";
rev = "v${version}";
hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4=";
};
nativeBuildInputs = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"essentials"
];
meta = with lib; {
homepage = "https://github.com/Neoteroi/essentials";
description = "General purpose classes and functions";
changelog = "https://github.com/Neoteroi/essentials/releases/v${version}";
license = licenses.mit;
maintainers = with maintainers; [aldoborrero zimbatm];
};
}
pkgs/development/python-modules/fakeredis/default.nix
+12 -7
View File
@@ -6,19 +6,19 @@
, lupa
, poetry-core
, pybloom-live
, pyprobables
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, redis
, six
, sortedcontainers
}:
buildPythonPackage rec {
pname = "fakeredis";
version = "2.20.1";
format = "pyproject";
version = "2.21.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws=";
hash = "sha256-A+XOCWeXVt8SUkKM+TKra8xODuCD0QE9+/8FefUt4OY=";
};
nativeBuildInputs = [
@@ -35,7 +35,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
redis
six
sortedcontainers
];
@@ -54,7 +53,13 @@ buildPythonPackage rec {
aioredis
];
bf = [
pybloom-live
pyprobables
];
cf = [
pyprobables
];
probabilistic = [
pyprobables
];
};
@@ -66,7 +71,7 @@ buildPythonPackage rec {
description = "Fake implementation of Redis API";
homepage = "https://github.com/dsoftwareinc/fakeredis-py";
changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}";
license = with licenses; [ mit ];
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/google-cloud-automl/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.12.0";
version = "2.13.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U=";
hash = "sha256-AhZ5KdSpxJS8jHfwJfLztMtyGZOnCwhb/lalrPZ9jog=";
};
nativeBuildInputs = [
pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "3.14.0";
version = "3.14.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0=";
hash = "sha256-v9gBSb9TYvaqF1/g7dJshSkJ2RlCAWXGdf7yPlne0I4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-dlp/default.nix
+8 -3
View File
@@ -9,20 +9,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.13.0";
format = "setuptools";
version = "3.15.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo=";
hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
proto-plus
pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+8 -3
View File
@@ -9,20 +9,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
version = "1.3.0";
format = "setuptools";
version = "1.3.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-oLqRmxNPbb+nUMN70kGlAtBCji4wXrbRv2DhNMcZV5c=";
hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
grpc-google-iam-v1
pkgs/development/python-modules/google-cloud-language/default.nix
+8 -3
View File
@@ -7,20 +7,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.12.0";
format = "setuptools";
version = "2.13.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-efuO/hWDM+aMBXR+nqhrWYsvQpoS83FJ2DrG+hhFlio=";
hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
proto-plus
pkgs/development/python-modules/google-cloud-pubsub/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.19.1";
version = "2.19.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU=";
hash = "sha256-pfkoBZjwxKWBm7YwpQxF3IrNoMlK/srgoYNovMv6JlE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+8 -3
View File
@@ -8,20 +8,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.18.0";
format = "setuptools";
version = "2.18.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Tkmb0z/3rv8nG9Z0h+IdVAQpeobcSHPuhh1jewGzC04=";
hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
grpc-google-iam-v1
pkgs/development/python-modules/google-cloud-speech/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.24.0";
version = "2.24.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Z7x4xfCbeRPoCbinCrTwIAp9JIvfavFvA1c4/a5UbHQ=";
hash = "sha256-aPW5m1cZNXpbiWCUQs104QH+/rVueanW0yE5TCdgWoQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+8 -3
View File
@@ -9,20 +9,25 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.13.0";
format = "setuptools";
version = "2.13.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ODRF08xxjUrj6PMzfTlcYLqGrgV71OA0VHT44ktQZ4k=";
hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
google-api-core
proto-plus
pkgs/development/python-modules/google-cloud-vision/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.6.0";
version = "3.7.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q=";
hash = "sha256-uHIhWpihTxcV28zv3OZrGf4mj26aBaR2isycRMtMeNM=";
};
nativeBuildInputs = [
pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+63
View File
@@ -0,0 +1,63 @@
{
buildPythonPackage,
fetchFromGitHub,
lib,
click,
essentials-openapi,
flask,
hatchling,
httpx,
jinja2,
mkdocs,
pytestCheckHook,
pythonImportsCheckHook,
rich,
setuptools,
}:
buildPythonPackage rec {
pname = "neoteroi-mkdocs";
version = "1.0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Neoteroi";
repo = "mkdocs-plugins";
rev = "v${version}";
hash = "sha256-UyTlgKWdBWckI9sBL4GRQtgNHYpHpZlWVOdmdQ+7lss=";
};
buildInputs = [
hatchling
];
nativeCheckInputs = [
pytestCheckHook
flask
setuptools
];
propagatedBuildInputs = [
essentials-openapi
click
jinja2
httpx
mkdocs
rich
];
disabledTests = [
"test_contribs" # checks against its own git repository
];
pythonImportsCheck = [
"neoteroi.mkdocs"
];
meta = with lib; {
homepage = "https://github.com/Neoteroi/mkdocs-plugins";
description = "Plugins for MkDocs";
changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/v${version}";
license = licenses.mit;
maintainers = with maintainers; [aldoborrero zimbatm];
};
}
pkgs/development/python-modules/optimum/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "optimum";
version = "1.16.2";
version = "1.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "optimum";
rev = "refs/tags/v${version}";
hash = "sha256-bEwCUPZJT1UTD8mQJKg+Nwag6kpn4076uyKocKI/+/M=";
hash = "sha256-101QW6MgCcmSeQ0AefPZKmg5O6+2JlrekYN3fIkukuw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/plugwise/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.37.0";
version = "0.37.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "plugwise";
repo = "python-plugwise";
rev = "refs/tags/v${version}";
hash = "sha256-a/8GVHhVZsK2DD3+mM8UvwkgjMC403Mc9UJSO19AlXs=";
hash = "sha256-6o0g3il4GV6E8avp9V2YrkaVPf2z37asdJOxf6Phbmc=";
};
postPatch = ''
pkgs/development/python-modules/py-serializable/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "py-serializable";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "madpah";
repo = "serializable";
rev = "refs/tags/v${version}";
hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE=";
hash = "sha256-OsgFzT5qGyszO4jFYWIAgGY41s0ZBEMwCbWZeY189h4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pyformlang/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pyformlang";
version = "1.0.6";
version = "1.0.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I=";
hash = "sha256-i4ib18Ktyc9pRu4P+tQIHoZ/IbAOk8Dn0MXJoxw8gAA=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pyprobables/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "pyprobables";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "barrust";
repo = "pyprobables";
rev = "refs/tags/v${version}";
hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"probables"
];
meta = with lib; {
description = "Probabilistic data structures";
homepage = "https://github.com/barrust/pyprobables";
changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/python-engineio/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "python-engineio";
version = "4.8.0";
version = "4.9.0";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-engineio";
rev = "refs/tags/v${version}";
hash = "sha256-btXwx9GRLBcjtcGdgckb2Y/MxC0E/rKTWKgkP8olezo=";
hash = "sha256-FpPGIK5HVtTzDOpORo+WPhS1860P3dm1nJkvakpzsjE=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-socketio/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "python-socketio";
version = "5.10.0";
version = "5.11.1";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-socketio";
rev = "refs/tags/v${version}";
hash = "sha256-nlzTzIswMRjvJ9l9TOtVvRvbKlQPvNH0/P1NIbQCmy8=";
hash = "sha256-miIl/+3JtjtoQaS6Jy0M9lPQJQp3VlpvrO5Hqlrq5JM=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-technove/default.nix
+64
View File
@@ -0,0 +1,64 @@
{ lib
, aiohttp
, aresponses
, awesomeversion
, backoff
, buildPythonPackage
, cachetools
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "python-technove";
version = "1.2.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Moustachauve";
repo = "pytechnove";
rev = "refs/tags/v${version}";
hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "--cov" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
awesomeversion
backoff
cachetools
yarl
];
nativeCheckInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"technove"
];
meta = with lib; {
description = "Python library to interact with TechnoVE local device API";
homepage = "https://github.com/Moustachauve/pytechnove";
changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/types-aiobotocore-packages/default.nix
+15 -10
View File
@@ -1,10 +1,11 @@
{ lib
, buildPythonPackage
, pythonOlder
, aiobotocore
, botocore
, typing-extensions
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, typing-extensions
}:
let
toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str;
@@ -13,7 +14,7 @@ let
buildPythonPackage rec {
pname = "types-aiobotocore-${serviceName}";
inherit version;
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,6 +22,10 @@ let
inherit pname version hash;
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiobotocore
botocore
@@ -44,13 +49,13 @@ let
};
in
rec {
types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.8.0" "sha256-7TmekyZVc2l2er1TIJURP7Qy0n7xRYnXt44FJr5XBWA=";
types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.11.2" "sha256-hUS1ZTj9CbC74Aiinmeh2BEQ2KymcqxuYVSeD12s5xg";
types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y=";
types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.11.2" "sha256-XtL7R0UrgI/9rSxfNYbA0Lez+DiVyB7R+rhn49Nxerc=";
types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y=";
types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.11.2" "sha256-vpE1GuvKFPsBf3rTk5V6B4ujFGaHE3wk9yN3j0sM0bo=";
types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo=";
types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.11.2" "sha256-g9a2ad5hZonlKWGnLQchfT5CAgwqsvseeQBQemCSCQw=";
types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.2" "sha256-XUzsO3dJmVEyAkwGcZ9BxNb8CceJALCNRIfs6/lFa8M=";
@@ -308,7 +313,7 @@ rec {
types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.2" "sha256-AgZvipboBZnhSlC7K0JRFpH8Z4pNPT2UfdXYjshxF8Y=";
types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M=";
types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8=";
types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.2" "sha256-qDj9RSbqHPpJ5yU+AXPeA+umbbSrf2Ssu1g0aiLvnMw=";
@@ -448,7 +453,7 @@ rec {
types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.2" "sha256-CKCC7W5h6qKv3Zya/e+WcVoWdOtCqoWKRlJFHSTdxaI=";
types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw=";
types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw=";
types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.2" "sha256-zg/QhW+4Chugyg6rG5HtrE1GAhbWUaveJpaJFemoN94=";
pkgs/development/python-modules/uqbar/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "uqbar";
version = "0.7.1";
version = "0.7.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-pZ2sNs9uK49PK8qxRRqpGMEI1Xr6Fn+fxptlEVv3GSk=";
hash = "sha256-8tjqPlS9Yo3pOFmpfe/sxgW0e1iqLRYhmPJCh5rKKEE=";
};
postPatch = ''
pkgs/development/tools/analysis/cppcheck/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck";
version = "2.13.3";
version = "2.13.4";
outputs = [ "out" "man" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar";
repo = "cppcheck";
rev = finalAttrs.version;
hash = "sha256-JTasjK9EkdGCTGL5Qx9uU3UBFlQzVdpTJ/v1IfzXCLE=";
hash = "sha256-YCE4TAi5eNUosQMsTn0kEcUh1AVw4rssrj+xB+ef4bE=";
};
nativeBuildInputs = [
pkgs/development/tools/wire/default.nix
+11 -3
View File
@@ -2,19 +2,27 @@
buildGoModule rec {
pname = "wire";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "google";
repo = "wire";
rev = "v${version}";
sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0=";
hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko=";
};
vendorHash = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc=";
patches = [
# Bump the minimum version of Go required to compile packages in this module,
# as `golang.org/x/tools` requires go1.18 or later.
./go-modules.patch
];
vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY=";
subPackages = [ "cmd/wire" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/google/wire";
description = "A code generation tool that automates connecting components using dependency injection";
pkgs/development/tools/wire/go-modules.patch
+79
View File
@@ -0,0 +1,79 @@
diff --git a/go.mod b/go.mod
index 944aef0..ee579ff 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/google/wire
-go 1.12
+go 1.18
require (
github.com/google/go-cmp v0.2.0
@@ -8,3 +8,5 @@ require (
github.com/pmezard/go-difflib v1.0.0
golang.org/x/tools v0.17.0
)
+
+require golang.org/x/mod v0.14.0 // indirect
diff --git a/go.sum b/go.sum
index 8da3aae..fbca3c1 100644
--- a/go.sum
+++ b/go.sum
@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
pkgs/development/tools/yq-go/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
version = "4.40.7";
version = "4.41.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
hash = "sha256-VvA6PYJYRejGlYDb/gyHDQSNOwDWSE7vXPqYGrVLtko=";
hash = "sha256-1zYem/cvvndyrWaE8wYoxouDDnQyT+VeupFF1VkuC2w=";
};
vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0=";
pkgs/servers/dns/pdns-recursor/default.nix
+26 -6
View File
@@ -1,26 +1,46 @@
{ lib, stdenv, fetchurl, pkg-config, boost, nixosTests
, openssl, systemd, lua, luajit, protobuf
, libsodium
, curl
, rustPlatform, cargo, rustc
, enableProtoBuf ? false
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pdns-recursor";
version = "4.9.3";
version = "5.0.2";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
hash = "sha256-FmBFMFFJ3s3pWCH3bwabZl9rISLf99RquVLVDZ8B7Us=";
url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
hash = "sha256-qQ6LYf3BgbWWFEw1kgEYynHDuV9GZYzOfoIidQ3kXKk=";
};
nativeBuildInputs = [ pkg-config ];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust";
hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA=";
};
cargoRoot = "settings/rust";
nativeBuildInputs = [
cargo
rustc
rustPlatform.cargoSetupHook
pkg-config
];
buildInputs = [
boost openssl systemd
lua luajit
libsodium
curl
] ++ lib.optional enableProtoBuf protobuf;
configureFlags = [
"--enable-reproducible"
"--enable-systemd"
"--enable-dns-over-tls"
"sysconfdir=/etc/pdns-recursor"
];
@@ -42,4 +62,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ rnhmjoj ];
};
}
})
pkgs/servers/minio/default.nix
+3 -3
View File
@@ -21,16 +21,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2024-02-04T22-36-13Z";
version = "2024-02-14T21-36-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
hash = "sha256-vA1xrwvHyhqrdWjEXqs0MUaPq8S3J2r1uE0IndpwdjQ=";
hash = "sha256-tXLdK5+akZ1ChUqs8i7Qb32E7ZoMfHk1kgDS+8RiRH4=";
};
vendorHash = "sha256-eE8F/cG7SdSHrFW4qg+MBdS/rxoz4xB0JbCQ3vi38ok=";
vendorHash = "sha256-4/fW2mKzgwcRHigksAsk7bXS0Leak8rZdzoQ6mK2ksA=";
doCheck = false;
pkgs/tools/misc/graylog/5.0.nix
-9
View File
@@ -1,9 +0,0 @@
{ callPackage, lib, ...}:
let
buildGraylog = callPackage ./graylog.nix {};
in buildGraylog {
version = "5.0.8";
sha256 = "sha256-TGJm2PGoXaLhlzyfSWKScEJxEGObTVttpEEaczsXHiA=";
maintainers = [ lib.maintainers.f2k1de ];
license = lib.licenses.sspl;
}
pkgs/tools/networking/bandwhich/default.nix
+16 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "bandwhich";
@@ -23,11 +23,25 @@ rustPlatform.buildRustPackage rec {
"--skip=tests::cases::ui::layout_under_50_width_under_50_height"
];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
# 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1
doCheck = !stdenv.isDarwin;
preConfigure = ''
export BANDWHICH_GEN_DIR=_shell-files
mkdir -p $BANDWHICH_GEN_DIR
'';
postInstall = ''
installManPage $BANDWHICH_GEN_DIR/bandwhich.1
installShellCompletion $BANDWHICH_GEN_DIR/bandwhich.{bash,fish} \
--zsh $BANDWHICH_GEN_DIR/_bandwhich
'';
meta = with lib; {
description = "A CLI utility for displaying current network utilization";
longDescription = ''
@@ -38,6 +52,7 @@ rustPlatform.buildRustPackage rec {
the background using reverse DNS on a best effort basis.
'';
homepage = "https://github.com/imsnif/bandwhich";
changelog = "https://github.com/imsnif/bandwhich/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne figsoda ];
platforms = platforms.unix;
pkgs/tools/networking/haproxy/default.nix
+2 -2
View File
@@ -29,11 +29,11 @@ let
sslPkg = sslPkgs.${sslLibrary};
in stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
version = "2.9.4";
version = "2.9.5";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-nDiSzDwISsTwASXvIqFRzxgUFthKqKN69q9qoDmQlrw=";
hash = "sha256-MreFsSiDj0IYuNVGkMhsSHlNA/gXy7Yn+0h2n3nv1Zs=";
};
buildInputs = [ sslPkg zlib libxcrypt ]
pkgs/tools/security/cfripper/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@ let
};
in python.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.15.3";
version = "1.15.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Skyscanner";
repo = "cfripper";
rev = "refs/tags/v${version}";
hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I=";
hash = "sha256-heVFum+Eaofd9L0dNHqD9GgHP+ckGwJi+NfeFci+ESc=";
};
postPatch = ''
pkgs/tools/security/sudo-rs/default.nix
+3 -3
View File
@@ -11,15 +11,15 @@
rustPlatform.buildRustPackage rec {
pname = "sudo-rs";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "memorysafety";
repo = "sudo-rs";
rev = "v${version}";
hash = "sha256-EQEdNDUXEMMiFZKuu9LR9ywjvKWyM5bWcRHHUB9+gp4=";
hash = "sha256-Fc9NgKo8Be8AqB1YcH/oH514f3pOjFtqNBIC+3xwagY=";
};
cargoHash = "sha256-Zs9/A7u4yMLKY4cAUCnsqRHgkxI8R3w1JwkAd2lw0eo=";
cargoHash = "sha256-1XhdMHGZZOmSFuVW3Oa1Xwjy3dzkgJOE7h24Ly2F3ps=";
nativeBuildInputs = [ installShellFiles pandoc ];
pkgs/top-level/aliases.nix
+1
View File
@@ -402,6 +402,7 @@ mapAliases ({
graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09
graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10
gringo = clingo; # added 2022-11-27
gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10
pkgs/top-level/all-packages.nix
-2
View File
@@ -8822,8 +8822,6 @@ with pkgs;
grails = callPackage ../development/web/grails { jdk = null; };
graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { };
graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { };
graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { };
pkgs/top-level/python-packages.nix
+10
View File
@@ -3749,6 +3749,10 @@ self: super: with self; {
escapism = callPackage ../development/python-modules/escapism { };
essentials = callPackage ../development/python-modules/essentials { };
essentials-openapi = callPackage ../development/python-modules/essentials-openapi { };
etcd = callPackage ../development/python-modules/etcd { };
etcd3 = callPackage ../development/python-modules/etcd3 {
@@ -8309,6 +8313,8 @@ self: super: with self; {
neo4j = callPackage ../development/python-modules/neo4j { };
neoteroi-mkdocs = callPackage ../development/python-modules/neoteroi-mkdocs { };
nessclient = callPackage ../development/python-modules/nessclient { };
nest = toPythonModule(pkgs.nest-mpi.override { withPython = true; python3 = python; });
@@ -9335,6 +9341,8 @@ self: super: with self; {
pyprecice = callPackage ../development/python-modules/pyprecice { };
pyprobables = callPackage ../development/python-modules/pyprobables { };
pyproject-api = callPackage ../development/python-modules/pyproject-api { };
pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { };
@@ -12028,6 +12036,8 @@ self: super: with self; {
python-stdnum = callPackage ../development/python-modules/python-stdnum { };
python-technove = callPackage ../development/python-modules/python-technove { };
python-telegram = callPackage ../development/python-modules/python-telegram { };
python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { };