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]
2023-11-05 12:01:15 +00:00
committed by GitHub
parent 6607a943e1 fa6f493ef0
commit 2ecaf22639
36 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/display-managers/greetd.nix
+1
View File
@@ -59,6 +59,7 @@ in
security.pam.services.greetd = {
allowNullPassword = true;
startSession = true;
enableGnomeKeyring = mkDefault config.services.gnome.gnome-keyring.enable;
};
# This prevents nixos-rebuild from killing greetd by activating getty again
pkgs/applications/file-managers/clifm/default.nix
+4 -4
View File
@@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }:
{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }:
stdenv.mkDerivation rec {
pname = "clifm";
version = "1.14.6";
version = "1.15";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc=";
sha256 = "sha256-4Z2u1APNfJ9Ai95MMWb5FCUgCA2Hrbp+5eBJZD3tN+U=";
};
buildInputs = [ libcap acl file readline ];
buildInputs = [ libcap acl file readline python3];
makeFlags = [
"DESTDIR=${placeholder "out"}"
pkgs/applications/misc/gallery-dl/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "gallery-dl";
version = "1.26.1";
version = "1.26.2";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "gallery_dl";
sha256 = "sha256-SJshEdvmPDQZ5mqiQfJpWcQ43WGXUxPvMMJiY/4Cxsc=";
sha256 = "sha256-Agccsz0TlzCDnhR5Vy7Tt3jrqz9+hwaclQgXJBhGY9w=";
};
propagatedBuildInputs = [
pkgs/applications/networking/cluster/nerdctl/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-izFDqaJFJrgeb3YPP/7rIf/IjvrtlwjbktNy702zVTU=";
hash = "sha256-PR3vhNfY84vKQaAMKmPPmY7kK3BRxELAC34NfMYXQPk=";
};
vendorHash = "sha256-4I+qCh/A/Yj5kUZLFvXTUV85l/2LVGPUCivTdDlA1ao=";
vendorHash = "sha256-qLxUAICm/SGy2iHAbg+12xmId+P335dFyjltYlB45iw=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
pkgs/applications/virtualization/docker-slim/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-slim";
version = "1.40.4";
version = "1.40.6";
src = fetchFromGitHub {
owner = "slimtoolkit";
repo = "slim";
rev = version;
hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g=";
hash = "sha256-0rn+tqdPVjkIPxOwL9rDnolrpcsDOwOah0Y7924mjD4=";
};
vendorHash = null;
pkgs/by-name/ga/gato/package.nix
+54
View File
@@ -0,0 +1,54 @@
{ lib
, python3
, git
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "gato";
version = "1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "gato";
rev = "refs/tags/${version}";
hash = "sha256-M9ONeLjEKQD5Kys7OriM34dEBWDKW3qrBk9lu2TitGE=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=gato" ""
'';
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
];
propagatedBuildInputs = with python3.pkgs; [
colorama
cryptography
packaging
pyyaml
requests
];
nativeCheckInputs = with python3.pkgs; [
git
pytestCheckHook
];
pythonImportsCheck = [
"gato"
];
meta = with lib; {
description = "GitHub Self-Hosted Runner Enumeration and Attack Tool";
homepage = "https://github.com/praetorian-inc/gato";
changelog = "https://github.com/praetorian-inc/gato/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "gato";
};
}
pkgs/development/libraries/numcpp/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "numcpp";
version = "2.12.0";
version = "2.12.1";
src = fetchFromGitHub {
owner = "dpilger26";
repo = "NumCpp";
rev = "Version_${finalAttrs.version}";
hash = "sha256-HeT2zZbULXZhmgquQTl3qHL0T50IIUf3oAZaEDIcAys=";
hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo=";
};
nativeCheckInputs = [gtest python3];
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
-6
View File
@@ -23,10 +23,4 @@ qtModule {
"bin/qmlscene"
"bin/qmltestrunner"
];
postFixup = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
mv $dev/bin/qmlformat $bin/bin/qmlformat
mv $dev/bin/qmltyperegistrar $bin/bin/qmltyperegistrar
ln -s $bin/bin/qmlformat $dev/bin/qmlformat
ln -s $bin/bin/qmltyperegistrar $dev/bin/qmltyperegistrar
'';
}
pkgs/development/python-modules/aiocsv/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiocsv";
version = "1.2.4";
version = "1.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "MKuranowski";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-R9gZqiHYKexXXjbAkKu9YqhZnzC/VAMSDzBYT/mF5v0=";
hash = "sha256-4QvVYcTpwhFH57r+iMgmYciWIC2prRnL+ih7qx/CA/U=";
};
nativeBuildInputs = [
pkgs/development/python-modules/aiounifi/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "64";
version = "65";
format = "pyproject";
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc=";
hash = "sha256-VpDtr5r7BxZDd8G8tPrHRVo+LRhsFoMlVUuOcG/3g0s=";
};
postPatch = ''
pkgs/development/python-modules/alexapy/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "alexapy";
version = "1.27.6";
version = "1.27.7";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "keatontaylor";
repo = "alexapy";
rev = "refs/tags/v${version}";
hash = "sha256-CKaxdKuvie88nn1LSTxCLCdbr9bzD6MtvgSU9lplT/8=";
hash = "sha256-8OktaoH15FmwWEpUS+3yv6Q7fwfTf144yvaldAp7CQU=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/approvaltests/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "approvaltests";
version = "9.0.0";
version = "10.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
hash = "sha256-tyUPXeMdFuzlBY/HrGHLDEwYngzBELayaVVfEh92lbE=";
hash = "sha256-3KorHpJUeWSJKVN/4IN0AqKOIL0sT5MaxkvQqpeilhw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/boschshcpy/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.72";
version = "0.2.73";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
hash = "sha256-Re+OKgarLe4n54nZyBm0EtzMHcGKqDY6r+7rtvRSqsg=";
hash = "sha256-DHH9VZWnQaLWEiZSrU4y2/jlqhvUvoKRjWpBTz01m8k=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cryptolyzer/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "cryptolyzer";
version = "0.10.0";
version = "0.10.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "CryptoLyzer";
inherit version;
hash = "sha256-jb2yin3W+VfqFWJbQOXNml0xJEbSr1SfSSFupfxBHRs=";
hash = "sha256-8jpWDd/+eEaAp8L4ySpNK91fma005cPMLgzAsSAIpKg=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cryptoparser/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "cryptoparser";
version = "0.10.3";
version = "0.11.0";
format = "pyproject";
src = fetchPypi {
pname = "CryptoParser";
inherit version;
hash = "sha256-FvSs0LeyuobkJhJd5vlR+Bm4LqGxPvPTogsYKtHOpVw=";
hash = "sha256-fgPmgZxv/UpaoeBO08xcUbPxmjVV4AUEgivNOvWxd04=";
};
nativeBuildInputs = [
pkgs/development/python-modules/holidays/default.nix
+31 -10
View File
@@ -1,15 +1,22 @@
{ lib
, buildPythonPackage
, convertdate
, fetchFromGitHub
, hijri-converter
, importlib-metadata
, korean-lunar-calendar
, polib
, pytestCheckHook
, python-dateutil
, pythonOlder
# build-system
, setuptools
# l10n
, polib
, lingua
, chameleon
# dependencies
, python-dateutil
# tests
, importlib-metadata
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -28,15 +35,29 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools
# l10n
lingua
chameleon
polib
];
postPatch = ''
patchShebangs scripts/l10n/*.py
'';
preBuild = ''
# make l10n
./scripts/l10n/generate_po_files.py
./scripts/l10n/generate_mo_files.py
'';
propagatedBuildInputs = [
convertdate
python-dateutil
hijri-converter
korean-lunar-calendar
];
doCheck = false;
nativeCheckInputs = [
importlib-metadata
polib
pkgs/development/python-modules/py-nextbusnext/default.nix
+8 -3
View File
@@ -3,12 +3,13 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "py-nextbusnext";
version = "1.0.1";
format = "setuptools";
version = "1.0.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -16,9 +17,13 @@ buildPythonPackage rec {
owner = "ViViDboarder";
repo = "py_nextbus";
rev = "refs/tags/v${version}";
hash = "sha256-iJPbRhXgA1AIkyf3zGZ9tuFAw8h6oyBbh7Ln/y72fyQ=";
hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
pkgs/development/python-modules/reolink-aio/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.7.12";
version = "0.7.14";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-molHdZ51irWEE3OHywP5n0bCClK8z67JGiYRwvHAOxs=";
hash = "sha256-fF/IwhHCTqi5eSRgfcUARWAqQ7jJ4nRpcWWOMx7IxLY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/segno/default.nix
+16 -3
View File
@@ -1,6 +1,11 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build-system
, setuptools
# tests
, pytestCheckHook
, pypng
, pyzbar
@@ -8,24 +13,32 @@
buildPythonPackage rec {
pname = "segno";
version = "1.5.2";
version = "1.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "heuer";
repo = "segno";
rev = version;
hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo=";
hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
pypng
pyzbar
];
pythonImportsCheck = [ "segno" ];
pythonImportsCheck = [
"segno"
];
meta = with lib; {
changelog = "https://github.com/heuer/segno/releases/tag/${version}";
description = "QR Code and Micro QR Code encoder";
homepage = "https://github.com/heuer/segno/";
license = licenses.bsd3;
pkgs/development/python-modules/tweepy/default.nix
+24 -1
View File
@@ -44,11 +44,34 @@ buildPythonPackage rec {
"tweepy"
];
# The checks with streaming fail due to (seemingly) not decoding (or unexpectedly sending response in) GZIP
# Same issue impacted mastodon-py, see https://github.com/halcy/Mastodon.py/commit/cd86887d88bbc07de462d1e00a8fbc3d956c0151 (who just disabled these)
disabledTestPaths = [
"tests/test_client.py"
];
disabledTests = [
"test_indicate_direct_message_typing"
"testcachedifferentqueryparameters"
"testcachedresult"
"testcreatedestroyblock"
"testcreatedestroyfriendship"
"testcreateupdatedestroylist"
"testgetfollowerids"
"testgetfollowers"
"testgetfriendids"
"testgetfriends"
"testgetuser"
"testcursorcursoritems"
"testcursorcursorpages"
"testcursornext"
];
meta = with lib; {
description = "Twitter library for Python";
homepage = "https://github.com/tweepy/tweepy";
changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ marius851000 ];
};
}
pkgs/development/python-modules/whodap/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "whodap";
version = "0.1.10";
version = "0.1.11";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-5XDTl8NPrYWs7gPTJRDVCiZN3cWQ53/ojhJivBPHUL0=";
hash = "sha256-IX4sxuOxH4rXZlpRiWncXvaB2TkfZl1rKioZ3eqDGHs=";
};
propagatedBuildInputs = [
pkgs/development/tools/mold/default.nix
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "rui314";
repo = "mold";
rev = "v${version}";
hash = "sha256-SahpgmkeGVXqQebtw36IjFwHcbvi0JeiEWkNV3hk3lM=";
hash = "sha256-eX76LRzhAk2n96eMtvbnm4Id99jRCDo3gMlrr5hI3Nw=";
};
nativeBuildInputs = [
pkgs/games/doom-ports/gzdoom/default.nix
+2 -2
View File
@@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gzdoom";
version = "4.11.1";
version = "4.11.3";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "gzdoom";
rev = "g${version}";
fetchSubmodules = true;
hash = "sha256-7PWaqYK7pa6jgl92+a9dqQVVKuE/lvqtm+7p0nfMTNI=";
hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748=";
};
outputs = [ "out" "doc" ];
pkgs/os-specific/linux/displaylink/default.nix
+5 -5
View File
@@ -12,11 +12,11 @@
}:
let
arch =
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
else if stdenv.hostPlatform.system == "i686-linux" then "x86"
bins =
if stdenv.hostPlatform.system == "x86_64-linux" then "x64-ubuntu-1604"
else if stdenv.hostPlatform.system == "i686-linux" then "x86-ubuntu-1604"
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu"
else throw "Unsupported architecture";
bins = "${arch}-ubuntu-1604";
libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ];
in
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.displaylink.com/";
license = licenses.unfree;
maintainers = with maintainers; [ abbradar ];
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
hydraPlatforms = [];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
pkgs/os-specific/linux/evdi/default.nix
+1 -1
View File
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = with licenses; [ lgpl21Only gpl2Only ];
homepage = "https://www.displaylink.com/";
broken = kernel.kernelOlder "4.19" || stdenv.isAarch64;
broken = kernel.kernelOlder "4.19";
};
}
pkgs/servers/home-assistant/component-packages.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.11.0";
version = "2023.11.1";
components = {
"3_day_blinds" = ps: with ps; [
];
pkgs/servers/home-assistant/default.nix
+3 -13
View File
@@ -97,16 +97,6 @@ let
};
});
holidays = super.holidays.overridePythonAttrs (oldAttrs: rec {
version = "0.28";
src = fetchFromGitHub {
owner = "dr-prodigy";
repo = "python-holidays";
rev = "refs/tags/v.${version}";
hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4=";
};
});
intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec {
version = "2.2.2";
src = fetchFromGitHub {
@@ -365,7 +355,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.11.0";
hassVersion = "2023.11.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -381,7 +371,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q=";
hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs=";
};
# Secondary source is git for tests
@@ -389,7 +379,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM=";
hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I=";
};
nativeBuildInputs = with python.pkgs; [
pkgs/servers/home-assistant/stubs.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.11.0";
version = "2023.11.1";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI=";
hash = "sha256-eLmWOMKLzhZ7M/gdUHhlDZ3T+N4h5aHxMwOI8ZUepps=";
};
nativeBuildInputs = [
pkgs/servers/openvscode-server/default.nix
+18 -8
View File
@@ -12,7 +12,9 @@
, python3
, esbuild
, nodejs
, node-gyp
, libsecret
, libkrb5
, xorg
, ripgrep
, AppKit
@@ -37,12 +39,12 @@ let
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.16.17";
version = "0.17.14";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
@@ -58,13 +60,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openvscode-server";
version = "1.79.2";
version = "1.84.0";
src = fetchFromGitHub {
owner = "gitpod-io";
repo = "openvscode-server";
rev = "openvscode-server-v${finalAttrs.version}";
hash = "sha256-u5LuDcKTN4CEpRnFCeEbni6hiDDwTV9LUEmXaQYJvJw=";
hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ=";
};
yarnCache = stdenv.mkDerivation {
@@ -87,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE=";
outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw=";
};
nativeBuildInputs = [
@@ -102,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
++ (with xorg; [ libX11 libxkbfile ])
++ (with xorg; [ libX11 libxkbfile libkrb5 ])
++ lib.optionals stdenv.isDarwin [
AppKit
Cocoa
@@ -140,8 +142,16 @@ stdenv.mkDerivation (finalAttrs: {
# set offline mirror to yarn cache we created in previous steps
yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}"
# set nodedir, so we can build binaries later
npm config set nodedir "${nodejs}"
# set nodedir to prevent node-gyp from downloading headers
# taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
mkdir -p $HOME/.node-gyp/${nodejs.version}
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
export npm_config_nodedir=${nodejs}
# use updated node-gyp. fixes the following error on Darwin:
# PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil'
export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js
runHook postConfigure
'';
pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
version = "2.5.4";
version = "2.6.1";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
hash = "sha256-fahL+8aq4rUGYgEq6ri5wzVprDqvMmZCNkxwKtcPO68=";
hash = "sha256-mC8cDLfTu/gpMjNfXGCAV8EhE+kMq2MofzibIWijX3w=";
};
buildInputs = [ postgresql ];
pkgs/servers/web-apps/pict-rs/default.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "pict-rs";
version = "0.4.3";
version = "0.4.5";
src = fetchFromGitea {
domain = "git.asonix.dog";
owner = "asonix";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gUBSPkfIjvIU94tdasaoSl8zKPdfZ2PuT7sD8zU+iCI=";
sha256 = "sha256-kCWzje3tGfSn3gSdS4AFsoWFOLV9DhWKmzJltZs1KqY=";
};
cargoHash = "sha256-ENFFhZ+OUcQPmQoYj5xFmUBJpofe8ovQgcEepujwcFA=";
cargoHash = "sha256-PiKkCiMNMbgBN8qJvzHnZBC782uKsS9aGyKEzG0cEec=";
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
pkgs/shells/oil/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
pname = "oil";
version = "0.17.0";
version = "0.18.0";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
hash = "sha256-H7oWI3+660MhMdDTTPX11/YalnItzhxfdBrtwKR8xrM=";
hash = "sha256-ll4YmmP9A9EpnIyd4Pv8Ot8lrK/grsWzqgn6am9PIRE=";
};
postPatch = ''
pkgs/tools/security/arti/default.nix
+3 -3
View File
@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
version = "1.1.9";
version = "1.1.10";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
sha256 = "sha256-nce+WpT9uloO9Ce/h1ziPWJhYMcL4yZvYO1EP8AEfxI=";
sha256 = "sha256-/O13n9YPY0RhSnSM9vJzLTXNuXT6iWrPo7S8EnnKIkw=";
};
cargoHash = "sha256-Qqm39QK+/rCmad3dJLVPGd7ZKP8ldtFI+NnxC6iQUBA=";
cargoHash = "sha256-LfqieUMWRL+86p0DyitxdfUGVwPtfhcwiwKYMqOZtdc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
pkgs/tools/security/cfripper/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.13.2";
version = "1.14.0";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-wcOtj56l2bUYE+WdbDwtB3aWlP2zEAFaaqw4THcHxbY=";
hash = "sha256-f8abfrYoEwmlQBl0eRFfigw2SrfPCL3+88bwc8miKEk=";
};
propagatedBuildInputs = with python3.pkgs; [
pkgs/tools/security/hcxtools/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
version = "6.3.1";
version = "6.3.2";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
sha256 = "sha256-EDTxzstQwQy7MSkdi1nQis8qEm8ZPblkeOkM8B48IRE=";
sha256 = "sha256-ZEkuWGt2PGkFW1RXCyrUiew92N4ov35mMObHk1xD6uM=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/top-level/all-packages.nix
+2 -1
View File
@@ -36369,9 +36369,10 @@ with pkgs;
vscodium-fhsWithPackages = vscodium.fhsWithPackages;
openvscode-server = callPackage ../servers/openvscode-server {
nodejs = nodejs_16;
nodejs = nodejs_18;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
inherit (darwin) cctools;
inherit (nodePackages) node-gyp;
};
code-server = callPackage ../servers/code-server {