Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-07-13 12:01:13 +00:00 committed by GitHub
commit f4330398cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 1047 additions and 11317 deletions

View file

@ -90,7 +90,9 @@ in
{
bind = "127.0.0.1";
tls_enabled = true;
pictrs_url = with config.services.pict-rs; "http://${address}:${toString port}";
pictrs = {
url = with config.services.pict-rs; "http://${address}:${toString port}";
};
actor_name_max_length = 20;
rate_limit.message = 180;
@ -253,6 +255,7 @@ in
LEMMY_UI_LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
LEMMY_UI_HTTPS = "false";
NODE_ENV = "production";
};
documentation = [

View file

@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "furnace";
version = "0.6pre5";
version = "0.6pre7";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-6KiG7nfQUdPW+EkBW3PPM141kOmolAgrrqhEGH/Azg4=";
sha256 = "sha256-Gr4XDfYaRUFdtnCJ6i0oRDszwAZYVW6Mbj4Sp7El5+8=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.12.2";
version = "3.12.4";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-AzQAEU5o3m1cFCxeyT32AzX4WUk3DliBPdw+cfQPyKU=";
sha256 = "sha256-B9mYFmb5wU3LtwMU2fubIhlVP0Zz1QNwciL5EY49P1I=";
};
nativeBuildInputs = [

View file

@ -19,11 +19,11 @@
"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.38": "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.41": "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.9161.47": "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"
},
"name": "ideavim"
},
@ -32,7 +32,7 @@
"idea-ultimate"
],
"builds": {
"231.9161.38": "https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip"
},
"name": "python"
},
@ -42,7 +42,7 @@
"idea-ultimate"
],
"builds": {
"231.9161.38": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip"
},
"name": "kotlin"
},
@ -63,13 +63,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9011.35": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
"231.9011.35": null,
"231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9161.38": "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.41": "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.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/6981/359999/ini-231.9225.16.zip"
},
"name": "ini"
},
@ -79,8 +79,8 @@
"phpstorm"
],
"builds": {
"231.9161.38": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
"231.9161.47": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
},
"name": "symfony-support"
},
@ -90,8 +90,8 @@
"phpstorm"
],
"builds": {
"231.9161.38": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
"231.9161.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
},
"name": "php-annotations"
},
@ -104,9 +104,8 @@
],
"builds": {
"231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
"231.9161.41": "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.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"
},
"name": "python-community-edition"
},
@ -127,13 +126,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip"
"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.41": "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.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip"
},
"name": "rust"
},
@ -156,11 +155,11 @@
"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.38": "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.41": "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.9161.47": "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"
},
"name": "rust-beta"
},
@ -176,9 +175,9 @@
],
"builds": {
"231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
"231.9161.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
},
"name": "ide-features-trainer"
},
@ -201,11 +200,11 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"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.38": "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.41": "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.9161.47": "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"
},
"name": "nixidea"
},
@ -214,7 +213,7 @@
"idea-ultimate"
],
"builds": {
"231.9161.38": "https://plugins.jetbrains.com/files/9568/343928/go-plugin-231.9161.14.zip"
"231.9225.16": "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip"
},
"name": "go"
},
@ -234,14 +233,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip",
"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.41": "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.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip"
},
"name": "csv-editor"
},
@ -264,11 +263,11 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
"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.38": "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.41": "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.9161.47": "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"
},
"name": "eclipse-keymap"
},
@ -291,11 +290,11 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
"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.38": "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.41": "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.9161.47": "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"
},
"name": "visual-studio-keymap"
},
@ -318,11 +317,11 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"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.38": "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.41": "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.9161.47": "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"
},
"name": "darcula-pitch-black"
},
@ -345,11 +344,11 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9011.35": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.29": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.40": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.46": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9161.47": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
"231.9161.47": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
},
"name": "github-copilot"
},
@ -372,18 +371,18 @@
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"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.38": "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.41": "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.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
},
"files": {
"https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip": "sha256-TZs6ColXUvrp2jw74h8M+6UhSqi9u/gDXlzTNhIt+oo=",
"https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip": "sha256-m52ukvz7pqOBPoyNr5l58glD19wXluguZVQKYajCYN8=",
"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/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/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
@ -393,18 +392,19 @@
"https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=",
"https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip": "sha256-imh+3U+HWM9jia2HfRXInHl1pfw+T6D4ls3DGqbqbsw=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip": "sha256-vQfCR7WMrknRminRcd0AoGrxofAf5dcD8/aXLwWBo3k=",
"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/336613/ini-231.9011.41.zip": "sha256-PtBDN+FNA518HaewPIr9pq5S3Z9RGSCA2NT+YnZ0l8c=",
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
"https://plugins.jetbrains.com/files/6981/359999/ini-231.9225.16.zip": "sha256-4Ko7v1VOK+rcgCm0vrde33TSUx2PPv6HvJLNmvEWjFk=",
"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/352612/intellij-rust-0.4.197.5401-231.zip": "sha256-Xi4gleut5anlXpiUHfsc41tvq2kOR4v63mHk+ovmTw8=",
"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/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/343928/go-plugin-231.9161.14.zip": "sha256-67SuJKJZEzEYojsL33zvtWArvADkkjd643cVb4s9EUk="
"https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip": "sha256-VZoavuQyHP7rJ3p/R+maoHetEt8bYP/eSnlfEgfFrFc="
}
}

