Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-07-19 12:01:12 +00:00 committed by GitHub
commit b110c513b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 1005 additions and 587 deletions

View file

@ -16754,6 +16754,14 @@
githubId = 8577941;
name = "Kevin Rauscher";
};
tomasajt = {
github = "TomaSajt";
githubId = 62384384;
name = "TomaSajt";
keys = [{
fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1";
}];
};
tomaskala = {
email = "public+nixpkgs@tomaskala.com";
github = "tomaskala";
@ -18076,6 +18084,12 @@
githubId = 73759599;
name = "Yaya";
};
yboettcher = {
name = "Yannik Böttcher";
github = "yboettcher";
githubId = 39460066;
email = "yannikboettcher@outlook.de";
};
ydlr = {
name = "ydlr";
email = "ydlr@ydlr.io";

View file

@ -29,10 +29,10 @@ let
mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest {
name = "keymap-${layout}";
machine.console.keyMap = mkOverride 900 layout;
machine.services.xserver.desktopManager.xterm.enable = false;
machine.services.xserver.layout = mkOverride 900 layout;
machine.imports = [ ./common/x11.nix extraConfig ];
nodes.machine.console.keyMap = mkOverride 900 layout;
nodes.machine.services.xserver.desktopManager.xterm.enable = false;
nodes.machine.services.xserver.layout = mkOverride 900 layout;
nodes.machine.imports = [ ./common/x11.nix extraConfig ];
testScript = ''
import json
@ -201,4 +201,33 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
extraConfig.console.keyMap = "de";
extraConfig.services.xserver.layout = "de";
};
custom = {
tests = {
us.qwerty = [ "a" "b" "g" "d" "z" "shift-2" "shift-3" ];
us.expect = [ "a" "b" "g" "d" "z" "@" "#" ];
greek.qwerty = map (x: "alt_r-${x}")
[ "a" "b" "g" "d" "z" ];
greek.expect = [ "α" "β" "γ" "δ" "ζ" ];
};
extraConfig.console.useXkbConfig = true;
extraConfig.services.xserver.layout = "us-greek";
extraConfig.services.xserver.extraLayouts.us-greek =
{ description = "US layout with alt-gr greek";
languages = [ "eng" ];
symbolsFile = pkgs.writeText "us-greek" ''
xkb_symbols "us-greek"
{
include "us(basic)"
include "level3(ralt_switch)"
key <LatA> { [ a, A, Greek_alpha ] };
key <LatB> { [ b, B, Greek_beta ] };
key <LatG> { [ g, G, Greek_gamma ] };
key <LatD> { [ d, D, Greek_delta ] };
key <LatZ> { [ z, Z, Greek_zeta ] };
};
'';
};
};
}

View file

@ -5,14 +5,14 @@
mkDerivation rec {
pname = "qpwgraph";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
sha256 = "sha256-9HgxFqwmRG2mJy9aTT0MeWdtE+YKG6rU8g24IZFHSRY=";
sha256 = "sha256-VMTVaJJHMgx5mJT4ZRL5CDOJp7UPOkZOjqulCFSd7xo=";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -17,14 +17,14 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
"231.9011.35": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip"
},
"name": "ideavim"
},
@ -67,11 +67,11 @@
"231.9011.35": null,
"231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip"
"231.9225.12": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip"
},
"name": "ini"
},
@ -106,8 +106,8 @@
],
"builds": {
"231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip"
},
"name": "python-community-edition"
},
@ -131,11 +131,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip"
},
"name": "rust"
},
@ -156,14 +156,14 @@
],
"builds": {
"223.8836.1185": null,
"231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip"
"231.9011.35": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip"
},
"name": "rust-beta"
},
@ -205,11 +205,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
},
"name": "nixidea"
},
@ -242,11 +242,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip"
},
"name": "csv-editor"
},
@ -270,11 +270,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
},
"name": "eclipse-keymap"
},
@ -298,11 +298,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
},
"name": "visual-studio-keymap"
},
@ -326,11 +326,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
"231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@ -354,11 +354,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip"
},
"name": "github-copilot"
},
@ -382,11 +382,11 @@
"231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
@ -400,20 +400,20 @@
"https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
"https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=",
"https://plugins.jetbrains.com/files/164/364022/IdeaVim-2.4.0-signed.zip": "sha256-aetarXrmK7EdYqLqAY0QNmi/djxDJnEyNTV1E0pay7Q=",
"https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip": "sha256-9KTWE7rudLZwxCEv5QNu/9rxA0o0GdQK4+oqkzeOtyA=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip": "sha256-vin0+O9f4rY3FYqztzdIlyal5bvrvrt8Q8neDrXRmsU=",
"https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=",
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
"https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip": "sha256-FHv/cELjKf3Jral2Cqc3QiE4bx1mm6jy42AsR27nt9g=",
"https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=",
"https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=",
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
"https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
"https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=",
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
"https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip": "sha256-OuOUVUYHfg5JFLX2xAQ/VHaS8gUI0H7SZEdau8fbAAY=",
"https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip": "sha256-kCS/fglqb4MD/sE+mGHchvQCUOdZiDrYtTAzn7XITkM=",
"https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=",
"https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=",
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
"https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip": "sha256-VZoavuQyHP7rJ3p/R+maoHetEt8bYP/eSnlfEgfFrFc="

View file

@ -92,10 +92,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.1.3",
"sha256": "192be48828cb7515e8158cec8aa6ba4d320d3b65ebd09a921e85085143e9bd56",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.tar.gz",
"build_number": "231.9161.46"
"version": "2023.1.4",
"sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz",
"build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -207,10 +207,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.1.3",
"sha256": "f7727c5f1b38352ca6ce7ad5ee410152b733bb72b98416d54b7b3e627fd6f2a9",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.dmg",
"build_number": "231.9161.46"
"version": "2023.1.4",
"sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg",
"build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -322,10 +322,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.1.3",
"sha256": "d8477d115836913063996abc43ecc531cf08b10f3fb8fc21f58d385743895337",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3-aarch64.dmg",
"build_number": "231.9161.46"
"version": "2023.1.4",
"sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg",
"build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",

File diff suppressed because it is too large Load diff

View file

@ -11,13 +11,13 @@
}:
let
version = "0.44";
version = "0.45";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
hash = "sha256-3kPRntl5tHsITrEJaRRcidowcyMpXDTVV5jFN/GV8Sk=";
hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos=";
};
meta = with lib; {

View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-39";
version = "2.0-44";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-+2V78G4SDFb6ZQDDorvT13yqnZw2JAObF+WGYMMGYHE=";
hash = "sha256-tvdQZ8FOoB2/+JBA41dpZYJnkBxQMX8ZfBQJ7B6NjYk=";
};
patches = [

View file

@ -1,25 +0,0 @@
{ lib, fetchPypi, buildPythonApplication }:
buildPythonApplication rec {
pname = "py65";
version = "1.1.0";
format = "wheel";
src = fetchPypi {
inherit pname version format;
sha256 = "Q7rjiHJ/Ew985vut/8fVAf/wWYW5aBPSvNPm8A6g1zg=";
};
meta = with lib; {
homepage = "https://py65.readthedocs.io/";
description = "Emulate 6502-based microcomputer systems in Python";
longDescription = ''
Py65 includes a program called Py65Mon that functions as a machine
language monitor. This kind of program is sometimes also called a
debugger. Py65Mon provides a command line with many convenient commands
for interacting with the simulated 6502-based system.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
};
}

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchFromGitHub
, fetchPypi
}:
@ -24,6 +25,16 @@ let
];
};
});
django-extensions = super.django-extensions.overridePythonAttrs (old: rec {
version = "3.1.5";
src = fetchFromGitHub {
inherit version;
owner = "django-extensions";
repo = "django-extensions";
rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5";
hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";
};
});
};
};
in

View file

