Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
@@ -114,6 +114,8 @@ in
|
||||
security.rtkit.enable = true;
|
||||
services.accounts-daemon.enable = true;
|
||||
services.displayManager.sessionPackages = [ pkgs.cosmic-session ];
|
||||
services.geoclue2.enable = true;
|
||||
services.geoclue2.enableDemoAgent = false;
|
||||
services.libinput.enable = true;
|
||||
services.upower.enable = true;
|
||||
# Required for screen locker
|
||||
|
||||
@@ -33,7 +33,7 @@ in
|
||||
};
|
||||
initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
|
||||
user = cfgAutoLogin.user;
|
||||
command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}'';
|
||||
command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe' pkgs.cosmic-session "start-cosmic"}'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -77,24 +77,61 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
systemd.tmpfiles.settings."10-glpi-agent" = {
|
||||
${cfg.stateDir} = {
|
||||
d = {
|
||||
mode = "0755";
|
||||
user = "root";
|
||||
group = "root";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.glpi-agent = {
|
||||
description = "GLPI Agent";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} --conf-file ${configFile} --vardir ${cfg.stateDir} --daemon --no-fork";
|
||||
ExecStart = lib.escapeShellArgs [
|
||||
"${lib.getExe cfg.package}"
|
||||
"--conf-file"
|
||||
"${configFile}"
|
||||
"--vardir"
|
||||
"${cfg.stateDir}"
|
||||
"--daemon"
|
||||
"--no-fork"
|
||||
];
|
||||
|
||||
DynamicUser = true;
|
||||
StateDirectory = "glpi-agent";
|
||||
CapabilityBoundingSet = [ "CAP_SYS_ADMIN" ];
|
||||
AmbientCapabilities = [ "CAP_SYS_ADMIN" ];
|
||||
|
||||
LimitCORE = 0;
|
||||
LimitNOFILE = 65535;
|
||||
LockPersonality = true;
|
||||
MemorySwapMax = 0;
|
||||
MemoryZSwapMax = 0;
|
||||
PrivateTmp = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "10s";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
"AF_NETLINK"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"@resources"
|
||||
"~@privileged"
|
||||
];
|
||||
NoNewPrivileges = true;
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
nodes = {
|
||||
pretix = {
|
||||
virtualisation.memorySize = 2048;
|
||||
|
||||
networking.extraHosts = ''
|
||||
127.0.0.1 tickets.local
|
||||
'';
|
||||
|
||||
@@ -40,8 +40,7 @@ clangStdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
pkg-config,
|
||||
doxygen,
|
||||
graphviz,
|
||||
pcre,
|
||||
libpthreadstubs,
|
||||
libXdmcp,
|
||||
unixODBC,
|
||||
@@ -171,7 +170,6 @@ stdenv.mkDerivation rec {
|
||||
libX11
|
||||
wxGTK
|
||||
gtk3
|
||||
pcre
|
||||
libXdmcp
|
||||
gettext
|
||||
glew
|
||||
|
||||
@@ -31,8 +31,7 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM=";
|
||||
};
|
||||
|
||||
|
||||
+4
-4
@@ -5,13 +5,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.5"
|
||||
"@anthropic-ai/claude-code": "^1.0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.5.tgz",
|
||||
"integrity": "sha512-A4RkIuHktcNygeZXfj/EcF1M5KXlPSwBBXLQLldUNyX4DFAeCpKh9b0UqnLlMd519QBmfmRYDvZqUlt7Fx0a7g==",
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.6.tgz",
|
||||
"integrity": "sha512-QqPZZ4IXbUaSLqXEx4z68Stjc7NlGh/b4woyYyMks+cMUJ5ZYDEkAe09cRZQ6tjubZNgBaGTOqfTaT8NgnkioQ==",
|
||||
"hasInstallScript": true,
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-bvfP1fkfRURLjgJ3mu5a+Rq9IqcU/Y/LkDp4MXzudww=";
|
||||
hash = "sha256-yMvx543OOClV/BSkM4/bzrbytL+98HAfp14Qk1m2le0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-u7coCE1bu5Z8r59vaoQOaWfXTRytX4HH3QIA6vf3DNc=";
|
||||
npmDepsHash = "sha256-5QP6WQ2tXGADOID9QHq/m7sDQeQsoMGQWxORvQhVROg=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc=";
|
||||
};
|
||||
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-05-16";
|
||||
version = "0-unstable-2025-05-27";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "581ccb06d726b037fd75f64ef964b3d0eb989e33";
|
||||
hash = "sha256-U4qWUPuGuAJlTMFY3qHTrlSmNYgxzuYxCHzZZ2O48FA=";
|
||||
rev = "43034b2f649f987a8bbb7a757c5f9f761343cd57";
|
||||
hash = "sha256-ez7ciW17SDAjrXWeld51jyHeKdLUTw0aOBSheFlH3q4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc=";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"yarn_offline_cache_hash": "sha256-EM1YRbcgn0gLgw/8KImKBbG7T14ztsXqw7U5SINUT+U="
|
||||
"yarn_offline_cache_hash": "sha256-no2bvBNM57JEk3nypsgnqvyuiHo3T1i8KCm887cP0Ak="
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "draupnir",
|
||||
"version": "2.2.0",
|
||||
"version": "2.3.1",
|
||||
"description": "A moderation tool for Matrix",
|
||||
"main": "lib/index.js",
|
||||
"repository": "https://github.com/the-draupnir-project/Draupnir.git",
|
||||
@@ -20,8 +20,7 @@
|
||||
"test:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json",
|
||||
"test:appservice:integration": "NODE_ENV=harness mocha --require test/tsnode.cjs --async-stack-traces --forbid-only --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"",
|
||||
"test:appservice:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --timeout 300000 --project ./tsconfig.json",
|
||||
"test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts",
|
||||
"version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][^\"]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py"
|
||||
"test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.7.0",
|
||||
@@ -52,8 +51,8 @@
|
||||
"@gnuxie/typescript-result": "^1.0.0",
|
||||
"@sentry/node": "^7.17.2",
|
||||
"@sinclair/typebox": "0.34.13",
|
||||
"@the-draupnir-project/interface-manager": "4.0.2",
|
||||
"@the-draupnir-project/matrix-basic-types": "1.2.0",
|
||||
"@the-draupnir-project/interface-manager": "4.1.0",
|
||||
"@the-draupnir-project/matrix-basic-types": "1.3.0",
|
||||
"better-sqlite3": "^9.4.3",
|
||||
"body-parser": "^1.20.2",
|
||||
"config": "^3.3.9",
|
||||
@@ -63,15 +62,16 @@
|
||||
"jsdom": "^24.0.0",
|
||||
"matrix-appservice-bridge": "^10.3.1",
|
||||
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
|
||||
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@2.10.0",
|
||||
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@2.10.1",
|
||||
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.4.0",
|
||||
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.1.4",
|
||||
"pg": "^8.8.0",
|
||||
"yaml": "^2.3.2"
|
||||
},
|
||||
"overrides": {
|
||||
"matrix-bot-sdk": "$@vector-im/matrix-bot-sdk",
|
||||
"@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
|
||||
"@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0"
|
||||
"@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0",
|
||||
"matrix-protection-suite": "$matrix-protection-suite"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.0.0"
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "draupnir";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-draupnir-project";
|
||||
repo = "Draupnir";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EeYjtrfnX+z6SeXavUhUU53mURph48gIUZlF3tubl20=";
|
||||
hash = "sha256-bDesbwTGmrwFp7VQwhxam9WApbmHj1aUrbIdYHdL7YA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -37,11 +37,10 @@
|
||||
zenity,
|
||||
covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg",
|
||||
fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png",
|
||||
# While ygoprodeck has higher quality images, "spamming" of their api results in a ban.
|
||||
# Thats why this link can change since it's compiled into the program, However it will
|
||||
# download assets when needed so it is unlikely to get banned. Unless you search the
|
||||
# card list with no filters of any kind. When testing use ProjectIgnis' website instead.
|
||||
pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg",
|
||||
# While ygoprodeck has higher quality images:
|
||||
# 1. automated downloads for sims via their API are discouraged by the owner
|
||||
# 2. images for prerelease cards are unavailable on their service
|
||||
pics_url ? "https://pics.projectignis.org:2096/pics/{}.jpg",
|
||||
}:
|
||||
let
|
||||
archLabel =
|
||||
|
||||
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE=";
|
||||
};
|
||||
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.203.6";
|
||||
version = "0.204.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-hxh0EgOa2ZFpufyS4Aei86QjeJA0vyuornPK7Y5nRtQ=";
|
||||
hash = "sha256-jW6L4Rxm05ymjtyKPt56ulSuUcfJv9Ev6Jk403NnDt0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hhr6UegsurRsrbN3YB9FAkbZkH+B6RwLmG7RRyNR4+4=";
|
||||
vendorHash = "sha256-+rARu2Qfi2IFngoFl4qmPiRk5iXE4+A74RhHIjocieg=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
@@ -52,7 +52,7 @@ buildGo124Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-8hhiEqQclZUc6zgYvTacVAu5Y47gLJyP249lP4WjVGQ=";
|
||||
hash = "sha256-z64qzc3rDFByJ6Usubm9IIHfu4/i07O/zjtq2VjN7lk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fider";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getfider";
|
||||
repo = "fider";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uABRIR/3D+//qYu/396qqVizP0kLmAA8auYd83rABhE=";
|
||||
hash = "sha256-2aV6f4cgO89hIqksT/kutR+ZRTGncuS04kJ5xZZC5Ds=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU=";
|
||||
};
|
||||
|
||||
|
||||
@@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY=";
|
||||
};
|
||||
|
||||
|
||||
@@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc=";
|
||||
};
|
||||
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "frankenphp";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "frankenphp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-y1S1oPBuXpu2ApCxv9ENqzD2wjSeMzwqnBldmVLEIsM=";
|
||||
hash = "sha256-YYEipvr0qqudKuLrINt5htl2oCp6wXWLpyvCPuwR9e8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
|
||||
@@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME=";
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5Gm9lXf1+l9pA/XNUi3uCuI1nvAX9cxRm+f0osMTE7Q=";
|
||||
hash = "sha256-wRz+zWUeKAbk6EmYjm7A4ks7ZhXXhpipts6XZZthsI0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FStOZN/7Zq/iLXesu5yPr59tPx+1xWAfhnrClJir7ss=";
|
||||
vendorHash = "sha256-axVG4KOxDy7+brwui2iPLutFLJ8L7LAQmeDcoFCv7uA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inputplumber";
|
||||
version = "0.58.0";
|
||||
version = "0.58.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FAnA9M9/SLTdsZReZy9BI6+pFFb6kf79aXsWk92QAIc=";
|
||||
hash = "sha256-G4RJansuv7U69l1QIfGp/cQqFtjY8BCMBcA9fiPMhHk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-g4YlY/FviPGU/x+Sb29BxbemBwJ82xFByED/LyGKgwU=";
|
||||
cargoHash = "sha256-ftIUollVuiL0a76D7WMvW5bzNUdTMebRVbWQYu2LfIA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ=";
|
||||
};
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-cnpg";
|
||||
version = "1.25.1";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnative-pg";
|
||||
repo = "cloudnative-pg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lAcCOHYtEO2v08REvJXvx+S6YzOsh6EcSUTmOXcpks8=";
|
||||
hash = "sha256-IYHzgP9KDNGlNe1znWKv/IST1if9Nnn2cP9rerAIgkY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KTGvOAAhJ3eP7gSrG4yF2bwX0D/vlzeeH7iHixfLwrM=";
|
||||
vendorHash = "sha256-mJyriMf2/2J1ol4gBxgmEdNT1qWCBnwKwIB0yyubxc4=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-cnpg" ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubexporter";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakito";
|
||||
repo = "kubexporter";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9TtoACuX6dEcoWX246a5PofEIksB5KnxzRjdk/HV/Ww=";
|
||||
hash = "sha256-J79AsxkR7Dm4SwnUmYli0H9jUit13RZ2BvLLhlTG5HU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SWStAW5XkZGM57ZoxrVdxM7vtmZpSPkByrhFREHqfW0=";
|
||||
vendorHash = "sha256-D3N0Trq0Izm6at5ikUOJSlHpD2qWmoKwu0ZYcm9l12o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
boost186,
|
||||
boost,
|
||||
gtest,
|
||||
zlib,
|
||||
}:
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
boost186
|
||||
boost
|
||||
gtest
|
||||
zlib
|
||||
];
|
||||
|
||||
@@ -38,8 +38,7 @@ mkYarnPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = data.cargoHash;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
|
||||
};
|
||||
|
||||
|
||||
@@ -23,8 +23,12 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src postPatch;
|
||||
name = "${pname}-${version}";
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
postPatch
|
||||
;
|
||||
hash = "sha256-CDUyH08s96xUy0VhK+4ym0w9IgAq9P1UjUipVjlpl9c=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "4.8.2";
|
||||
version = "4.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HG3TuK4mh44D+qVtcfM09dbuf+M2ZuREASXxG0me3B4=";
|
||||
hash = "sha256-heAIVvQdb69XO3xP6Xq7+5/FqaKrie/1JxJ8FyFXw/U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lxqAd7N5yrW453s6cEGAtCcxLyJMsWK8LtT31kTODoc=";
|
||||
vendorHash = "sha256-G+wr4mDuQoZEgdyHohDSVUJza70eZc+zrmQ79d/49lE=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nbfc-linux";
|
||||
version = "0.3.16";
|
||||
version = "0.3.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbfc-linux";
|
||||
repo = "nbfc-linux";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-vbpdBYrH8sf62UjVfSiJEwEDpKagGw8FIHkIBKwjy1Q=";
|
||||
hash = "sha256-6TyAhPt/692nd3pQVvcJEarXmUsByPiCXt1TuQBDTMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
boehmgc,
|
||||
zlib,
|
||||
sqlite,
|
||||
pcre,
|
||||
pcre2,
|
||||
cmake,
|
||||
pkg-config,
|
||||
git,
|
||||
@@ -14,32 +13,24 @@
|
||||
apr,
|
||||
aprutil,
|
||||
libmysqlclient,
|
||||
mbedtls_2,
|
||||
mbedtls,
|
||||
openssl,
|
||||
pkgs,
|
||||
gtk2,
|
||||
gtk3,
|
||||
libpthreadstubs,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neko";
|
||||
version = "2.3.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HaxeFoundation";
|
||||
repo = "neko";
|
||||
rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}";
|
||||
sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g";
|
||||
hash = "sha256-cTu+AlDnpXAow6jM77Ct9DM8p//z6N1utk7Wsd+0g9U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/HaxeFoundation/neko/pull/224
|
||||
(fetchpatch {
|
||||
url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch";
|
||||
sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -49,16 +40,17 @@ stdenv.mkDerivation rec {
|
||||
boehmgc
|
||||
zlib
|
||||
sqlite
|
||||
pcre
|
||||
pcre2
|
||||
apacheHttpd
|
||||
apr
|
||||
aprutil
|
||||
libmysqlclient
|
||||
mbedtls_2
|
||||
mbedtls
|
||||
openssl
|
||||
libpthreadstubs
|
||||
] ++ lib.optional stdenv.hostPlatform.isLinux gtk2;
|
||||
] ++ lib.optional stdenv.hostPlatform.isLinux gtk3;
|
||||
cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
@@ -73,23 +65,26 @@ stdenv.mkDerivation rec {
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "High-level dynamically typed programming language";
|
||||
homepage = "https://nekovm.org";
|
||||
license = [
|
||||
# list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE
|
||||
licenses.gpl2Plus # nekoc, nekoml
|
||||
licenses.lgpl21Plus # mysql.ndll
|
||||
licenses.bsd3 # regexp.ndll
|
||||
licenses.zlib # zlib.ndll
|
||||
licenses.asl20 # mod_neko, mod_tora, mbedTLS
|
||||
licenses.mit # overall, other libs
|
||||
lib.licenses.gpl2Plus # nekoc, nekoml
|
||||
lib.licenses.lgpl21Plus # mysql.ndll
|
||||
lib.licenses.bsd3 # regexp.ndll
|
||||
lib.licenses.zlib # zlib.ndll
|
||||
lib.licenses.asl20 # mod_neko, mod_tora, mbedTLS
|
||||
lib.licenses.mit # overall, other libs
|
||||
"https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc
|
||||
];
|
||||
maintainers = [
|
||||
maintainers.marcweber
|
||||
maintainers.locallycompact
|
||||
maintainers = with lib.maintainers; [
|
||||
marcweber
|
||||
locallycompact
|
||||
];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.29.7";
|
||||
version = "1.29.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CQWPDhHPKo2MYWQnVG07JBMzQLwWwDOWAcOc/3Ovr1M=";
|
||||
hash = "sha256-y+I0BN41WsiUTg//7PMEi24esYsldpmk0/hGtjs8kdA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -122,7 +122,7 @@ class Flake:
|
||||
m = cls._re.match(flake_str)
|
||||
assert m is not None, f"got no matches for {flake_str}"
|
||||
attr = m.group("attr")
|
||||
nixos_attr = f"nixosConfigurations.{attr or hostname_fn() or 'default'}"
|
||||
nixos_attr = f'nixosConfigurations."{attr or hostname_fn() or "default"}"'
|
||||
path_str = m.group("path")
|
||||
if ":" in path_str:
|
||||
return cls(path_str, nixos_attr)
|
||||
|
||||
@@ -385,7 +385,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
|
||||
"nix",
|
||||
"eval",
|
||||
"--json",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.images",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.images',
|
||||
"--apply",
|
||||
"builtins.attrNames",
|
||||
],
|
||||
@@ -400,7 +400,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
|
||||
"nix-command flakes",
|
||||
"build",
|
||||
"--print-out-paths",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.images.azure',
|
||||
],
|
||||
check=True,
|
||||
stdout=PIPE,
|
||||
@@ -411,7 +411,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
|
||||
"nix",
|
||||
"eval",
|
||||
"--json",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure.passthru.filePath",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.images.azure.passthru.filePath',
|
||||
],
|
||||
check=True,
|
||||
stdout=PIPE,
|
||||
@@ -462,7 +462,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
|
||||
"nix-command flakes",
|
||||
"build",
|
||||
"--print-out-paths",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel',
|
||||
"-v",
|
||||
"--option",
|
||||
"narinfo-cache-negative-ttl",
|
||||
@@ -756,7 +756,7 @@ def test_execute_nix_switch_flake_target_host(
|
||||
"nix-command flakes",
|
||||
"build",
|
||||
"--print-out-paths",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel',
|
||||
"--no-link",
|
||||
],
|
||||
check=True,
|
||||
@@ -860,7 +860,7 @@ def test_execute_nix_switch_flake_build_host(
|
||||
"nix-command flakes",
|
||||
"eval",
|
||||
"--raw",
|
||||
"/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
|
||||
'/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel.drvPath',
|
||||
],
|
||||
check=True,
|
||||
stdout=PIPE,
|
||||
@@ -1063,7 +1063,7 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
|
||||
"nix-command flakes",
|
||||
"build",
|
||||
"--print-out-paths",
|
||||
"github:user/repo#nixosConfigurations.hostname.config.system.build.toplevel",
|
||||
'github:user/repo#nixosConfigurations."hostname".config.system.build.toplevel',
|
||||
],
|
||||
check=True,
|
||||
stdout=PIPE,
|
||||
|
||||
@@ -32,38 +32,42 @@ def test_build_attr_to_attr() -> None:
|
||||
|
||||
def test_flake_parse(tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
|
||||
assert m.Flake.parse("/path/to/flake#attr") == m.Flake(
|
||||
Path("/path/to/flake"), "nixosConfigurations.attr"
|
||||
Path("/path/to/flake"), 'nixosConfigurations."attr"'
|
||||
)
|
||||
assert m.Flake.parse("/path/ to /flake", lambda: "hostname") == m.Flake(
|
||||
Path("/path/ to /flake"), "nixosConfigurations.hostname"
|
||||
Path("/path/ to /flake"), 'nixosConfigurations."hostname"'
|
||||
)
|
||||
assert m.Flake.parse("/path/to/flake", lambda: "hostname") == m.Flake(
|
||||
Path("/path/to/flake"), "nixosConfigurations.hostname"
|
||||
Path("/path/to/flake"), 'nixosConfigurations."hostname"'
|
||||
)
|
||||
# change directory to tmpdir
|
||||
with monkeypatch.context() as patch_context:
|
||||
patch_context.chdir(tmpdir)
|
||||
assert m.Flake.parse(".#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
|
||||
assert m.Flake.parse("#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
|
||||
assert m.Flake.parse(".") == m.Flake(Path("."), "nixosConfigurations.default")
|
||||
assert m.Flake.parse(".#attr") == m.Flake(
|
||||
Path("."), 'nixosConfigurations."attr"'
|
||||
)
|
||||
assert m.Flake.parse("#attr") == m.Flake(
|
||||
Path("."), 'nixosConfigurations."attr"'
|
||||
)
|
||||
assert m.Flake.parse(".") == m.Flake(Path("."), 'nixosConfigurations."default"')
|
||||
assert m.Flake.parse("path:/to/flake#attr") == m.Flake(
|
||||
"path:/to/flake", "nixosConfigurations.attr"
|
||||
"path:/to/flake", 'nixosConfigurations."attr"'
|
||||
)
|
||||
assert m.Flake.parse("github:user/repo/branch") == m.Flake(
|
||||
"github:user/repo/branch", "nixosConfigurations.default"
|
||||
"github:user/repo/branch", 'nixosConfigurations."default"'
|
||||
)
|
||||
git_root = tmpdir / "git_root"
|
||||
git_root.mkdir()
|
||||
(git_root / ".git").mkdir()
|
||||
assert m.Flake.parse(str(git_root)) == m.Flake(
|
||||
f"git+file://{git_root}", "nixosConfigurations.default"
|
||||
f"git+file://{git_root}", 'nixosConfigurations."default"'
|
||||
)
|
||||
|
||||
work_tree = tmpdir / "work_tree"
|
||||
work_tree.mkdir()
|
||||
(work_tree / ".git").write_text("gitdir: /path/to/git", "utf-8")
|
||||
assert m.Flake.parse(str(work_tree)) == m.Flake(
|
||||
"git+file:///path/to/git", "nixosConfigurations.default"
|
||||
"git+file:///path/to/git", 'nixosConfigurations."default"'
|
||||
)
|
||||
|
||||
|
||||
@@ -84,7 +88,7 @@ def test_flake_from_arg(
|
||||
|
||||
# Flake string
|
||||
assert m.Flake.from_arg("/path/to/flake#attr", None) == m.Flake(
|
||||
Path("/path/to/flake"), "nixosConfigurations.attr"
|
||||
Path("/path/to/flake"), 'nixosConfigurations."attr"'
|
||||
)
|
||||
|
||||
# False
|
||||
@@ -94,7 +98,7 @@ def test_flake_from_arg(
|
||||
with monkeypatch.context() as patch_context:
|
||||
patch_context.chdir(tmpdir)
|
||||
assert m.Flake.from_arg(True, None) == m.Flake(
|
||||
Path("."), "nixosConfigurations.hostname"
|
||||
Path("."), 'nixosConfigurations."hostname"'
|
||||
)
|
||||
|
||||
# None when we do not have /etc/nixos/flake.nix
|
||||
@@ -124,7 +128,7 @@ def test_flake_from_arg(
|
||||
),
|
||||
):
|
||||
assert m.Flake.from_arg(None, None) == m.Flake(
|
||||
"git+file:///etc/nixos", "nixosConfigurations.hostname"
|
||||
"git+file:///etc/nixos", 'nixosConfigurations."hostname"'
|
||||
)
|
||||
|
||||
with (
|
||||
@@ -145,7 +149,7 @@ def test_flake_from_arg(
|
||||
),
|
||||
):
|
||||
assert m.Flake.from_arg(None, None) == m.Flake(
|
||||
Path("/path/to"), "nixosConfigurations.hostname"
|
||||
Path("/path/to"), 'nixosConfigurations."hostname"'
|
||||
)
|
||||
|
||||
with (
|
||||
@@ -156,7 +160,7 @@ def test_flake_from_arg(
|
||||
),
|
||||
):
|
||||
assert m.Flake.from_arg("/path/to", m.Remote("user@host", [], None)) == m.Flake(
|
||||
Path("/path/to"), "nixosConfigurations.remote-hostname"
|
||||
Path("/path/to"), 'nixosConfigurations."remote-hostname"'
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
|
||||
"nix-command flakes",
|
||||
"build",
|
||||
"--print-out-paths",
|
||||
".#nixosConfigurations.hostname.config.system.build.toplevel",
|
||||
'.#nixosConfigurations."hostname".config.system.build.toplevel',
|
||||
"--no-link",
|
||||
"--nix-flag",
|
||||
"foo",
|
||||
@@ -194,7 +194,7 @@ def test_build_remote_flake(
|
||||
"nix-command flakes",
|
||||
"eval",
|
||||
"--raw",
|
||||
".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
|
||||
'.#nixosConfigurations."hostname".config.system.build.toplevel.drvPath',
|
||||
"--flake",
|
||||
],
|
||||
stdout=PIPE,
|
||||
@@ -304,7 +304,7 @@ def test_edit(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
|
||||
"edit",
|
||||
"--commit-lock-file",
|
||||
"--",
|
||||
f"{tmpdir}#nixosConfigurations.attr",
|
||||
f'{tmpdir}#nixosConfigurations."attr"',
|
||||
],
|
||||
check=False,
|
||||
)
|
||||
|
||||
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw=";
|
||||
};
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2025.4.0";
|
||||
version = "2025.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-K/llv85CWp+V70BiYAR7lT+urGdLbXBhWpCptxUqDrc=";
|
||||
hash = "sha256-vu+7jKXIuNZ4BN2IamdDxGJkraj93eNYUT3sUU2LCAg=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
@@ -54,7 +54,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-FqwgHmIUfcipVbeXmN4uYPHdmnuaSgOQ9LHgKRf16ys=";
|
||||
npmDepsHash = "sha256-NSBSL6+0ancoPHbvJu4fBxK8EVj06dbltjHqJi2yh5w=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-mollie";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-mollie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6VwS8yzueeZ7Yf8U98nljFlFPNVJt6ncd9Qr8nz/SWE=";
|
||||
hash = "sha256-P+50WRYB5QQWS54NMTJoEnLpizlovVq3PR/qwA2inME=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-servicefees";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-servicefees";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oZXJd7Pj9dPfSZ1FqTxT6FlNA8cJDWIPPLS8nN+l7ZM=";
|
||||
hash = "sha256-PsVItCBFJ4dRdRY2jKJ7aErYx/bhxKQtDsiJbyXsNKk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
qt6,
|
||||
qdiskinfo,
|
||||
themeBundle ? null,
|
||||
unstableGitUpdater,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -34,15 +34,15 @@ assert
|
||||
&& themeBundle' ? rightCharacter
|
||||
);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdiskinfo";
|
||||
version = "0.3-unstable-2025-05-22";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edisionnano";
|
||||
repo = "QDiskInfo";
|
||||
rev = "9b7f4fb44e888dde7c9d0e82300d275e8671769d";
|
||||
hash = "sha256-GqHDTEeZ+dEmCeyFehaNKB8af5PN8ZTSKxm00mkqouk=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FufbF0oEqpYgXnfzUZJ3tTN2jJoIQX4UB3yURRV7y00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
|
||||
themeName: themeBundle:
|
||||
(qdiskinfo.override { inherit themeBundle; }).overrideAttrs { pname = "qdiskinfo-${themeName}"; }
|
||||
);
|
||||
updateScript = unstableGitUpdater { };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -118,4 +118,4 @@ stdenv.mkDerivation {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "QDiskInfo";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rcu";
|
||||
version = "2025.001s";
|
||||
version = "4.0.24";
|
||||
|
||||
format = "other";
|
||||
|
||||
src =
|
||||
let
|
||||
src-tarball = requireFile {
|
||||
name = "rcu-d${version}-source.tar.gz";
|
||||
hash = "sha256-QC9ieulYAmE9pwt1/eZmyI5MZfRV0f24Pe5oKtuXNok=";
|
||||
name = "rcu-${version}-source.tar.gz";
|
||||
hash = "sha256-3rZiqg8Uuta3kI2m+2rBZ1XzN9bFds+emhivH5X7sJg=";
|
||||
url = "https://www.davisr.me/projects/rcu/";
|
||||
};
|
||||
in
|
||||
|
||||
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-mn3Jl5XEHYbCCFjLd8TBqtZKEdevH95IWKdgHwAtXk0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsop";
|
||||
version = "0.6.4";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "heiko";
|
||||
repo = "rsop";
|
||||
rev = "rsop/v${version}";
|
||||
hash = "sha256-0+kzEYR2ZijI02aqyXpBcIldRa4wJtYqO/MMljjcXzc=";
|
||||
hash = "sha256-jbAv4uTG+ffp6mc9EsezPORh9KqDfUBNXxQuaOIbNfQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Ef9ahFlOmfVkvNBeSmoCV7dwS/YI5ZTaQ0X59oyHSjs=";
|
||||
cargoHash = "sha256-G1N76ZG43eiTjxhOfRCSwjz7XOAolj88tex8qoZuC2Y=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation (finaAttrs: {
|
||||
pname = "scom";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crash-systems";
|
||||
repo = "scom";
|
||||
tag = finaAttrs.version;
|
||||
hash = "sha256-z/y4SB0R3nxiBGAWLGBsRH0tncDuBxpjy6NGG8ZbIPw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = {
|
||||
description = "Minimal serial communication tool";
|
||||
homepage = "https://github.com/crash-systems/scom";
|
||||
mainProgram = "scom";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ savalet ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-DBWg9Xss1ChbPyI3MiN7eTXhSUG37ZaYS/HFxou9d/w=";
|
||||
};
|
||||
|
||||
|
||||
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "squeekboard-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -30,8 +30,12 @@ stdenv.mkDerivation {
|
||||
;
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src sourceRoot;
|
||||
name = "${pname}-${version}";
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA=";
|
||||
};
|
||||
|
||||
|
||||
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-D9gchFS5zrD1cttq/gveT7wY2Y/5hfiUrwBa7qHD9cs=";
|
||||
};
|
||||
|
||||
|
||||
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-j0A6HlApV0l7LuB7ISHp+k/bSH5Icdv+aNQ9juCCO9I=";
|
||||
};
|
||||
|
||||
|
||||
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-S+JW6OvmB9vj9cR9/qnw5EIECjpD8JPhxfgwDEEtlC0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
at-spi2-atk,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
wrapGAppsHook4,
|
||||
at-spi2-atk,
|
||||
glib,
|
||||
gtk4,
|
||||
gtk4-layer-shell,
|
||||
installShellFiles,
|
||||
scdoc,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wleave";
|
||||
@@ -25,16 +26,17 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
pkg-config
|
||||
scdoc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
at-spi2-atk
|
||||
glib
|
||||
gtk4
|
||||
gtk4-layer-shell
|
||||
glib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
lxqt-build-tools,
|
||||
lxqt-menu-data,
|
||||
menu-cache,
|
||||
pcre,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
@@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
|
||||
libxcb
|
||||
lxqt-menu-data
|
||||
menu-cache
|
||||
pcre
|
||||
] ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
@@ -33,9 +33,9 @@ let
|
||||
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
|
||||
"20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
|
||||
"21.0.0-git".gitRelease = {
|
||||
rev = "3d0c616ce30cdc3d9c26dda8fdc608a6c85f00a6";
|
||||
rev-version = "21.0.0-unstable-2025-05-18";
|
||||
sha256 = "sha256-5tfGng/urJNSqlFy5sxIYsR5brtf2ZlL5tssGD6Oef8=";
|
||||
rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
|
||||
rev-version = "21.0.0-unstable-2025-05-25";
|
||||
sha256 = "sha256-n8WFnYNb46kK7MEh7XF/Psdbn+KJQFKs/LQBZxCklY4=";
|
||||
};
|
||||
} // llvmVersions;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
libGL,
|
||||
libGLU,
|
||||
libjpeg,
|
||||
libopus,
|
||||
libpng,
|
||||
libpthreadstubs,
|
||||
libpulseaudio,
|
||||
@@ -30,7 +29,6 @@
|
||||
libXxf86misc,
|
||||
libXxf86vm,
|
||||
openal,
|
||||
pcre,
|
||||
physfs,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
@@ -68,13 +66,11 @@ stdenv.mkDerivation rec {
|
||||
libGL
|
||||
libGLU
|
||||
libjpeg
|
||||
libopus
|
||||
libpng
|
||||
libtheora
|
||||
libvorbis
|
||||
libwebp
|
||||
openal
|
||||
pcre
|
||||
physfs
|
||||
texinfo
|
||||
zlib
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
eigen,
|
||||
python3,
|
||||
cairo,
|
||||
pcre,
|
||||
pkg-config,
|
||||
swig,
|
||||
rapidjson,
|
||||
@@ -40,8 +39,6 @@ stdenv.mkDerivation rec {
|
||||
eigen
|
||||
python3
|
||||
cairo
|
||||
pcre
|
||||
swig
|
||||
rapidjson
|
||||
boost
|
||||
maeparser
|
||||
@@ -50,6 +47,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
||||
@@ -169,5 +169,11 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
wlroots = wlroots_0_18;
|
||||
wlroots_0_19 = generic {
|
||||
version = "0.19.0";
|
||||
hash = "sha256-I8z50yA/ukvXEC5TksG84+GrQpfC4drBJDRGw0R8RLk=";
|
||||
extraBuildInputs = [
|
||||
lcms2
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,9 +37,8 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
sourceRoot = "${src.name}/aardwolf/utils/rlers";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA=";
|
||||
};
|
||||
|
||||
|
||||
@@ -44,8 +44,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-uB3r6+Ewpi4dVke/TsCZltfc+ZABYLOLKuNxw+Jfu/M=";
|
||||
};
|
||||
|
||||
|
||||
@@ -33,9 +33,8 @@ buildPythonPackage rec {
|
||||
|
||||
cargoRoot = "src/_bcrypt";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
sourceRoot = "${pname}-${version}/${cargoRoot}";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
|
||||
};
|
||||
|
||||
|
||||
@@ -64,8 +64,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-ZtCTg8qNCiqlH7RsZxaWUNAoazdgmXP2GtpjDpRdvbk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -21,8 +21,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac=";
|
||||
};
|
||||
|
||||
|
||||
@@ -35,8 +35,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-dKwNnWBzBM9QEcRbbvkNhFJnFxFakqZ/MS7rqE8/tNQ=";
|
||||
};
|
||||
|
||||
|
||||
@@ -35,12 +35,11 @@ buildPythonPackage rec {
|
||||
# call `cargo build --release` in bindings/python and copy the
|
||||
# resulting lock file
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
postPatch = ''
|
||||
cd bindings/python
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-4zi29ZdALummwcWxYqDDEPAjKptmLqyYUJzWMrEK4os=";
|
||||
};
|
||||
|
||||
|
||||
@@ -40,8 +40,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-tFOZJFrNge3N+ux2Hp4Mlm9K/AXYxuuBzEQdQYGGDjg=";
|
||||
inherit patches;
|
||||
};
|
||||
|
||||
@@ -24,8 +24,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c=";
|
||||
};
|
||||
|
||||
|
||||
@@ -31,8 +31,7 @@ buildPythonPackage {
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU=";
|
||||
};
|
||||
|
||||
|
||||
@@ -21,8 +21,12 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src sourceRoot;
|
||||
name = "${pname}-${version}";
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-97aEuXdq9oEqYJs6sgQU5a0vAMJmWJzu2WGjOqzxZ4c=";
|
||||
};
|
||||
|
||||
|
||||
@@ -28,9 +28,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU=";
|
||||
};
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-Ppc+6ex3yLC4xuhbZGZDKLqxDjSdGpgrLDpbbbqMgPY=";
|
||||
};
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-O4aKqVSShFpt8mdZkY3WV55j9CIczRSRkIMC7dJoGv0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -26,8 +26,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-CW95omstpWm76TTSKsb04iChU0EW1Vl+OA3QXxfZAX0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -29,8 +29,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-V1z16GKaSQVjp+stWir7kAO2wsnOYPdhKi4KzIKmKx8=";
|
||||
};
|
||||
|
||||
|
||||
@@ -25,8 +25,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o=";
|
||||
};
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-51qJAcJvolYCW3XWeymc2xd2QHiKLd7MdRdDedEH8QY=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
libiconv,
|
||||
pytestCheckHook,
|
||||
python,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
pyyaml-ft,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
setuptools-rust,
|
||||
@@ -20,20 +22,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libcst";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Instagram";
|
||||
repo = "LibCST";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KqiB1LieRJJ34kJgIlqyMKCzO7iDen8j9+s0ZmrHe+c=";
|
||||
hash = "sha256-mHYcbw3BfvntKHadObYow8H/2f0LqpfSTbKju0CKhx4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-EPS506x8KUFAbZ47ZWtH1q0ndXutM2fOqcsYpXRc0+c=";
|
||||
hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg=";
|
||||
};
|
||||
|
||||
cargoRoot = "native";
|
||||
@@ -52,7 +54,7 @@ buildPythonPackage rec {
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
dependencies = [
|
||||
pyyaml
|
||||
(if pythonOlder "3.13" then pyyaml else pyyaml-ft)
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -20,8 +20,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-2AR9slC/vWv5Ump1DLE2em8LLSTXHVkI/PBW5PxCXXg=";
|
||||
};
|
||||
|
||||
|
||||
@@ -19,8 +19,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -23,8 +23,7 @@ buildPythonPackage {
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -25,8 +25,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4=";
|
||||
};
|
||||
|
||||
|
||||
@@ -42,8 +42,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-ZUBrZqdesy0qKaxuD5gSlq7qOoXWn0aZNOidUb0grMM=";
|
||||
};
|
||||
|
||||
|
||||
@@ -43,8 +43,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-vMuqqUfaYFZ1wC3SZBVF7Wq2OUKd7UkdC8GB93QBq8Y=";
|
||||
};
|
||||
|
||||
|
||||
@@ -21,8 +21,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-91p0eoVRzc9S8pHRhAlRey4k4jW9IMttiH+9Joh91IQ=";
|
||||
};
|
||||
|
||||
|
||||
@@ -39,9 +39,8 @@ buildPythonPackage rec {
|
||||
|
||||
cargoRoot = "rust";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit pname version src;
|
||||
sourceRoot = "${src.name}/rust";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-F5bCuvI8DcyeUTS7UyYBixCjuGFKGOXPw8HLVlYKuxA=";
|
||||
};
|
||||
|
||||
|
||||
@@ -72,8 +72,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-iPf25DMGNHrWYByNTylB6bPpLfzs0ADwgkjfhVxiiXA=";
|
||||
};
|
||||
|
||||
|
||||
@@ -22,8 +22,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-OSnPGRZwuAzcvu80GgTXdc740SfhDIsXrQZq9a/BCdE=";
|
||||
};
|
||||
|
||||
|
||||
@@ -40,8 +40,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-Qep5YD4LQ+r118L5H+hUqeS00SibyvsbtLWDrJJBNc0=";
|
||||
};
|
||||
|
||||
|
||||
@@ -30,8 +30,7 @@ let
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
inherit pname version src;
|
||||
hash = "sha256-MY6Gxoz5Q7nCptR+zvdABh2agfbpqOtfTtor4pmkb9c=";
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user