View file

@ -35,26 +35,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2023.1.3",
"sha256": "f456024e1b5de405ada9bd570483ffca1126edec9c81bfa02b077f81434b5719",
"url": "https://download.jetbrains.com/go/goland-2023.1.3.tar.gz",
"build_number": "231.9161.41"
"version": "2023.1.4",
"sha256": "ac8bd42b6dee2aedcfd05656b7f74969e6775f41c9d6614d3cc4946fbc8c346f",
"url": "https://download.jetbrains.com/go/goland-2023.1.4.tar.gz",
"build_number": "231.9225.16"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2023.1.3",
"sha256": "336ec81b78645349e0b476047e2d1993ed3f1c571f8961565a3e47fe5c9c02bf",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3.tar.gz",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "9ea98c03b29903f7bde41f6a3c039621fff5d04015f37f9f21e04966d557ea90",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.tar.gz",
"build_number": "231.9225.16"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2023.1.3",
"sha256": "a58954ed6732eb799502e14b250ead8b21e00c3f064e196ada34dcd6a3a3f399",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3.tar.gz",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "b5b15e1bbc7d953715a2b3f5eb25b9bb26baa99bdbee2d11acc91339c725f73a",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.tar.gz",
"build_number": "231.9225.16"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -150,26 +150,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2023.1.3",
"sha256": "6f7173843e157f24001b837f4d50827bf55b629df4d82f9b95c08ec29dc2ff3b",
"url": "https://download.jetbrains.com/go/goland-2023.1.3.dmg",
"build_number": "231.9161.41"
"version": "2023.1.4",
"sha256": "ec4d8724ef0b3c1d597801d23622ea5625b65c260d43d9e670c2fc63f448ea45",
"url": "https://download.jetbrains.com/go/goland-2023.1.4.dmg",
"build_number": "231.9225.16"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2023.1.3",
"sha256": "a7a71c941df436b8b5e78b679f1810cb9395663a788a114c1bbaeb99054e0ccf",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3.dmg",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "07dcc09078efea0a6c7d009ec79878d69534f2ca973f546ed469abbc4fec5088",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.dmg",
"build_number": "231.9225.16"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2023.1.3",
"sha256": "d460609c97d970a9cbbe753067bb7d829ef2d124a6494ae1e4aa3b4ec44191f6",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3.dmg",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "d039c8789724962fa264d55d47ac2e5efc2779fd082dcb6615ae15b2ca66ce91",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.dmg",
"build_number": "231.9225.16"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -265,26 +265,26 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2023.1.3",
"sha256": "d0b923a44305ef3ce113cabd2a19e1f2bfd0adec0cdc0571765851206aad5160",
"url": "https://download.jetbrains.com/go/goland-2023.1.3-aarch64.dmg",
"build_number": "231.9161.41"
"version": "2023.1.4",
"sha256": "5b60eac7a22f6e37345efe9dbbd65e9176a6f1ec899f92bcecbcabb8f96b2ae4",
"url": "https://download.jetbrains.com/go/goland-2023.1.4-aarch64.dmg",
"build_number": "231.9225.16"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2023.1.3",
"sha256": "c815f1f1af1e4c781b4cb8fda629e83b40e12b6f18485a2bf3a5cfce8a9a78dc",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3-aarch64.dmg",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "806d6edf7e4cf5636938522c4f64887ed9657b7628311573148d630bbd677228",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4-aarch64.dmg",
"build_number": "231.9225.16"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2023.1.3",
"sha256": "7b9d9d69378d6fb256bede3e6feac39a0f3b0600c25f5a891c6ade73f7273b72",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3-aarch64.dmg",
"build_number": "231.9161.38"
"version": "2023.1.4",
"sha256": "a03b9357a0d54936df1631f75d11d2647bc89ca5c5baaa4af07a58ab729924cc",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4-aarch64.dmg",
"build_number": "231.9225.16"
},
"mps": {
"update-channel": "MPS RELEASE",

View file

@ -1581,6 +1581,22 @@ let
};
};
gleam.gleam = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gleam";
publisher = "gleam";
version = "2.3.0";
sha256 = "sha256-dhRS8fLKY0plRwnrAUWT4g/LfH6IpODTNhT79g4Nm+0=";
};
meta = {
description = "Support for the Gleam programming language";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gleam.gleam";
homepage = "https://github.com/gleam-lang/vscode-gleam#readme";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.msfjarvis ];
};
};
golang.go = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Go";

