Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-17 06:00:58 +00:00 committed by GitHub
commit 2e936d668c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 291 additions and 235 deletions

4
.github/labeler.yml vendored
View File

@ -188,6 +188,10 @@
- nixos/tests/xfce.nix
- pkgs/desktops/xfce/**/*
"6.topic: zig":
- pkgs/development/compilers/zig/**/*
- doc/hooks/zig.section.md
"8.has: changelog":
- nixos/doc/manual/release-notes/**/*

View File

@ -51,13 +51,6 @@ in
environment.extraInit =
''
unset ASPELL_CONF
for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do
if [ -d "$i/lib/aspell" ]; then
export ASPELL_CONF="dict-dir $i/lib/aspell"
fi
done
export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER"
export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}"
'';

View File

@ -579,7 +579,7 @@ in
description = "OAuth2 Proxy";
path = [ cfg.package ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
after = [ "network-online.target" ];
serviceConfig = {
User = "oauth2_proxy";

View File

@ -2,9 +2,11 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
, glib
, gtk4
, pango
, librsvg
}:
rustPlatform.buildRustPackage rec {
@ -22,8 +24,8 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "gtk4_8" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk4 pango ];
nativeBuildInputs = [ pkg-config wrapGAppsHook];
buildInputs = [ glib gtk4 pango librsvg ];
meta = with lib; {
description = "Clean and customizable greeter for greetd";

View File

@ -9,7 +9,7 @@
, python3
, icu
, lldb
, dotnet-sdk_6
, dotnet-sdk_7
, maven
, autoPatchelfHook
, libdbusmenu
@ -275,7 +275,7 @@ let
plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer
rm -rf lib/ReSharperHost/linux-x64/dotnet
ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet
ln -s ${dotnet-sdk_7} lib/ReSharperHost/linux-x64/dotnet
'');
});

View File

@ -17,13 +17,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
},
"name": "ideavim"
},
@ -63,13 +63,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip"
},
"name": "ini"
},
@ -79,8 +79,8 @@
"phpstorm"
],
"builds": {
"231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
},
"name": "symfony-support"
},
@ -90,8 +90,8 @@
"phpstorm"
],
"builds": {
"231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
},
"name": "php-annotations"
},
@ -103,9 +103,9 @@
"rider"
],
"builds": {
"231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip"
},
"name": "python-community-edition"
},
@ -126,13 +126,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip"
},
"name": "rust"
},
@ -153,13 +153,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
},
"name": "rust-beta"
},
@ -197,14 +197,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.18": "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",
"232.8660.111": null,
"232.8660.143": null,
"232.8660.185": null,
"232.8660.186": null,
"232.8660.197": null
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip"
},
"name": "nixidea"
},
@ -234,13 +234,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip",
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
},
"name": "csv-editor"
},
@ -261,13 +261,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
},
"name": "vscode-keymap"
},
@ -288,13 +288,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
},
"name": "eclipse-keymap"
},
@ -315,13 +315,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
},
"name": "visual-studio-keymap"
},
@ -342,13 +342,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.18": "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",
"232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
"232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.205": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.212": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@ -368,14 +368,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip"
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip"
},
"name": "github-copilot"
},
@ -396,49 +396,41 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
},
"files": {
"https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=",
"https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=",
"https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=",
"https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=",
"https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=",
"https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
"https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=",
"https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=",
"https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
"https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
"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/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
"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/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=",
"https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=",
"https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip": "sha256-pSbM2BkXrWdEVedLIh89sQ1FDnlgO+saXyZsfkI2qYA=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=",
"https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=",
"https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=",
"https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip": "sha256-qxTbWKdYSb4b6CRDKup7rL8EO2qZLM9bctMlTDHfrBk=",
"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/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=",
"https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=",
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
"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/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=",
"https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=",
"https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=",
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=",
"https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=",
"https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=",
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
"https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=",
"https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o="
}
}

View File