@ -0,0 +1,52 @@
{ lib
, stdenv
, fetchFromGitHub
, python3
, makeWrapper
}:
let
pythonEnv = (python3.withPackages (ps: with ps; [
pyside6
py65
qdarkstyle
]));
in
stdenv.mkDerivation (finalAttrs: {
pname = "smb3-foundry";
version = "1.2";
src = fetchFromGitHub {
owner = "mchlnix";
repo = "SMB3-Foundry";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE=";
};
patches = [ ./fix-relative-dirs.patch ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/app
cp -R smb3parse foundry scribe data doc VERSION smb3-foundry.py smb3-scribe.py $out/app
makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-foundry \
--add-flags "$out/app/smb3-foundry.py"
makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-scribe \
--add-flags "$out/app/smb3-scribe.py"
runHook postInstall
'';
meta = {
homepage = "https://github.com/mchlnix/SMB3-Foundry";
description = "A modern Super Mario Bros. 3 Level Editor";
changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ tomasajt ];
};
})

View file

@ -0,0 +1,34 @@
diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py
index ace83d7..46012df 100644
--- a/foundry/gui/WarningList.py
+++ b/foundry/gui/WarningList.py
@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance
from PySide6.QtGui import QCursor, QFocusEvent
from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget
+from foundry import root_dir
from foundry.game import GROUND
from foundry.game.ObjectDefinitions import GeneratorType
from foundry.game.gfx.objects import EnemyItem
@@ -216,7 +217,7 @@ class WarningList(QWidget):
return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id]
def _build_enemy_clan_dict(self):
- with open("data/enemy_data.json", "r") as enemy_data_file:
+ with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file:
enemy_data = json.loads(enemy_data_file.read())
self._enemy_dict.clear()
diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py
index ecef169..8bba57e 100644
--- a/smb3parse/util/parser/__init__.py
+++ b/smb3parse/util/parser/__init__.py
@@ -302,7 +302,7 @@ def gen_levels_in_rom(
print("---------------------", level_count, "------------------------")
- level_data = pathlib.Path("data/levels.dat")
+ level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat")
missing = 0
levels: dict[int, set[int]] = defaultdict(set)

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.20.3";
version = "2.21.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-1Auvx2KZ97iD9EDm6QQdgS5YF9smw4dTvXF1IXtYrSI=";
hash = "sha256-6Jg56lQR8oK9TaJNqnEu70JkUz9OomvRbm5to2j3NOA=";
};
vendorHash = "sha256-61j3HVDe6AbXpdmxhQQctv4C2hNBK/rWvZeC+KtISKY=";
vendorHash = "sha256-Ypu3AKnjh2lDh43t1GZMJo7ZyEDyNbPWvoePLp+WQdI=";
ldflags = [
"-s -w"

View file

@ -2,14 +2,13 @@
#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian
import base64
import gzip
import textwrap
from urllib import request
from collections import OrderedDict
from debian.deb822 import Packages
from debian.debian_support import Version
def packages():
packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
handle = request.urlopen(packages_url)
@ -17,7 +16,7 @@ def packages():
def latest_packages(packages: bytes):
latest_packages: dict[str, Packages] = {}
latest_packages: OrderedDict[str, Packages] = {}
for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
name: str = package['Package']
if not name.startswith('microsoft-edge-'):

View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "pv-migrate";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "utkuozdemir";
repo = pname;
rev = "v${version}";
sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE=";
sha256 = "sha256-mTzVMO0Msk5q8Wnpb0iQ8kifhNXlp4MfM+irMmOLDv8=";
};
subPackages = [ "cmd/pv-migrate" ];
vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo=";
vendorHash = "sha256-SyORFCfX/4dhYLnsE/lc21/18TKpLkOxz+W9lsHjKNE=";
ldflags = [
"-s"

View file

@ -2,11 +2,11 @@
let
pname = "rambox";
version = "2.1.3";
version = "2.1.5";
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
sha256 = "sha256-wvjCr1U+/1/GtebMNWJjizzegqZ+wWXUrmOshYtMq6o=";
sha256 = "sha256-+9caiyh5o537cwjF0/bGdaJGQNd2Navn/nLYaYjnRN8=";
};
desktopItem = (makeDesktopItem {

View file

@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "sdrangel";
version = "7.15.0";
version = "7.15.1";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
hash = "sha256-APDrVujz/2ZYqxGggabAj8ght72Vuf+oMS/kuVaWkWM=";
hash = "sha256-xOnToYe7+0Jlm4bWvnFbYxVi1VqBlGfKYdzHf4igyl0=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensmt";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
sha256 = "sha256-XwrhqxDunao4uyUyBhDgGdMjRlmetke77Zmb7za+Aes=";
sha256 = "sha256-gP2oaTEBVk54oK4Le5VudF7+HM8JXCzVqv8UXc08RFQ=";
};
nativeBuildInputs = [ cmake bison flex ];

View file

@ -6,7 +6,7 @@
let
pname = "lefthook";
version = "1.4.4";
version = "1.4.5";
in
buildGoModule rec {
inherit pname version;
@ -15,7 +15,7 @@ buildGoModule rec {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
hash = "sha256-YVnf+ieYnvNQkw6W2gPBFiZLknaBknptv4ltvGKdw04=";
hash = "sha256-4QMizZrCj1WW5/SswBw5TYFVANI1OFoPd43nNGQHRNo=";
};
vendorHash = "sha256-QKprfszbWqegvIJ2J+f3gxLpkpZgfuLP5HjoMwyCi5M=";

View file

@ -105,6 +105,11 @@ rec {
url = "https://github.com/moby/moby/pull/43136.patch";
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
})
(fetchpatch {
name = "fix-issue-with-go-1.20.6.patch";
url = "https://github.com/moby/moby/pull/45972.patch";
hash = "sha256-zxFh/bI6+INOYSg6QFs0S9rdl9Z21KUIZFmzpNVjpSA=";
})
];
postPatch = ''

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.73.0";
version = "1.73.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-poVhzJi5cYAYJgLxcsnR8b9gGa5+T56xsFex3/pr7CU=";
hash = "sha256-+IFlr1xLLnk0Ox3CcHUdEEiDqk5z0MegWu6h9RW7M8Q=";
};
vendorHash = null;

View file