View file

@ -60,11 +60,11 @@
mkDerivation rec {
pname = "digikam";
version = "8.0.0";
version = "8.1.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
hash = "sha256-ECxxK2IJ/irId8mx0BnaytrxFa35FVcNJoFgZtFR6Ec=";
hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM=";
};
nativeBuildInputs = [

View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
version = "2.0.0";
sha256 = "1iqwdbn7kcrg1dh0zh75zk3gwjsxjisdrzxywjfkm9jcvb6ygs7m";
manifestsSha256 = "1kyzgifvisykcj1hikbk7z9xwi5gj4pa19ngbkv7fcgv45clbj6s";
version = "2.0.1";
sha256 = "1smrqb2y99ml45g2n00lz7cz6vkisahl2jy7mncxvhl7s6wx5acz";
manifestsSha256 = "0j8hlggndbbiapa4sxv3rvvhj4g8b1brgq3g55v0d9k6dzq3q6b3";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-OH1Kn+VZARqQ1L26zdjEOYseMT9fY+QVDhN+F+h6GZw=";
vendorSha256 = "sha256-n0915f9mHExAEsHtplpLSPDJBWU5cFgBQC2ElToNRmA=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-Phiswg3ouIVkk1hsO0Hm5mFdcpZb403ypETrKKHOyTw=";
sha256 = "sha256-TmnWDCucZ4yQjl0+2hGGoopQ62h+AM1WogC5d+JUIO0=";
};
ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorHash = "sha256-AjfWxRwAWLX/TF1bI6Q7AUcfYhMHBgDNtKQsZSrBMn4=";
vendorHash = "sha256-YFlf0lqG4vWn9d5RAvi12ti/wV+qvsHWn123hhfmxRU=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

View file

@ -166,9 +166,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.5.2";
hash = "sha256-Ri2nWLjPPBINXyPIQSbnd1L+t7QLgXiTOgqX8Dk/rXg=";
vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0=";
version = "1.5.3";
hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo=";
vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