@ -67,10 +67,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2023.1.4",
"sha256": "7b44d704641c6015ce49e12e82c8866e9fdd8e8d421590235e536b3b1312b180",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.tar.gz",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "81345b7bf6f9bd844804a6d72f617dd9ced606508e5d34eba8cd83a8b115f556",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.tar.gz",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -92,10 +92,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.1.4",
"sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "1aa3436edb94cba8ec0e51605e146ecd528affa96e0e26df572c2437e9b00d2f",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.tar.gz",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -182,10 +182,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2023.1.4",
"sha256": "4d3d9005772d2136e44f7774377fae053b690501800ea5e650d0f35882690fdd",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.dmg",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "c8a3287383190113c65ec3c11fe808096faf581ce71953a258992900d97c377f",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.dmg",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -207,10 +207,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.1.4",
"sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "8041b79a64ac24578d8fe9c1ec02d91eb3b047164cf48713e988bc9a9c3d53d7",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.dmg",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -297,10 +297,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2023.1.4",
"sha256": "3285135fc4c529640ecfc5b451fa9b51d9df2a323915509cc6cbb3f25717c9e2",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4-aarch64.dmg",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "365ed1ea1eb87f93abf581080c72866d693bfc60c4b8cd5682b5ec93f63ed4a9",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2-aarch64.dmg",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -322,10 +322,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.1.4",
"sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "c5168f8ce698b5ddea7652f88b652239f87e87fa51438ac358aa8a44a3686272",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2-aarch64.dmg",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",

View File

@ -11,16 +11,15 @@ buildGoModule rec {
owner = "nomad-software";
repo = "meme";
rev = "v${version}";
sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k";
hash = "sha256-MzSPJCszVEZkBvSbRzXR7AaDQOOjDQ2stKKJr8oGOSE=";
};
vendorSha256 = null;
vendorHash = null;
meta = with lib; {
description = "A command line utility for creating image macro style memes";
homepage = "https://github.com/nomad-software/meme";
license = licenses.mit;
maintainers = [ maintainers.fgaz ];
platforms = with platforms; linux ++ darwin;
};
}

View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "pixinsight";
version = "1.8.9-1";
version = "1.8.9-2";
src = requireFile rec {
name = "PI-linux-x64-${version}-20220518-c.tar.xz";
name = "PI-linux-x64-${version}-20230814-c.tar.xz";
url = "https://pixinsight.com/";
sha256 = "sha256-AVeDJ7YYqCo7KfelUUQurjglNnTwCf0pOzJCV/bQrrw=";
sha256 = "sha256-4Jspkl5riMlbeJX/h1zhVfVymORPK1X4l0LyOgXm05Y=";
message = ''
PixInsight is available from ${url} and requires a commercial (or trial) license.
After a license has been obtained, PixInsight can be downloaded from the software distribution
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
libXext
libXfixes
libXrandr
libxkbfile
]);
postPatch = ''

View File

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "2.0.1.16621";
version = "2.0.2.16660";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-FZuoLzouwi3HfTJct+Sh8DNzdzQoEsErBb04SgYrZN0=";
sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM=";
stripRoot = false;
};

View File

@ -10,17 +10,18 @@
, pamixer # pamixer
, pulseaudio # pactl
, libdbusmenu-gtk3 # tray
, playerctl
}:
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.7.17";
version = "0.9.11";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM=";
rev = "v${version}";
hash = "sha256-4/R/x3iQ6nsG5OLy/FMA24uxS3xKD/2901gBNe6lkk4=";
};
# No tests
@ -30,7 +31,7 @@ python3Packages.buildPythonApplication rec {
strictDeps = false;
dontWrapGApps = true;
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ];
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ];
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
propagatedBuildInputs = (with python3Packages;
[ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ])
@ -56,6 +57,7 @@ python3Packages.buildPythonApplication rec {
description = "GTK3-based panel for Sway window manager";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ ludovicopiero ];
mainProgram = "nwg-panel";
};
}

View File

