Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-24 18:04:23 +00:00
committed by GitHub
60 changed files with 1567 additions and 16092 deletions
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "regreet";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "rharish101";
repo = "ReGreet";
rev = version;
hash = "sha256-MPLlHYTfDyL2Uy50A4lVke9SblXCErgJ24SP3kFuIPw=";
hash = "sha256-ubKSqt3axp46ECIKwq9K1aHTPeuMQ3fCx6aRlhXh2F0=";
};
cargoHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA=";
cargoHash = "sha256-Gwz1xs6OhrBb4xOuUUmxDVKxTC2lyp4Ckzi+9bnaRgo=";
buildFeatures = [ "gtk4_8" ];
+24 -24
View File
@@ -29,11 +29,11 @@
let
platform_major = "4";
platform_minor = "33";
platform_minor = "34";
year = "2024";
month = "09"; # release month
buildmonth = "09"; # sometimes differs from release month
timestamp = "${year}${buildmonth}030240";
month = "12"; # release month
buildmonth = "11"; # sometimes differs from release month
timestamp = "${year}${buildmonth}201800";
gtk = gtk3;
arch =
if stdenv.hostPlatform.isx86_64 then
@@ -79,8 +79,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-zCIVlrr8CPRBiv1FOVHjoW7WcKC74V+JC2ciyiBuYOw=";
aarch64 = "sha256-Lnwz8up/WoOdth0bxxePxagwkOaTljFYkCHHu5NoCPk=";
x86_64 = "sha256-d3MVeci4jF9adqvgepmZtzoPul+DTMtJlf7v92PMyq0=";
aarch64 = "sha256-gsOmF3bGthd7CEG+HxEQJqACfb+ErWU+fVO2MVR2cz8=";
}
.${arch};
};
@@ -95,8 +95,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-a/Vnbm1zzay5GSsJbU3yFGs7fSBx77wvOHJdlEs8BjE=";
aarch64 = "sha256-ghf0Q31cudxGDmYvLXyeqTYCpqIkZNp9y1Bd/izOSl4=";
x86_64 = "sha256-bJvODmesfkED5yHnaJGLZSeFctfVCQDA3lvH00S/zbk=";
aarch64 = "sha256-e0rWjD19tUyVJMMbb5THVj28o0HnBFssP0yCAQ5wKnA=";
}
.${arch};
};
@@ -111,8 +111,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-6krmMvja30Jal1w4gi1NQSZpPxAMtjvs+tPtts+YuLA=";
aarch64 = "sha256-qYzcR+4m8QAdV6JTvMuVU2h2oxVJGmyg9UJMibdkPxM=";
x86_64 = "sha256-+DfoJ+QAlI9Ioz4Wbj2LvtpV3vAXjl0wtZBNS9osOYw=";
aarch64 = "sha256-XCpIKoLhrodOJkLPY6uICpuYu5PBUp96MFQCeuOyOUA=";
}
.${arch};
};
@@ -127,8 +127,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-AFwJNQJdULmiID3JPjQG3L631ujaNYsaDJ3QT60WwSY=";
aarch64 = "sha256-MbvWrgHhTS1odtFCdZYdTOYZNjhb3gqvjGO1dVfdokA=";
x86_64 = "sha256-MUe5DU+3/4lzG1hykpgOX/46Pgp9qtoN9MOYk6EFK6o=";
aarch64 = "sha256-/tv7+RsRAFfV5zfU+uFNNlE1rrJavRFOhLYhSkIX0Ec=";
}
.${arch};
};
@@ -143,8 +143,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-6vNwys0HTaJdSl+1mK7hlGU0tQVyakvzrL0GZEObniQ=";
aarch64 = "sha256-fERBf9bkGowZkRLQEMxLUB8qUVKZgRZOZjJEz+kc+WU=";
x86_64 = "sha256-ZHJkIOAaz87z6Dz/6X62E7ckQIFDtzqgE5ODZeb/Rss=";
aarch64 = "sha256-dLLwLFTeUXoL9Pri4EB48nZGUH/zF2mCt6anv519aP4=";
}
.${arch};
};
@@ -182,8 +182,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-4eYdixsPswwsBWfRng5VPp+/39mDuAO7cHc6NS3VI7o=";
aarch64 = "sha256-UUdm7YqLOTappGwEnM3frvGZcESuh3LVl1L/HoN88Ug=";
x86_64 = "sha256-DhrNe9nx4RYAaq+NIHCBLX+bOn+dE13yF07hjuRzHZI=";
aarch64 = "sha256-OHE0vxjV9kp43Os2LCLuZFCMLWy3vnCChMC54TyXO9I=";
}
.${arch};
};
@@ -198,8 +198,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-gAbc049iHCPwGohQwNG1pCejCpOh0qUsnjSZosedqUU=";
aarch64 = "sha256-VpKs4O1Rxb/qhULUK+EPIPsGSH+qQJpNsDRGNX09Bj0=";
x86_64 = "sha256-z0hLFqdDSqhUmCiOp0fkTkiybOmCIA118JMBb90yEiY=";
aarch64 = "sha256-JzUgyfPEi9vq497gJhHuobb0TR113hC2suFvNKix7So=";
}
.${arch};
};
@@ -214,8 +214,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-BLvjy4vBuvMt3mZccp+UWw9p58taWiyZkbwaeMOOBpU=";
aarch64 = "sha256-5tGJoOPk56/0WVZAxB8VWryJmnHMr4gHQyjET9sB1Qk=";
x86_64 = "sha256-PxQ+jGTEs917IeWuTCgyyx7vAodZr4ju/aa4WQmoGQ0=";
aarch64 = "sha256-g4EHYFjoPONiGwreAmENcXWVinPkDAIE6KyVmZokQAo=";
}
.${arch};
};
@@ -230,8 +230,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-IQL6dWNHg5DMVkR2XYge2jHmIwx8KS968k8EoS/II+A=";
aarch64 = "sha256-ATni52tdHyaVvacSAiiOB6eN1zwS17VZazcsd6HOemA=";
x86_64 = "sha256-g8ILZ9esbXbm+4bImFJkEwE/UNJT2HHCXx/8i+Lvb00=";
aarch64 = "sha256-arV2VgQypj8fSEpqGd8CbJ/FyKE6k+e4x7kXqShDKrw=";
}
.${arch};
};
@@ -246,8 +246,8 @@ rec {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash =
{
x86_64 = "sha256-BqRcUU6GivuPFzr3e2FX+ga5OVO8o7NzuXuqUu52pN4=";
aarch64 = "sha256-lAsur73Z/EaKVLY9URoyvcvtD9LoOO7FG6l/lUtT8H8=";
x86_64 = "sha256-qqOdASLe11FT4Eot7j/Yf02acHgblV77W3fqTOCrNSQ=";
aarch64 = "sha256-9yA2OLOcp3uKJ88OKqz7vCXMzS52om6ohUJkGZpkjE4=";
}
.${arch};
};
@@ -7,6 +7,7 @@
electron,
libsecret,
asar,
python3,
glib,
desktop-file-utils,
callPackage,
@@ -53,6 +54,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/standardnotes
cp -R usr/share/{applications,icons} $out/share
cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/
cp -R opt/Standard\ Notes/resources/app.asar.unpacked $out/share/standardnotes/
rm $out/share/standardnotes/app.asar.unpacked/node_modules/cbor-extract/build/node_gyp_bins/python3
ln -s ${python3.interpreter} $out/share/standardnotes/app.asar.unpacked/node_modules/cbor-extract/build/node_gyp_bins/python3
${lib.optionalString stdenv.hostPlatform.isAarch64 ''
rm $out/share/standardnotes/app.asar.unpacked/node_modules/microtime/build/node_gyp_bins/python3
ln -s ${python3.interpreter} $out/share/standardnotes/app.asar.unpacked/node_modules/microtime/build/node_gyp_bins/python3
''}
asar e $out/share/standardnotes/app.asar asar-unpacked
find asar-unpacked -name '*.node' -exec patchelf \
--add-rpath "${libPath}" \
@@ -1,13 +1,13 @@
{
"version": "3.181.23",
"version": "3.195.13",
"deb": {
"x86_64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-amd64.deb",
"hash": "sha512-zWjST3guI0qifvZIwSLJ0nIpU12Mu3+m25Xdoqv0BQC7tscChEdCGUAJRUKHEf0b8l4uvp8qBGHiBOfbrIi//w=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.195.13/standard-notes-3.195.13-linux-amd64.deb",
"hash": "sha512-z7tZkOvzYzEPhu3rz8PG7mWdEua1z2ToVoj6l2wmvZUx/nS6lQ3yIFhEvpnMyXRZ2qDn4ihnBT20fyZttvkjMQ=="
},
"aarch64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-arm64.deb",
"hash": "sha512-7R5Ym44mrVgUiqdt6NL8F9uUUOroQRxwn30xKThyIQm2HGRUJivRfOws98El9zV8bKG1khk4DZaMiLQSMjrtaQ=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.195.13/standard-notes-3.195.13-linux-arm64.deb",
"hash": "sha512-c9p7aLCkcqdtx/X2vrmb5GCyc7JtR9O9GVwrkgGPJpZ0FdSR5zhX0nI9sJFHBIA/GuPuDYOM4fimyfpQzy0Nfw=="
}
}
}
@@ -4236,6 +4236,18 @@ final: prev:
meta.homepage = "https://github.com/raghur/fruzzy/";
};
fugit2-nvim = buildVimPlugin {
pname = "fugit2.nvim";
version = "2024-12-19";
src = fetchFromGitHub {
owner = "SuperBo";
repo = "fugit2.nvim";
rev = "96f729a4bdcf44174c6168f4457b9f3f9229efa2";
sha256 = "151i92jzmwh2b2h6v85cfrdlnqa9ll49gcrvg1r3hi83yj4dygzr";
};
meta.homepage = "https://github.com/SuperBo/fugit2.nvim/";
};
fugitive-gitlab-vim = buildVimPlugin {
pname = "fugitive-gitlab.vim";
version = "2024-11-13";
@@ -33,6 +33,7 @@
jq,
khard,
languagetool,
libgit2,
llvmPackages,
meson,
neovim-unwrapped,
@@ -1034,6 +1035,24 @@ in
nvimRequireCheck = "fuzzy_nvim";
};
fugit2-nvim = super.fugit2-nvim.overrideAttrs (oa: {
# Requires web-devicons but mini.icons can mock them up
nativeCheckInputs = oa.nativeCheckInputs ++ [
self.nvim-web-devicons
];
dependencies = with self; [
nui-nvim
plenary-nvim
];
# Patch libgit2 library dependency
postPatch = ''
substituteInPlace lua/fugit2/libgit2.lua \
--replace-fail \
'M.library_path = "libgit2"' \
'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
});
fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs {
# The plugin has a makefile which tries to run tests in a docker container.
# This prevents it.
@@ -350,6 +350,7 @@ https://github.com/megaannum/forms/,,
https://github.com/rubiin/fortune.nvim/,HEAD,
https://github.com/rafamadriz/friendly-snippets/,,
https://github.com/raghur/fruzzy/,,
https://github.com/SuperBo/fugit2.nvim/,HEAD,
https://github.com/shumphrey/fugitive-gitlab.vim/,,
https://github.com/BeneCollyridam/futhark-vim/,,
https://github.com/tzachar/fuzzy.nvim/,HEAD,
@@ -205,6 +205,9 @@ self = stdenv.mkDerivation {
cp bin/votour $out/bin/
'' + ''
ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
'' + lib.optionalString (coqAtLeast "8.21") ''
ln -s $out/lib/rocq-runtime $OCAMLFIND_DESTDIR/rocq-runtime
ln -s $out/lib/rocq-core $OCAMLFIND_DESTDIR/rocq-core
'' + lib.optionalString (coqAtLeast "8.14") ''
ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server
'' + lib.optionalString buildIde ''
@@ -229,16 +232,16 @@ self = stdenv.mkDerivation {
};
}; in
if coqAtLeast "8.17" then self.overrideAttrs(_: let
init-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in {
core-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in {
buildPhase = ''
runHook preBuild
make dunestrap
dune build -p coq-core,${init-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
dune build -p coq-core${lib.optionalString (coqAtLeast "8.21") ",rocq-runtime"},${core-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
dune install --prefix $out coq-core ${init-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"}
dune install --prefix $out coq-core ${lib.optionalString (coqAtLeast "8.21") "rocq-runtime"} ${core-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"}
runHook postInstall
'';
}) else self
+34
View File
@@ -0,0 +1,34 @@
{
lib,
fetchFromGitHub,
buildGoModule,
nix-update-script,
}:
buildGoModule rec {
pname = "ahoy";
version = "2.2.0";
src = fetchFromGitHub {
owner = "ahoy-cli";
repo = "ahoy";
tag = "v${version}";
hash = "sha256-xwjfY9HudxVz3xEEyRPtWysbojtan56ABBL3KgG0J/8=";
};
# vendor folder exists
vendorHash = null;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Create self-documenting cli programs from YAML files";
homepage = "https://github.com/ahoy-cli/ahoy";
changelog = "https://github.com/ahoy-cli/ahoy/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "ahoy";
};
}
+5 -2
View File
@@ -1,10 +1,13 @@
{ buildGoModule, authentik }:
{
buildGoModule,
authentik,
}:
buildGoModule {
pname = "authentik-ldap-outpost";
inherit (authentik) version src;
vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
env.CGO_ENABLED = 0;
+3 -1
View File
@@ -1,4 +1,6 @@
{ callPackage }: {
{ callPackage }:
{
ldap = callPackage ./ldap.nix { };
proxy = callPackage ./proxy.nix { };
radius = callPackage ./radius.nix { };
}
+160 -120
View File
@@ -1,26 +1,27 @@
{ lib
, stdenvNoCC
, callPackages
, fetchFromGitHub
, fetchpatch
, fetchzip
, buildNpmPackage
, buildGoModule
, runCommand
, openapi-generator-cli
, nodejs
, python312
, codespell
, makeWrapper }:
{
lib,
stdenvNoCC,
callPackages,
cacert,
fetchFromGitHub,
buildNpmPackage,
buildGoModule,
runCommand,
chromedriver,
openapi-generator-cli,
nodejs,
python312,
makeWrapper,
}:
let
version = "2024.6.4";
version = "2024.12.1";
src = fetchFromGitHub {
owner = "goauthentik";
repo = "authentik";
rev = "version/${version}";
hash = "sha256-QwK/auMLCJEHHtyexFnO+adCq/u0fezHQ90fXW9J4c4=";
hash = "sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA=";
};
meta = with lib; {
@@ -29,34 +30,69 @@ let
homepage = "https://goauthentik.io/";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ jvanbruegge risson ];
knownVulnerabilities = [
"CVE-2024-52307"
"CVE-2024-52287"
"CVE-2024-52289"
"Authentik 2024.6.x is end-of-life, consider using https://github.com/nix-community/authentik-nix for an up-to-date alternative"
maintainers = with maintainers; [
jvanbruegge
risson
];
};
website = buildNpmPackage {
pname = "authentik-website";
inherit version src meta;
npmDepsHash = "sha256-JM+ae+zDsMdvovd2p4IJIH89KlMeDU7HOZjFbDCyehw=";
# prefetch-npm-deps does not save all dependencies even though the lockfile is fine
website-deps = stdenvNoCC.mkDerivation {
pname = "authentik-website-deps";
inherit src version meta;
NODE_ENV = "production";
NODE_OPTIONS = "--openssl-legacy-provider";
sourceRoot = "source/website";
outputHash = "sha256-SONw9v67uuVk8meRIuS1KaBGbej6Gbz6nZxPDnHfCwQ=";
outputHashMode = "recursive";
nativeBuildInputs = [
nodejs
cacert
];
buildPhase = ''
npm ci --cache ./cache
rm -r ./cache
'';
installPhase = ''
mv node_modules $out
'';
dontPatchShebangs = true;
};
website = stdenvNoCC.mkDerivation {
pname = "authentik-website";
inherit src version meta;
nativeBuildInputs = [ nodejs ];
postPatch = ''
cd website
substituteInPlace package.json --replace-fail 'cross-env ' ""
'';
sourceRoot = "source/website";
buildPhase = ''
runHook preBuild
cp -r ${website-deps} node_modules
chmod -R +w node_modules
pushd node_modules/.bin
patchShebangs $(readlink docusaurus)
popd
cat node_modules/.bin/docusaurus
npm run build-bundled
runHook postBuild
'';
installPhase = ''
mkdir $out
cp -r build $out/help
'';
npmBuildScript = "build-bundled";
npmFlags = [ "--ignore-scripts" ];
};
clientapi = stdenvNoCC.mkDerivation {
@@ -86,19 +122,21 @@ let
pname = "authentik-webui";
inherit version meta;
src = runCommand "authentik-webui-source" {} ''
src = runCommand "authentik-webui-source" { } ''
mkdir -p $out/web/node_modules/@goauthentik/
cp -r ${src}/web $out/
ln -s ${src}/package.json $out/
ln -s ${src}/website $out/
ln -s ${clientapi} $out/web/node_modules/@goauthentik/api
'';
npmDepsHash = "sha256-8TzB3ylZzVLePD86of8E/lGgIQCciWMQF9m1Iqv9ZTY=";
npmDepsHash = "sha256-aRfpJWTp2WQB3E9aqzJn3BiPLwpCkdvMoyHexaKvz0U=";
postPatch = ''
cd web
'';
CHROMEDRIVER_FILEPATH = lib.getExe chromedriver;
installPhase = ''
runHook preInstall
mkdir $out
@@ -110,7 +148,10 @@ let
NODE_ENV = "production";
NODE_OPTIONS = "--openssl-legacy-provider";
npmInstallFlags = [ "--include=dev" ];
npmInstallFlags = [
"--include=dev"
"--ignore-scripts"
];
};
python = python312.override {
@@ -164,14 +205,6 @@ let
inherit version src meta;
pyproject = true;
patches = [
(fetchpatch {
name = "scim-schema-load.patch";
url = "https://github.com/goauthentik/authentik/commit/f3640bd3c0ee2f43efcfd506bb71d2b7b6761017.patch";
hash = "sha256-4AC7Dc4TM7ok964ztc+XdHvoU/DKyi9yJoz5u1dljEM=";
})
];
postPatch = ''
rm lifecycle/system_migrations/tenant_files.py
substituteInPlace authentik/root/settings.py \
@@ -186,76 +219,82 @@ let
--replace-fail 'web/' '${webui}/'
'';
nativeBuildInputs = [ prev.poetry-core ];
nativeBuildInputs = [
prev.poetry-core
];
propagatedBuildInputs = with final; [
argon2-cffi
celery
channels
channels-redis
codespell
colorama
dacite
deepmerge
defusedxml
django
django-cte
django-filter
django-guardian
django-model-utils
django-pglock
django-prometheus
django-redis
django-storages
django-tenants
djangorestframework
djangorestframework-guardian2
docker
drf-spectacular
duo-client
facebook-sdk
fido2
flower
geoip2
google-api-python-client
gunicorn
jsonpatch
kubernetes
ldap3
lxml
msgraph-sdk
opencontainers
packaging
paramiko
psycopg
pydantic
pydantic-scim
pyjwt
pyyaml
requests-oauthlib
scim2-filter-parser
sentry-sdk
service-identity
setproctitle
structlog
swagger-spec-validator
tenant-schemas-celery
twilio
twisted
ua-parser
urllib3
uvicorn
watchdog
webauthn
wsproto
xmlsec
zxcvbn
]
++ channels.optional-dependencies.daphne
++ django-storages.optional-dependencies.s3
++ opencontainers.optional-dependencies.reggie
++ psycopg.optional-dependencies.c
++ uvicorn.optional-dependencies.standard;
propagatedBuildInputs =
with final;
[
argon2-cffi
celery
channels
channels-redis
cryptography
dacite
deepmerge
defusedxml
django
django-countries
django-cte
django-filter
django-guardian
django-model-utils
django-pglock
django-prometheus
django-redis
django-storages
django-tenants
djangorestframework
djangorestframework-guardian2
docker
drf-orjson-renderer
drf-spectacular
duo-client
fido2
flower
geoip2
google-api-python-client
gunicorn
gssapi
jsonpatch
jwcrypto
kubernetes
ldap3
lxml
msgraph-sdk
opencontainers
packaging
paramiko
psycopg
pydantic
pydantic-scim
pyjwt
pyrad
python-kadmin-rs
pyyaml
requests-oauthlib
scim2-filter-parser
sentry-sdk
service-identity
setproctitle
structlog
swagger-spec-validator
tenant-schemas-celery
twilio
ua-parser
urllib3
uvicorn
watchdog
webauthn
wsproto
xmlsec
zxcvbn
]
++ django-storages.optional-dependencies.s3
++ opencontainers.optional-dependencies.reggie
++ psycopg.optional-dependencies.c
++ uvicorn.optional-dependencies.standard;
postInstall = ''
mkdir -p $out/web $out/website
@@ -287,7 +326,7 @@ let
env.CGO_ENABLED = 0;
vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
postInstall = ''
mv $out/bin/server $out/bin/authentik
@@ -296,18 +335,14 @@ let
subPackages = [ "cmd/server" ];
};
in stdenvNoCC.mkDerivation {
in
stdenvNoCC.mkDerivation {
pname = "authentik";
inherit src version;
postPatch = ''
rm Makefile
patchShebangs lifecycle/ak
# This causes issues in systemd services
substituteInPlace lifecycle/ak \
--replace-fail 'printf' '>&2 printf' \
--replace-fail '> /dev/stderr' ""
'';
installPhase = ''
@@ -316,7 +351,12 @@ in stdenvNoCC.mkDerivation {
cp -r lifecycle/ak $out/bin/
wrapProgram $out/bin/ak \
--prefix PATH : ${lib.makeBinPath [ (python.withPackages (ps: [ps.authentik-django])) proxy ]} \
--prefix PATH : ${
lib.makeBinPath [
(python.withPackages (ps: [ ps.authentik-django ]))
proxy
]
} \
--set TMPDIR /dev/shm \
--set PYTHONDONTWRITEBYTECODE 1 \
--set PYTHONUNBUFFERED 1
+21
View File
@@ -0,0 +1,21 @@
{
buildGoModule,
authentik,
}:
buildGoModule {
pname = "authentik-proxy-outpost";
inherit (authentik) version src;
vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
env.CGO_ENABLED = 0;
subPackages = [ "cmd/proxy" ];
meta = authentik.meta // {
description = "Authentik proxy outpost which is used for HTTP reverse proxy authentication";
homepage = "https://goauthentik.io/docs/providers/proxy/";
mainProgram = "proxy";
};
}
+5 -2
View File
@@ -1,10 +1,13 @@
{ buildGoModule, authentik }:
{
buildGoModule,
authentik,
}:
buildGoModule {
pname = "authentik-radius-outpost";
inherit (authentik) version src;
vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI=";
vendorHash = "sha256-FyRTPs2xfostV2x03IjrxEYBSrsZwnuPn+oHyQq1Kq0=";
env.CGO_ENABLED = 0;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xwin";
version = "0.17.4";
version = "0.18.2";
src = fetchFromGitHub {
owner = "rust-cross";
repo = "cargo-xwin";
rev = "v${version}";
hash = "sha256-lglCbrZhlNrBsHZUbUBNxT3QM5eNPYVvOLLTs993dXY=";
hash = "sha256-bK0bEaJaPTXpwLeDCS4kwf4S0mLP6MrI8BxzOM9ha8M=";
};
cargoHash = "sha256-WG2yxE03tRUke1GJml34ej4MUoTqQT4IZQ9OTRqaZFc=";
cargoHash = "sha256-bDnkSN3rt23j3EZRJdPLtYzltSvRGyYV+rlVAZPzjS4=";
meta = with lib; {
description = "Cross compile Cargo project to Windows MSVC target with ease";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cnquery";
version = "11.34.0";
version = "11.35.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
rev = "refs/tags/v${version}";
hash = "sha256-bgwAQi6X+g9GeqKrTLcxlDtdWXqVNsKq24CaVmzl/+M=";
hash = "sha256-WBzl3DyjPr5vV9oobqZx1pprs4gkVN9BafOMIMqqb7E=";
};
subPackages = [ "apps/cnquery" ];
+3 -2
View File
@@ -62,7 +62,7 @@
gtk-mac-integration,
versionCheckHook,
nix-update-script,
gitUpdater,
}:
stdenv.mkDerivation rec {
@@ -171,8 +171,9 @@ stdenv.mkDerivation rec {
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.updateScript = nix-update-script {
passthru.updateScript = gitUpdater {
rev-prefix = "release-";
url = "https://github.com/darktable-org/darktable";
};
meta = {
+57
View File
@@ -0,0 +1,57 @@
{
lib,
fetchurl,
fetchFromGitHub,
flutter327,
makeDesktopItem,
copyDesktopItems,
}:
flutter327.buildFlutterApplication rec {
pname = "evolve-core";
version = "1.6";
src = fetchFromGitHub {
owner = "arcnations-united";
repo = "evolve-core";
tag = "v${version}";
hash = "sha256-W8KpGQ81wjv/tAl09ax/a4Any5PNhhl1DIABhWgAwdc=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
desktopItems = [
(makeDesktopItem {
name = "Evolve Core";
exec = "evolvecore";
icon = "evolvecore";
desktopName = "evolvecore";
genericName = "A modern GTK theme manager";
categories = [ "Utility" ];
comment = "A modern GTK Theme Manager for GNOME with GTK 4.0 support and some cool features";
terminal = false;
type = "Application";
startupWMClass = "evolvecore";
})
];
nativeBuildInputs = [
copyDesktopItems
];
postInstall = ''
install -D assets/iconfile.png -t $out/share/icons
mv $out/share/icons/iconfile.png $out/share/icons/evolvecore.png
'';
meta = {
description = "Modern GTK Theme Manager for GNOME with GTK 4.0 support and some cool features";
homepage = "https://github.com/arcnations-united/evolve-core";
changelog = "https://github.com/arcnations-united/evolve-core/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "evolvecore";
platforms = lib.platforms.linux;
};
}
@@ -0,0 +1,792 @@
{
"packages": {
"animations": {
"dependency": "direct main",
"description": {
"name": "animations",
"sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.11"
},
"archive": {
"dependency": "transitive",
"description": {
"name": "archive",
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.1"
},
"args": {
"dependency": "transitive",
"description": {
"name": "args",
"sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.0"
},
"async": {
"dependency": "transitive",
"description": {
"name": "async",
"sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.11.0"
},
"boolean_selector": {
"dependency": "transitive",
"description": {
"name": "boolean_selector",
"sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
},
"card_swiper": {
"dependency": "direct main",
"description": {
"name": "card_swiper",
"sha256": "21e52a144decbf0054e7cfed8bbe46fc89635e6c86b767eaccfe7d5aeba32528",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
},
"characters": {
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
},
"clock": {
"dependency": "transitive",
"description": {
"name": "clock",
"sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.1"
},
"collection": {
"dependency": "transitive",
"description": {
"name": "collection",
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.18.0"
},
"crypto": {
"dependency": "transitive",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
},
"csslib": {
"dependency": "transitive",
"description": {
"name": "csslib",
"sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.2"
},
"cupertino_icons": {
"dependency": "direct main",
"description": {
"name": "cupertino_icons",
"sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.8"
},
"fake_async": {
"dependency": "transitive",
"description": {
"name": "fake_async",
"sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.1"
},
"ffi": {
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
},
"file_picker": {
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.1"
},
"flex_color_picker": {
"dependency": "direct main",
"description": {
"name": "flex_color_picker",
"sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.0"
},
"flex_seed_scheme": {
"dependency": "transitive",
"description": {
"name": "flex_seed_scheme",
"sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1"
},
"flutter": {
"dependency": "direct main",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"flutter_animate": {
"dependency": "direct main",
"description": {
"name": "flutter_animate",
"sha256": "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.2"
},
"flutter_lints": {
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
"sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.3"
},
"flutter_plugin_android_lifecycle": {
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.23"
},
"flutter_shaders": {
"dependency": "transitive",
"description": {
"name": "flutter_shaders",
"sha256": "34794acadd8275d971e02df03afee3dee0f98dbfb8c4837082ad0034f612a3e2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3"
},
"flutter_svg": {
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.16"
},
"flutter_test": {
"dependency": "direct dev",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"flutter_web_plugins": {
"dependency": "transitive",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"google_fonts": {
"dependency": "direct main",
"description": {
"name": "google_fonts",
"sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.1"
},
"html": {
"dependency": "direct main",
"description": {
"name": "html",
"sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.15.5"
},
"http": {
"dependency": "transitive",
"description": {
"name": "http",
"sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.2"
},
"http_parser": {
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.2"
},
"image": {
"dependency": "direct main",
"description": {
"name": "image",
"sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.0"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.5"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.5"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
},
"lints": {
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
},
"matcher": {
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.16+1"
},
"material_color_utilities": {
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.11.1"
},
"mesh_gradient": {
"dependency": "direct main",
"description": {
"name": "mesh_gradient",
"sha256": "3dc7a7195d90f164e69aa805f4dea876eee54aed6b271ee22ae792d7b9c1fedb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.8"
},
"meta": {
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.15.0"
},
"page_transition": {
"dependency": "direct main",
"description": {
"name": "page_transition",
"sha256": "dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
},
"palette_generator": {
"dependency": "direct main",
"description": {
"name": "palette_generator",
"sha256": "0b20245c451f14a5ca0818ab7a377765162389f8e8f0db361cceabf0fed9d1ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.3+5"
},
"path": {
"dependency": "transitive",
"description": {
"name": "path",
"sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.0"
},
"path_parsing": {
"dependency": "transitive",
"description": {
"name": "path_parsing",
"sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"path_provider": {
"dependency": "direct main",
"description": {
"name": "path_provider",
"sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.5"
},
"path_provider_android": {
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.15"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
},
"path_provider_linux": {
"dependency": "transitive",
"description": {
"name": "path_provider_linux",
"sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.1"
},
"path_provider_platform_interface": {
"dependency": "transitive",
"description": {
"name": "path_provider_platform_interface",
"sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
},
"path_provider_windows": {
"dependency": "transitive",
"description": {
"name": "path_provider_windows",
"sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.0"
},
"petitparser": {
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.2"
},
"platform": {
"dependency": "transitive",
"description": {
"name": "platform",
"sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.6"
},
"plugin_platform_interface": {
"dependency": "transitive",
"description": {
"name": "plugin_platform_interface",
"sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.8"
},
"process_run": {
"dependency": "direct main",
"description": {
"name": "process_run",
"sha256": "8d9c6198b98fbbfb511edd42e7364e24d85c163e47398919871b952dc86a423e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.14.2"
},
"pub_semver": {
"dependency": "transitive",
"description": {
"name": "pub_semver",
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
},
"sky_engine": {
"dependency": "transitive",
"description": "flutter",
"source": "sdk",
"version": "0.0.99"
},
"source_span": {
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.0"
},
"stack_trace": {
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.11.1"
},
"stream_channel": {
"dependency": "transitive",
"description": {
"name": "stream_channel",
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
},
"string_scanner": {
"dependency": "transitive",
"description": {
"name": "string_scanner",
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
},
"synchronized": {
"dependency": "transitive",
"description": {
"name": "synchronized",
"sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.3.0+3"
},
"term_glyph": {
"dependency": "transitive",
"description": {
"name": "term_glyph",
"sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.2"
},
"typed_data": {
"dependency": "transitive",
"description": {
"name": "typed_data",
"sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
},
"url_launcher": {
"dependency": "direct main",
"description": {
"name": "url_launcher",
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.14"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.2"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
"description": {
"name": "url_launcher_platform_interface",
"sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.2"
},
"url_launcher_web": {
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.3"
},
"vector_graphics": {
"dependency": "transitive",
"description": {
"name": "vector_graphics",
"sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.15"
},
"vector_graphics_codec": {
"dependency": "transitive",
"description": {
"name": "vector_graphics_codec",
"sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.12"
},
"vector_graphics_compiler": {
"dependency": "transitive",
"description": {
"name": "vector_graphics_compiler",
"sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.16"
},
"vector_math": {
"dependency": "transitive",
"description": {
"name": "vector_math",
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.2.5"
},
"web": {
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"win32": {
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.9.0"
},
"xdg_directories": {
"dependency": "transitive",
"description": {
"name": "xdg_directories",
"sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"xml": {
"dependency": "transitive",
"description": {
"name": "xml",
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
},
"yaml": {
"dependency": "transitive",
"description": {
"name": "yaml",
"sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
}
},
"sdks": {
"dart": ">=3.5.0 <4.0.0",
"flutter": ">=3.24.0"
}
}
@@ -1,21 +1,24 @@
# To use this package, use: `services.transmission.webHome = pkgs.flood-for-transmission;`
{ lib
, buildNpmPackage
, fetchFromGitHub
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "flood-for-transmission";
version = "2024-05-18T08-04-58";
version = "2024-11-16T12-26-17";
src = fetchFromGitHub {
owner = "johman10";
repo = "flood-for-transmission";
rev = version;
hash = "sha256-/vD53tFvCBOU9i/EfogjNjCEp6BBkR6eEKWnPhCUdJk=";
tag = version;
hash = "sha256-OED2Ypi1V+wwnJ5KFVRbJAyh/oTYs90E6uhSnSwJwJU=";
};
npmDepsHash = "sha256-BKr4Gm3bTFnxgv4HlPclr8+c6jDVPFFbGXvpk5t8/X4=";
npmDepsHash = "sha256-J3gRzvSXXyoS0OoLrTSV1vBSupFqky0Jt99nyz+hy1k=";
strictDeps = true;
installPhase = ''
runHook preInstall
@@ -28,8 +31,9 @@ buildNpmPackage rec {
meta = with lib; {
description = "Flood clone for Transmission";
homepage = "https://github.com/johman10/flood-for-transmission";
maintainers = with maintainers; [ al3xtjames ];
downloadPage = "https://github.com/johman10/flood-for-transmission/releases";
license = licenses.gpl3Only;
maintainers = with maintainers; [ al3xtjames ];
platforms = platforms.all;
};
}
File diff suppressed because it is too large Load Diff
+81 -91
View File
@@ -1,93 +1,118 @@
{
lib,
rustPlatform,
buildGoModule,
stdenv,
fetchFromGitHub,
pnpm_9,
wrapGAppsHook3,
cargo-tauri_1,
darwin,
cacert,
cargo-tauri,
cmake,
curl,
desktop-file-utils,
esbuild,
fetchFromGitHub,
git,
glib-networking,
jq,
nodejs,
pkg-config,
libsoup_2_4,
libgit2,
makeBinaryWrapper,
moreutils,
openssl,
rust,
webkitgtk_4_0,
nix-update-script,
cacert,
nodejs,
openssl,
pkg-config,
pnpm_9,
rust,
rustPlatform,
turbo,
webkitgtk_4_1,
wrapGAppsHook4,
yq,
}:
let
excludeSpec = spec: [
"--exclude"
spec
];
in
rustPlatform.buildRustPackage rec {
pname = "gitbutler";
version = "0.12.16";
version = "0.14.4";
src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
rev = "release/${version}";
hash = "sha256-L4PVaNb3blpLIcyA7XLc71qwUPUADclxvbOkq1Jc1no=";
tag = "release/${version}";
hash = "sha256-JeiiV7OXRI4xTTQp1dXqT1ozTrIc7cltvZ6yVOhcjGU=";
};
# deactivate the upstream updater in tauri configuration & set the version
# Deactivate the upstream updater, set the version, and merge Tauri's
# configuration files
#
# Remove references to non-existent workspaces in `gix` crates
postPatch = ''
tauri_conf="crates/gitbutler-tauri/tauri.conf.release.json"
jq '.package.version = "${version}" | .tauri.updater.active = false' "$tauri_conf" | sponge "$tauri_conf"
jq --slurp \
'.[0] * .[1]
| .version = "${version}"
| .bundle.createUpdaterArtifacts = false
| .plugins.updater.endpoints = [ ]' \
crates/gitbutler-tauri/tauri.conf{,.release}.json \
| sponge crates/gitbutler-tauri/tauri.conf.json
tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
'';
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-context-menu-0.7.1" = "sha256-vKfq20hrFLmfoXO94D8HwAE3UdGcuqVZf3+tOBhLqj0=";
"tauri-plugin-log-0.0.0" = "sha256-gde2RS5NFA0Xap/Xb7XOeVQ/5t2Nw+j+HOwfeJmSNMU=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-ooe9in3JfEPMbZSMjobVJpWZdqBTf2AsfEkcsQc0Fts=";
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-rlEwFwN6DrOJZm1Hzy6qu7rLKQx69rRIqrScx9FExZM=";
hash = "sha256-bLuKG+7QncLwiwKDrlcHKaSrUmDaJUxdvpdv0Jc6UPo=";
};
nativeBuildInputs = [
cargo-tauri_1.hook
cacert # Required by turbo
cargo-tauri.hook
cmake # Required by `zlib-sys` crate
desktop-file-utils
jq
moreutils
nodejs
pkg-config
pnpm_9.configHook
wrapGAppsHook3
cacert
];
turbo
wrapGAppsHook4
yq # For `tomlq`
] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
buildInputs =
[ openssl ]
[
libgit2
openssl
]
++ lib.optional stdenv.hostPlatform.isDarwin curl
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libsoup_2_4
webkitgtk_4_0
]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit
CoreServices
Security
WebKit
]
);
webkitgtk_4_1
];
# extended release configuration
tauriBuildFlags = [ "--config crates/gitbutler-tauri/tauri.conf.release.json" ];
tauriBuildFlags = [
"--config"
"crates/gitbutler-tauri/tauri.conf.json"
];
nativeCheckInputs = [ git ];
# `gitbutler-git`'s checks do not support release mode
checkType = "debug";
cargoTestFlags =
[
"--workspace"
]
# Errors with "Lazy instance has previously been poisoned"
++ excludeSpec "gitbutler-branch-actions"
++ excludeSpec "gitbutler-stack";
env = {
# make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our
# Make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our
# target dir
# https://github.com/gitbutlerapp/gitbutler/blob/56b64d778042d0e93fa362f808c35a7f095ab1d1/crates/gitbutler-tauri/inject-git-binaries.sh#L10C10-L10C26
TRIPLE_OVERRIDE = rust.envVars.rustHostPlatformSpec;
@@ -95,64 +120,30 @@ rustPlatform.buildRustPackage rec {
# `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's
COREPACK_ENABLE_STRICT = 0;
# disable turbo telemetry
TURBO_TELEMETRY_DEBUG = 1;
# we depend on nightly features
# We depend on nightly features
RUSTC_BOOTSTRAP = 1;
# we also need to have `tracing` support in `tokio` for `console-subscriber`
# We also need to have `tracing` support in `tokio` for `console-subscriber`
RUSTFLAGS = "--cfg tokio_unstable";
ESBUILD_BINARY_PATH = lib.getExe (
esbuild.override {
buildGoModule =
args:
buildGoModule (
args
// rec {
version = "0.20.2";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
};
TUBRO_BINARY_PATH = lib.getExe turbo;
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
);
}
);
# Needed to get openssl-sys to use pkgconfig.
OPENSSL_NO_VENDOR = true;
LIBGIT2_NO_VENDOR = 1;
};
preBuild = ''
pushd packages/ui
pnpm package
popd
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
mv $out/Applications/GitButler.app/Contents/MacOS/GitButler $out/bin/git-butler
ln -s $out/bin/git-butler $out/Applications/GitButler.app/Contents/MacOS/GitButler
makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
desktop-file-edit \
--set-comment "A Git client for simultaneous branches on top of your existing workflow." \
--set-key="Keywords" --set-value="git;" \
--set-key="StartupWMClass" --set-value="GitButler" \
$out/share/applications/git-butler.desktop
$out/share/applications/GitButler.desktop
'';
# the `gitbutler-git` crate's checks do not support release mode
checkType = "debug";
nativeCheckInputs = [ git ];
passthru = {
updateScript = nix-update-script {
extraArgs = [
@@ -166,13 +157,12 @@ rustPlatform.buildRustPackage rec {
description = "Git client for simultaneous branches on top of your existing workflow";
homepage = "https://gitbutler.com";
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
mainProgram = "git-butler";
license = lib.licenses.fsl11Mit;
maintainers = with lib.maintainers; [
getchoo
techknowlogick
];
mainProgram = "gitbutler-tauri";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
broken = true; # build fails on darwin and linux
};
}
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
version = "2.24.0";
version = "2.25.1";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
tag = "v${version}";
sha256 = "sha256-lUEoqXJF1k4/il9bdDTinkUV5L869njZNYqObG/mHyA=";
sha256 = "sha256-1bNYTzfBSwEEi5tjDjUI9i+0Xh+T0SQNE+8GgDwexx0=";
};
vendorHash = "sha256-Ttt7bPKU+TMKRg5550BS6fsPwYp0QJqcZ7NLrhttSdw=";
vendorHash = "sha256-zWWJxvwOZTAk5f6AMrhCBo3n5/Np6hucx6AM+Ucq6ec=";
ldflags = [
"-X=main.version=${version}"
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "highs";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "ERGO-Code";
repo = "HiGHS";
rev = "v${finalAttrs.version}";
hash = "sha256-JuUPnsCNImWpkeh0B//7yM1Wix9SpnfApp8cxX9WeYk=";
hash = "sha256-VUbYg1NRoRk0IzO6y+NaWnfjOuIYoM8pfPPqJcG7Bbo=";
};
strictDeps = true;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "kdlfmt";
version = "0.0.6";
version = "0.0.8";
src = fetchFromGitHub {
owner = "hougesen";
repo = "kdlfmt";
rev = "v${version}";
hash = "sha256-Lv4BMhMsi2GBzIsFS2HGZcwENgU1vvgPDZUPBb9ucfo=";
hash = "sha256-Eq/m5PnStfZokktgrsYx7e8uWZDB/JgomsrahuL5GYo=";
};
cargoHash = "sha256-2Lh5jtLsY67e38Xa+GGRBg9L/WIE/Nnd6XDI4crtrTc=";
cargoHash = "sha256-ay8QO2mHsbfidM9iBHfSdt7JN33T1o87jA/3ZIg1eUw=";
meta = {
description = "Formatter for kdl documents";
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+pzVSCmK4Ex0CA94PtP2A+tW4p88THQlkhEhdOA4jdg=";
sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8=";
};
cargoHash = "sha256-s7/WuV4tTA06yRcvJMrEFXcemy/9ia5ZVRS5LDj/oXY=";
cargoHash = "sha256-ykY0QGK3fUqzxgX8HNmi6J50kM+iTRj3SS7p4mNEOBg=";
nativeBuildInputs = [ installShellFiles ];
+7 -7
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "knxd";
version = "0.14.66";
version = "0.14.71";
src = fetchFromGitHub {
owner = "knxd";
repo = "knxd";
rev = finalAttrs.version;
hash = "sha256-3Npf+SlCWOMBd9CBLPysGtYe2Zk7I7T4t1bQHZTq3rI=";
tag = finalAttrs.version;
hash = "sha256-623Q2OGGr4wVdmJytjidTPEkP3hs2Z+KukbXt+hlPgM=";
};
postPatch = ''
@@ -60,11 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
"systemdsysusersdir=$(out)/lib/sysusers.d"
];
meta = with lib; {
meta = {
description = "Advanced router/gateway for KNX";
homepage = "https://github.com/knxd/knxd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
})
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "kubeone";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
hash = "sha256-YLJ/SNxu0F7edOmXm99iZRaLeu8MPUOLuZs9RKPV2bU=";
hash = "sha256-k/okEg9jiLyVn1v3zeduSJ2dY8xWppH5V8L7rud4/H8=";
};
vendorHash = "sha256-79eEqzQgEjDU4PbxMcFXLEH3so1kKjdYJpP2nWPXv20=";
vendorHash = "sha256-gwyY6g//uEvvzChLQrTKlzq9REMUIXVjIDZXBMOHNO8=";
ldflags = [
"-s"
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "legba";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "legba";
rev = "v${version}";
hash = "sha256-emj2N3S26Nm0UiHGZIraCJN07rJNOMvdWRoUbHneknY=";
hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g=";
};
cargoHash = "sha256-viDfJ214Zf5segjrLSTbHav5T5e219NAF+MvuPow+JQ=";
cargoHash = "sha256-UaaB4d7sfHm+KJI05x/TYeEd8pTePJaFBMW7t7ShSqg=";
nativeBuildInputs = [
cmake
+5 -3
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "lesspipe";
version = "2.11";
version = "2.14";
src = fetchFromGitHub {
owner = "wofr06";
repo = "lesspipe";
rev = "v${version}";
hash = "sha256-jJrKiRdrargk0JzcPWxBZGyOpMfTIONHG8HNRecazVo=";
hash = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
};
nativeBuildInputs = [
@@ -121,6 +121,7 @@ stdenv.mkDerivation rec {
"lynx"
"elinks"
"html2text"
"xmq"
"dtc"
"pdftotext"
"pdftohtml"
@@ -137,7 +138,6 @@ stdenv.mkDerivation rec {
"xlscat"
"odt2txt"
"wvText"
"antiword"
"catdoc"
"broken_catppt"
"sxw2txt"
@@ -157,9 +157,11 @@ stdenv.mkDerivation rec {
"plutil"
"id3v2"
"csvlook"
"csvtable"
"jq"
"zlib-flate"
"lessfilter"
"snap"
]
++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
# resholve only identifies this on darwin/bsd
+3 -3
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation {
pname = "librime-lua";
version = "0-unstable-2024-11-02";
version = "0-unstable-2024-12-21";
src = fetchFromGitHub {
owner = "hchunhui";
repo = "librime-lua";
rev = "b210d0cfbd2a3cc6edd4709dd0a92c479bfca10b";
hash = "sha256-ETjLN40G4I0FEsQgNY8JM4AInqyb3yJwEJTGqdIHGWg=";
rev = "e3912a4b3ac2c202d89face3fef3d41eb1d7fcd6";
hash = "sha256-zx0F41szn5qlc2MNjt1vizLIsIFQ67fp5cb8U8UUgtY=";
};
propagatedBuildInputs = [ lua ];
+3 -3
View File
@@ -7,7 +7,7 @@
nix-update-script,
}:
let
version = "0.3.1";
version = "0.3.7";
in
rustPlatform.buildRustPackage {
pname = "lla";
@@ -17,12 +17,12 @@ rustPlatform.buildRustPackage {
owner = "triyanox";
repo = "lla";
rev = "refs/tags/v${version}";
hash = "sha256-0yPc/HJcPrHeokp4wQ3WOLL9gEIX/0udHUwY39LwvLc=";
hash = "sha256-8BnYLC5SGFvk9srRyLxflDgfVbbGMSHXBOjXQLMLIi8=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
cargoHash = "sha256-402FMy7I2NmzDUjsgQAG+iBKjgwtpX8OMdXWnst3Ao8=";
cargoHash = "sha256-H/BnJiR9+wcddAEWkKaqamTEDgjTUOMq1AiGWQAfjDM=";
cargoBuildFlags = [ "--workspace" ];
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "maestro";
version = "1.39.2";
version = "1.39.7";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
hash = "sha256-yX9ZtfWLg2OnsDqYH9jSW6elB+snmUUY5hWjO2Bw1sA=";
hash = "sha256-+Ptn14WkJLQ+Pb7rYXW51ycc5hdAGY3yXr2faDgFljA=";
};
dontUnpack = true;
File diff suppressed because it is too large Load Diff
@@ -19,27 +19,24 @@
let
pnpm = pnpm_9;
in
rustPlatform.buildRustPackage rec {
pname = "modrinth-app-unwrapped";
version = "0.8.9";
version = "0.9.0";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
rev = "refs/tags/v${version}";
hash = "sha256-DR1aPbSqAVhL/m/Maa3mPzNWwK4A1WvDd/PwEMVYn5g=";
tag = "v${version}";
hash = "sha256-uDG+WHeMY/quzF8mHBn5o8xod4/G5+S4/zD2lbqdN0M=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"wry-0.44.1" = "sha256-I1qkUVTu+Yqk1Imo1w5rG/lRSPLITF5BdcjBsPe+jXU=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-D9hkdliyKc8m9i2D9pG3keGmZsx+rzrgVXZws9Ot24I=";
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-murZ82LV2pGng/Cg08NoWr/mDIVECrf00utVrs6PKRg=";
hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0=";
};
nativeBuildInputs = [
@@ -56,6 +53,12 @@ rustPlatform.buildRustPackage rec {
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
# Tests fail on other, unrelated packages in the monorepo
cargoTestFlags = [
"--package"
"theseus_gui"
];
env = {
TURBO_BINARY_PATH = lib.getExe turbo;
};
+1 -2
View File
@@ -24,8 +24,7 @@
xorg,
}:
symlinkJoin rec {
name = "${pname}-${version}";
symlinkJoin {
pname = "modrinth-app";
inherit (modrinth-app-unwrapped) version;
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "mollysocket";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "mollyim";
repo = "mollysocket";
rev = version;
hash = "sha256-kWmftkzxhVkXQ8EcGJz+Yg6o9OubIMQprwDrcKb2HWQ=";
hash = "sha256-IJaWCawA1vM+3qdHbPZCn4laM7DAL19k1P1MjghtGv8=";
};
cargoHash = "sha256-UgJI9lUbvX/Yw90fo6/voX9noWZH8XVssOR4DpquHUY=";
cargoHash = "sha256-FNFTPjj9TQeIG7K/+qpOav/TcNsmt+G6EhBftHqNbB4=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -6,16 +6,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phel";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "phel-lang";
repo = "phel-lang";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-U+E4AdxjBjuMEG5CDpyr4Avu/NzvQXdksPsl+tQMybM=";
hash = "sha256-irN1Dnov6vDiU4xGsf2nxz7/kz1YOMq0yOLYt4HY1EM=";
};
vendorHash = "sha256-ROJrVhkq3A0ZOsWv8rNNlVmE8KYu+vDM201BECOgmik=";
vendorHash = "sha256-jcMfGPnGoSP8E1JXPEqKr53amV0d08GvGfe8niwM8Q4=";
doInstallCheck = true;
postInstallCheck = ''
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.23.9";
version = "0.23.11";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-56wPSSCA3TpsF/JdAPPxQW/EE0kkCz6TETFjfahxa68=";
hash = "sha256-hH6fQ2fWAdAQ5dM/wuKAmyBJx5qQkUbf8zsYNdXyyME=";
};
vendorHash = "sha256-mvmQsj/euZ8DMBOYmK4E9QKT59/qcoS+p6ZvPNQnqJk=";
vendorHash = "sha256-3R3z0gd84FxKiIR9sC1saaalyTX2r/VYLPkyP1nJTtM=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
+3 -3
View File
@@ -5,7 +5,7 @@
}:
let
pname = "saucectl";
version = "0.190.0";
version = "0.190.1";
in
buildGoModule {
inherit pname version;
@@ -14,7 +14,7 @@ buildGoModule {
owner = "saucelabs";
repo = "saucectl";
rev = "refs/tags/v${version}";
hash = "sha256-P7aERLPpaxYyr1W7bhgz/44eD1719hXsHjax5uxVJ9g=";
hash = "sha256-I1W7hAirtyLppJfM1gdzho3VU9rgFDt6j1dexGIHkXg=";
};
ldflags = [
@@ -22,7 +22,7 @@ buildGoModule {
"-X github.com/saucelabs/saucectl/internal/version.GitCommit=${version}"
];
vendorHash = "sha256-RbZmCBhBMRq4Z6t0L1H4r8/9V/mdKC+GtoaFuokFy84=";
vendorHash = "sha256-NJBEIUeTasoIAeaGm+RdmfeELodXcnpxcxxQFaUJf4o=";
checkFlags = [ "-skip=^TestNewRequestWithContext$" ];
+54
View File
@@ -0,0 +1,54 @@
{
stdenvNoCC,
lib,
fetchurl,
appimageTools,
makeWrapper,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "starc";
version = "0.7.5";
src = fetchurl {
url = "https://github.com/story-apps/starc/releases/download/v${finalAttrs.version}/starc-setup.AppImage";
hash = "sha256-KAY04nXVyXnjKJxzh3Pvi50Vs0EPbLk0VgfZuz7MQR0=";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase =
let
appimageContents = appimageTools.extract { inherit (finalAttrs) pname version src; };
starc-unwrapped = appimageTools.wrapType2 { inherit (finalAttrs) pname version src; };
in
''
runHook preInstall
# Fixup desktop item icons
install -D ${appimageContents}/starc.desktop -t $out/share/applications/
substituteInPlace $out/share/applications/starc.desktop \
--replace-fail "Icon=starc" "${''
Icon=dev.storyapps.starc
StartupWMClass=Story Architect''}"
cp -r ${appimageContents}/share/* $out/share/
makeWrapper ${starc-unwrapped}/bin/starc $out/bin/starc \
--unset QT_PLUGIN_PATH
runHook postInstall
'';
meta = {
description = "Intuitive screenwriting app that streamlines the writing process";
homepage = "https://starc.app/";
mainProgram = "starc";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ pancaek ];
platforms = [ "x86_64-linux" ];
};
})
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "updatecli";
version = "0.88.0";
version = "0.90.0";
src = fetchFromGitHub {
owner = "updatecli";
repo = "updatecli";
rev = "v${version}";
hash = "sha256-qWggdLNF6iWrbcKgdR3Tr19bwK5wS5ffadS3kMFGp5E=";
hash = "sha256-O7NG6KGEiUGieAS2nEfpvCWnE1SYe5pbwD87q2/uBkA=";
};
vendorHash = "sha256-feBmzBrV6yoepU8CiqKaB/bCWIhuiDNhMTem0y1Lynw=";
vendorHash = "sha256-Y1klBZZvDtCootNXQOlScSgDpaw1/owzBX9ykCD6NCw=";
# tests require network access
doCheck = false;
+16 -9
View File
@@ -1,11 +1,15 @@
{
lib,
stdenv,
cmake,
rustPlatform,
fetchFromGitHub,
# nativeBuildInputs
cmake,
installShellFiles,
pkg-config,
rustPlatform,
buildPackages,
versionCheckHook,
python3Packages,
nix-update-script,
@@ -41,13 +45,16 @@ rustPlatform.buildRustPackage rec {
# Tests require python3
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME=$TMPDIR
installShellCompletion --cmd uv \
--bash <($out/bin/uv --generate-shell-completion bash) \
--fish <($out/bin/uv --generate-shell-completion fish) \
--zsh <($out/bin/uv --generate-shell-completion zsh)
'';
postInstall =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
''
installShellCompletion --cmd uv \
--bash <(${emulator} $out/bin/uv generate-shell-completion bash) \
--fish <(${emulator} $out/bin/uv generate-shell-completion fish) \
--zsh <(${emulator} $out/bin/uv generate-shell-completion zsh)
'';
nativeInstallCheckInputs = [
versionCheckHook
@@ -30,11 +30,18 @@
useDune = true;
configurePhase = ''
echo "no configure phase"
patchShebangs stdlib/dev/with-rocq-wrap.sh
''; # don't run Coq's configure
preBuild = ''
echo "(dirs stdlib)" > dune
buildPhase = ''
cd stdlib
dev/with-rocq-wrap.sh dune build -p coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
'';
installPhase = ''
dev/with-rocq-wrap.sh dune install --root . coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR
mkdir $out/lib/coq/
mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}
'';
meta = {
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "1.9.1";
version = "1.10.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
hash = "sha256-NdqmmYAqCYCm1QAqf8K22HdMd0zO3zYds2cEbJutwPA=";
hash = "sha256-W9DLG9PXXuXe3rdtrbAvZZU2d7WsZ9vw/A6c3cFHBFM=";
fetchSubmodules = true;
};
@@ -42,7 +42,8 @@ buildDunePackage rec {
checkInputs = [
ounit
];
doCheck = lib.versionAtLeast ocaml.version "4.08";
# Check are not compatible with re ≥ 1.12
doCheck = lib.versionAtLeast ocaml.version "4.08" && !lib.versionAtLeast ocaml.version "4.12";
meta = with lib; {
description = "Dose library (part of Mancoosi tools)";
+11 -5
View File
@@ -4,20 +4,26 @@
buildDunePackage,
ocaml,
ounit,
ounit2,
seq,
}:
let
version_sha =
if lib.versionAtLeast ocaml.version "4.08" then
if lib.versionAtLeast ocaml.version "4.12" then
{
version = "1.12.0";
hash = "sha256-oB8r8i9ywvSrq9jT52NeNcG/a8WkGtbVoAdFTdq60dQ=";
}
else if lib.versionAtLeast ocaml.version "4.08" then
{
version = "1.11.0";
sha256 = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8=";
hash = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8=";
}
else
{
version = "1.9.0";
sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
hash = "sha256:1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
};
in
@@ -29,12 +35,12 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
sha256 = version_sha.sha256;
inherit (version_sha) hash;
};
buildInputs = lib.optional doCheck ounit;
propagatedBuildInputs = [ seq ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ (if lib.versionAtLeast version "1.12" then ounit2 else ounit) ];
meta = {
homepage = "https://github.com/ocaml/ocaml-re";
@@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
django,
djangorestframework,
orjson,
}:
buildPythonPackage {
pname = "drf-orjson-renderer";
version = "1.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "brianjbuck";
repo = "drf_orjson_renderer";
rev = "8885ef748f0152927106ee068375429774a519df";
hash = "sha256-opC7KcuTg7kdl8xy8H8ZszJb5nn8vJCpRUUIizdnYqU=";
};
build-system = [ setuptools ];
doCheck = false; # Tests are broken upstream (https://github.com/brianjbuck/drf_orjson_renderer/pull/26)
dependencies = [
django
djangorestframework
orjson
];
pythonImportsCheck = [ "drf_orjson_renderer" ];
meta = {
description = "JSON renderer and parser for Django Rest Framework using the orjson library";
homepage = "https://github.com/brianjbuck/drf_orjson_renderer";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jvanbruegge ];
};
}
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-repair";
version = "0.30.3";
version = "0.32.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mangiucugna";
repo = "json_repair";
tag = "v${version}";
hash = "sha256-8EHrI+Z9SempjiBwCeLlskA7FPOhYbi0WHevi7ewlrY=";
hash = "sha256-js2XTplrRZyyVHztA3yGicdjfBFNoUTvjzT/U2NESWQ=";
};
build-system = [ setuptools ];
@@ -128,6 +128,13 @@ buildPythonPackage rec {
"test_prompt_with_llm_and_async_lambda"
"test_prompt_with_chat_model_and_parser"
"test_combining_sequences"
# AssertionError: assert [+ received] == [- snapshot]
"test_chat_input_schema"
# AssertionError: assert {'$defs': {'D...ype': 'array'} == {'$defs': {'D...ype': 'array'}
"test_schemas"
# AssertionError: assert [+ received] == [- snapshot]
"test_graph_sequence_map"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Langchain-core the following tests due to the test comparing execution time with magic values.
@@ -21,6 +21,7 @@
numpy,
pandas,
pandas-stubs,
websockets,
# check deps
pytestCheckHook,
@@ -35,7 +36,7 @@
buildPythonPackage rec {
pname = "openai";
version = "1.57.4";
version = "1.58.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -44,7 +45,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "refs/tags/v${version}";
hash = "sha256-djYvHEIieJPak8EY7c5hhMhTzxm/Prc4RSfrFjzHqI4=";
hash = "sha256-QK0NNMJM4sj4u8nlNPBBQpqV0pBYUMcSwKqhna5q10c=";
};
build-system = [
@@ -61,7 +62,7 @@ buildPythonPackage rec {
sniffio
tqdm
typing-extensions
];
] ++ optional-dependencies.realtime;
optional-dependencies = {
datalib = [
@@ -69,6 +70,9 @@ buildPythonPackage rec {
pandas
pandas-stubs
];
realtime = [
websockets
];
};
pythonImportsCheck = [ "openai" ];
@@ -43,6 +43,14 @@ buildPythonPackage rec {
pythonImportsCheck = [ "opentelemetry.instrumentation" ];
disabledTests = [
# bootstrap: error: argument -a/--action: invalid choice: 'pipenv' (choose from install, requirements)
# RuntimeError: Patch is already started
"test_run_cmd_install"
"test_run_cmd_print"
"test_run_unknown_cmd"
];
passthru.updateScript = opentelemetry-api.updateScript;
meta = with lib; {
@@ -5,6 +5,7 @@
setuptools,
aiohttp,
websockets,
regex,
}:
buildPythonPackage rec {
@@ -23,6 +24,7 @@ buildPythonPackage rec {
dependencies = [
aiohttp
websockets
regex
];
pythonImportsCheck = [ "pymee" ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.15.3";
version = "1.15.5";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
tag = "v${version}";
hash = "sha256-B+dajZ7tjG96X5o/bTOMENyWj6tnZXiWRFCIdSdshy0=";
hash = "sha256-Oah/cTRWl1uj7M5VExDrRPwkWOSajZ2Zqh3jH90hXho=";
};
build-system = [ poetry-core ];
@@ -0,0 +1,67 @@
{
lib,
pkgs,
fetchFromGitHub,
rustPlatform,
pythonImportsCheckHook,
buildPythonPackage,
cargo,
rustc,
pkg-config,
sccache,
setuptools,
setuptools-rust,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "python-kadmin-rs";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "authentik-community";
repo = "kadmin-rs";
rev = "kadmin/version/${version}";
hash = "sha256-5sbYnEoT0/3BTJBipEy+DpIDbX6mRIpAE6CuAoJ5bw4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
hash = "sha256-QLj7RDoyn8QzExUSnofT8XqHZmh72j87HlzOksBvk7Q=";
};
buildInputs = [
pkgs.krb5
];
nativeBuildInputs = [
sccache
pkg-config
pythonImportsCheckHook
rustPlatform.bindgenHook
rustPlatform.cargoSetupHook
cargo
rustc
];
build-system = [
setuptools
setuptools-rust
setuptools-scm
];
pythonImportsCheck = [
"kadmin"
"kadmin_local"
];
meta = {
description = "Rust and Python interfaces to the Kerberos administration interface (kadm5)";
homepage = "https://github.com/authentik-community/kadmin-rs";
changelog = "https://github.com/authentik-community/kadmin-rs/releases/tag/kadmin%2Fversion%2F${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jvanbruegge ];
};
}
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "rmsd";
version = "1.6.1";
version = "1.6.2";
format = "setuptools";
propagatedBuildInputs = [ scipy ];
src = fetchPypi {
inherit pname version;
hash = "sha256-nllfrUlviV2+5k94CiJQTnChrQVcchh1+uhxt84kncM=";
hash = "sha256-E5QIJRqYivSeMxdSOGNt0sbJ6ExHcyLRZ91X6saduto=";
};
pythonImportsCheck = [ "rmsd" ];
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "scim2-filter-parser";
version = "0.5.0";
format = "pyproject";
version = "0.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "15five";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI=";
hash = "sha256-KmtOtI/5HT0lVwvXQFTlEwMeptoa4cA5hTSgSULxhIc=";
};
patches = [
@@ -31,14 +31,14 @@ buildPythonPackage rec {
})
];
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry.masonry.api" "poetry.core.masonry.api"
'';
propagatedBuildInputs = [ sly ];
dependencies = [ sly ];
optional-dependencies = {
django-query = [ django ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1286";
version = "3.0.1287";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-tSwg9Bu1ist6A+uS6lvY3bUtilXrwqYryIN4LbLMHvU=";
hash = "sha256-rr56baecL1uROadbtrrSXip2wVKbArZFvDL8DTNUMCI=";
};
build-system = [ setuptools ];
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "timetagger";
version = "24.12.1";
version = "24.12.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "almarklein";
repo = pname;
tag = "v${version}";
hash = "sha256-d8O4wmY3eJ2HrHq6SKEoaXYAh+A+hWpN72Zfw6WyC1g=";
hash = "sha256-YzMVjIsi7MGIwt828xE3FYobrh9CUz5FqCIogXjmOcM=";
};
propagatedBuildInputs = [
+4
View File
@@ -3873,6 +3873,8 @@ self: super: with self; {
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
drf-orjson-renderer = callPackage ../development/python-modules/drf-orjson-renderer { };
drf-spectacular = callPackage ../development/python-modules/drf-spectacular { };
drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { };
@@ -10723,6 +10725,8 @@ self: super: with self; {
python-juicenet = callPackage ../development/python-modules/python-juicenet { };
python-kadmin-rs = callPackage ../development/python-modules/python-kadmin-rs { };
python-kasa = callPackage ../development/python-modules/python-kasa { };
python-keycloak = callPackage ../development/python-modules/python-keycloak { };