View file

@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.0.1";
version = "4.0.2";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-G5UzEjr0J5IrPX+r7elY3IU5LVCIHZfQt5htj1FFVuk=";
hash = "sha256-DmSO4NAkyAmUJe5g1BsnKSTsjhmADujxRBCQcIg0Ajw=";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@ -86,6 +86,7 @@ let
meta = {
homepage = "https://weechat.org/";
changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html";
description = "A fast, light and extensible chat client";
longDescription = ''
You can find more documentation as to how to customize this package

View file

@ -1,4 +1,4 @@
{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests }:
{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2 }:
rec {
thunderbird = thunderbird-115;
@ -75,5 +75,16 @@ rec {
webrtcSupport = false;
pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
icu = icu.overrideAttrs (attrs: {
# standardize vtzone output
# Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132
# https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
patches = attrs.patches ++ [(fetchpatch2 {
url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff";
stripLen = 3;
hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM=";
})];
});
};
}

View file

@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
version = "4.0.20";
version = "4.0.22";
pname = "flmsg";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "sha256-TsYwd2uUGJsweiKigTWBPXA7PtItZeIOxKk3lV3sy24=";
sha256 = "sha256-ueOkhmxrd4OT5g8z78TWUZuxT5SbF9300UWe7UByfD0=";
};
buildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -32,14 +32,14 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20230408-112425-69ae8472";
version = "20230712-072601-f4abf8fd";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
fetchSubmodules = true;
hash = "sha256-Uk6I/JtSkGCQGG95DDD1hsu40X00/k5d44WP3OJ+rn4=";
hash = "sha256-B6AakLbTWIN123qAMQk/vFN83HHNRSNkqicNRU1GaCc=";
};
postPatch = ''
@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js=";
"xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA=";
"xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY=";
"xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw=";
};
};

View file

@ -242,7 +242,7 @@ let
description = "A compiled language with Ruby like syntax and type inference";
homepage = "https://crystal-lang.org/";
license = licenses.asl20;
maintainers = with maintainers; [ david50407 manveru peterhoeg ];
maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ];
};
})
);
@ -278,5 +278,11 @@ rec {
binary = binaryCrystal_1_2;
};
crystal = crystal_1_8;
crystal_1_9 = generic {
version = "1.9.0";
sha256 = "sha256-FFpAL1U8WtfwDCLaUP+axSnJlGaKp/jzBs54rit9T2A=";
binary = binaryCrystal_1_2;
};
crystal = crystal_1_9;
}

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-qGFF6Q1cY2hDb2TycB39RY7RAIJica0y6ju76NeIplY=";
hash = "sha256-74QYiT67Xn2nBZx5R3f3qGSI2pDD09bEuDy98tf0Bsg=";
};
nativeBuildInputs = [ git pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoHash = "sha256-/WIM7DhnfPlo/DGoTSEHON+et55h364V++VHU8Olvuc=";
cargoHash = "sha256-42N9bmoLh6XUwpJTG5ZJ4iepYdW91baF9OqsBKgp/WI=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "socket_wrapper";
version = "1.4.0";
version = "1.4.2";
src = fetchurl {
url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz";
sha256 = "sha256-IGQQBSyh8hjZuymmRtU4FI2n7FyYmP28Nun9eorvAHY=";
sha256 = "sha256-CgjsJJ3Z/7s7FtV3s1LVc1YfV77uw1lhgqxuyORrmrY=";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "bitstring";
version = "4.1.0";
version = "4.1.1";
duneVersion = "3";
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "xguerin";
repo = pname;
rev = "v${version}";
sha256 = "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b";
sha256 = "sha256-eO7/S9PoMybZPnQQ+q9qbqKpYO4Foc9OjW4uiwwNds8=";
};
propagatedBuildInputs = [ stdlib-shims ];

View file

@ -20,6 +20,8 @@ buildPythonPackage rec {
pyserial
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [
"serial_asyncio"
];
@ -29,6 +31,5 @@ buildPythonPackage rec {
homepage = "https://github.com/pyserial/pyserial-asyncio";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pytapo";
version = "3.1.13";
version = "3.1.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fuColL2POq9hGL53oxPGZri5m1AqBPwdggCt6i4RM/Q=";
hash = "sha256-pYzp/iQHTXS+ovtWIwOoUfYg/h/46ZLNZyevK2vQHEA=";
};
propagatedBuildInputs = [

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.96.1";
version = "1.97.0";
vendorHash = null;
@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-COkD0YFij07mHpkeJSnZXLaB9olZGBN/HpFb06ag4Rs=";
sha256 = "sha256-ii8j1SBG+dGIBzh5fekvVjHhpkQnL84b5yYz6fSYyvo=";
};
meta = with lib; {

View file

@ -1,40 +0,0 @@
{ poetry2nix, pkgs, lib }:
let
pythonPackages = (poetry2nix.mkPoetryPackages {
projectDir = ./.;
overrides = [
poetry2nix.defaultPoetryOverrides
(import ./poetry-git-overlay.nix { inherit pkgs; })
(self: super: {
irrd = super.irrd.overridePythonAttrs (old: {
prePatch = ''
sed -i '/wheel/d' setup.py
'';
meta = old.meta // {
description = "Internet Routing Registry daemon version 4 is an IRR database server, processing IRR objects in the RPSL format.";
license = lib.licenses.mit;
homepage = "https://github.com/irrdnet/irrd";
maintainers = [ lib.maintainers.n0emis ];
};
});
coredis = super.coredis.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ [
super.setuptools
];
});
ariadne = super.ariadne.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ [
super.setuptools
];
});
})
];
}).python.pkgs;
in pythonPackages.irrd