@ -2,11 +2,11 @@
appimageTools.wrapType2 rec {
pname = "remnote";
version = "1.12.3";
version = "1.12.9";
src = fetchurl {
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
sha256 = "sha256-qLEEIzTE5h9+9tWL0qSFCqN/MW124NtIacqiKnhlbp8=";
sha256 = "sha256-ZBo7yxbTS+2pWecbPGxp0UMy16HRMwuuUUejb6DUHic=";
};
meta = with lib; {

View File

@ -655,11 +655,11 @@
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
},
"kubernetes": {
"hash": "sha256-J3+F6GJJjGzWBwqnznI/If6I0sZ733h6ShR2EdbqPVs=",
"hash": "sha256-aPplKT6L9Lmp4St6DLtHywiunqLaABEB9urbtSfK8Ec=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
"rev": "v2.22.0",
"rev": "v2.23.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
@ -682,13 +682,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",
"hash": "sha256-tSbrd+T1HOOpO4atNDcYmq0SkEureSJkjWOnxqOTdnM=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.5.2",
"rev": "v2.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="
"vendorHash": "sha256-dIxOvx8UpZD5I7acucxzfnq+gyDX+uqVMJRkqH5jTRI="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@ -827,11 +827,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-dB8yoUPv6uYKveZxCblwif2FKW0qNdY5CJMpbZivB78=",
"hash": "sha256-sxhykS4pXF00VJVtVd7kO2GasAqBUUMqPDPLE3BzUFI=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.8.0",
"rev": "v5.9.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1270,12 +1270,12 @@
"vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q="
},
"yandex": {
"hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=",
"hash": "sha256-Y4bEbqUTxP1QDf1r8a3vtxV+RG3dqjHxHN9p/nB3qz8=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.96.1",
"rev": "v0.97.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg="
"vendorHash": "sha256-1Sw4a9HFYt24Om5Bbbmx6JskhbMd4zTv6K6WOrQetpQ="
}
}

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.41.3";
version = "0.41.6";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-/VC9zhWC3jJuIXQ2fel6moLzrdsguPaylgfkY9FoClQ=";
hash = "sha256-6CDK9DNjBQ5EPp562na0DOWFmlxnlVl8Z8pwm3pGQ9A=";
};
sourceRoot = ".";

View File

@ -76,11 +76,11 @@ buildType = if debugBuild then "Debug" else "Release";
in stdenv.mkDerivation rec {
pname = "jcef-jetbrains";
rev = "3dfde2a70f1f914c6a84ba967123a0e38f51053f";
rev = "1ac1c682c497f2b864f86050796461f22935ea64";
# This is the commit number
# Currently from the 231 branch: https://github.com/JetBrains/jcef/tree/231
# Currently from the branch: https://github.com/JetBrains/jcef/tree/232
# Run `git rev-list --count HEAD`
version = "654";
version = "672";
nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja ];
buildInputs = [ libX11 libXdamage nss nspr ];
@ -89,19 +89,19 @@ in stdenv.mkDerivation rec {
owner = "jetbrains";
repo = "jcef";
inherit rev;
hash = "sha256-g8jWzRI2uYzu8O7JHENn0u9yY08fvY6g0Uym02oYUMI=";
hash = "sha256-3HuW8upR/bZoK8euVti2KpCZh9xxfqgyHmgoG1NjxOI=";
};
cef-bin = let
fileName = "cef_binary_104.4.26+g4180781+chromium-104.0.5112.102_linux64_minimal";
fileName = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_linux64_minimal";
urlName = builtins.replaceStrings ["+"] ["%2B"] fileName;
in fetchzip rec {
name = fileName;
url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2";
hash = "sha256-0PAWWBR+9TO8hhejydWz8R6Df3d9A/Mb0VL8stlPz5Q=";
hash = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw=";
};
clang-fmt = fetchurl {
url = "https://storage.googleapis.com/chromium-clang-format/942fc8b1789144b8071d3fc03ff0fcbe1cf81ac8";
hash = "sha256-5iAU49tQmLS7zkS+6iGT+6SEdERRo1RkyRpiRvc9nVY=";
url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263";
hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE=";
};
configurePhase = ''

View File