@ -107,9 +107,9 @@ version = "0.6"
[apropos]
dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"]
license = "bsd"
sha256 = "0graywcx94xvn9m4lk86f3qipsvnvr3vww6mqr37kd0ykj2rwrb7"
sha256 = "1xnqfnbnac4pzm4j3mphq09p18q962dxg11cfyxqk8k6v8qrv5nh"
synopsis = "CHICKEN apropos"
version = "3.7.0"
version = "3.7.2"
[arcadedb]
dependencies = ["uri-common", "medea"]
@ -303,9 +303,9 @@ version = "2.0.4"
[bloom-filter]
dependencies = ["iset", "message-digest-primitive", "message-digest-type", "message-digest-utils", "check-errors"]
license = "bsd"
sha256 = "1ncxjfyv1hqbrls79pii7q4wxn0s8xkrp32khl3v0fq8mswbknzj"
sha256 = "1ljak0xscrywyl1sbv8yx9qkw1r2m94gyw3ag73p3z8m618valy3"
synopsis = "Bloom Filter"
version = "2.3.1"
version = "2.3.4"
[blosc]
dependencies = ["srfi-13", "compile-file"]
@ -552,6 +552,13 @@ sha256 = "1047v7mk836mf4g6ba5a90lmgqql1ss1ap9kgk0mhzrffznjipgn"
synopsis = "Download files (such as web comic images) by recursing on XPath"
version = "1.21"
[commands]
dependencies = []
license = "bsd"
sha256 = "13y49vrkd9rs98s9fk10g8w056xb9nnqxwn1372sayw64789i3ib"
synopsis = "Helpers for programs that dispatch commands"
version = "1.0.0"
[comparse]
dependencies = ["lazy-seq", "trie", "matchable", "srfi-1", "srfi-13", "srfi-14", "srfi-69"]
license = "bsd"
@ -576,9 +583,9 @@ version = "1.0"
[condition-utils]
dependencies = ["srfi-1", "srfi-69", "check-errors"]
license = "bsd"
sha256 = "1srb3lgnfvlpwn31w72jcg5wlghlgpp0khgwlk8cqy9ll5piqwqk"
sha256 = "11mkmbyciyrqyakp1gyfvmbfayglhzx2x6j6zyp9kj31vhi2y4hd"
synopsis = "SRFI 12 Condition Utilities"
version = "2.2.2"
version = "2.2.3"
[continuations]
dependencies = []
@ -790,6 +797,13 @@ sha256 = "166qm2vx5gj7bc57s1bnnbp55zhv19hnimmivhhdhsnq32wi3511"
synopsis = "EDN data reader/writer."
version = "1.0"
[edward]
dependencies = ["r7rs", "srfi-1", "srfi-14", "srfi-37", "matchable", "posix-regex"]
license = "gplv3"
sha256 = "0gfvjgg6c6hl2xmh63067xkh0sd2vmczwisirgglcm2inz4hjll3"
synopsis = "An extensible implementation of the ed text editor as defined in POSIX.1-2008"
version = "1.0.1"
[egg-tarballs]
dependencies = ["simple-sha1", "srfi-1", "srfi-13"]
license = "bsd"
@ -1381,9 +1395,9 @@ version = "0.3"
[ipfs]
dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"]
license = "unlicense"
sha256 = "0kxir3f0f2w03wrsgdfn81hdmyzcrz6yglaqm369xrra2cpd4akb"
sha256 = "1cxjbl5kl4xk42a4p8j3av6ip0gqvp5yxahsccvm0snc98n3ngqg"
synopsis = "IPFS HTTP API for Scheme"
version = "0.0.11"
version = "0.0.12"
[irc]
dependencies = ["matchable", "regex", "srfi-1"]
@ -1437,9 +1451,9 @@ version = "7.0"
[json-rpc]
dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"]
license = "mit"
sha256 = "0gh9w6mm6d3y2325m8cci743g1mh7q7bx3d4ygp47pj6mwjgihlz"
sha256 = "18qnp9ryp3s0i8363ny5c2v16csqq416smnzd3pls103zn47p44v"
synopsis = "A JSON RPC library for R7RS scheme."
version = "0.3.0"
version = "0.4.0"
[json-utils]
dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"]
@ -1514,9 +1528,9 @@ version = "1.2"
[levenshtein]
dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"]
license = "bsd"
sha256 = "1k32dfkn2m48icdgykm44a8c6y86qrim563y37c73rkxdzyjm9dy"
sha256 = "1v8g5ghilraz2lx0fif3yb1rlg3n51zvvik2l12ycqh0wj0pz59l"
synopsis = "Levenshtein edit distance"
version = "2.2.5"
version = "2.2.8"
[lexgen]
dependencies = ["srfi-1", "utf8", "srfi-127"]
@ -1577,9 +1591,9 @@ version = "3.4"
[lmdb]
dependencies = ["srfi-1"]
license = "openldap"
sha256 = "012gv5wblhaikd1r62dmjjqvyzxysbrs605hiw2xcfk1mx5ji7cz"
sha256 = "1ymy7ji9q7zvy8708f4zzavxkvajmq8l8m1z6v6873qkxgv6jkw8"
synopsis = "Bindings to LMDB"
version = "1.0.5"
version = "1.0.6"
[locale]
dependencies = ["srfi-1", "utf8", "check-errors"]
@ -1612,9 +1626,9 @@ version = "3"
[lsp-server]
dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"]
license = "mit"
sha256 = "1jqdmzjdixmza3h3m363bdm1kmwpr2di14ig5a9rh4aw33zaax5v"
sha256 = "0wbigf0s37377hjfxspwydhvnds165mhp2qa14iskvsw5zbp8g80"
synopsis = "LSP Server for CHICKEN."
version = "0.3.0"
version = "0.4.1"
[macaw]
dependencies = []
@ -1836,9 +1850,9 @@ version = "5.0"
[monocypher]
dependencies = []
license = "bsd-2-clause"
sha256 = "15lpm5bmqn4b8mh5wws66jay5flwj9y185zdjxj5qc23i5q3cwh0"
sha256 = "09q33a6b8v306j93kd67wk5gisca7sij0p98i7pd10xnimllc5hh"
synopsis = "Monocypher cryptographic library"
version = "4.0.1-0"
version = "4.0.1"
[moremacros]
dependencies = ["srfi-69", "miscmacros", "check-errors"]
@ -2221,9 +2235,9 @@ version = "0.1.1"
[r7rs]
dependencies = ["matchable", "srfi-1", "srfi-13"]
license = "bsd"
sha256 = "1lxby5hj8bwqdwys5324fvrj6q9j4dp10mlvla3qjfc9scppxj79"
sha256 = "1rwx52mjsylvbkmpg0z7jbawaf87dsxdgwgq8z5nh8k5nb03b6v5"
synopsis = "R7RS compatibility"
version = "1.0.8"
version = "1.0.9"
[rabbit]
dependencies = ["srfi-1"]
@ -2316,6 +2330,13 @@ sha256 = "18d0f37a13nsknay6vw27xvr1k0s4p4ss2dc29fhx89hsv5ycjsq"
synopsis = "RIPE Message Digest"
version = "2.1.2"
[rlimit]
dependencies = ["srfi-13"]
license = "bsd"
sha256 = "0jmz98253k3q9a6kyyby6jm722w3s74c5y3km7ih9ybjjmcdkyzv"
synopsis = "Setting resource limits"
version = "1.0.1"
[rocksdb]
dependencies = []
license = "bsd"
@ -2344,6 +2365,13 @@ sha256 = "1vngrvh2b7rv5n5zvksfg27zikpc7d8xb8n1kd0pyfr7hna00wf9"
synopsis = "Serialization of arbitrary data."
version = "0.9.12"
[s9fes-char-graphics]
dependencies = ["srfi-1", "utf8", "format"]
license = "public-domain"
sha256 = "1h12l59860cyv8xwvvpf96dnlqwd25mrq2qapj9nyxv0vbkcs4p6"
synopsis = "Scheme 9 from Empty Space Char Graphics"
version = "1.3.3"
[salmonella-diff]
dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"]
license = "bsd"
@ -3040,9 +3068,9 @@ version = "1.0.3"
[srfi-19]
dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"]
license = "bsd"
sha256 = "02348j6zdp1nyh0f8jw1j848qlm0dv7p7q6rw7jdfzqi4bq5myva"
sha256 = "14nyv6m67k2angmhg028rd50mq77qi1zfr5f0praiyy07k2pmcpz"
synopsis = "Time Data Types and Procedures"
version = "4.7.2"
version = "4.7.3"
[srfi-193]
dependencies = []
@ -3761,9 +3789,9 @@ version = "3.6.3"
[uuid-lib]
dependencies = ["record-variants"]
license = "bsd"
sha256 = "1788c9wilnwa21r27g9cfwjypbzgmv6rs5i93yrywg2fry9v45nd"
sha256 = "0da71k0f3j1l9wjnfk9gqs9gw3v1192xhxbxv2gfmah3fvxf203p"
synopsis = "OSF DCE 1.1 UUID"
version = "0.0.9"
version = "0.0.10"
[uuid]
dependencies = []

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -i oil -p oil chicken
#! nix-shell -I nixpkgs=../../../../.. -i oil -p oil chicken
export URL_PREFIX="https://code.call-cc.org/egg-tarballs/5/"
cd $(nix-prefetch-url \

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "inform6";
version = "6.41-r5";
version = "6.41-r6";
src = fetchurl {
url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz";
sha256 = "sha256-JsLufRmqUmJ4if1XURi9swS0upw+Hj827T27A9qDANg=";
sha256 = "sha256-YJ3k9c+uYRzI5vMzPXAWvbLoAv45CWxZ21DFsx4UtVc=";
};
buildInputs = [ perl ];

View file

@ -0,0 +1,67 @@
{ lib
, fetchFromGitHub
, llvmPackages_15
, lld_15
, rocm-device-libs
, python3
, rocm-runtime
, cmake
, boost
, libxml2
, libffi
, makeWrapper
, hip
, rocmSupport ? false
}:
let
inherit (llvmPackages_15) stdenv;
in
stdenv.mkDerivation rec {
pname = "OpenSYCL";
version = "0.9.4";
src = fetchFromGitHub {
owner = "OpenSYCL";
repo = "OpenSYCL";
rev = "v${version}";
sha256 = "sha256-5YkuUOAnvoAD5xDKxKMPq0B7+1pb6hVisPAhs0Za1ls=";
};
nativeBuildInputs = [
cmake
makeWrapper
];
buildInputs = [
libxml2
libffi
boost
llvmPackages_15.openmp
llvmPackages_15.libclang.dev
llvmPackages_15.llvm
] ++ lib.optionals rocmSupport [
hip
rocm-runtime
];
# opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually
cmakeFlags = [
"-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include"
];
postFixup = ''
wrapProgram $out/bin/syclcc-clang \
--prefix PATH : ${lib.makeBinPath [ python3 lld_15 ]} \
--add-flags "-L${llvmPackages_15.openmp}/lib" \
--add-flags "-I${llvmPackages_15.openmp.dev}/include" \
'' + lib.optionalString rocmSupport ''
--add-flags "--rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode"
'';
meta = with lib; {
homepage = "https://github.com/OpenSYCL/OpenSYCL";
description = "Multi-backend implementation of SYCL for CPUs and GPUs";
maintainers = with maintainers; [ yboettcher ];
license = licenses.bsd2;
};
}

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "evcxr";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "v${version}";
sha256 = "sha256-s8zM1vxEeJYcRek1rqUmrBfvB2zCAF3iLG8UVA7WABI=";
sha256 = "sha256-IQM/uKDxt18rVOd6MOKhQZC26vjxVe+3Yn479ITFDFs=";
};
cargoSha256 = "sha256-wMo5Fq6aMiE6kg8mZoz1T3KPwKSdJcej83MB+/GRM5w=";
cargoHash = "sha256-6kyxAHxphZjwfHo7OHrATSKFzrpXIRHVTjynDawlWew=";
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";