View file

@ -1,14 +0,0 @@
{ pkgs }:
self: super: {
irrd = super.irrd.overridePythonAttrs (
_: {
src = pkgs.fetchgit {
url = "https://github.com/irrdnet/irrd.git";
rev = "1f6cefbfc70802c67f4a8911c3f0bf2c1cf7e18a";
sha256 = "1zmdqqv6vw8gdcwm67gc68lm224cipx6cdjf1dql61684s32g5wm";
};
}
);
}

File diff suppressed because it is too large Load diff

View file

@ -1,15 +0,0 @@
[tool.poetry]
name = "irrd-env"
version = "0.1.0"
description = ""
authors = []
[tool.poetry.dependencies]
python = "^3.8.1"
irrd = { git = "https://github.com/irrdnet/irrd.git", tag = "v4.2.6" }
[tool.poetry.dev-dependencies]
[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

View file

@ -1,5 +0,0 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p poetry poetry2nix.cli
set -eu
poetry lock
poetry2nix lock

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bacula";
version = "13.0.2";
version = "13.0.3";
src = fetchurl {
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
sha256 = "sha256-bgi8vmpKsHDhfp6cTpvE6UTS5b03ZSHKNCxv6WogaH0=";
sha256 = "sha256-CUnDK+EJBYXojkwB2CgALodgMTbYfFmKKd/0K7PtKkA=";
};
# libtool.m4 only matches macOS 10.*

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "jfrog-cli";
version = "2.40.0";
version = "2.42.1";
src = fetchFromGitHub {
owner = "jfrog";
repo = "jfrog-cli";
rev = "refs/tags/v${version}";
hash = "sha256-Fhpg78IV+NEkKXWk0Xw58uE6G2qfaYhgKfhmTVAGvEo=";
hash = "sha256-ScHlF5fvqBDvmI8p+o1LcQXZHXxKL5OS4AigE74AYVY=";
};
vendorHash = "sha256-zzqXl6i1ZrxIU9ePzTd+drOtPU76DcfLY8RDu/rVNzE=";
vendorHash = "sha256-TTQ9cjtkcg606imz55k9bLSya7xFs2gKIqETcrPLKIQ=";
postInstall = ''
# Name the output the same way as the original build script does

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule
, git
@ -11,25 +12,58 @@
, openssl
, extra-cmake-modules
, fontconfig
, go
, testers
, turbo
, nix-update-script
, go
, zlib
, libiconv
, Security
, IOKit
, CoreServices
, CoreFoundation
}:
let
version = "1.8.8";
version = "1.10.7";
src = fetchFromGitHub {
owner = "vercel";
repo = "turbo";
rev = "v${version}";
sha256 = "sha256-Qn1qAdhzQrkdMbZs9zqZA0k7UTig39ljJ3DQn49pJf8=";
sha256 = "sha256-AkrwaaXUiFPZqOO1mX/1XBOZRFRtCdgI7glzdv8ZOfU=";
};
go-turbo = buildGoModule rec {
ffi = rustPlatform.buildRustPackage {
pname = "turbo-ffi";
inherit src version;
cargoBuildFlags = [ "--package" "turborepo-ffi" ];
cargoHash = "sha256-j+r1irE0OGMfr9TAYhTOsFjBNzxjmF5/e7EebtshuG8=";
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
pkg-config
extra-cmake-modules
protobuf
];
buildInputs = [
openssl
fontconfig
];
doCheck = false;
postInstall = ''
cp target/release-tmp/libturborepo_ffi.a $out/lib
'';
};
go-turbo = buildGoModule {
inherit src version;
pname = "go-turbo";
modRoot = "cli";
vendorSha256 = "sha256-/C5zUQk8bJPBu1L9RYJh74haGkB+37fWldeg/2U8X9I=";
vendorSha256 = "sha256-8quDuT8VwT3B56jykkbX8ov+DNFZwxPf31+NLdfX1p0=";
nativeBuildInputs = [
git
@ -39,8 +73,22 @@ let
protoc-gen-go-grpc
];
buildInputs = [zlib ] ++ lib.optionals stdenv.isDarwin [
Security
libiconv
];
ldFlags = [
"-s -w"
"-X main.version=${version}"
"-X main.commit=${src.rev}"
"-X main.date=1970-01-01-00:00:01"
"-X main.builtBy=goreleaser"
];
preBuild = ''
make compile-protos
cp ${ffi}/lib/libturborepo_ffi.a ./internal/ffi/libturborepo_ffi_${go.GOOS}_${go.GOARCH}.a
'';
preCheck = ''
@ -53,11 +101,35 @@ let
git config --global init.defaultBranch main
git init
popd
# package_deps_hash_test.go:492: hash of child-dir/libA/pkgignorethisdir/file, got 67aed78ea231bdee3de45b6d47d8f32a0a792f6d want go-turbo> package_deps_hash_test.go:499: found extra hashes in map[.gitignore:3237694bc3312ded18386964 a855074af7b066af some-dir/another-one:7e59c6a6ea9098c6d3beb00e753e2c54ea502311 some-dir/excluded-file:7e59 c6a6ea9098c6d3beb00e753e2c54ea502311 some-dir/other-file:7e59c6a6ea9098c6d3beb00e753e2c54ea502311 some-fil e:7e59c6a6ea9098c6d3beb00e753e2c54ea502311]
rm ./internal/hashing/package_deps_hash_test.go
rm ./internal/hashing/package_deps_hash_go_test.go
# Error: Not equal:
# expected: env.DetailedMap{All:env.EnvironmentVariableMap(nil), BySource:env.BySource{Explicit:env.EnvironmentVariableMap{}, Matching:env.EnvironmentVariableMap{}}}
# actual : env.DetailedMap{All:env.EnvironmentVariableMap{}, BySource:env.BySource{Explicit:env.EnvironmentVariableMap{}, Matching:env.EnvironmentVariableMap{}}}
rm ./internal/run/global_hash_test.go
'' + lib.optionalString stdenv.isLinux ''
# filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/test-1689172679812 1}
# filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/test-1689172679812 1}
# filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/child/test-1689172679812 1}
# filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/sibling/test-1689172679812 1}
# filewatcher_test.go:127: got event {/build/TestFileWatching1921149570/001/parent/child/foo 1}
# filewatcher_test.go:137: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep 1}
# filewatcher_test.go:141: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/path 1}
# filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep 1}
# filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/test-1689172679812
# filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/test-1689172679812
# filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/child/test-1689172679812
# filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/sibling/test-1689172679812
# filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/path/test-1689172679812 1}
# filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/test-1689172679812 1}
rm ./internal/filewatcher/filewatcher_test.go
'';
};
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "turbo";
inherit src version;
cargoBuildFlags = [
@ -66,12 +138,8 @@ rustPlatform.buildRustPackage rec {
];
RELEASE_TURBO_CLI = "true";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"update-informer-0.6.0" = "sha256-uMp6PE4ccNGflbYz5WbLBKDtTlXNjOPA3vAnIMSdMEs=";
};
};
cargoHash = "sha256-GCo1PRB4JkHSXz7nBiKhJsC1xhMTlA136gGpUblPpVk=";
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
pkg-config
@ -81,6 +149,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
fontconfig
] ++ lib.optionals stdenv.isDarwin [
IOKit
CoreServices
CoreFoundation
];
postInstall = ''
@ -90,7 +162,12 @@ rustPlatform.buildRustPackage rec {
# Browser tests time out with chromium and google-chrome
doCheck = false;
passthru.tests.version = testers.testVersion { package = turbo; };
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "^\d+\.\d+\.\d+$" ];
};
tests.version = testers.testVersion { package = turbo; };
};
meta = with lib; {
description = "High-performance build system for JavaScript and TypeScript codebases";

View file

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

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "mawk";
version = "1.3.4-20230203";
version = "1.3.4-20230525";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz"
"https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz"
];
sha256 = "sha256-bbejKsecURB60xpAfU+SxrhC3eL2inUztOe3sD6JAL4=";
sha256 = "sha256-VjnRS7kSQ3Oz1/lX0rklrYrZZW1GISw/I9vKgQzJJp8=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5fBQkujOmxdiLkNuHL8y4QmuKQVGJuFlC7bRu+xElyk=";
sha256 = "sha256-GcfRnYOMrkMBIc2s6u/kwzh1kCFo2+PQCIcQyXxVdDM=";
};
vendorHash = null;