@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: {
insn-constants.h \
'' + lib.optionalString stdenv.targetPlatform.isM68k ''
sysroot-suffix.h \
'' + lib.optionalString stdenv.targetPlatform.isArmv7 ''
'' + lib.optionalString stdenv.targetPlatform.isAarch32 ''
arm-isa.h \
arm-cpu.h \
'' + ''

View File

@ -4,7 +4,7 @@
, flex
, bison
, libxml2
, python
, pythonSupport ? stdenv.hostPlatform.hasSharedLibraries, python
, libusb1
, avahiSupport ? true, avahi
, libaio
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
pname = "libiio";
version = "0.24";
outputs = [ "out" "lib" "dev" "python" ];
outputs = [ "out" "lib" "dev" ]
++ lib.optional pythonSupport "python";
src = fetchFromGitHub {
owner = "analogdevicesinc";
@ -37,8 +38,9 @@ stdenv.mkDerivation rec {
flex
bison
pkg-config
] ++ lib.optionals pythonSupport ([
python
] ++ lib.optional python.isPy3k python.pkgs.setuptools;
] ++ lib.optional python.isPy3k python.pkgs.setuptools);
buildInputs = [
libxml2
@ -49,25 +51,26 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d"
"-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}"
"-DPYTHON_BINDINGS=on"
# osx framework is disabled,
# the linux-like directory structure is used for proper output splitting
"-DOSX_PACKAGE=off"
"-DOSX_FRAMEWORK=off"
] ++ lib.optionals pythonSupport [
"-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}"
"-DPYTHON_BINDINGS=on"
] ++ lib.optionals (!avahiSupport) [
"-DHAVE_DNS_SD=OFF"
];
postPatch = ''
# Hardcode path to the shared library into the bindings.
sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
substituteInPlace libiio.rules.cmakein \
--replace /bin/sh ${runtimeShell}
'' + lib.optionalString pythonSupport ''
# Hardcode path to the shared library into the bindings.
sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
'';
postInstall = ''
postInstall = lib.optionalString pythonSupport ''
# Move Python bindings into a separate output.
moveToOutput ${python.sitePackages} "$python"
'';

View File

@ -6,18 +6,19 @@
, lz4
, pugixml
, zlib
, zstd
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libxisf";
version = "0.2.8";
version = "0.2.9";
src = fetchFromGitea {
domain = "gitea.nouspiro.space";
owner = "nou";
repo = "libXISF";
rev = "v${finalAttrs.version}";
hash = "sha256-YB97vMz2+cFRYq8x2Su3Eh952U6kGIVLYV7kDEd5S8g=";
hash = "sha256-Jh3NWtQSV0uePDMCDNzdI4qpRGbHTel3neRZAA3anQk=";
};
patches = [
@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
lz4
pugixml
zlib
zstd
];
doCheck = true;

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "16.0.0";
version = "16.0.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs=";
hash = "sha256-DxEfkM//WvGqS/iWb6RIvE2raIYb/I0bcwrLqLBjCmw=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.60";
version = "0.2.65";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
hash = "sha256-RCHOkTBnJcqGc3Y0cQhkgkizuqNl98MU8lxpVoHVLcc=";
hash = "sha256-6KqfEPwTrW9VzR73LYFZeQOpG57vS9Xa/Dl4vLMD8U8=";
};
propagatedBuildInputs = [

View File

@ -28,13 +28,13 @@
buildPythonPackage rec {
pname = "drf-spectacular";
version = "0.26.3";
version = "0.26.4";
src = fetchFromGitHub {
owner = "tfranzel";
repo = "drf-spectacular";
rev = "refs/tags/${version}";
hash = "sha256-O47676BOuCx3wMpeuRATQOAWZQev+R+OxZi4boQABmc=";
hash = "sha256-f8x4QOt2EbDv+NlYAmpzXrCdT+q4wLGIrDsuUd45j2U=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,9 @@
, fetchPypi
, buildPythonPackage
, pythonOlder
, oldest-supported-numpy
, setuptools
, wheel
, numpy
, hdf5
, cython
@ -33,7 +35,6 @@ in buildPythonPackage rec {
# avoid strict pinning of numpy
postPatch = ''
substituteInPlace setup.py \
--replace "numpy ==" "numpy >=" \
--replace "mpi4py ==" "mpi4py >="
'';
@ -50,8 +51,10 @@ in buildPythonPackage rec {
nativeBuildInputs = [
cython
oldest-supported-numpy
pkgconfig
setuptools
wheel
];
buildInputs = [ hdf5 ]

View File

@ -8,15 +8,13 @@
buildPythonPackage rec {
pname = "jmp";
# As of 2022-01-01, the latest stable version (0.0.2) fails tests with recent JAX versions,
# IIUC it's fixed in https://github.com/deepmind/jmp/commit/4969392f618d7733b265677143d8c81e44085867
version = "unstable-2021-10-03";
version = "0.0.4";
src = fetchFromGitHub {
owner = "deepmind";
repo = pname;
rev = "260e5ba01f46b10c579a61393e6c7e546aeae93e";
hash = "sha256-BTHy/jNf6LeV+x3GTI9MDBWLK6A5z2Z1TQyBkHMTeuE=";
rev = "refs/tags/v${version}";
hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y=";
};
# Wheel requires only `numpy`, but the import needs `jax`.

View File

@ -10,19 +10,28 @@
buildPythonPackage rec {
pname = "json-tricks";
version = "3.15.5";
disabled = pythonOlder "3.5";
version = "3.17.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mverleg";
repo = "pyjson_tricks";
rev = "v${version}";
sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU=";
rev = "refs/tags/v${version}";
hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s=";
};
nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ];
nativeCheckInputs = [
numpy
pandas
pytz
pytestCheckHook
];
pythonImportsCheck = [ "json_tricks" ];
pythonImportsCheck = [
"json_tricks"
];
meta = with lib; {
description = "Extra features for Python JSON handling";

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "msgspec";
version = "0.18.0";
version = "0.18.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "jcrist";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-FZq8SEtn/p7x43Je2d0gIGDi8S4uz4cdV0KkQecCFT4=";
hash = "sha256-cacwbl5JYqQGXhdt/F0nhX032GCw8RwFi0XBsn7dlq0=";
};
# Requires libasan to be accessible

View File

@ -7,11 +7,12 @@
, pythonOlder
, pytest-asyncio
, pytestCheckHook
, pytz
}:
buildPythonPackage rec {
pname = "odp-amsterdam";
version = "5.1.1";
version = "5.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,13 +21,12 @@ buildPythonPackage rec {
owner = "klaasnicolaas";
repo = "python-odp-amsterdam";
rev = "refs/tags/v${version}";
hash = "sha256-DaL2CTrhWqBwl3kktF1wndxzrreA24C3zXmp4ghf/4s=";
hash = "sha256-iJjwxvlxzRpKy2P0A3mS2i05bues5YasP72HuZiuFyE=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"0.0.0"' '"${version}"'
sed -i '/addopts/d' pyproject.toml
'';
@ -36,6 +36,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
pytz
];
nativeCheckInputs = [

View File

@ -2,6 +2,7 @@
, fetchFromGitHub
}: rec {
version = "3.5.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "openrazer";

View File

@ -17,15 +17,13 @@ let
common = import ./common.nix { inherit lib fetchFromGitHub; };
in
buildPythonPackage (common // {
pname = "openrazer_daemon";
pname = "openrazer-daemon";
disabled = !isPy3k;
outputs = [ "out" "man" ];
prePatch = ''
cd daemon
'';
sourceRoot = "${common.src.name}/daemon";
postPatch = ''
substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer"
@ -43,8 +41,8 @@ buildPythonPackage (common // {
setproctitle
];
postBuild = ''
DESTDIR="$out" PREFIX="" make install manpages
postInstall = ''
DESTDIR="$out" PREFIX="" make manpages install-resources install-systemd
'';
# no tests run

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "oracledb";
version = "1.3.2";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-uzw5HBZ7V3jdsVp1OKKzbbXJuIpQyGxheByp/zArtkM=";
hash = "sha256-lrpQj3g4ksfKZI8misvLikqcgDfH3UpQnwXyyJ1iMb4=";
};
nativeBuildInputs = [

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "api-linter";
version = "1.55.2";
version = "1.56.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
rev = "v${version}";
hash = "sha256-OBx8zlxDLlPy6hfA8A9+F0bOglAzY81d9U7uCje0vyo=";
hash = "sha256-IanIznKRmmW83/NWjW5VeBQUA/u4RSFzAQf1/QOAsK8=";
};
vendorHash = "sha256-x8mncoXVK7p6xxgaZL/Fv6dHgeOj2rWr55ovvk6zwQE=";
vendorHash = "sha256-6MvXVHg4EH5S37JnY0jnAFjDplQINWPFyd54c1W/oAE=";
subPackages = [ "cmd/api-linter" ];
@ -23,7 +23,7 @@ buildGoModule rec {
"-w"
];
# reference: https://github.com/googleapis/api-linter/blob/v1.55.2/.github/workflows/release.yaml#L76
# reference: https://github.com/googleapis/api-linter/blob/v1.56.0/.github/workflows/release.yaml#L76
preBuild = ''
cat > cmd/api-linter/version.go <<EOF
package main

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "okteto";
version = "2.18.3";
version = "2.19.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-ZSrTVfZfIzfeXr6SDKHZZYrqvGKYA6bwMXZ4fBP+2Uo=";
hash = "sha256-cjdSJNhGP0YCent3r5GG1AhfWGbML46JAremXIwXMDY=";
};
vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g=";
vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU=";
postPatch = ''
# Disable some tests that need file system & network access.

View File

@ -1,11 +1,11 @@
{ appimageTools, lib, fetchurl }:
let
pname = "uhk-agent";
version = "3.0.1";
version = "3.0.2";
src = fetchurl {
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-TX7mL6BWAZHZ2W9/BneOt1vxt2slC2Lv6eFWPAgS2a8=";
sha256 = "sha256-RrZ2J6bmk8VXVmpUi9bjqQRJBYjGIczMaSEG9aQ4U4I=";
};
appimageContents = appimageTools.extract {

View File

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "komga";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "sha256-7/Q4POz2MyS8he3E5F/Delmwc4/EHCoXXz5EAnzVwFk=";
sha256 = "sha256-R1weJRQ8DkBbUndGyO8wvFpsI+6OTZ59C8P6EzsMV+E=";
};
nativeBuildInputs = [

View File

@ -135,6 +135,8 @@ let
pkgs.pkgsLLVM.stdenv
pkgs.pkgsStatic.bash
pkgs.pkgsCross.arm-embedded.stdenv
pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
pkgs.pkgsCross.raspberryPi.stdenv # for armv6l
pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
pkgs.pkgsCross.m68k.stdenv
pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc

View File

@ -2,23 +2,23 @@
buildGoModule rec {
pname = "ligolo-ng";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "tnpitsecurity";
repo = "ligolo-ng";
rev = "v${version}";
hash = "sha256-O/qiznQs+x7qBYXVItd0W7a0irEzRf0We7kW7HHLqcw=";
hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8=";
};
vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs=";
postConfigure = ''
export CGO_ENABLED=0
'';
ldflags = [ "-s" "-w" "-extldflags '-static'" ];
vendorHash = "sha256-If0K6DmkGk3AmO3eb/ocAl1RJeBN/xgY7dOh9lnVLh8=";
doCheck = false; # tests require network access
meta = with lib; {

View File

@ -2,6 +2,8 @@
, fetchFromGitHub
, buildPythonApplication
, setuptools
, setuptools-scm
, wheel
, nss
, nix-update-script
}:
@ -9,18 +11,19 @@
buildPythonApplication rec {
pname = "firefox_decrypt";
version = "1.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "unode";
repo = pname;
rev = "0931c0484d7429f7d4de3a2f5b62b01b7924b49f";
sha256 = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM=";
hash = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ];

View File

@ -142,9 +142,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.4"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@ -234,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "difftastic"
version = "0.49.0"
version = "0.50.0"
dependencies = [
"assert_cmd",
"bumpalo",
@ -244,6 +244,7 @@ dependencies = [
"crossterm",
"glob",
"hashbrown 0.12.3",
"humansize",
"itertools",
"lazy_static",
"libc",
@ -362,6 +363,15 @@ dependencies = [
"libc",
]
[[package]]
name = "humansize"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
dependencies = [
"libm",
]
[[package]]
name = "humantime"
version = "1.3.0"
@ -402,6 +412,12 @@ version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "libm"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "libmimalloc-sys"
version = "0.1.24"
@ -651,9 +667,9 @@ checksum = "59ffec9df464013295b499298811e6a3de31bf8128092135826517db12dee601"
[[package]]
name = "rayon"
version = "1.6.1"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
@ -661,9 +677,9 @@ dependencies = [
[[package]]
name = "rayon-core"
version = "1.10.1"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",

View File

@ -16,13 +16,13 @@ in
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.49.0";
version = "0.50.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
hash = "sha256-jFBvMRkuAaQAi/28BBf/9cm6FcNMOYS5M69YoSXsX4Q=";
hash = "sha256-CC06Bryn5VNEsW4Wwbo+ubifizCWgpWUE1FsAozZcdg=";
};
cargoLock = {

View File

@ -1,31 +1,57 @@
{ lib, python3Packages, fetchFromGitHub, fetchurl, youtube-dl, git }:
{ lib
, python3Packages
, fetchFromGitHub
, fetchurl
, youtube-dl
}:
let
install_freedesktop = fetchurl {
url = "https://github.com/thann/install_freedesktop/tarball/2673e8da4a67bee0ffc52a0ea381a541b4becdd4";
sha256 = "0j8d5jdcyqbl5p6sc1ags86v3hr2sghmqqi99d1mvc064g90ckrv";
install-freedesktop = python3Packages.buildPythonPackage rec {
pname = "install-freedesktop";
version = "0.1.2-1-g2673e8d";
format = "setuptools";
src = fetchurl {
name = "Thann-install_freedesktop-${version}.tar.gz";
url = "https://github.com/thann/install_freedesktop/tarball/2673e8da4a67bee0ffc52a0ea381a541b4becdd4";
hash = "sha256-O08G0iMGsF1DSyliXOHTIsOxDdJPBabNLXRhz5osDUk=";
};
# package has no tests
doCheck = false;
};
in
python3Packages.buildPythonApplication rec {
pname = "play-with-mpv";
version = "unstable-2020-05-18";
version = "unstable-2021-04-02";
format = "setuptools";
src = fetchFromGitHub {
owner = "thann";
repo = "play-with-mpv";
rev = "656448e03fe9de9e8bd21959f2a3b47c4acb8c3e";
sha256 = "1qma8b3lnkdhxdjsnrq7n9zgy53q62j4naaqqs07kjxbn72zb4p4";
owner = "thann";
repo = "play-with-mpv";
rev = "07a9c1dd57d9e16538991b13fd3e2ed54d6e3a2d";
hash = "sha256-ZtUFzgYGNa9+g2xDONW8B5bbsbXmyY3IeT1GQH0AVIw=";
};
nativeBuildInputs = [ git ];
propagatedBuildInputs = [ youtube-dl ];
postPatch = ''
substituteInPlace setup.py --replace \
'"https://github.com/thann/install_freedesktop/tarball/master#egg=install_freedesktop-0.2.0"' \
'"file://${install_freedesktop}#egg=install_freedesktop-0.2.0"'
'"https://github.com/thann/install_freedesktop/tarball/master#egg=install_freedesktop-0.2.0"' \
'"file://${install-freedesktop}#egg=install_freedesktop-0.2.0"' \
--replace 'version = get_version()' 'version = "0.1.0.post9"'
'';
nativeBuildInputs = with python3Packages; [
install-freedesktop
wheel
];
propagatedBuildInputs = [
youtube-dl
];
# package has no tests
doCheck = false;
meta = with lib; {
description = "Chrome extension and python server that allows you to play videos in webpages with MPV instead";
homepage = "https://github.com/Thann/play-with-mpv";

View File

@ -23673,9 +23673,7 @@ with pkgs;
lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { };
ligolo-ng = callPackage ../tools/networking/ligolo-ng {
buildGoModule = buildGo119Module; # go 1.20 build failure
};
ligolo-ng = callPackage ../tools/networking/ligolo-ng { };
linenoise = callPackage ../development/libraries/linenoise { };

View File

@ -5889,7 +5889,10 @@ self: super: with self; {
inherit (pkgs.config) cudaSupport;
};
libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python;
libiio = (toPythonModule (pkgs.libiio.override {
pythonSupport = true;
inherit python;
})).python;
libkeepass = callPackage ../development/python-modules/libkeepass { };