View file

@ -16,13 +16,13 @@
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.22.11";
version = "2.22.17";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-w91mVdTVXWCAtY0eFyYVxrSKydiqHgsbkl+MQxHt13E=";
hash = "sha256-TUay32EzVzV2nlDYZgF5pAhnQNk7d8JbgAUHheNSpzo=";
};
postPatch = ''

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.59";
version = "9.2.60";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-1AlmVRiGrYe0fS5Ny1JzyA2gGWKaUVioeZQTGhwMoaM=";
hash = "sha256-gai+o8XVcOj/HidvlictpnbHLUcGrNR+BLkCuEK8b7c=";
};
nativeBuildInputs = [

View file

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.59";
version = "9.2.60";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Wel6IxZMAztJj3NZi0hIYMgLa1hsO0apFa6Y29B1Hkg=";
hash = "sha256-+LeJDSYtAdWyYu2wDm+r7nr1H+CKGxQI9CnmY/8lc/w=";
};
propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.59";
version = "9.2.60";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6ELsHKtflvJDmWJDGY73j1J88J/8qt+pFE3rmUMXl2w=";
hash = "sha256-w2dauzM7niQSbgLgSMXN5X2aU1Xj+9G/8Mah4CDMWGw=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asteval";
version = "0.9.30";
version = "0.9.31";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "newville";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-vKPMA8yiTNQPYehDVo6mleOv82ZNxHgi8P/HIOZb9/o=";
hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.59";
version = "9.2.60";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QVbLliWVY8Si1dcIhCroYH+uF6nxrTKFsRmxP62AfPI=";
hash = "sha256-UpNnvHlsZkDltIDJAl8m1wx79MByRpBjUneiTW0PZr8=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.59";
version = "9.2.60";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EYNNNWfqvdrkEAMekY42yrHTgisBxmXbol/IwZ5x3o8=";
hash = "sha256-CpJiRcaZGM7AOzO1HqCmzWJAFhS2fHmSOJsRLs3VPFc=";
};
nativeBuildInputs = [

View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.45.0";
version = "0.46.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-a//tZ0SMtL9d/1WfsqzuHAbn2oYSuOKnNPJ4tQs5ZgM=";
hash = "sha256-5PvJKoXisJGaImiWrkX8Xks1bAxX8cJlllnfvgeJxnQ=";
};
nativeBuildInputs = [

View file

@ -15,7 +15,7 @@
let
pname = "findpython";
version = "0.3.0";
version = "0.3.1";
in
buildPythonPackage {
inherit pname version;
@ -25,7 +25,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-5sbWxIznz9aVnM3OEtYSHVds/zlfST/UZmfn1amqJHQ=";
hash = "sha256-diH4qcGZpw0hmDHN2uuEyn6D4guDWBcr/0eHGhil7aQ=";
};
nativeBuildInputs = [

View file

@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "gymnasium";
version = "0.28.1";
version = "0.29.0";
src = fetchFromGitHub {
owner = "Farama-Foundation";
repo = pname;
rev = "v${version}";
hash = "sha256-7rRF21H3IxbgmqxvtC370kr0exLgfg3e2tA3J49xuao=";
rev = "refs/tags/v${version}";
hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI=";
};
format = "pyproject";

View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "py65";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "mnaberez";
repo = "py65";
rev = "refs/tags/${version}";
hash = "sha256-WLs3TAZovuphWZIvMvM3CZnqg1aZfMF4Yrqw46k+bLA=";
};
postPatch = ''
substituteInPlace py65/tests/test_monitor.py \
--replace "test_argv_rom" "dont_test_argv_rom" \
--replace "test_argv_combination_rom_mpu" "dont_test_argv_combination_rom_mpu"
'';
meta = {
homepage = "https://py65.readthedocs.io/";
description = "Emulate 6502-based microcomputer systems in Python";
longDescription = ''
Py65 includes a program called Py65Mon that functions as a machine
language monitor. This kind of program is sometimes also called a
debugger. Py65Mon provides a command line with many convenient commands
for interacting with the simulated 6502-based system.
'';
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ AndersonTorres tomasajt ];
};
}

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pynina";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyNINA";
inherit version;
hash = "sha256-5+Mg3dPjMxEL2pgEeuR1TwiicIMHN6RO6G0SgbZm/eM=";
hash = "sha256-HyOk3W95dEl+p8YGh3xP29HcvbncqxsUaWSQUiKgTWM=";
};
propagatedBuildInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.59";
version = "9.2.60";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-V4YZFua3SrmUz96dWgMWUZulK6f1+VqlRAf6GWHul0Y=";
hash = "sha256-gDkt+6fuQ3kHfjgy3VqYGZNM9mGyJdbkt6QzNpVHzYQ=";
};
nativeBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "rpds-py";
version = "0.8.10";
version = "0.9.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -18,13 +18,13 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "rpds_py";
inherit version;
hash = "sha256-E+ZDzorVAqAmM5c2L7iHWUtJz4S/UY1gOMFvI18rzqQ=";
hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-D4pbEipVn1r5rrX+wDXi97nDZJyBlkdqhmbJSgQGTLU=";
hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo=";
};
nativeBuildInputs = [

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.22.3";
version = "3.22.4";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-PrXqBYOEFCXIZsihhImh1swbGFRCoyTGl82dkfBE7aU=";
hash = "sha256-DFOtanrrc3Jufuu5ybbbc0xJX29CVp2tFOP93QFoJeM=";
};
nativeBuildInputs = [ setuptools ];

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-FLs4xTWBn4OuwOxeE6vJEqkXnBMa8kFbcMArtk2iaik=";
hash = "sha256-LTWF1Grou3BCzyaj67cIi3g5HNJjKGFkrK8BQUzYNlE=";
};
cargoHash = "sha256-U6nXh+QDG+Eoe5eRcuOF6pOIaFB5l2v8ZbDGaHdbf08=";
cargoHash = "sha256-DVjXilanc2pxngU9ueoIDucA7Xokjb5jrWsNtbdKFQ4=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View file