View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "guest-agent";
version = "20230601.00";
version = "20230707.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
sha256 = "sha256-kmep4pIxqFq8/EcdbimiIuQVm0HEIXY0dFqooPornBI=";
sha256 = "sha256-lGybidp/dZRe65L2fQlNTNHYNmMDrbYfBPeC9isER2I=";
};
vendorHash = "sha256-ULGpgygBVC4SRLhPiUlZgBH93w84WlNbvq3S7cVHLaQ=";

View file

@ -13604,7 +13604,9 @@ with pkgs;
tuptime = callPackage ../tools/system/tuptime { };
turbo = callPackage ../tools/misc/turbo { };
turbo = callPackage ../tools/misc/turbo {
inherit (darwin.apple_sdk_11_0.frameworks) Security IOKit CoreServices CoreFoundation;
};
turses = callPackage ../applications/networking/instant-messengers/turses { };
@ -15162,6 +15164,7 @@ with pkgs;
llvmPackages = llvmPackages_15;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
})
crystal_1_9
crystal_1_8
crystal;
@ -26005,8 +26008,6 @@ with pkgs;
theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
};
irrd = callPackage ../servers/irrd { };
inspircd = callPackage ../servers/irc/inspircd { };
inspircdMinimal = inspircd.override { extraModules = []; };