Merge master into staging-next
This commit is contained in:
@@ -11770,6 +11770,12 @@
|
||||
githubId = 56772267;
|
||||
name = "Jürgen Hahn";
|
||||
};
|
||||
jherland = {
|
||||
email = "johan@herland.net";
|
||||
github = "jherland";
|
||||
githubId = 547031;
|
||||
name = "Johan Herland";
|
||||
};
|
||||
jhh = {
|
||||
email = "jeff@j3ff.io";
|
||||
github = "jhh";
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
gettext,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
# runtime
|
||||
adwaita-icon-theme,
|
||||
@@ -43,10 +44,9 @@
|
||||
python3,
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quodlibet${tag}";
|
||||
version = "4.6.0-unstable-2024-08-08";
|
||||
version = "4.7.1";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@@ -57,14 +57,21 @@ python3.pkgs.buildPythonApplication {
|
||||
src = fetchFromGitHub {
|
||||
owner = "quodlibet";
|
||||
repo = "quodlibet";
|
||||
rev = "3dcf31dfc8db9806d1f73a47fdabc950d35ded1d";
|
||||
hash = "sha256-8qWuxTvMF6ksDkbZ6wRLPCJK1cSqgGMPac/ht6qVpnA=";
|
||||
tag = "release-${version}";
|
||||
hash = "sha256-xr3c1e4tjw2YHuKbvNeUPBIFdHEcpztqXjHVDSSxYlo=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-gdist-python-3.12.patch ];
|
||||
# Fix "E ModuleNotFoundError: No module named 'distutils'" in Python 3.12 or newer
|
||||
patches = [ ./fix-gdist-python-3.12-and-newer.patch ];
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
postPatch = ''
|
||||
# Fix "FileExistsError: File already exists: /nix/store/<...>-quodlibet-4.7.1/bin/quodlibet"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'quodlibet = "quodlibet.main:main"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
gettext
|
||||
@@ -118,7 +125,8 @@ python3.pkgs.buildPythonApplication {
|
||||
++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ]
|
||||
++ lib.optionals withPahoMqtt [ paho-mqtt ]
|
||||
++ lib.optionals withPypresence [ pypresence ]
|
||||
++ lib.optionals withSoco [ soco ];
|
||||
++ lib.optionals withSoco [ soco ]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ];
|
||||
|
||||
nativeCheckInputs =
|
||||
[
|
||||
@@ -127,6 +135,7 @@ python3.pkgs.buildPythonApplication {
|
||||
glibcLocales
|
||||
hicolor-icon-theme
|
||||
xvfb-run
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
polib
|
||||
@@ -152,7 +161,6 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
preCheck = ''
|
||||
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
export HOME=$(mktemp -d)
|
||||
export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS"
|
||||
'';
|
||||
|
||||
@@ -167,10 +175,10 @@ python3.pkgs.buildPythonApplication {
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString (kakasi != null) ''
|
||||
gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)
|
||||
gappsWrapperArgs+=(--prefix PATH : ${lib.getBin kakasi})
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GTK-based audio player written in Python, using the Mutagen tagging library";
|
||||
longDescription = ''
|
||||
Quod Libet is a GTK-based audio player written in Python, using
|
||||
@@ -186,8 +194,8 @@ python3.pkgs.buildPythonApplication {
|
||||
& internet radio, and all major audio formats.
|
||||
'';
|
||||
homepage = "https://quodlibet.readthedocs.io/en/latest";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
coroa
|
||||
pbogdan
|
||||
];
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
libpng,
|
||||
gsl,
|
||||
libsndfile,
|
||||
@@ -15,15 +18,15 @@
|
||||
assert withOpenCL -> opencl-clhpp != null;
|
||||
assert withOpenCL -> ocl-icd != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mandelbulber";
|
||||
version = "2.32";
|
||||
version = "2.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buddhi1980";
|
||||
repo = "mandelbulber2";
|
||||
rev = version;
|
||||
sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE=";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-3PPgH9E+k2DFm8ib1bmvTsllQ9kYi3oLDwPHcs1Otac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,13 +48,25 @@ stdenv.mkDerivation rec {
|
||||
ocl-icd
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/mandelbulber2";
|
||||
sourceRoot = "${finalAttrs.src.name}/mandelbulber2";
|
||||
|
||||
qmakeFlags = [
|
||||
"SHARED_PATH=${placeholder "out"}"
|
||||
(if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro")
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
test = runCommand "mandelbulber2-test" {
|
||||
nativeBuildInputs = [
|
||||
finalAttrs.finalPackage
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
} "mandelbulber2 --test && touch $out";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "3D fractal rendering engine";
|
||||
mainProgram = "mandelbulber2";
|
||||
@@ -61,4 +76,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kovirobi ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
with python3Packages;
|
||||
mkDerivationWith buildPythonPackage rec {
|
||||
pname = "plover";
|
||||
version = "4.0.0.dev10";
|
||||
version = "4.0.2";
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
@@ -28,8 +28,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstenoproject";
|
||||
repo = "plover";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns=";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
|
||||
};
|
||||
|
||||
# I'm not sure why we don't find PyQt5 here but there's a similar
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fldigi";
|
||||
version = "4.2.06";
|
||||
version = "4.2.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-Q2DeIl1vjP65u2pb5qxJLlJwLI9wT4dgnEUtO8sbbAg=";
|
||||
hash = "sha256-9KpTh0fBqiVC901R1PdH2SEya32Ijl+jkxSSpFuhs6o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -24,34 +24,19 @@
|
||||
xvfb-run,
|
||||
gitUpdater,
|
||||
md4c,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellarium";
|
||||
version = "25.1";
|
||||
version = "25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs=";
|
||||
hash = "sha256-2QK9dHflCdmDrRXEHCBpuJR73jsMz9D9lJNa1pbfrTs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patch from upstream to fix compilation with Qt 6.9
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Stellarium/stellarium/commit/bbcd60ae52b6f1395ef2390a2d2ba9d0f98db548.patch";
|
||||
hash = "sha256-9VaqLASxn1udUApDZRI5SCqCXNGOHUcdbM+pKhW8ZAg=";
|
||||
})
|
||||
|
||||
# Upstream patch to support building with a locally provided md4c package
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Stellarium/stellarium/commit/972c6ba72f575964fbf2049a22d51b4d1fd3983c.patch";
|
||||
hash = "sha256-ef1Jw5NeT0KLVKQt7VcvQh83n2ujMFK+Nv0165ZQ2r8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "app2unit";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vladimir-csp";
|
||||
repo = "app2unit";
|
||||
tag = "v${version}";
|
||||
sha256 = "fw6Vh3Jyop95TQdOFrpspbauSfqMpd0BZkZVc1k6+K0=";
|
||||
sha256 = "sha256-CwiB/Co75BbVXem2XD2i7kccgjcDk8a0lXCOoz0QVIc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
|
||||
buildGo123Module (finalAttrs: {
|
||||
pname = "avalanchego";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = "avalanchego";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t6KruPHt51wJ4aJaCG/8tuwKYtaifHvQ3z9oVknNS4E=";
|
||||
hash = "sha256-AyYBPkMPwgbxgr5Q/mpAUpsXhQ9Y++91XkPHScZ1MtI=";
|
||||
};
|
||||
|
||||
# https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-iyx9k8mPPOwpHo9lEdNPf0sQHxbKbNTVLUZrPYY8dWM=";
|
||||
vendorHash = "sha256-pMrkXv9vgED6e1qtgz+pJj3T0Nyemy0PKr8w7ZiKbgk=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "az-pim-cli";
|
||||
@@ -43,14 +44,15 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/az-pim-cli completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
command = "HOME=$TMPDIR az-pim-cli version";
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "version";
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";
|
||||
|
||||
@@ -2,23 +2,33 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
python3Packages,
|
||||
rsync,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.13.3";
|
||||
version = "3.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = "barman";
|
||||
tag = "release/${version}";
|
||||
hash = "sha256-ffedLH7b/Z1y+yL5EkFJIGdksQZEKc3uu3KOyNc2plw=";
|
||||
hash = "sha256-Z3+PgUJcyG/M05hMmIhRr3HttzHUDx7BGIs44LA/qE4=";
|
||||
};
|
||||
|
||||
patches = [ ./unwrap-subprocess.patch ];
|
||||
patches = [
|
||||
./unwrap-subprocess.patch
|
||||
# fix building with Python 3.13
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/EnterpriseDB/barman/commit/931f997f1d73bbe360abbca737bea9ae93172989.patch?full_index=1";
|
||||
hash = "sha256-0aqyjsEabxLf4dpC4DeepmypAl7QfCedh7vy98iVifU=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
distutils
|
||||
@@ -40,12 +50,13 @@ python3Packages.buildPythonApplication rec {
|
||||
python-snappy
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
mock
|
||||
pytestCheckHook
|
||||
nativeCheckInputs = [
|
||||
python3Packages.lz4
|
||||
python3Packages.mock
|
||||
python3Packages.pytestCheckHook
|
||||
python3Packages.zstandard
|
||||
rsync
|
||||
versionCheckHook
|
||||
zstandard
|
||||
lz4
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
@@ -59,10 +70,19 @@ python3Packages.buildPythonApplication rec {
|
||||
"test_get_file_mode"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^release/(\\d+\\.\\d+\\.\\d+)$"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Backup and Recovery Manager for PostgreSQL";
|
||||
homepage = "https://www.pgbarman.org/";
|
||||
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${src.tag}/NEWS";
|
||||
changelog = "https://github.com/EnterpriseDB/barman/blob/${src.tag}/RELNOTES.md";
|
||||
mainProgram = "barman";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ freezeboy ];
|
||||
|
||||
@@ -34,26 +34,27 @@ python3Packages.buildPythonApplication rec {
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
click
|
||||
dulwich
|
||||
grpcio
|
||||
jinja2
|
||||
markupsafe
|
||||
packaging
|
||||
pluginbase
|
||||
protobuf
|
||||
psutil
|
||||
pyroaring
|
||||
requests
|
||||
ruamel-yaml
|
||||
ruamel-yaml-clib
|
||||
tomlkit
|
||||
ujson
|
||||
];
|
||||
dependencies =
|
||||
[ buildbox ]
|
||||
++ (with python3Packages; [
|
||||
click
|
||||
dulwich
|
||||
grpcio
|
||||
jinja2
|
||||
markupsafe
|
||||
packaging
|
||||
pluginbase
|
||||
protobuf
|
||||
psutil
|
||||
pyroaring
|
||||
requests
|
||||
ruamel-yaml
|
||||
ruamel-yaml-clib
|
||||
tomlkit
|
||||
ujson
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
buildbox
|
||||
fuse3
|
||||
lzip
|
||||
patch
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cardinal";
|
||||
version = "24.12";
|
||||
version = "25.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
|
||||
hash = "sha256-iXurkftPCfTL3a2zH1RSGIyMISFiUhDawyndNhY8Ynk=";
|
||||
hash = "sha256-siZbbYrMGjhiof2M2ZBl2gekePuwsKvR8uZCdjyywiE=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ciao";
|
||||
version = "1.24.0-m1";
|
||||
version = "1.25.0-m1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ciao-lang";
|
||||
repo = "ciao";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vjDiYL6yVfLo7NrVKdYRxMUrg7aqQHTezqNoDJcsEuI=";
|
||||
sha256 = "sha256-jsHz50+R/bs19ees3kKYalYk72ET9eSAAUY7QogI0go=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cifs-utils";
|
||||
version = "7.3";
|
||||
version = "7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-xOHrX0rYgNluFtlaHNvH7JeKtRxbbYogrgnaxjjzbdU=";
|
||||
sha256 = "sha256-UzU9BcMLT8nawAao8MUFTN2KGDTBdjE8keRpQCXEuJE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,30 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyberchef";
|
||||
let
|
||||
icon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/gchq/CyberChef/c57556f49f723863b9be15668fd240672cd15b09/src/web/static/images/cyberchef-512x512.png";
|
||||
hash = "sha256-Lg9JbVHhdILdrRtxYFWSv9HNJUx98JOaTbs+IbS1eO0=";
|
||||
};
|
||||
desktopItem = (
|
||||
makeDesktopItem {
|
||||
name = "cyberchef";
|
||||
desktopName = "Cyberchef";
|
||||
exec = "cyberchef";
|
||||
icon = "cyberchef";
|
||||
comment = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
|
||||
categories = [ "Development" ];
|
||||
}
|
||||
);
|
||||
version = "10.19.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cyberchef";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
|
||||
sha256 = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY=";
|
||||
hash = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/cyberchef"
|
||||
mkdir -p "$out/bin"
|
||||
|
||||
mv "CyberChef_v${version}.html" index.html
|
||||
mv * "$out/share/cyberchef"
|
||||
|
||||
cat <<INI > $out/bin/cyberchef
|
||||
#!/bin/sh
|
||||
xdg-open $out/share/cyberchef/index.html
|
||||
INI
|
||||
|
||||
chmod +x $out/bin/cyberchef
|
||||
|
||||
install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/cyberchef.png
|
||||
|
||||
mkdir -p $out/share/applications/
|
||||
cp ${desktopItem}/share/applications/*.desktop $out/share/applications/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
|
||||
homepage = "https://gchq.github.io/CyberChef";
|
||||
changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [ sebastianblunt ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sebastianblunt
|
||||
aldenparker
|
||||
];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
testers,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
dprint,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -62,16 +62,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--fish <($out/bin/dprint completions fish)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/dprint";
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
inherit (finalAttrs) version;
|
||||
|
||||
package = dprint;
|
||||
command = ''
|
||||
DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version
|
||||
'';
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dump";
|
||||
version = "0.4b48";
|
||||
version = "0.4b51";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dump/dump-${version}.tar.gz";
|
||||
sha256 = "sha256-qT6WPMIMXUfq2dedK0OeDV12gV7ewlFpEVUckOYOxRk=";
|
||||
sha256 = "sha256-huaDpzNVNMkVzwpQUlPay/RrYiSnD79or3RgsWPkU+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "21.0.0";
|
||||
version = "21.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Wnp3qkF7e358uGftBy5vi3GandyZsAyxESvgUFB7mmM=";
|
||||
hash = "sha256-T+5qZBziXiCeCJJaW/EcbgnRLv+AUKDD4ODKbJKvbjY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
+12
-12
@@ -1,30 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtwebengine,
|
||||
libsForQt5,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitqlient";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "francescmm";
|
||||
repo = "gitqlient";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtwebengine
|
||||
libsForQt5.qtwebengine
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
@@ -35,12 +35,12 @@ mkDerivation rec {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/francescmm/GitQlient";
|
||||
description = "Multi-platform Git client written with Qt";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ romildo ];
|
||||
mainProgram = "gitqlient";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -36,12 +36,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glamoroustoolkit";
|
||||
version = "1.1.24";
|
||||
version = "1.1.32";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-dTJ2YMNZwpZj3ZDWegjFr9aiaUtTpN8gY1wq5SAoVvs=";
|
||||
hash = "sha256-uZrq4RM50NcQPHFFfqIRBJ/rq/I09D8WxKz3/xqpOEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-task";
|
||||
version = "3.43.3";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-task";
|
||||
repo = "task";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZIZdk0yyykjjSdH6YG8K8WpI8e8426odk8RxISsJe80=";
|
||||
hash = "sha256-hZi1BSVv3Z+OzJyNvruyDbxYjTgfERnssWZaK0HGQmc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3Uu0ozwOgp6vQh+s9nGKojw6xPUI49MjjPqKh9g35lQ=";
|
||||
vendorHash = "sha256-8OLWIAikKqmj3tXRO7Ro3VFItKDrhVh6n8pHbBM9Nrc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.26.3";
|
||||
version = "2.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-e/TPCli2wXyzEpn84hZdtVaAmXJK+d0vMRLilXohiN8=";
|
||||
sha256 = "sha256-q1jYruLeXjXu5KmUpwSxzwLusKxSrf2RMirwdPN0Uf4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Des02yenoa6am0xIqto7xlOWHh44F5EBVEhi9t+v644=";
|
||||
vendorHash = "sha256-Sa2AOwX0McSGQs1Y0evVhdhpjHNNcgyouOtu6H9/AYI=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.version=${version}"
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "guacamole-client";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war";
|
||||
hash = "sha256-QmcwfzYAZjcj8kr5LVlumcg1lCUxUTUFKkLUUflSkgA=";
|
||||
hash = "sha256-tBzrHi3wELVNtWPgsA7bjV/p8HPGFoRi5Ml43w/G5xY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "itgmania";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itgmania";
|
||||
repo = "itgmania";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-OGOvC7/NmEsWXVw4bFjqdT/Hg3Ypbwct//uWuW3/f1o=";
|
||||
hash = "sha256-C9qVUZdRnKbQgfgbXnzT+lI2+FEXBaMQv/U6UF5wyzo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "3.3.12",
|
||||
"version": "3.3.13",
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12.AppImage",
|
||||
"sha256": "1fjrblmlpm6sf4jdvifmyxic0rw2bs1f4sbw3nz4xy7wlsab5f62"
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.AppImage",
|
||||
"sha256": "1gd5qlkjwrx8kxx5d97r58v5wxw4zbzjblr24ydjqbbfhjrr1zr2"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12.dmg",
|
||||
"sha256": "0rk5jl7i7sj31336r8yn8wf9h4xwdwi66wvwrkblvxrfhgddn2gj"
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.dmg",
|
||||
"sha256": "05v5idqnajlya83ax252xs6d1nc0p6679aihij35b885nqiql6f5"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12-arm64.dmg",
|
||||
"sha256": "13m4nypg1v5d7i13has9f1sp08dijc44962dr75b9jfiq8q6ciz6"
|
||||
"url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13-arm64.dmg",
|
||||
"sha256": "1bafq33n0qdw4hxbq3mp2499zpzz0kc4gqh9cdp650994kmq8207"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,13 +41,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "koboldcpp";
|
||||
version = "1.92";
|
||||
version = "1.94";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LostRuins";
|
||||
repo = "koboldcpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tVY8j3RlRiZ3UK5YTzyhV77nk97jRF8frtjq4Ws84WU=";
|
||||
hash = "sha256-qWH8yGjDTkMPLHjfMopfQKyBA5T1HHgllEH9Joceq3s=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libaec";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.dkrz.de";
|
||||
owner = "k202009";
|
||||
repo = "libaec";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4WS3l79v9CTFBLuJmNMMK7RRNPLSa5KYID3W4aGMTuE=";
|
||||
sha256 = "sha256-MJFx0gErfrSK6EeeGDk8CQWj6j4PVvFPJEI/iys3bI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdatachannel";
|
||||
version = "0.22.6";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paullouisageneau";
|
||||
repo = "libdatachannel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Xn2RfPFvCIx7gTFqxXbFVJZDkphZR94SAHJ+0ombf+8=";
|
||||
hash = "sha256-bzheNNG6J0tswFZT+Vlqm2FS9MArois46yb8XeL5YqI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.159.5";
|
||||
version = "1.160.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs=";
|
||||
hash = "sha256-F88mDic6cnSa8mHhr+uX2WORFgJOu9LChLIS6DqWc40=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg=";
|
||||
hash = "sha256-pZwCcAOYLKR6wfncIyuisYccNSGK+lqUg6lkyfKPgFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
withAdditionalGuestAgents ? false,
|
||||
lima-additional-guestagents,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
testers,
|
||||
writeText,
|
||||
runCommand,
|
||||
@@ -92,14 +93,16 @@ buildGoModule (finalAttrs: {
|
||||
nativeInstallCheckInputs = [
|
||||
# Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/cb99e9f8d01ebb82d000c7912fcadcd87ec13ad5/pkg/limayaml/defaults.go#L53
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/limactl";
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
# Don't use versionCheckHook for this package until Env solutions like #403971 or #411609 are available on the master branch.
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
[[ "$("$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${finalAttrs.version}" ]]
|
||||
USER=nix $out/bin/limactl validate templates/default.yaml
|
||||
|
||||
runHook postInstallCheck
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "localstack";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "localstack";
|
||||
repo = "localstack";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kRAlRJlGdpbSmbffhAIJvWWqKG9nhe6zHCQyxX88gRM=";
|
||||
hash = "sha256-lqFT2Ad92ZjsuKIuaFZ/tes2xJ8PBl0XUvqRmppWL0c=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "louvre";
|
||||
version = "2.16.3-1";
|
||||
version = "2.18.1-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CuarzoSoftware";
|
||||
repo = "Louvre";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZdV/KvYnPN4IKU6kbjDhCgcC3TdWqZbNJzDt39ZQ2x8=";
|
||||
hash = "sha256-wkOY3ARq7x3roRflRN8rMSbrI5B4amI+0CVJmfLYx2w=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
php,
|
||||
testers,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "magento-cloud";
|
||||
@@ -32,12 +33,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "HOME=$TMPDIR magento-cloud --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nerdfetch";
|
||||
version = "8.3.1";
|
||||
version = "8.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThatOneCalculator";
|
||||
repo = "NerdFetch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ptd699Q2kX+04TGnChQK45dBf0W1QUFk7vHpRl3kFKo=";
|
||||
hash = "sha256-KMu/cMjRFEyfRxoKDGn4PfubGCrotVsKQ9wwc1wQaVM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.9.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M=";
|
||||
hash = "sha256-AZ8vrDtpVADW8NMq/MBpYd6VSMcuFzk67UXoXdPeiPk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-TELyc62l/8IaX9eL2lxRFth0AAZ4LXsV2WNzXSHRnTw=";
|
||||
npmDepsHash = "sha256-XNAphh1zNi4enf0Mz9TUgWyZHezTuctMPTBswKO4eW8=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
installPhase = ''
|
||||
@@ -30,6 +30,8 @@ buildNpmPackage rec {
|
||||
description = "NetBird Management Service Web UI Panel";
|
||||
homepage = "https://github.com/netbirdio/dashboard";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [
|
||||
patrickdag
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openturns";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openturns";
|
||||
repo = "openturns";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-88wxgifLuF/P/qeMLVP0S5Agutf022Dsysu38mh9+8w=";
|
||||
hash = "sha256-lAFfOwriDdYvfRK/5vEQ/v97o3l/aH8jPHCVf9vlfV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polylith";
|
||||
version = "0.2.21";
|
||||
version = "0.2.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
|
||||
sha256 = "sha256-w1STu6+OzEhZ3MnfXer6QRQauEfW15iMIiiMN+nxAe0=";
|
||||
sha256 = "sha256-DKJ669TeDFK/USi7UxraAqgqnSCkG/nSIGphvpsmUv8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -13,12 +13,12 @@ let
|
||||
{
|
||||
aarch64-darwin = {
|
||||
arch = "arm64";
|
||||
sha256 = "sha256-w1zu+sK8JqBMGBaKPYGJqddEWYWCv1aJRM+Q91l5dPw=";
|
||||
sha256 = "sha256-KOvYt3VL1hZAyf6T+3whMTyhHgndnlZO0e3L1KtDxqE=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "64";
|
||||
sha256 = "sha256-dlRK6NpDskuIW0nuf9mWx/xolOnGmH77ny+2ADaD7QU=";
|
||||
sha256 = "sha256-LCpxbDgcIbVmA7RYykli7gLGb0FWQ4LigxghZYEv1Bk=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system}
|
||||
|
||||
@@ -56,12 +56,12 @@ let
|
||||
{
|
||||
aarch64-linux = {
|
||||
arch = "arm64";
|
||||
sha256 = "sha256-XtY5SmYoU2OhX69jRb8uSGwx5vPiSfgmF2jY7mJIrTY=";
|
||||
sha256 = "sha256-XOQam1W7YT0YDesDR51G/cH318DcxpnAEiJg2JZU3Q4=";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
arch = "64";
|
||||
sha256 = "sha256-eEgUk3VnahmFua8UrNMUi2lG0UujiuDTs64XqaAkYe8=";
|
||||
sha256 = "sha256-TE/AMWkj80+22WaOG2BK6vt4NnMSpBq9hQMwSPiQ12A=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "11.46.6";
|
||||
version = "11.50.5";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.getpostman.com";
|
||||
changelog = "https://www.postman.com/release-notes/postman-app/#${
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
libpng,
|
||||
libiconv,
|
||||
@@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "fukuchi";
|
||||
repo = "libqrencode";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nbrmg9SqCqMrLE7WCfNEzMV/eS9UVCKCrjBrGMzAsLk";
|
||||
};
|
||||
|
||||
@@ -48,22 +49,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: {
|
||||
configureFlags = [ "--with-tests" ];
|
||||
doCheck = true;
|
||||
});
|
||||
passthru = {
|
||||
tests = finalAttrs.finalPackage.overrideAttrs {
|
||||
configureFlags = [ "--with-tests" ];
|
||||
doCheck = true;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://fukuchi.org/works/qrencode/";
|
||||
description = "C library for encoding data in a QR Code symbol";
|
||||
description = "C library and command line tool for encoding data in a QR Code symbol";
|
||||
longDescription = ''
|
||||
Libqrencode is a C library for encoding data in a QR Code symbol,
|
||||
a kind of 2D symbology that can be scanned by handy terminals
|
||||
such as a mobile phone with CCD.
|
||||
such as a smartphone.
|
||||
|
||||
The library also contains qrencode, a command-line utility to output
|
||||
QR Code images in various formats.
|
||||
'';
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ lib.maintainers.mdaniels5757 ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "qrencode";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-06-12";
|
||||
version = "0-unstable-2025-06-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "1f7e019500a87027fd03f89e148e52b71946e4c0";
|
||||
hash = "sha256-xw7MaPUXLZOla8LfmhdiFbf8xLke3OKh1wwBdWm9ENo=";
|
||||
rev = "1aee62f52cb02cbdb054c233a350f4f07d828e48";
|
||||
hash = "sha256-5gK2JTct89HrjJHAVAPxEUyKf6ukHExFgNb3Os4kv9M=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snowflake-cli";
|
||||
version = "3.7.2";
|
||||
version = "3.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snowflakedb";
|
||||
repo = "snowflake-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MCJl6Mkkkp9JkG+8ZNfWAYQFMJccdtKfPdcnfaY8Y3w=";
|
||||
hash = "sha256-2g3EiJ4mgqbyfF9brCvIWJGblWUtaBAO8qor2AeN8mU=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec {
|
||||
urllib3
|
||||
gitpython
|
||||
pydantic
|
||||
prompt-toolkit
|
||||
snowflake-core
|
||||
snowflake-connector-python
|
||||
];
|
||||
|
||||
@@ -72,6 +74,12 @@ python3Packages.buildPythonApplication rec {
|
||||
"test_executing_command_sends_telemetry_usage_data" # Fails on mocked version
|
||||
"test_internal_application_data_is_sent_if_feature_flag_is_set"
|
||||
"test_if_bundling_dependencies_resolves_requirements" # impure?
|
||||
"test_silent_output_help" # Snapshot needs update? Diff between received and snapshot is the word 'TABLE' moving down a line
|
||||
"test_new_connection_can_be_added_as_default" # Snapshot needs update? Diff between received and snapshot is an empty line
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/app/test_version_check.py"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-dFTdbMX355klZ2wY160bYcgMiOiOGplEU7/e6Btv5JI=";
|
||||
cargoHash = "sha256-PfpbzawgwkqykG4u2G05rgZwksuxWJUcv6asnJvZJvU=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "squirreldisk-${version}-npm-deps";
|
||||
@@ -51,6 +51,13 @@ rustPlatform.buildRustPackage rec {
|
||||
./update-pdu-json-format.patch
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
# Remove dependency on parallel-disk-usage crate. The version is outdated and
|
||||
# does not compile anymore with Rust 1.87.0.
|
||||
# https://github.com/adileo/squirreldisk/pull/49
|
||||
./remove-pdu-crate.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use pdu binary from nixpkgs instead of the vendored prebuilt binary
|
||||
rm src-tauri/bin/pdu-*
|
||||
|
||||
@@ -0,0 +1,487 @@
|
||||
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
|
||||
index 667c8b7..440d72a 100644
|
||||
--- a/src-tauri/Cargo.lock
|
||||
+++ b/src-tauri/Cargo.lock
|
||||
@@ -38,12 +38,6 @@ version = "1.0.68"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
|
||||
|
||||
-[[package]]
|
||||
-name = "assert-cmp"
|
||||
-version = "0.2.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "737bf4aa6df38f69a17efc233b4d0343cc5aa0d2c3b53e7007bd4c9866038ffd"
|
||||
-
|
||||
[[package]]
|
||||
name = "atk"
|
||||
version = "0.15.1"
|
||||
@@ -252,64 +246,6 @@ version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
-[[package]]
|
||||
-name = "clap"
|
||||
-version = "4.1.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
|
||||
-dependencies = [
|
||||
- "bitflags",
|
||||
- "clap_derive",
|
||||
- "clap_lex",
|
||||
- "is-terminal",
|
||||
- "once_cell",
|
||||
- "strsim",
|
||||
- "termcolor",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "clap-utilities"
|
||||
-version = "0.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "15bcff807ef65113605e59223ac0ce77adc2cc0976e3ece014e0f2c17e4a7798"
|
||||
-dependencies = [
|
||||
- "clap",
|
||||
- "clap_complete",
|
||||
- "pipe-trait",
|
||||
- "thiserror",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "clap_complete"
|
||||
-version = "4.1.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75"
|
||||
-dependencies = [
|
||||
- "clap",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "clap_derive"
|
||||
-version = "4.1.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
|
||||
-dependencies = [
|
||||
- "heck 0.4.0",
|
||||
- "proc-macro-error",
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "clap_lex"
|
||||
-version = "0.3.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
|
||||
-dependencies = [
|
||||
- "os_str_bytes",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "cocoa"
|
||||
version = "0.24.1"
|
||||
@@ -518,38 +454,14 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
|
||||
|
||||
-[[package]]
|
||||
-name = "darling"
|
||||
-version = "0.12.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c"
|
||||
-dependencies = [
|
||||
- "darling_core 0.12.4",
|
||||
- "darling_macro 0.12.4",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.13.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
|
||||
dependencies = [
|
||||
- "darling_core 0.13.4",
|
||||
- "darling_macro 0.13.4",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "darling_core"
|
||||
-version = "0.12.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
|
||||
-dependencies = [
|
||||
- "fnv",
|
||||
- "ident_case",
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "strsim",
|
||||
- "syn",
|
||||
+ "darling_core",
|
||||
+ "darling_macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -566,24 +478,13 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "darling_macro"
|
||||
-version = "0.12.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
|
||||
-dependencies = [
|
||||
- "darling_core 0.12.4",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.13.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
|
||||
dependencies = [
|
||||
- "darling_core 0.13.4",
|
||||
+ "darling_core",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
@@ -599,37 +500,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "derive_builder"
|
||||
-version = "0.10.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30"
|
||||
-dependencies = [
|
||||
- "derive_builder_macro",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "derive_builder_core"
|
||||
-version = "0.10.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5"
|
||||
-dependencies = [
|
||||
- "darling 0.12.4",
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "derive_builder_macro"
|
||||
-version = "0.10.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
|
||||
-dependencies = [
|
||||
- "derive_builder_core",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "0.99.17"
|
||||
@@ -722,27 +592,6 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "errno"
|
||||
-version = "0.2.8"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
||||
-dependencies = [
|
||||
- "errno-dragonfly",
|
||||
- "libc",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "errno-dragonfly"
|
||||
-version = "0.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
- "libc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "1.8.0"
|
||||
@@ -784,16 +633,6 @@ dependencies = [
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "fmt-iter"
|
||||
-version = "0.2.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d0b9289d76691c7084d8830f1d0a29ddefbad768f8b5f276e012840bb0fca610"
|
||||
-dependencies = [
|
||||
- "derive_more",
|
||||
- "itertools",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
@@ -1329,37 +1168,6 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "io-lifetimes"
|
||||
-version = "1.0.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
|
||||
-dependencies = [
|
||||
- "libc",
|
||||
- "windows-sys 0.42.0",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "is-terminal"
|
||||
-version = "0.4.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
|
||||
-dependencies = [
|
||||
- "hermit-abi",
|
||||
- "io-lifetimes",
|
||||
- "rustix",
|
||||
- "windows-sys 0.42.0",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "itertools"
|
||||
-version = "0.10.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
|
||||
-dependencies = [
|
||||
- "either",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.8"
|
||||
@@ -1477,12 +1285,6 @@ dependencies = [
|
||||
"safemem",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "linux-raw-sys"
|
||||
-version = "0.1.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
|
||||
-
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.9"
|
||||
@@ -1892,12 +1694,6 @@ dependencies = [
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "os_str_bytes"
|
||||
-version = "6.4.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
|
||||
-
|
||||
[[package]]
|
||||
name = "overload"
|
||||
version = "0.1.1"
|
||||
@@ -1929,31 +1725,6 @@ dependencies = [
|
||||
"system-deps 6.0.3",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "parallel-disk-usage"
|
||||
-version = "0.8.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e42b33f85d6d5a345c243fff616265c2b8263a44641e88e4afd80f32dbd7279b"
|
||||
-dependencies = [
|
||||
- "assert-cmp",
|
||||
- "clap",
|
||||
- "clap-utilities",
|
||||
- "clap_complete",
|
||||
- "derive_more",
|
||||
- "fmt-iter",
|
||||
- "itertools",
|
||||
- "pipe-trait",
|
||||
- "rayon",
|
||||
- "rounded-div",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "smart-default",
|
||||
- "terminal_size",
|
||||
- "text-block-macros",
|
||||
- "thiserror",
|
||||
- "zero-copy-pads",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
@@ -2115,12 +1886,6 @@ version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
-[[package]]
|
||||
-name = "pipe-trait"
|
||||
-version = "0.4.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2"
|
||||
-
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.26"
|
||||
@@ -2432,12 +2197,6 @@ dependencies = [
|
||||
"windows 0.37.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "rounded-div"
|
||||
-version = "0.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "464c8fb0a126d6a0326baf6abf1aa62c2da0d5780aa781a81451d64f543f5e2f"
|
||||
-
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
version = "0.3.3"
|
||||
@@ -2456,20 +2215,6 @@ dependencies = [
|
||||
"semver 1.0.16",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "rustix"
|
||||
-version = "0.36.7"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
|
||||
-dependencies = [
|
||||
- "bitflags",
|
||||
- "errno",
|
||||
- "io-lifetimes",
|
||||
- "libc",
|
||||
- "linux-raw-sys",
|
||||
- "windows-sys 0.42.0",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.11"
|
||||
@@ -2658,7 +2403,7 @@ version = "1.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
|
||||
dependencies = [
|
||||
- "darling 0.13.4",
|
||||
+ "darling",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
@@ -2747,17 +2492,6 @@ version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
|
||||
-[[package]]
|
||||
-name = "smart-default"
|
||||
-version = "0.6.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
|
||||
-dependencies = [
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "soup2"
|
||||
version = "0.2.1"
|
||||
@@ -2792,7 +2526,6 @@ version = "0.0.0"
|
||||
dependencies = [
|
||||
"cocoa",
|
||||
"objc",
|
||||
- "parallel-disk-usage",
|
||||
"raw-window-handle",
|
||||
"regex",
|
||||
"serde",
|
||||
@@ -3200,31 +2933,6 @@ dependencies = [
|
||||
"utf-8",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "termcolor"
|
||||
-version = "1.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
|
||||
-dependencies = [
|
||||
- "winapi-util",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "terminal_size"
|
||||
-version = "0.2.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
|
||||
-dependencies = [
|
||||
- "rustix",
|
||||
- "windows-sys 0.42.0",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "text-block-macros"
|
||||
-version = "0.1.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7f8b59b4da1c1717deaf1de80f0179a9d8b4ac91c986d5fd9f4a8ff177b84049"
|
||||
-
|
||||
[[package]]
|
||||
name = "thin-slice"
|
||||
version = "0.1.1"
|
||||
@@ -3452,12 +3160,6 @@ version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
|
||||
|
||||
-[[package]]
|
||||
-name = "unicode-width"
|
||||
-version = "0.1.10"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
-
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.3.1"
|
||||
@@ -4036,18 +3738,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "zero-copy-pads"
|
||||
-version = "0.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "5649a5dce1370c707880332f781f6566883736a41861a5749890f4671d5746b6"
|
||||
-dependencies = [
|
||||
- "derive_builder",
|
||||
- "derive_more",
|
||||
- "fmt-iter",
|
||||
- "unicode-width",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "zip"
|
||||
version = "0.6.3"
|
||||
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
|
||||
index c930949..3ae2c83 100644
|
||||
--- a/src-tauri/Cargo.toml
|
||||
+++ b/src-tauri/Cargo.toml
|
||||
@@ -22,7 +22,6 @@ window-vibrancy = "0.3.2"
|
||||
window-shadows = { git = "https://github.com/adileo/window-shadows" }
|
||||
raw-window-handle = "0.5.0"
|
||||
walkdir = "2"
|
||||
-parallel-disk-usage = "0.8.3"
|
||||
regex = "1"
|
||||
|
||||
[target."cfg(target_os = \"windows\")".dependencies]
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
|
||||
index ab70b3c..9e25353 100644
|
||||
--- a/src/engine/client/client.cpp.orig
|
||||
+++ b/src/engine/client/client.cpp
|
||||
@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
|
||||
{
|
||||
char aError[2048];
|
||||
snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
|
||||
- log_error("client", aError);
|
||||
+ log_error("client", "%s", aError);
|
||||
pClient->ShowMessageBox("Config File Error", aError);
|
||||
PerformAllCleanup();
|
||||
return -1;
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "taterclient-ddnet";
|
||||
version = "10.3.0";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjrc6";
|
||||
repo = "taterclient-ddnet";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
|
||||
hash = "sha256-SSf9W+1yl7ExHsifbVM5IN4OfZvMdz62xMfdb++38II=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -80,10 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
./client_log_format_security.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/engine/shared/storage.cpp \
|
||||
--replace-fail /usr/ $out/
|
||||
@@ -101,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Since we are not building the server executable, the `run_tests` Makefile target
|
||||
# will not be generated.
|
||||
#
|
||||
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
|
||||
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.4.0/CMakeLists.txt#L3088
|
||||
doCheck = false;
|
||||
|
||||
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tauno-monitor";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taunoe";
|
||||
repo = "tauno-monitor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-144kRMhZUwgn3BRy6c0A5Fwh1Yisuf7H2s/0ChpIKVI=";
|
||||
hash = "sha256-WsBov5ftt0lXw3fC04EGAFj1imDaPAmKvWDC5a1y9+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "7.4.3";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7F0yrU7OW3qVglQonQLWH66lPw0CwgDWt/Y/+zrnWLM=";
|
||||
hash = "sha256-y++cW+N6KPm+/g4pqvPeTfiuR6IRiSMONJ0tJ4+5ym0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "voxinput";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "richiejp";
|
||||
repo = "VoxInput";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ykWb5I3cd3DMDVqYrcmOtCKhLpmob7HBXs5Ek5E7/do=";
|
||||
hash = "sha256-kIKvgPojlkIpDjxaFsHXEvHX3txW9GbachRFksA/Ymg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OserWlRhKyTvLrYSikNCjdDdTATIcWTfqJi9n4mHVLE=";
|
||||
vendorHash = "sha256-Qcc/Y7xRaERuu3SIvn/jwTtj+xKii4EZvFsewGG687Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gtest,
|
||||
openblas,
|
||||
xtensor,
|
||||
xtl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xtensor-blas";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xtensor-blas";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Lg6MjJbZUCMqv4eSiZQrLfJy/86RWQ9P85UfeIQJ6bk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
xtensor
|
||||
xtl
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
openblas
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
# Disable some failing tests
|
||||
env.GTEST_FILTER =
|
||||
"-"
|
||||
+ lib.concatStringsSep ":" [
|
||||
"xlapack.*"
|
||||
"xlinalg.*"
|
||||
"xtest_extended.*"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Extension to the xtensor library offering bindings to BLAS and LAPACK";
|
||||
homepage = "https://github.com/QuantStack/xtensor-blas";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ jherland ];
|
||||
};
|
||||
})
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.3.3.3";
|
||||
version = "2.3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = "yoshimi";
|
||||
rev = version;
|
||||
hash = "sha256-i6kzVtg2ukob0QBr/hbxblm+eTkPIKbnGLpFdUl/zGQ=";
|
||||
hash = "sha256-d0NA4/uCC1jhksM7KOi+SXqeLiq9XZimXV0KUyRhWGs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsmith-api";
|
||||
version = "2.0.18";
|
||||
version = "2.0.20";
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_api";
|
||||
inherit format version;
|
||||
hash = "sha256-5Mnf1VaEhfhTdmIaSCW5vUDcKc4zWF3IELP1y+1oi48=";
|
||||
hash = "sha256-ZZeXXWcefJK8iSdSs8+48UBaytoaVy89Aue9QQYQNKs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gguf";
|
||||
version = "0.16.3";
|
||||
version = "0.17.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7muCe/g8iZ/oJ2vsJ2xDpvaxyLgCfvvr+kyPqFKl09U=";
|
||||
hash = "sha256-Nq1xqtkAo+dfyU6+lupgKfA6TkS+difvetPQPox7y1M=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.18.1";
|
||||
version = "5.20.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_dataproc";
|
||||
inherit version;
|
||||
hash = "sha256-vIGv3275bnnl+ZkaZS0t1+IQRAxNgEvs3NW4ljxwOls=";
|
||||
hash = "sha256-aBsuUfbjaaU99JHQhdTmLU+lXc6x+pL12ZfcQ+MUgf4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_websecurityscanner";
|
||||
inherit version;
|
||||
hash = "sha256-EWTO9yWJUHe+mELBp1/CxB6OCaS0woZtooKFAGH4yGY=";
|
||||
hash = "sha256-Bmi8LH4HtxlnLsDtpSG1BQYp5yg4gEaKzLxPIUwPemM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_gzip";
|
||||
version = "1.8.7";
|
||||
version = "1.9.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dryq1LLC+lVHj/i+m60ubGGItlX5/clCnwNGrexI92I=";
|
||||
hash = "sha256-EFNmVndZ22x9+GbYaWEd7Tu4PVwOUPuwHQLBkiuYtFc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
cryptography,
|
||||
freezegun,
|
||||
pytestCheckHook,
|
||||
@@ -11,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jwt";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit version;
|
||||
owner = "GehirnInc";
|
||||
repo = "python-jwt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Cv64SmhkETm8mx1Kj5u0WZpCPjPNvC+KS6/XaMzxCho=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -28,7 +29,9 @@ buildPythonPackage rec {
|
||||
substituteInPlace setup.cfg --replace "--flake8" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ cryptography ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ cryptography ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -38,10 +41,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "jwt" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "JSON Web Token library for Python 3";
|
||||
homepage = "https://github.com/GehirnInc/python-jwt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thornycrackers ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ thornycrackers ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linode-api";
|
||||
version = "5.29.1";
|
||||
version = "5.32.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "linode";
|
||||
repo = "python-linode-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-orMQr3FYyK4piazMsZmYkaZ/G/DvQOZObdtWt0wiEi4=";
|
||||
hash = "sha256-z1enJwdMy7yi+lVkeMkMMQ0kenCcVY8NQWKINAue5VA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metaflow";
|
||||
version = "2.15.16";
|
||||
version = "2.15.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Netflix";
|
||||
repo = "metaflow";
|
||||
tag = version;
|
||||
hash = "sha256-w95zyPKCfSCIW+32w6mko+Dsxqa56D8yc1Pws1db98s=";
|
||||
hash = "sha256-Yg5DoFPn5uInLf8roHhIKXvK+/K6TWATdG8uK8XOUyg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
netbox,
|
||||
django,
|
||||
netaddr,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-attachments";
|
||||
@@ -22,7 +24,11 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ netbox ];
|
||||
nativeCheckInputs = [
|
||||
netbox
|
||||
django
|
||||
netaddr
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
python-dateutil,
|
||||
drf-yasg,
|
||||
netbox,
|
||||
netaddr,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-contract";
|
||||
@@ -32,6 +33,7 @@ buildPythonPackage rec {
|
||||
# running tests requires initialized django project
|
||||
nativeCheckInputs = [
|
||||
netbox
|
||||
netaddr
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
setuptools,
|
||||
netbox,
|
||||
pythonAtLeast,
|
||||
django,
|
||||
netaddr,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-floorplan-plugin";
|
||||
@@ -22,7 +24,11 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ netbox ];
|
||||
nativeCheckInputs = [
|
||||
netbox
|
||||
django
|
||||
netaddr
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
netbox,
|
||||
pythonAtLeast,
|
||||
napalm,
|
||||
django,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-napalm-plugin";
|
||||
@@ -25,7 +26,10 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [ napalm ];
|
||||
|
||||
nativeCheckInputs = [ netbox ];
|
||||
nativeCheckInputs = [
|
||||
netbox
|
||||
django
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
setuptools,
|
||||
netbox,
|
||||
pythonAtLeast,
|
||||
django,
|
||||
netaddr,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-topology-views";
|
||||
@@ -22,7 +24,11 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ netbox ];
|
||||
nativeCheckInputs = [
|
||||
netbox
|
||||
django
|
||||
netaddr
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
|
||||
|
||||
@@ -19,6 +19,11 @@
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
|
||||
# `httpx_aiohttp` not currently in `nixpkgs`
|
||||
# optional-dependencies (aiohttp)
|
||||
# aiohttp,
|
||||
# httpx_aiohttp,
|
||||
|
||||
# optional-dependencies (datalib)
|
||||
numpy,
|
||||
pandas,
|
||||
@@ -47,7 +52,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "1.87.0";
|
||||
version = "1.91.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -56,7 +61,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KXvtAxkALZd/T5mVLkDemO7qQ7E2CLVmRpAg1+cRcdU=";
|
||||
hash = "sha256-5thOFxXIStNowiEz9IacAkAC611zzXXs0ZB1tyuR+Go=";
|
||||
};
|
||||
|
||||
postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
|
||||
@@ -81,6 +86,11 @@ buildPythonPackage rec {
|
||||
++ lib.optionals withVoiceHelpers optional-dependencies.voice-helpers;
|
||||
|
||||
optional-dependencies = {
|
||||
# `httpx_aiohttp` not currently in `nixpkgs`
|
||||
# aiohttp = [
|
||||
# aiohttp
|
||||
# httpx_aiohttp
|
||||
# ];
|
||||
datalib = [
|
||||
numpy
|
||||
pandas
|
||||
|
||||
@@ -23,12 +23,12 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pycuda";
|
||||
version = "2025.1";
|
||||
version = "2025.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UnOOmpQcKVwKXfaqDUmsifZtg12szpyci4TnUw/kYi8=";
|
||||
hash = "sha256-urBnjUP0achl9f5gJPSBx4HsUf7+Zoas1mxnK/q+o08=";
|
||||
};
|
||||
|
||||
preConfigure = with lib.versions; ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytubefix";
|
||||
version = "9.1.1";
|
||||
version = "9.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JuanBindez";
|
||||
repo = "pytubefix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OKOP1kDPYXMQkVOITSxYqMYQvtVom8VCaLnCBYEhgR8=";
|
||||
hash = "sha256-Jnqgttcz6HuZ8PpTQMspFu6CTtdqUzOkuKiiNivxE1s=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pydantic,
|
||||
python-dateutil,
|
||||
requests,
|
||||
snowflake-connector-python,
|
||||
pyyaml,
|
||||
urllib3,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
hatchling,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-core";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "snowflake_core";
|
||||
inherit version;
|
||||
hash = "sha256-3BzO3s5BtS/cuF+JwKuAG8Usca5oo79ffp33TXUP5E8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
pydantic
|
||||
python-dateutil
|
||||
pyyaml
|
||||
requests
|
||||
snowflake-connector-python
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pyopenssl"
|
||||
];
|
||||
|
||||
# Tests require access to Snowflake
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"snowflake.core"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Subpackage providing Python access to Snowflake entity metadata.";
|
||||
homepage = "https://pypi.org/project/snowflake.core";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vtimofeenko ];
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-confluencebuilder";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "sphinxcontrib_confluencebuilder";
|
||||
inherit version;
|
||||
hash = "sha256-+YKH9qTtqWNUlQMRkFSmP+RK8IAN6/rrYctvY3pIf+I=";
|
||||
hash = "sha256-2Sl0ZwdHn0dXf+kbNcxaDMfWLaGdfUgCRjKTADA+unM=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clazy";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "clazy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-t1j/MrKD8ocmhbFtWz6BJUbPSCSWjlRmuYnsPhHWgAM=";
|
||||
hash = "sha256-i/tqH2RHU+LwvMFI8ft92j0i04mQxLVIyrGXlqzMGWs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crawl${lib.optionalString tileMode "-tiles"}";
|
||||
version = "0.32.1";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crawl";
|
||||
repo = "crawl";
|
||||
rev = version;
|
||||
hash = "sha256-jhjFC8+A2dQomMwKZPSiEViXeQpty2Dk9alDcNsLvq0=";
|
||||
hash = "sha256-GXrYLGoQ1UwDHs+kLLcaBNpJ2BVMv4NhmpyfNFxPmg8=";
|
||||
};
|
||||
|
||||
# Patch hard-coded paths and remove force library builds
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcompris";
|
||||
version = "25.1";
|
||||
version = "25.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-3aTkhsfsTQgHRKBaa4nbr+Df4HBB+/JF8ImCcWN1rLU=";
|
||||
hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo=";
|
||||
};
|
||||
|
||||
# fix concatenation of absolute paths like
|
||||
# /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1/share/gcompris-qt/rcc/core.rcc
|
||||
# /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc
|
||||
postPatch = ''
|
||||
substituteInPlace src/core/config.h.in --replace-fail \
|
||||
"../@_data_dest_dir@" "../share/gcompris-qt"
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vkquake";
|
||||
version = "1.32.2";
|
||||
version = "1.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Novum";
|
||||
repo = "vkQuake";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ImgzfwpgALKsK0NvJr9/NBCaUWDxuINu5vYOCMhbRQg=";
|
||||
hash = "sha256-Nb3nTU0cJK5vNitfNBF7Usc0vTgMxZdQ3I3mjM1E9po=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
kernel,
|
||||
kernelModuleMakeFlags,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -11,13 +12,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rtw88";
|
||||
version = "0-unstable-2024-08-22";
|
||||
version = "0-unstable-2025-05-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
repo = "rtw88";
|
||||
rev = "764a1ee307d7e5720a93b8139c94d76737eced91";
|
||||
hash = "sha256-xHo9Qww3w36/UFhMhoLjSzZKpC2VKywJZlCPL30XirA=";
|
||||
rev = "461b696b51317ba4ca585a4ddb32f2e72cd4efc9";
|
||||
hash = "sha256-PBAON2s7gKvpO40vppahEtkWJ4HIjbOjfUz+fx87gIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
@@ -37,6 +38,8 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Backport of the latest Realtek RTW88 driver from wireless-next for older kernels";
|
||||
homepage = "https://github.com/lwfinger/rtw88";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly-exporter";
|
||||
version = "9.2.0";
|
||||
version = "9.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "fastly-exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x3BhFY6F8RMlEOefw5jinbosV3ebAADmnM2Rp7uBcvk=";
|
||||
hash = "sha256-C2lm9E60mjMCkMnUNdm3P+OXx0nUc7JwV1zNYnmlVt0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sXDOetqTxFEr16tOmM9nomg/v18rdVx3pG67Yiw6g5E=";
|
||||
vendorHash = "sha256-wbkm6b8xTGAQ4bCjIOVvJVA7sckPxtDiwMcjglaL/Pk=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.prometheus-exporters) fastly;
|
||||
|
||||
@@ -20,9 +20,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.104.1";
|
||||
version = "0.105.1";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell";
|
||||
inherit version;
|
||||
@@ -31,11 +30,11 @@ rustPlatform.buildRustPackage {
|
||||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
tag = version;
|
||||
hash = "sha256-ibQBwcoWzxl7t5q0KpiCiEmAasJJjBg2LMGf28y3sCk=";
|
||||
hash = "sha256-UcIcCzfe2C7qFJKLo3WxwXyGI1rBBrhQHtrglKNp6ck=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-8HxLX94i86F9vsnlZFgvVdTCkponlEA51WXCT3zlc2w=";
|
||||
cargoHash = "sha256-v3BtcEd1eMtHlDLsu0Y4i6CWA47G0CMOyVlMchj7EJo=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config ]
|
||||
@@ -43,13 +42,8 @@ rustPlatform.buildRustPackage {
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
zlib
|
||||
]
|
||||
[ zstd ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [
|
||||
nghttp2
|
||||
@@ -75,9 +69,9 @@ rustPlatform.buildRustPackage {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
curlMinimal
|
||||
];
|
||||
checkInputs =
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [ curlMinimal ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/nu";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m17n-lib";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/m17n/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-e2xCX3ktBtFOT1sXIE02J+LI67Qj69rpLAxkZxDT1sc=";
|
||||
hash = "sha256-cSn+O3rVAPiLivhgXvB7lsh6deyYamlf/8CkCfRKfIY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,13 +7,13 @@ buildGoModule rec {
|
||||
pname = "ocb";
|
||||
# Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
|
||||
# whenever that version changes.
|
||||
version = "0.126.0";
|
||||
version = "0.128.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "cmd/builder/v${version}";
|
||||
hash = "sha256-YxNo5xY+Fnw690eKzLgnJHeR0qxzk+ZtOlqKIpnaFjM=";
|
||||
hash = "sha256-gEwhx33L6XiEqFvMpFmBvte/Y1tZ39Xmo9T8vmmYBtw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/builder";
|
||||
|
||||
@@ -62,11 +62,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsyslog";
|
||||
version = "8.2504.0";
|
||||
version = "8.2506.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-UJKiDtQJh8dMxgTr/NbHSeR+ufw0rcHCY35lU+fwR6s=";
|
||||
hash = "sha256-bW/QJXyV51Z2XU1YWoM9VN06Dl7rgwi4YqgbNop0u3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3067,8 +3067,6 @@ with pkgs;
|
||||
|
||||
gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
|
||||
|
||||
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
|
||||
|
||||
glogg = libsForQt5.callPackage ../tools/text/glogg { };
|
||||
|
||||
gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
|
||||
|
||||
@@ -16454,6 +16454,8 @@ self: super: with self; {
|
||||
callPackage ../development/python-modules/snowflake-connector-python
|
||||
{ };
|
||||
|
||||
snowflake-core = callPackage ../development/python-modules/snowflake-core { };
|
||||
|
||||
snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { };
|
||||
|
||||
snowplow-tracker = callPackage ../development/python-modules/snowplow-tracker { };
|
||||
|
||||
Reference in New Issue
Block a user