@ -2268,7 +2268,7 @@ dependencies = [
[[package]]
name = "surrealdb-migrations"
version = "0.9.11"
version = "0.9.12"
dependencies = [
"anyhow",
"assert_cmd",

View file

@ -10,7 +10,7 @@
let
pname = "surrealdb-migrations";
version = "0.9.11";
version = "0.9.12";
in
rustPlatform.buildRustPackage rec {
inherit pname version;
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
owner = "Odonno";
repo = pname;
rev = "v${version}";
hash = "sha256-vCn5doVnD2TlwXhD7/mT+hLHTdNJUphID8MmX3D5+Xc=";
hash = "sha256-avDztyxjRTa66MUfIvwtxY1SiGNAtVdepUPHggrbDk0=";
};
cargoLock = {

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "re-flex";
version = "3.3.5";
version = "3.3.6";
src = fetchFromGitHub {
owner = "Genivia";
repo = "RE-flex";
rev = "v${version}";
sha256 = "sha256-vZfoCtLlLV4bxXn5SUvTQ77AP+TSNpYoer7qiid6bG4=";
sha256 = "sha256-SFcb3lfvhR9BbpwM79pBs3cwKPR9KakEMcI/Thm1plo=";
};
nativeBuildInputs = [ boost autoconf automake ];

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "railway";
version = "3.3.1";
version = "3.4.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
hash = "sha256-RxZa1NH3DpHmrGbNlm85Dv1dydCC344D3lgN0lGVFt8=";
hash = "sha256-pydnIUqUBMLHonEGcvB+K+48QQYQuFfZxbAETJjU+3o=";
};
cargoHash = "sha256-3ZP4D2cEYzqrupYtKANRaMNNIZ83fTDoUedKCruk6CY=";
cargoHash = "sha256-VgLQfUk1xeAwr9KUo1Vz4Ndw0FAnYGw3af0v3ueNPuA=";
nativeBuildInputs = [ pkg-config ];

View file

@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e4dfef09bebad6d85efa8b6e1b2f7a809c4419d7135ab573c4fd133c0e8ead"
dependencies = [
"age-core",
"base64",
"base64 0.13.1",
"bech32",
"chacha20poly1305",
"cookie-factory",
@ -61,7 +61,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32"
dependencies = [
"base64",
"base64 0.13.1",
"chacha20poly1305",
"cookie-factory",
"hkdf",
@ -72,6 +72,17 @@ dependencies = [
"sha2",
]
[[package]]
name = "ahash"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
"getrandom 0.2.9",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
version = "0.7.20"
@ -138,6 +149,12 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bech32"
version = "0.9.1"
@ -246,6 +263,26 @@ dependencies = [
"zeroize",
]
[[package]]
name = "charset"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46"
dependencies = [
"base64 0.13.1",
"encoding_rs",
]
[[package]]
name = "chumsky"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d"
dependencies = [
"hashbrown",
"stacker",
]
[[package]]
name = "cipher"
version = "0.4.4"
@ -259,9 +296,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.2.7"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc"
dependencies = [
"clap_builder",
"clap_derive",
@ -270,9 +307,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.2.7"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae"
dependencies = [
"anstyle",
"bitflags",
@ -291,9 +328,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.2.0"
version = "4.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
dependencies = [
"heck",
"proc-macro2",
@ -303,9 +340,15 @@ dependencies = [
[[package]]
name = "clap_lex"
version = "0.4.1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "configparser"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a"
[[package]]
name = "console"
@ -326,6 +369,12 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
[[package]]
name = "core-foundation-sys"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
version = "0.2.7"
@ -454,6 +503,12 @@ dependencies = [
"parking_lot_core",
]
[[package]]
name = "data-encoding"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "decompress"
version = "0.6.0"
@ -562,6 +617,15 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if",
]
[[package]]
name = "errno"
version = "0.3.1"
@ -610,7 +674,7 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
dependencies = [
"toml",
"toml 0.5.11",
]
[[package]]
@ -682,6 +746,12 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "fs-err"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
[[package]]
name = "generic-array"
version = "0.14.7"
@ -761,6 +831,9 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash",
]
[[package]]
name = "heck"
@ -808,7 +881,7 @@ dependencies = [
"serde",
"serde_derive",
"thiserror",
"toml",
"toml 0.5.11",
"unic-langid",
]
@ -1053,6 +1126,17 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "mailparse"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa"
dependencies = [
"charset",
"data-encoding",
"quoted_printable",
]
[[package]]
name = "memchr"
version = "2.5.0"
@ -1061,9 +1145,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "minijinja"
version = "0.31.1"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b1dbc390e4447b2500c4071d7bc2a808cf07e925bae6b92db8a3c3eae773c58"
checksum = "1f75e6f2b03d9292f6e18aaeeda21d58c91f6943a58ea19a2e8672dcf9d91d5b"
dependencies = [
"serde",
"serde_json",
@ -1093,6 +1177,21 @@ dependencies = [
"adler",
]
[[package]]
name = "monotrail-utils"
version = "0.0.1"
source = "git+https://github.com/konstin/poc-monotrail#596c51ed1955ada7117b09b526eba6140cbdc288"
dependencies = [
"anyhow",
"fs-err",
"pep508_rs",
"serde",
"serde_json",
"toml 0.7.3",
"tracing",
"unscanny",
]
[[package]]
name = "nix"
version = "0.26.2"
@ -1121,6 +1220,15 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "ntapi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
dependencies = [
"winapi",
]
[[package]]
name = "number_prefix"
version = "0.4.0"
@ -1222,6 +1330,7 @@ checksum = "fe1d15693a11422cfa7d401b00dc9ae9fb8edbfbcb711a77130663f4ddf67650"
dependencies = [
"lazy_static",
"regex",
"serde",
"tracing",
"unicode-width",
]
@ -1235,6 +1344,7 @@ dependencies = [
"once_cell",
"pep440_rs",
"regex",
"serde",
"thiserror",
"tracing",
"unicode-width",
@ -1344,6 +1454,31 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "psm"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
dependencies = [
"cc",
]
[[package]]
name = "python-pkginfo"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e23988cc0f9fbe3c42ae6e399daa7c0273d6013784b744b1742c6e1060611b0e"
dependencies = [
"flate2",
"fs-err",
"mailparse",
"rfc2047-decoder",
"serde",
"tar",
"thiserror",
"zip",
]
[[package]]
name = "quote"
version = "1.0.27"
@ -1353,6 +1488,12 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "quoted_printable"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49"
[[package]]
name = "rand"
version = "0.7.3"
@ -1444,9 +1585,21 @@ dependencies = [
[[package]]
name = "regex"
version = "1.8.1"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick 1.0.1",
"memchr",
"regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
dependencies = [
"aho-corasick 1.0.1",
"memchr",
@ -1455,9 +1608,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.7.1"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reword"
@ -1468,6 +1621,20 @@ dependencies = [
"unicode-segmentation",
]
[[package]]
name = "rfc2047-decoder"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e"
dependencies = [
"base64 0.21.2",
"charset",
"chumsky",
"memchr",
"quoted_printable",
"thiserror",
]
[[package]]
name = "rust-embed"
version = "6.6.1"
@ -1530,13 +1697,14 @@ dependencies = [
[[package]]
name = "rye"
version = "0.6.0"
version = "0.11.0"
dependencies = [
"age",
"anyhow",
"bzip2",
"clap",
"clap_complete",
"configparser",
"console",
"curl",
"decompress",
@ -1550,11 +1718,13 @@ dependencies = [
"license",
"memchr",
"minijinja",
"monotrail-utils",
"nix",
"once_cell",
"pathdiff",
"pep440_rs",
"pep508_rs",
"python-pkginfo",
"regex",
"same-file",
"self-replace",
@ -1564,6 +1734,7 @@ dependencies = [
"shlex",
"simple-home-dir",
"slug",
"sysinfo",
"tar",
"tempfile",
"toml_edit",
@ -1637,9 +1808,9 @@ dependencies = [
[[package]]
name = "self-replace"
version = "1.3.2"
version = "1.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f21725f004568aa515e4699949b3453e0603a11e407e88c6fe0e6d548a4a20e"
checksum = "a0e7c919783db74b5995f13506069227e4721d388bea4a8ac3055acac864ac16"
dependencies = [
"fastrand",
"tempfile",
@ -1683,6 +1854,15 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_spanned"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
[[package]]
name = "sha2"
version = "0.10.6"
@ -1740,6 +1920,19 @@ dependencies = [
"winapi",
]
[[package]]
name = "stacker"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
dependencies = [
"cc",
"cfg-if",
"libc",
"psm",
"winapi",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
@ -1780,6 +1973,20 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "sysinfo"
version = "0.29.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11"
dependencies = [
"cfg-if",
"core-foundation-sys",
"libc",
"ntapi",
"once_cell",
"winapi",
]
[[package]]
name = "tar"
version = "0.4.38"
@ -1894,11 +2101,26 @@ dependencies = [
"serde",
]
[[package]]
name = "toml"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
@ -1907,6 +2129,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
@ -2021,6 +2245,12 @@ dependencies = [
"subtle",
]
[[package]]
name = "unscanny"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
[[package]]
name = "url"
version = "2.3.1"
@ -2318,9 +2548,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125"
dependencies = [
"byteorder",
"bzip2",
"crc32fast",
"crossbeam-utils",
"flate2",
"time",
]
[[package]]

View file

@ -1,30 +1,29 @@
{ lib
, fetchFromGitHub
, rustPlatform
, git
, openssl
, fetchFromGitHub
, pkg-config
, openssl
, stdenv
, Libsystem
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "rye";
version = "0.6.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = pname;
rev = version;
# One of the tests runs git command so we need .git directory there
leaveDotGit = true;
sha256 = "llm4aqMfaVf3VbHudWjb9V2GFgJpP9S211Ui7xXdrAU=";
rev = "refs/tags/${version}";
hash = "sha256-00Q+qvK1fq9CGb6umtCiUJZZ1M5LMxiSIM3/s7eOumM=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"dialoguer-0.10.4" = "sha256-WDqUKOu7Y0HElpPxf2T8EpzAY3mY8sSn9lf0V0jyAFc=";
"monotrail-utils-0.0.1" = "sha256-4x5jnXczXnToU0QXpFalpG5A+7jeyaEBt8vBwxbFCKQ=";
};
};
@ -35,12 +34,16 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
git
openssl
]
++ lib.optional stdenv.isDarwin SystemConfiguration;
++ lib.optionals stdenv.isDarwin [
Libsystem
SystemConfiguration
];
nativeCheckInputs = [ git ];
checkFlags = [
"--skip=utils::test_is_inside_git_work_tree"
];
meta = with lib; {
description = "A tool to easily manage python dependencies and environments";

View file

@ -7,21 +7,21 @@
let
pname = "osu-lazer-bin";
version = "2023.621.0";
version = "2023.717.0";
name = "${pname}-${version}";
osu-lazer-bin-src = {
aarch64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
sha256 = "sha256-TM2yGr8XmovcVxSXlI+AuddGJ+Qd+slYIqTpLpmGUyo=";
sha256 = "sha256-C2ZqCs3dBtNPiqYnMdYieyLIBbBedc7jhAtV3XccXUI=";
};
x86_64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
sha256 = "sha256-8yW45ZOpvd74aY42T/apQhIDOKLdYP/5Z/YZYsByrJk=";
sha256 = "sha256-LoumCJV2U7V0L1a0IapCKFcgmqawdp1NdFdtenmgNa0=";
};
x86_64-linux = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
sha256 = "sha256-21n04TSDBrsxTj/Os5lHLWiTzma5A6BAcyvrMofFj9g=";
sha256 = "sha256-ozywsabQawTcflIPC86b/YV4apX1OnokziSrlLlyaIM=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

View file

@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2023.621.0";
version = "2023.717.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "sha256-ejptMzhRQcYEFa5c9XurYxaFZOUgTuAfe7qlGYhNX08=";
sha256 = "sha256-Yqv2CaJwjagUb+P87TQhpexdQaFc6nzKh6P+CJocx4Y=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

View file

@ -8,7 +8,7 @@
(fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
(fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; })
(fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; })
(fetchNuGet { pname = "Fody"; version = "6.7.0"; sha256 = "0fv0zrffa296qjyi11yk31vfqh6gm1nxsx8g5zz380jcsrilnp3h"; })
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })
(fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.46"; sha256 = "0yx0xgbbzd6fdyslf7pc37bxk4hfkj1c7359ibqwmapv9aby7lm2"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
@ -124,29 +124,28 @@
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; })
(fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; })
(fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.4"; sha256 = "1fk0029b1183pxd6qvzkmy8byx5dhjka3f8x20sd7drbzvqpn6am"; })
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.4"; sha256 = "0ahxg4mckzljav5y9g7c1795wgyx2banysg5l7ix3xrl4xmjfmp3"; })
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.1"; sha256 = "0ww8ib1la21x80v54w6vf5ddq0s2bv49rlzdhdg35pbw51jx1m95"; })
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.1"; sha256 = "04cj5vp665pnja7y07i3zpw3r1ff9kr9b8iglyqjhq7bz0y2dxvy"; })
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.1"; sha256 = "0vp3bgspczw76gh4qm61dhrrxkds4nsqarppg5rdicxpvirj66yq"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.1"; sha256 = "1ikdwfk2n9knfps15j1hrx1f02c0sksi70vjk1bml8cvmz6chjg7"; })
(fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.809.0"; sha256 = "1wpdvd9cmr4kx2hng2img89fhgrl1sg0mws8x97dd84glckqjr82"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2022.809.0"; sha256 = "051nri1cpp3h1i7z6ww3zi2vd9ck3fvs4m418sqdgicl83hs6pdi"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.712.0"; sha256 = "064qrrlhhfx18mmrxqhq06d0sdhzzpqxjgc3znpflqh5j1l4j4m1"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.712.0"; sha256 = "1zs9ky53faxqhf6hx1pvnnni79dil8m7f8w4yh9if306bnllnwl4"; })
(fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; })
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.620.0"; sha256 = "10rq2dvfrjxcq01n6ixwsanxpzp55ax8flnvnc6fr2bi4bh9ajxy"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.716.0"; sha256 = "11qzwxrmbnzrx0g3dqx9ici58kfn5b3g3riwis3fsjfyiziwzvx8"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.619.0"; sha256 = "0ilzv4c0fh2y96cm8h9d65v1dbafj2myirn8nia4f0wxafyq3cjr"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.605.0"; sha256 = "1628yh97ginvx0i1dlpkmkw9hzvri5fj11b111lqy7xirfy7i66b"; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.709.0"; sha256 = "1p7lh7583lka6awb4q3vwfhlmry69n9gfjp2h0zm2bvyn9p1928f"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.707.0"; sha256 = "1hndj38qpi7936z7dh6lyip00hvx99q8xzrmkvrp9562ys9xjdpw"; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; })
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g7beb1270bf"; sha256 = "1xsdmkby36vqhhdjl11v6p1dbd5adwb2mslkv5dj934fn4lmj9sy"; })
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "0n4aj5nx81yfsfj1zn2c9ffv2807lm2npn0v7rks7972m1fhn48n"; })
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "1nwh1pnwvf4smd7f00igaa4plqf3hl2vc9wsw2mbljr04s800mpp"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; })
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g9f8aa2931a"; sha256 = "0jzjaakcfy3x85wx8smp4j7hffbynqakgqvwslr3bkbqlfdxxbil"; })
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "120d6zjh5ss79iz44m9fc4bzhj62yyzawp1wd9knvxq322a6i82n"; })
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "0xn2cazwv6c6wllas4advsam1dgvqlw1k1vlrp0imswgz6zbvf4f"; })
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; })
(fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; })
(fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; })
(fetchNuGet { pname = "Realm.SourceGenerator"; version = "10.20.0"; sha256 = "0y0bwqg87pmsld7cmawwwz2ps5lpkbyyzkb9cj0fbynsn4jdygg0"; })
(fetchNuGet { pname = "Realm"; version = "11.1.2"; sha256 = "0kfq7knlw0njvhkqz9hjpgi1qqxsh8i1vj07zbj20jspamqrwdyd"; })
(fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.1.2"; sha256 = "01w9lbzwd0d5gc0v2jahbwlhka1fxpj5lpz0cq7v04r0y6064v23"; })
(fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })

View file

@ -12,20 +12,20 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.87.0";
version = "1.88.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
hash = "sha256-QBg0aIYIncKDCcgjj1cSAugNtLMb83F7MCijTCcn8YM=";
hash = "sha256-uNk+vyOCbaoy8Jw8W5KyedIw6bJ0ci8NkFTMlBVcxEw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-+QFa3NrzDrCniHpbP+pFWImMh9FHERFTRzbEiP4p/7Y=";
hash = "sha256-ILLZUQjUbLvmNsDpCSqKAYO/PRHTJ/XTDJTo/LCT/mg=";
};
postPatch = ''

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "sftpgo";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitHub {
owner = "drakkan";
repo = "sftpgo";
rev = "refs/tags/v${version}";
hash = "sha256-Xx5Y667SaCQo3XowDcBAelOsmiQDoLmD/kLu9QFZgcA=";
hash = "sha256-Xhu7QNPox0i6UuunRF1APYqdLrrlW0nR2BjzsABBnCw=";
};
vendorHash = "sha256-Cca4X2meD+ytT6QcrvuiDnpzQQdYnpTfX/ZM0n8QeeU=";
vendorHash = "sha256-XAfGNRHXLGzvZ5E397CNVx9VuSa///yoX49hwQKuAA4=";
ldflags = [
"-s"

View file

@ -579,28 +579,6 @@ self: super:
${optionalString (symbolsFile != null) "cp '${symbolsFile}' 'symbols/${name}'"}
${optionalString (typesFile != null) "cp '${typesFile}' 'types/${name}'"}
# patch makefiles
for type in compat geometry keycodes symbols types; do
if ! test -f "$type/${name}"; then
continue
fi
test "$type" = geometry && type_name=geom || type_name=$type
${ed}/bin/ed -v $type/Makefile.am <<EOF
/''${type_name}_DATA =
a
${name} \\
.
w
EOF
${ed}/bin/ed -v $type/Makefile.in <<EOF
/''${type_name}_DATA =
a
${name} \\
.
w
EOF
done
# add model description
${ed}/bin/ed -v rules/base.xml <<EOF
/<\/modelList>

View file

@ -18,7 +18,7 @@
, chafa
, enableOpencv ? stdenv.isLinux
, opencv
, enableSway ? stdenv.isLinux
, enableWayland ? stdenv.isLinux
, extra-cmake-modules
, wayland
, wayland-protocols
@ -30,19 +30,20 @@
stdenv.mkDerivation rec {
pname = "ueberzugpp";
version = "2.8.8";
version = "2.8.9";
src = fetchFromGitHub {
owner = "jstkdng";
repo = "ueberzugpp";
rev = "v${version}";
hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U=";
hash = "sha256-RW2dKueidFM/RkGfOAorHukGVm1srbuAlyUP/r+JWi0=";
};
# error: no member named 'ranges' in namespace 'std'
postPatch = lib.optionalString withoutStdRanges ''
for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp; do
for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp src/terminal.cpp; do
sed -i "1i #include <range/v3/algorithm/for_each.hpp>" $f
sed -i "2i #include <range/v3/algorithm/reverse.hpp>" $f
substituteInPlace $f \
--replace "#include <ranges>" "" \
--replace "std::ranges" "ranges"
@ -72,7 +73,7 @@ stdenv.mkDerivation rec {
cli11
] ++ lib.optionals enableOpencv [
opencv
] ++ lib.optionals enableSway [
] ++ lib.optionals enableWayland [
extra-cmake-modules
wayland
wayland-protocols
@ -85,8 +86,8 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optionals (!enableOpencv) [
"-DENABLE_OPENCV=OFF"
] ++ lib.optionals enableSway [
"-DENABLE_SWAY=ON"
] ++ lib.optionals enableWayland [
"-DENABLE_WAYLAND=ON"
] ++ lib.optionals (!enableX11) [
"-DENABLE_X11=OFF"
];

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "cyberchef";
version = "10.4.0";
version = "10.5.2";
src = fetchzip {
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
sha256 = "sha256-BjdeOTVZUMitmInL/kE6a/aw/lH4YwKNWxdi0B51xzc=";
sha256 = "sha256-sN8dCgmLj0jHfoaUNk2ml/iEJy8/QFfCTRCn9tyTz78=";
stripRoot = false;
};

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "rtx";
version = "1.34.0";
version = "1.34.1";
src = fetchFromGitHub {
owner = "jdxcode";
repo = "rtx";
rev = "v${version}";
sha256 = "sha256-ePRYlTGgZDrIClZ4kb9v62/FiLzZT6DzL3kaY6eAq5g=";
sha256 = "sha256-yzfiYhWZsoqqWhVBXgV0QQOe8Xcfp71e0t81+UBqiQI=";
};
cargoSha256 = "sha256-RFAIc4KfMvxz2BYX8x8j8T5evMqFP8ML4+wHwWdODVk=";
cargoSha256 = "sha256-4Ac5NUADyI24TkLH5AwlGxEWHjYP8ye+D89QF1ToU4A=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

View file

@ -1,7 +1,11 @@
{ lib
, clang
, fetchFromGitHub
, symlinkJoin
, buildGoModule
, makeWrapper
, v2ray-geoip
, v2ray-domain-list-community
}:
buildGoModule rec {
pname = "dae";
@ -19,7 +23,7 @@ buildGoModule rec {
proxyVendor = true;
nativeBuildInputs = [ clang ];
nativeBuildInputs = [ clang makeWrapper ];
ldflags = [
"-s"
@ -37,6 +41,19 @@ buildGoModule rec {
# network required
doCheck = false;
assetsDrv = symlinkJoin {
name = "dae-assets";
paths = [ v2ray-geoip v2ray-domain-list-community ];
};
postInstall = ''
install -Dm444 install/dae.service $out/lib/systemd/system/dae.service
wrapProgram $out/bin/dae \
--suffix DAE_LOCATION_ASSET : $assetsDrv/share/v2ray
substituteInPlace $out/lib/systemd/system/dae.service \
--replace /usr/bin/dae $out/bin/dae
'';
meta = with lib; {
description = "A Linux high-performance transparent proxy solution based on eBPF";
homepage = "https://github.com/daeuniverse/dae";

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.56.1";
version = "1.56.2";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-hmUwKFSU1KgdfC/WdK0rbRNMjzzBRWyfMQ/PomdGvbo=";
hash = "sha256-yjEaVfyfOlH/GPZz06lKvdds88VZUygPe1OxueMDnJA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ automake cmake autoconf ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "q";
version = "0.11.2";
version = "0.11.4";
src = fetchFromGitHub {
owner = "natesales";
repo = "q";
rev = "v${version}";
sha256 = "sha256-a2MmDKRXM2n3joHKdWU5sbBrF94TzcLUelNXIiL328M=";
sha256 = "sha256-zoIHpj1i0X5SCVhcT3bl5xxsDcvD2trEVhlIC5YnIZo=";
};
vendorHash = "sha256-cZRaf5Ks6Y4PzeVN0Lf1TxXzrifb7uQzsMbZf6JbLK4=";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tunwg";
version = "23.06.14+dbfe3aa";
version = "23.07.15+3213668";
src = fetchFromGitHub {
owner = "ntnj";
repo = "tunwg";
rev = "v${version}";
hash = "sha256-w7rx2Q0VXQBETmHROcVWzh0TIEjiITpI5CR9jvtXF7E=";
hash = "sha256-FghsfL3GW8jWBICJWXsqiFZPbDhIKl2nY8RsMH6ILTw=";
};
vendorHash = "sha256-3vDcCOrhYTHvr8ck0WxZPRUQNsKtEVyUKTD5Epbno6I=";
vendorHash = "sha256-pzUWhKcht9vodBiZGe9RU+tm0c1/slBGeIrKfZlIDdk=";
ldflags = [ "-s" "-w" ];

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "comma";
version = "1.6.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "comma";
rev = "v${version}";
hash = "sha256-5HNH/Lqj8OU/piH3tvPRkINXHHkt6bRp0QYYR4xOybE=";
hash = "sha256-x2HVm2vcEFHDrCQLIp5QzNsDARcbBfPdaIMLWVNfi4c=";
};
cargoHash = "sha256-4Epy5ZPyitRVTHEFVlRo66GvxJVBddlOII/7yqjuK9k=";
cargoHash = "sha256-N6Bc0+m0Qz1c/80oLvQTj8gvMusPXIriegNlRYWWStU=";
nativeBuildInputs = [ makeBinaryWrapper ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-07-12";
version = "2023-07-18";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ro17fRg9sw6+3ba6apIXtGwWvnPs0i6tMMJu6VwWPd0=";
hash = "sha256-fna7N9TCrq2Fz+/S0vNQRCx35EFTRr+OiYk6aXzWfyc=";
};
nativeBuildInputs = [

View file

@ -8,6 +8,7 @@
, opencl-headers
, ocl-icd
, xxHash
, Foundation, IOKit, Metal, OpenCL, libiconv
}:
stdenv.mkDerivation rec {
@ -19,13 +20,22 @@ stdenv.mkDerivation rec {
sha256 = "sha256-sl4Qd7zzSQjMjxjBppouyYsEeyy88PURRNzzuh4Leyo=";
};
postPatch = ''
# Remove hardcoded paths on darwin
substituteInPlace src/Makefile \
--replace "/usr/bin/ar" "ar" \
--replace "/usr/bin/sed" "sed" \
--replace '-i ""' '-i'
'';
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals cudaSupport [
addOpenGLRunpath
];
buildInputs = [ opencl-headers xxHash ];
buildInputs = [ opencl-headers xxHash ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit Metal OpenCL libiconv ];
makeFlags = [
"PREFIX=${placeholder "out"}"
@ -35,6 +45,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_XXHASH=1"
];
enableParallelBuilding = true;
preFixup = ''
for f in $out/share/hashcat/OpenCL/*.cl; do
# Rewrite files to be included for compilation at runtime for opencl offload
@ -63,7 +75,7 @@ stdenv.mkDerivation rec {
description = "Fast password cracker";
homepage = "https://hashcat.net/hashcat/";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ kierdavis zimbatm ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubernetes-polaris";
version = "8.3.0";
version = "8.4.0";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "polaris";
rev = version;
sha256 = "sha256-rvxe9kHTAc2QZnJRkWNzzYgrM8ShPlBZVIvOKlbP8vg=";
sha256 = "sha256-r1SUYz71IXgqWTYtZlk+OjlYHSfJ8nOK2/YFOoIESMw=";
};
vendorHash = "sha256-K9QvA4WNF61iToPze26OwP78HKseuajnsHzmWdoo7Y4=";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.9.8";
version = "2.9.9";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0rviTlnsI4BfWDJMgbkma44xauDhlZB2d15uel4/Y3M=";
hash = "sha256-33kKRJNPy78Chtiv9/e27Jsg2aEmMAHZ/RLmrP5klIg=";
};
vendorHash = "sha256-OSaxxfUZBimMaM81Y2lV9CIxYCS1HCngCENFROZiikg=";
vendorHash = "sha256-oJw9mVp/be1Xb8p8Szz5Vi30uNoITcDLjRK+SvzVM6Y=";
modRoot = "./v2";
subPackages = [

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "quark-engine";
version = "23.4.1";
version = "23.6.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-YOI768QNAgqUy3Vc2kyJCUeJE7j0PyP5BOUelhvyHgU=";
sha256 = "sha256-RkYLTZ40ZINg3cNPBJrSOGOzSSfislBmwdUOQHDu32U=";
};
propagatedBuildInputs = with python3.pkgs; [

View file

@ -31,6 +31,5 @@ buildGoModule rec {
description = "Cryptographic protocol analysis for students and engineers";
maintainers = with lib.maintainers; [ zimbatm ];
license = with lib.licenses; [ gpl3 ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "1.0.108";
version = "1.0.110";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WPSwm11yVSuFTsLmNDn2xGaucyUoSu4EpFVjTpkAMS8=";
sha256 = "sha256-TIa4yGj3imDrWJ6U8Qyv84bAihhuFbQizXghJuEIc88=";
};
cargoHash = "sha256-XR6SpZhsuMfqx4Ns9g/+DOTm622OU8tltwW9Oe1PE2I=";
cargoHash = "sha256-0ORDDwb2wXdJXoesfcY98EgONWjovT/bE96qFVxDRcM=";
meta = with lib; {
description = "Automatically update system timezone based on location";

View file

@ -1829,6 +1829,8 @@ with pkgs;
sorted-grep = callPackage ../tools/text/sorted-grep { };
smb3-foundry = callPackage ../applications/misc/smb3-foundry { };
smbmap = callPackage ../tools/security/smbmap { };
smbscan = callPackage ../tools/security/smbscan { };
@ -2543,7 +2545,7 @@ with pkgs;
punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
py65 = python3Packages.callPackage ../applications/emulators/py65 { };
py65 = with python3.pkgs; toPythonApplication py65;
resim = callPackage ../applications/emulators/resim { };
@ -8695,7 +8697,9 @@ with pkgs;
hashcash = callPackage ../tools/security/hashcash { };
hashcat = callPackage ../tools/security/hashcat { };
hashcat = callPackage ../tools/security/hashcat {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL;
};
hashcat-utils = callPackage ../tools/security/hashcat-utils { };
@ -16982,6 +16986,9 @@ with pkgs;
opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { };
opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { };
opensyclWithRocm = opensycl.override { rocmSupport = true; };
ravedude = callPackage ../development/tools/rust/ravedude { };
ra-multiplex = callPackage ../development/tools/rust/ra-multiplex {};
@ -19658,8 +19665,9 @@ with pkgs;
rufo = callPackage ../development/tools/rufo { };
rye = callPackage ../development/tools/rye {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye {
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration;
};
samurai = callPackage ../development/tools/build-managers/samurai { };
@ -35443,7 +35451,9 @@ with pkgs;
ueberzug = with python3Packages; toPythonApplication ueberzug;
ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { };
ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;
};
uefi-run = callPackage ../tools/virtualization/uefi-run { };

View file

@ -7913,6 +7913,8 @@ self: super: with self; {
py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { };
py65 = callPackage ../development/python-modules/py65 { };
pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { };
pyatag = callPackage ../development/python-modules/pyatag { };