Merge staging-next into staging
This commit is contained in:
@@ -224,6 +224,8 @@ in
|
||||
platform = "linux";
|
||||
enable_estimator_updates = false;
|
||||
};
|
||||
# suppress PolicyKit warnings if system control is disabled
|
||||
machine.provider = lib.mkIf (!cfg.allowSystemControl) (lib.mkDefault "none");
|
||||
};
|
||||
|
||||
security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl ''
|
||||
|
||||
@@ -697,7 +697,7 @@ in
|
||||
kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix { };
|
||||
kernel-rust = handleTest ./kernel-rust.nix { };
|
||||
keter = handleTest ./keter.nix { };
|
||||
kexec = handleTest ./kexec.nix { };
|
||||
kexec = runTest ./kexec.nix;
|
||||
keycloak = discoverTests (import ./keycloak.nix);
|
||||
keyd = handleTest ./keyd.nix { };
|
||||
keymap = handleTest ./keymap.nix { };
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
services.caddy = {
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
|
||||
hash = "sha256-WPmJPnyOrAnuJxvn3ywswqvLGV8SZzzn3gU1Tbtpao4=";
|
||||
hash = "sha256-BJ+//h/bkj6y2Zhxas8oJyrryiTDR2Qpz7+VloqrbwQ=";
|
||||
};
|
||||
configFile = pkgs.writeText "Caddyfile" ''
|
||||
{
|
||||
|
||||
+54
-56
@@ -1,62 +1,60 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "kexec";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [
|
||||
flokli
|
||||
lassulus
|
||||
];
|
||||
};
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "kexec";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [
|
||||
flokli
|
||||
lassulus
|
||||
];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
node1 =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.vlans = [ ];
|
||||
virtualisation.memorySize = 4 * 1024;
|
||||
};
|
||||
nodes = {
|
||||
node1 =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.vlans = [ ];
|
||||
virtualisation.memorySize = 4 * 1024;
|
||||
};
|
||||
|
||||
node2 =
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
virtualisation.vlans = [ ];
|
||||
environment.systemPackages = [ pkgs.hello ];
|
||||
imports = [
|
||||
"${modulesPath}/installer/netboot/netboot-minimal.nix"
|
||||
"${modulesPath}/testing/test-instrumentation.nix"
|
||||
"${modulesPath}/profiles/qemu-guest.nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
node2 =
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
virtualisation.vlans = [ ];
|
||||
environment.systemPackages = [ pkgs.hello ];
|
||||
imports = [
|
||||
"${modulesPath}/installer/netboot/netboot-minimal.nix"
|
||||
"${modulesPath}/testing/test-instrumentation.nix"
|
||||
"${modulesPath}/profiles/qemu-guest.nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
''
|
||||
# Test whether reboot via kexec works.
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
|
||||
node1.execute("systemctl kexec >&2 &", check_return=False)
|
||||
node1.connected = False
|
||||
node1.connect()
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
''
|
||||
# Test whether reboot via kexec works.
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
|
||||
node1.execute("systemctl kexec >&2 &", check_return=False)
|
||||
node1.connected = False
|
||||
node1.connect()
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
|
||||
# Check if the machine with netboot-minimal.nix profile boots up
|
||||
node2.wait_for_unit("multi-user.target")
|
||||
node2.shutdown()
|
||||
# Check if the machine with netboot-minimal.nix profile boots up
|
||||
node2.wait_for_unit("multi-user.target")
|
||||
node2.shutdown()
|
||||
|
||||
# Kexec node1 to the toplevel of node2 via the kexec-boot script
|
||||
node1.succeed('touch /run/foo')
|
||||
node1.fail('hello')
|
||||
node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False)
|
||||
node1.connected = False
|
||||
node1.connect()
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
node1.succeed('! test -e /run/foo')
|
||||
node1.succeed('hello')
|
||||
node1.succeed('[ "$(hostname)" = "node2" ]')
|
||||
# Kexec node1 to the toplevel of node2 via the kexec-boot script
|
||||
node1.succeed('touch /run/foo')
|
||||
node1.fail('hello')
|
||||
node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False)
|
||||
node1.connected = False
|
||||
node1.connect()
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
node1.succeed('! test -e /run/foo')
|
||||
node1.succeed('hello')
|
||||
node1.succeed('[ "$(hostname)" = "node2" ]')
|
||||
|
||||
node1.shutdown()
|
||||
'';
|
||||
}
|
||||
)
|
||||
node1.shutdown()
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "youtube-music";
|
||||
name = "com.github.th_ch.youtube_music";
|
||||
exec = "youtube-music %u";
|
||||
icon = "youtube-music";
|
||||
desktopName = "YouTube Music";
|
||||
|
||||
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.496";
|
||||
hash = "sha256-vf6JwsMMAcAZMXTRrczgEpvmmN34eSgsO8QXNL4+DHM=";
|
||||
version = "2.0.501";
|
||||
hash = "sha256-j/WCtyrBc/D37kcjzJ/TVrqXSh9EzDoAe18mYXs43fk=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -259,8 +259,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ng-template";
|
||||
publisher = "Angular";
|
||||
version = "19.2.3";
|
||||
hash = "sha256-fW7JtaFXBR+PL17CUCtIAXndO/fBctisHd/uZg5Dez4=";
|
||||
version = "19.2.4";
|
||||
hash = "sha256-LJpv7ZVnJrPb4Ty0H250WcliCoJS4lXc878BTYHfJ+8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
|
||||
@@ -668,8 +668,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "markdown-mermaid";
|
||||
publisher = "bierner";
|
||||
version = "1.27.0";
|
||||
hash = "sha256-09w/k1LlGYtyWWbVgoprJG/qB/zCuedF9Cu7kUXcNrE=";
|
||||
version = "1.28.0";
|
||||
hash = "sha256-NAQD6DK1c13nA/O0QHNxFraImE6C0+Jzj9+f06EkiW0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog";
|
||||
@@ -785,8 +785,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-tailwindcss";
|
||||
publisher = "bradlc";
|
||||
version = "0.14.14";
|
||||
hash = "sha256-LUjVrtL1HmxzzW8OqbadN/p3DdZDwSj2iFeXudV2ULo=";
|
||||
version = "0.14.15";
|
||||
hash = "sha256-BJKPAyXBHX9W0pSxtri67PFL1zA4Vd2OMFfWi5bDnYQ=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
|
||||
@@ -1015,8 +1015,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "coder-remote";
|
||||
publisher = "coder";
|
||||
version = "1.7.0";
|
||||
hash = "sha256-uUm5kS8vjCKGpJOdyJcE/ig3DUZSsQ7LbvYodNyWF5w=";
|
||||
version = "1.7.1";
|
||||
hash = "sha256-egtB8mF9bbGb5YJ2pS9uGMzLmJcHAZ7UTswrn6k2k3A=";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
|
||||
@@ -1162,8 +1162,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "dbclient-jdbc";
|
||||
publisher = "cweijan";
|
||||
version = "1.4.3";
|
||||
hash = "sha256-XaV7N3IFe6+gc/qrHkSUikAQghJb6k6+XE5fMYWdyDY=";
|
||||
version = "1.4.4";
|
||||
hash = "sha256-hrymsnprfrRQeS/WRGqdV3MNPw+C+iJCcXF1IfNjGWE=";
|
||||
};
|
||||
meta = {
|
||||
description = "JDBC Adapter For Database Client";
|
||||
@@ -1178,8 +1178,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-database-client2";
|
||||
publisher = "cweijan";
|
||||
version = "8.2.4";
|
||||
hash = "sha256-tfUEUFyijRfzH805Eb26fgrIPLPv2GuOsCOqHuQQmQM=";
|
||||
version = "8.2.5";
|
||||
hash = "sha256-t6+LLLGuh67cuvGzv9+ic7AFqQU+bxDc6UByJM0OF7s=";
|
||||
};
|
||||
meta = {
|
||||
description = "Database Client For Visual Studio Code";
|
||||
@@ -1192,8 +1192,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "DanielGavin";
|
||||
name = "ols";
|
||||
version = "0.1.33";
|
||||
hash = "sha256-6XjNiRmdUMgc/cFrn0SmI/ad7eoBBaCQUsu9lItarMc=";
|
||||
version = "0.1.34";
|
||||
hash = "sha256-Xec6UHMe/6ChA4SHCPzMuUAJZejKpGo3YHy9paashmY=";
|
||||
};
|
||||
meta = {
|
||||
description = "Visual Studio Code extension for Odin language";
|
||||
@@ -1207,8 +1207,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "DanielSanMedium";
|
||||
name = "dscodegpt";
|
||||
version = "3.10.68";
|
||||
hash = "sha256-CB6XraQoMoFRhSKZzTVwsXs5ip5PfYraGR6GyULxrl0=";
|
||||
version = "3.10.84";
|
||||
hash = "sha256-s7Zo8zRZ4nsEuoSPwQL3osRs5zlmbcEsCjIJ8janhPs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
|
||||
@@ -1259,8 +1259,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "databricks";
|
||||
publisher = "databricks";
|
||||
version = "2.9.1";
|
||||
hash = "sha256-wbq7XtINlPVUqBdmbl/O3P8f7Y/KqGSR+vbtEUofKk4=";
|
||||
version = "2.9.2";
|
||||
hash = "sha256-lGVp/pkYQFqCa1fCEydrNke1yRxUmTRaaN+giuLdISQ=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
|
||||
@@ -1355,8 +1355,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "composer-php-vscode";
|
||||
publisher = "devsense";
|
||||
version = "1.57.17031";
|
||||
hash = "sha256-TY7cqUrbxNDS1JT+LgGGgs6mbseoQLq1+BBuybMQsVk=";
|
||||
version = "1.57.17158";
|
||||
hash = "sha256-S/A9Bg4RAd5WDJYDziOahbXqEDeHR/bWaNbh0vzhlww=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";
|
||||
@@ -1428,8 +1428,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "profiler-php-vscode";
|
||||
publisher = "devsense";
|
||||
version = "1.57.17031";
|
||||
hash = "sha256-fC+8trGmvgYjsnJA6+L6sxFoE6Cr91Q7xdparE9JKyg=";
|
||||
version = "1.57.17158";
|
||||
hash = "sha256-Ng7zuyNQjrQwqjgMl2NC204uPFD6lkbYp+zN+y9NC/A=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";
|
||||
@@ -1486,8 +1486,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "discloud";
|
||||
name = "discloud";
|
||||
version = "2.22.40";
|
||||
hash = "sha256-YxWla1bayzIX70PxdFSZuJum6ddazzgQKjRH7DpceTY=";
|
||||
version = "2.22.42";
|
||||
hash = "sha256-jIjRMQ279KK8BxcQWWzcRcwfhkTg8W4aGUwqijje7ZY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
|
||||
@@ -1515,8 +1515,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "competitive-programming-helper";
|
||||
publisher = "DivyanshuAgrawal";
|
||||
version = "2025.4.1743875007";
|
||||
hash = "sha256-WtzJ9rcssUAk2zACjqWYpwh6aHtzh9eGMGANeeFqCnU=";
|
||||
version = "2025.4.1744912235";
|
||||
hash = "sha256-IUnQOaoBIcvWz72Ck1QC366LARw1UncNnvm04sc8WA0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
|
||||
@@ -1599,8 +1599,8 @@ let
|
||||
# semver scheme, contrary to preview versions which are listed on
|
||||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they expire after two weeks.
|
||||
version = "17.0.1";
|
||||
hash = "sha256-0wRhdVR9q7oFjQQM090oXRxICUMCu7BjgOGkKTxeQmg=";
|
||||
version = "17.0.3";
|
||||
hash = "sha256-jU1N5tJ4V3jzSNW9oE8AH5PRhTmsiIGnu65+IH5NxO0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@@ -1902,8 +1902,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-jest-runner";
|
||||
publisher = "firsttris";
|
||||
version = "0.4.80";
|
||||
hash = "sha256-Qe0EOKohvk/ALYT0QbOiYKOkBvfF63hv3T4VwiIls6A=";
|
||||
version = "0.4.82";
|
||||
hash = "sha256-8sKMxatSaibMESktDJdQ84jINsE05ZVSjLMGjHFw7VI=";
|
||||
};
|
||||
meta = {
|
||||
description = "Simple way to run or debug a single (or multiple) tests from context-menu";
|
||||
@@ -2109,8 +2109,8 @@ let
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
|
||||
version = "1.297.0";
|
||||
hash = "sha256-UVL0Yf8MSY7ETOxmEK+dljrOQL9ctUWVhbYdr0v00b0=";
|
||||
version = "1.303.0";
|
||||
hash = "sha256-xh1jdosoSdIdLbmKQJjIwqwC5aF6Ko7y+GC3Y+gBazI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -2187,8 +2187,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlab-workflow";
|
||||
publisher = "gitlab";
|
||||
version = "6.7.1";
|
||||
hash = "sha256-qNOjbDdGrab53YYO4TCqxk8v2pmvjElgeXYU525/6Eg=";
|
||||
version = "6.11.0";
|
||||
hash = "sha256-4fzjJKj4RGzqD+ionUA2Al7UGv5aJNCo8O1JOnS+nqY=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitLab extension for Visual Studio Code";
|
||||
@@ -2345,8 +2345,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "haskell";
|
||||
name = "haskell";
|
||||
version = "2.5.3";
|
||||
hash = "sha256-3HbUH5+YCPqypGlsaSDwwyN/PoG9KO0YnZ1Ps7ZLQ48=";
|
||||
version = "2.6.0";
|
||||
hash = "sha256-2lvG7yZ+QAoafwyWQkVwyl2MsP8zWWQkTw8hBtib+C0=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -2507,8 +2507,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-vibrancy-continued";
|
||||
publisher = "illixion";
|
||||
version = "1.1.46";
|
||||
hash = "sha256-TcEPr2lpUDsx/G6WXePsS7FUEOKSYSjaapsPEI5xXNU=";
|
||||
version = "1.1.48";
|
||||
hash = "sha256-bTxseGGog4hyk5Hn9b7ggObtiJif7gWxHE0Kb7y7uEk=";
|
||||
};
|
||||
meta = {
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
|
||||
@@ -2692,8 +2692,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gruvbox";
|
||||
publisher = "jdinhlife";
|
||||
version = "1.24.6";
|
||||
hash = "sha256-nnQxaHnlgBpZSMigr04yqqO+mmZ+HqYq3WQFIRi3pRg=";
|
||||
version = "1.26.0";
|
||||
hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog";
|
||||
@@ -2957,8 +2957,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-cfn-lint";
|
||||
publisher = "kddejong";
|
||||
version = "0.26.4";
|
||||
hash = "sha256-SeLkZurILFc6qVOgbr9epOhspqfOe8EQ+WerrGfh548=";
|
||||
version = "0.26.5";
|
||||
hash = "sha256-/DSGwHkXu6auCN1KZ3pJnMC6PnCHIhXDkCD5oE2fYdk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -3017,8 +3017,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "asn1js";
|
||||
publisher = "lapo";
|
||||
version = "0.1.4";
|
||||
hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU=";
|
||||
version = "0.2.1";
|
||||
hash = "sha256-/75tsueW1PQIHN6YOLajREcMbRnzxzBIGnd7LGAxwBs=";
|
||||
};
|
||||
meta = {
|
||||
description = "Decode ASN.1 content inside VSCode";
|
||||
@@ -3080,8 +3080,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-ltex-plus";
|
||||
publisher = "ltex-plus";
|
||||
version = "15.5.0";
|
||||
hash = "sha256-tAqtWX7NHR8ftrtDRY2BGk3VwLa0Wx9OxQo8uGF/JlA=";
|
||||
version = "15.5.1";
|
||||
hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w=";
|
||||
};
|
||||
meta = {
|
||||
description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others";
|
||||
@@ -3139,8 +3139,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "matangover";
|
||||
name = "mypy";
|
||||
version = "0.4.1";
|
||||
hash = "sha256-hCgOclEnjhWTLMZPXJkoxgFN4pqZ1MKTzmRtjeHbLeU=";
|
||||
version = "0.4.2";
|
||||
hash = "sha256-T0H2JGr1WgSgXbf3aLvjKK0OOh9O+eg9YLs/ydblb9U=";
|
||||
};
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
@@ -3337,8 +3337,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "ms-azuretools";
|
||||
name = "vscode-docker";
|
||||
version = "1.29.4";
|
||||
hash = "sha256-j2ACz2Ww5hddoDLHGdxnuQIqerP5ogZ80/wS+Aa5Gdo=";
|
||||
version = "1.29.5";
|
||||
hash = "sha256-WQiVqC/+qJkEHpYTRbg5NbzQG1+jtifvjF/wbQJfQeY=";
|
||||
};
|
||||
meta = {
|
||||
description = "Docker Extension for Visual Studio Code";
|
||||
@@ -3357,8 +3357,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-dotnet-runtime";
|
||||
publisher = "ms-dotnettools";
|
||||
version = "2.3.1";
|
||||
hash = "sha256-0bn2B17kJd5uXe/MJCzYin2iWGdKD4H4nUIXdzb5NxM=";
|
||||
version = "2.3.3";
|
||||
hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";
|
||||
@@ -3423,8 +3423,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-kubernetes-tools";
|
||||
publisher = "ms-kubernetes-tools";
|
||||
version = "1.3.21";
|
||||
hash = "sha256-/Y7sRpJzwmo3fgwdrYqNNu8XA+j3zohJBv9vOcm3bRk=";
|
||||
version = "1.3.22";
|
||||
hash = "sha256-9iSOBxsqjFa6OcwD8n8bwHtIvZUZYxgI9ug09Uk2NwE=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -3680,8 +3680,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "remote-wsl";
|
||||
publisher = "ms-vscode-remote";
|
||||
version = "0.88.5";
|
||||
hash = "sha256-zTAGRYaOjO1xpfjh6v/lKFM1emR/OexWc1Yo8O5oUgU=";
|
||||
version = "0.99.0";
|
||||
hash = "sha256-zwM4gj11sM00HjaOUFEZ77Vm07iCDwwPmEqiJ97kXL8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ms-vscode-remote.remote-wsl/changelog";
|
||||
@@ -3750,8 +3750,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "mvllow";
|
||||
name = "rose-pine";
|
||||
version = "2.13.0";
|
||||
hash = "sha256-GtQq7eTvb1BuNcA5SJpYRaJo7mhevTAT1uBbqXkRURM=";
|
||||
version = "2.14.0";
|
||||
hash = "sha256-bjYumipeZM5tNl/cTHLcm/EyX4FU1AzQU3W53e0cGfc=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -3874,8 +3874,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ocaml-platform";
|
||||
publisher = "ocamllabs";
|
||||
version = "1.28.2";
|
||||
hash = "sha256-j49r7lhJkHZHkeFXTC/hQNLw4ICQ2JW/ahYUVYwLJd4=";
|
||||
version = "1.29.0";
|
||||
hash = "sha256-Bznz5wpG71zXOAUYkwP5Q0hnYNq6OBfrMX620OvOEK8=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4003,8 +4003,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "6.5.0";
|
||||
hash = "sha256-1aZW8FYFIHsRC3klVHt/0Pp5RteF8XBseuJZuLnRgJE=";
|
||||
version = "6.6.0";
|
||||
hash = "sha256-7l7J4oTunWL2K9UxbnygaeGxxHqhwJRmYfeW2JRgcvc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
@@ -4339,8 +4339,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "metals";
|
||||
publisher = "scalameta";
|
||||
version = "1.48.0";
|
||||
hash = "sha256-GtlVj/XvnlsLQb8PwXl6S2OW0mOl8SCR3N76zhZBwxA=";
|
||||
version = "1.49.0";
|
||||
hash = "sha256-/vzQojojvEz0KLebFCE3q4ptqPm40s4UgwxUAwMx8zs=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.asl20;
|
||||
@@ -4441,8 +4441,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "shopify";
|
||||
name = "ruby-lsp";
|
||||
version = "0.9.13";
|
||||
hash = "sha256-Lde17QPuaubrvomwZjWA9f34/Dn0qyG5MQxMLJFWBQ8=";
|
||||
version = "0.9.16";
|
||||
hash = "sha256-X+Ym36NWQOYXW5IcevImdkKU1IAr36YGZrNziacIHWA=";
|
||||
};
|
||||
meta = {
|
||||
description = "VS Code plugin for connecting with the Ruby LSP";
|
||||
@@ -4558,8 +4558,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "sonarsource";
|
||||
name = "sonarlint-vscode";
|
||||
version = "4.19.0";
|
||||
hash = "sha256-IjukIQIs4RoCZyzJiRDgFIPBvIK5Wn8o7NdvbfqlMBI=";
|
||||
version = "4.20.2";
|
||||
hash = "sha256-e1HYFPILERzlBYEBC7q9gUfj65tmruMduVAjzG0CUnM=";
|
||||
};
|
||||
meta.license = lib.licenses.lgpl3Only;
|
||||
};
|
||||
@@ -4725,8 +4725,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "109.5.3";
|
||||
hash = "sha256-wbU1euQmFyHOEHq2y2JvcAZeV4eee9pM0NKZnSgkRKU=";
|
||||
version = "109.5.4";
|
||||
hash = "sha256-aJjwXQKSpCCmwkaBfdTEgPGWALGb3qRD8JOgTbRWRh8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
@@ -4759,8 +4759,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
publisher = "tabnine";
|
||||
version = "3.253.0";
|
||||
hash = "sha256-4FDYIDLqb66XylX1WRGqbwqBUc0XgNG6XENEVXC/7Sk=";
|
||||
version = "3.259.0";
|
||||
hash = "sha256-BhJskqQr222VA6Sf7okttUIeYpsi99IyXJIOOWZKQ9M=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "RooVeterinaryInc";
|
||||
name = "roo-cline";
|
||||
version = "3.11.12";
|
||||
hash = "sha256-f7IPxeF/UxywMm8yVEZV/sHTKILZ3n788bhwH4xx89I=";
|
||||
version = "3.13.0";
|
||||
hash = "sha256-vVl8hMMpCrLP+/U6KJ3Qz/q0OYgQuEMfu8UzpScER8o=";
|
||||
};
|
||||
|
||||
passthru.updateScript = vscode-extensions-update-script { };
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.12.1";
|
||||
hash = "sha256-N845Ib84q1sjJgsE7deQO1q1P5vZdAsoBYfB7iEY0qU=";
|
||||
version = "3.12.3";
|
||||
hash = "sha256-HluLBJe7v21vViI7NcbmrXpE/ZBserW4eAvab5swjyQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
help2man,
|
||||
gzip,
|
||||
@@ -22,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3d";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];
|
||||
|
||||
@@ -30,9 +31,18 @@ stdenv.mkDerivation rec {
|
||||
owner = "f3d-app";
|
||||
repo = "f3d";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mnDmo5qzdnElhvZwBmHL3xC2o8iLuvYyfZXHoaAUG08=";
|
||||
hash = "sha256-QJQlZXUZyWhpYteHoIsGOj1jdf3Lpy/BMXopeto4IRo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/f3d-app/f3d/pull/2155
|
||||
(fetchpatch {
|
||||
name = "add-missing-include.patch";
|
||||
url = "https://github.com/f3d-app/f3d/commit/3814f3356d888ce59bbe6eda0293c2de73b0c89a.patch";
|
||||
hash = "sha256-TeV8byIxX6PBEW06/sS7kHaSS99S88WiyzjHZ/Zh5x4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-28ahonJ0qeynoqf02gws0LstaL4E08dywSJ8s3tgEDI=";
|
||||
hash = "sha256-us1TnszA/10OMVSDsNvzRb6mcM4eMR3pQ5EF4ggA958=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
@@ -26,10 +26,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XW1cBW7mk/aO/3IPQK29s4a6ArSKjo7/64koJuzp07I=";
|
||||
hash = "sha256-hzDd2BNTZzjwqhc/STbSAHnNlP7g1cFuMehqU1LumQE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qrlpuqTnFn/9oMTMovswpS1eAI7P9gvesoMpsIWKcY8=";
|
||||
vendorHash = "sha256-9Iu4qmBVkGeSAywLgQuDR7y+TwCBqwhVxhfaXhCDnUc=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
|
||||
@@ -21,17 +21,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Tuoxvatfm3edkUiMDGmCZdl/jLKr7WH8WCXR14jKT4=";
|
||||
hash = "sha256-6mRu1B02bX7Ax0d7MgI1cGalIKOqFMN+xP8ii+pUJWE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-wH+y93loozkgCZZeCR1EVNGBUPY/+OYwZRFeAIcVNTg=";
|
||||
cargoHash = "sha256-YZ6O31R/1L7m25Z+6Xq6b44cRAX1jgRFPlhmoFVYFok=";
|
||||
|
||||
postPatch = ''
|
||||
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "graphw00f";
|
||||
version = "1.1.19";
|
||||
version = "1.2.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolevf";
|
||||
repo = "graphw00f";
|
||||
tag = version;
|
||||
hash = "sha256-w2iVgs3WnEYCiCfwxB/HcwNRoWTlLfVJIzfp1VbrQXA=";
|
||||
hash = "sha256-8fOvcc//UdDawgGMAhbYQ/O5kd1l2skWGDlFNYocNY8=";
|
||||
};
|
||||
|
||||
dependencies = with python3.pkgs; [ requests ];
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
hidapi,
|
||||
udev,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hidapitester";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "todbot";
|
||||
repo = "hidapitester";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OpLeKTouCB3efsXWJO0lZxUHxtDKeBY7OYk0HwC2NF4=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
cp --no-preserve=mode -r ${hidapi.src} hidapi
|
||||
export HIDAPI_DIR=$PWD/hidapi
|
||||
'';
|
||||
|
||||
env.HIDAPITESTER_VERSION = finalAttrs.version;
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
hidapi
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 hidapitester $out/bin/hidapitester
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Simple command-line program to test HIDAPI";
|
||||
homepage = "https://github.com/todbot/hidapitester";
|
||||
changelog = "https://github.com/todbot/hidapitester/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ lykos153 ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "hidapitester";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,87 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
|
||||
bash,
|
||||
SDL2,
|
||||
SDL2_image,
|
||||
SDL2_ttf,
|
||||
libmpeg2,
|
||||
libvorbis,
|
||||
libzip,
|
||||
libX11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hypseus-singe";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DirtBagXon";
|
||||
repo = "hypseus-singe";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E=";
|
||||
};
|
||||
|
||||
patches = [ ./use-shared-mpeg2.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
bash
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_ttf
|
||||
libmpeg2
|
||||
libvorbis
|
||||
libzip
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${lib.getDev SDL2_image}/include/SDL2"
|
||||
"-I${lib.getDev SDL2_ttf}/include/SDL2"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 hypseus $out/bin/hypseus.bin
|
||||
cd ../..
|
||||
install -Dm755 scripts/run.sh $out/bin/hypseus
|
||||
install -Dm755 scripts/singe.sh $out/bin/singe
|
||||
|
||||
substituteInPlace $out/bin/{hypseus,singe} \
|
||||
--replace-fail "/bin/cat" "cat" \
|
||||
--replace-fail hypseus.bin $out/bin/hypseus.bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Laserdisc game emulator, the SDL2 version of Daphne and Singe";
|
||||
homepage = "https://github.com/DirtBagXon/hypseus-singe";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "hypseus";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,59 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 6a85063..73dbd39 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -50,13 +50,12 @@ include(GetGitRevisionDescription)
|
||||
include(InstallRequiredSystemLibraries)
|
||||
include(FindPkgConfig)
|
||||
include(ExternalProject)
|
||||
-include(BuildLibMPEG2)
|
||||
|
||||
use_cxx11( )
|
||||
|
||||
PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
|
||||
PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf)
|
||||
-build_libmpeg2( )
|
||||
+PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2)
|
||||
|
||||
message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}")
|
||||
|
||||
@@ -110,7 +109,6 @@ add_subdirectory(timer)
|
||||
add_subdirectory(video)
|
||||
add_subdirectory(vldp)
|
||||
|
||||
-add_dependencies( vldp libmpeg2 )
|
||||
add_dependencies( ldp-out vldp )
|
||||
add_dependencies( game vldp )
|
||||
add_dependencies( sound vldp )
|
||||
diff --git a/src/vldp/vldp_internal.cpp b/src/vldp/vldp_internal.cpp
|
||||
index 16a74cb..2605011 100644
|
||||
--- a/src/vldp/vldp_internal.cpp
|
||||
+++ b/src/vldp/vldp_internal.cpp
|
||||
@@ -40,9 +40,9 @@
|
||||
#include <plog/Log.h>
|
||||
|
||||
#include <inttypes.h>
|
||||
-
|
||||
+extern "C" {
|
||||
#include <mpeg2.h>
|
||||
-
|
||||
+}
|
||||
#ifdef VLDP_DEBUG
|
||||
#define FRAMELOG "frame_report.txt"
|
||||
#endif
|
||||
diff --git a/src/vldp/vldp_internal.h b/src/vldp/vldp_internal.h
|
||||
index 88450e9..1ea83ef 100644
|
||||
--- a/src/vldp/vldp_internal.h
|
||||
+++ b/src/vldp/vldp_internal.h
|
||||
@@ -26,9 +26,9 @@
|
||||
#define VLDP_INTERNAL_H
|
||||
|
||||
#include "vldp.h" // for the VLDP_BOOL definition and SDL.h
|
||||
-
|
||||
+extern "C" {
|
||||
#include <mpeg2.h>
|
||||
-
|
||||
+}
|
||||
// this is which version of the .dat file format we are using
|
||||
#define DAT_VERSION 3
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BYmIGcQvy38KIWQp8Zr3Anz9HIfbXUhj4G+VgkusjhU=";
|
||||
hash = "sha256-Q7qtLLTvJcIFPSx6MkS7SI89MBcM88g3KmX/b3BAKwI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
nixosTests,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.kexec = nixosTests.kexec;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://horms.net/projects/kexec/kexec-tools";
|
||||
description = "Tools related to the kexec Linux feature";
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-VBzobT/UT1YFLYWfJ5XFND+p6fClf/qZVb4eEVpdTqg=";
|
||||
hash = "sha256-uKChHjC5kzctFEEYP6YUp0sr7s9YULn9nfu87wsjxUQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libzim";
|
||||
version = "9.2.3";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = "libzim";
|
||||
tag = version;
|
||||
hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc=";
|
||||
hash = "sha256-DZiFeZ2ry3JpXDs3mvf0q7diwhkjQ2730KQkDQPbgcY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mapproxy";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapproxy";
|
||||
repo = "mapproxy";
|
||||
tag = version;
|
||||
hash = "sha256-bqM25exBPUB7hFtseWMw4Q1W6IeHLx+JrplOkZVEIl0=";
|
||||
hash = "sha256-2c9tYra6EM1eL+bk1Kg+HVy6oXRKWTJz4ZnZA7hX2HA=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.11.4";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0=";
|
||||
hash = "sha256-V4waFxYmWHBV5H0R3H//hB6pXhYPgRCWkkBwf3EC5bQ=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
vendorHash = "sha256-zMS6zZvJQAcnoklCi5qoM+aMMCSaeTQmQBxawgC67P8=";
|
||||
vendorHash = "sha256-CZg0POONweix6CXPnXDprCF7F8BN06awtNCVdJMoPnU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
doxygen,
|
||||
eigen,
|
||||
elfutils,
|
||||
fetchpatch2,
|
||||
glslang,
|
||||
gst-plugins-base,
|
||||
gstreamer,
|
||||
@@ -66,14 +65,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monado";
|
||||
version = "24.0.0";
|
||||
version = "25.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "monado";
|
||||
repo = "monado";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -138,16 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tracy
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Remove this patch on the next update
|
||||
# https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2338
|
||||
(fetchpatch2 {
|
||||
name = "improve-reproducibility.patch";
|
||||
url = "https://gitlab.freedesktop.org/monado/monado/-/commit/9819fb6dd61d2af5b2d993ed37b976760002b055.patch";
|
||||
hash = "sha256-qpTF1Q64jl8ZnJzMtflrpHLahCqfde2DXA9/Avlc18I=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport)
|
||||
(lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport)
|
||||
|
||||
@@ -41,12 +41,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peergos";
|
||||
repo = "web-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TSvhp/9nneXGADiDPgGvA78emVcQG0UzHsFfVS9k7mo=";
|
||||
hash = "sha256-te+m4S3mhYEocLd9NjQNFA8vbMf470V1dlPqCr0KLV4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -30,11 +32,14 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd pet \
|
||||
--zsh ./misc/completions/zsh/_pet
|
||||
--bash <($out/bin/pet completion bash) \
|
||||
--fish <($out/bin/pet completion fish) \
|
||||
--zsh $src/misc/completions/zsh/_pet
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpactor";
|
||||
version = "2025.03.28.0";
|
||||
version = "2025.04.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpactor";
|
||||
repo = "phpactor";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I=";
|
||||
hash = "sha256-HJH+31qAE4shamRl1/+TRtje0ZzOtPV7l++NIaacmxE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7wFlS+a97tdhfxfc/IElzOVH25MAgf42UZBC1giBAls=";
|
||||
vendorHash = "sha256-qdR8/ME9H7gusALjXXbKl8hj20N704Nw1tC3V9xTcEY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
buildNpmPackage,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
stdenvNoCC,
|
||||
@@ -12,12 +11,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocket-id";
|
||||
repo = "pocket-id";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YFoh30uMQItoeY1j08flPbxUhybeKJTEhd9hsiMaCJQ=";
|
||||
hash = "sha256-ax5E3e3GUrQLVsQREUhjmORjXQgKrEBVa9ySJr5ZLUY=";
|
||||
};
|
||||
|
||||
backend = buildGoModule {
|
||||
@@ -26,7 +25,7 @@ let
|
||||
|
||||
sourceRoot = "${src.name}/backend";
|
||||
|
||||
vendorHash = "sha256-mqpBP+A2X5ome1Ppg/Kki0C+A77jFtWzUjI/RN+ZCzg=";
|
||||
vendorHash = "sha256-0LAlltXd7YNQu7ymdjUSy75hMBz6MpvmUtgct43BU7M=";
|
||||
|
||||
preFixup = ''
|
||||
mv $out/bin/cmd $out/bin/pocket-id-backend
|
||||
@@ -70,7 +69,7 @@ let
|
||||
});
|
||||
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "pocket-id";
|
||||
inherit
|
||||
version
|
||||
@@ -112,6 +111,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
marcusramberg
|
||||
ymstnt
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podman-desktop";
|
||||
version = "1.17.2";
|
||||
version = "1.18.0";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "containers";
|
||||
repo = "podman-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AbOR+iCV11OVEzNGRjyJ9+BAMuWkywMNR6dPiLe0quI=";
|
||||
hash = "sha256-u3Irn+hSyTNTLl8QenMZbISE5aFhb58mOSOooVoijKw=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-BLzNETlvLqXAzPhTXOIQmwHhXudMxoNQ8WOlpsaKo6I=";
|
||||
hash = "sha256-2k0BbE9FkWEErsTuCECjy+iI3u1Biv1MF9hI7Oq3Aus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -24,15 +24,15 @@ let
|
||||
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
hash =
|
||||
{
|
||||
x64-linux_hash = "sha256-bVPUN500vTUdWCz6U1oP0uqLW+LChbCKZMhnYInQ54I=";
|
||||
arm64-linux_hash = "sha256-qYG1uFyn26J6ElTeeI8Ozf6kVhm6EZKKMJ+4UFRhlqQ=";
|
||||
x64-osx_hash = "sha256-qQK9KDX8KFAIzCdSpc7SWggYZm9cD8bv80BTdmT2MqA=";
|
||||
x64-linux_hash = "sha256-QHZ6pdeCIld5pkgK6ZBhxKho6kM/IBCx0BlxM1xiTXk=";
|
||||
arm64-linux_hash = "sha256-FoRKTsuCCTS9Y56GR6xfvLrmLmqVIoEk8P7RGzE3NU0=";
|
||||
x64-osx_hash = "sha256-Wj3JVkwJXrtgAGBYcv8e2kGzSGGzYeG9TL+Dtt/ulpI=";
|
||||
}
|
||||
."${arch}-${os}_hash";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "readarr";
|
||||
version = "0.4.13.2760";
|
||||
version = "0.4.14.2782";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@@ -25,17 +25,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "restate";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restatedev";
|
||||
repo = "restate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bMv+ICCjuuROYyBnMIRGlb1UQV5kh7B0MqBDSI+eVtE=";
|
||||
hash = "sha256-zAICgEwErB6lHC/AK/3WuhL5u+Y5l+DXd4H63OLBQl8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-DFXpDR4TPiMfkKWTmTJg/gDMaG/i4eCnIJGresZ41ts=";
|
||||
cargoHash = "sha256-NlT+j3OD52HgDMeWAm9MewPQaQ+xf0FIpsRd5rTTVdQ=";
|
||||
|
||||
env = {
|
||||
PROTOC = lib.getExe protobuf;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-04-07";
|
||||
version = "0-unstable-2025-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "305c2e344fe3ed14d4166211e0d21728702d83bf";
|
||||
hash = "sha256-KLyjjHahEbM3lOTPLqgT75mhyVWEXJSugraH7kzQDV8=";
|
||||
rev = "9f0947a0fc0408da9350b95eb95a6860f8018471";
|
||||
hash = "sha256-7CDAlttsebdDix4kKTrp3CKejWfodO2BkqcweHt1D8M=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -35,20 +35,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.1.27";
|
||||
version = "3.1.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QRj1MHGpSWD+X84CxAYCaVeXjreQHV4BI8KevQvdcqY=";
|
||||
hash = "sha256-s36rtNmVAp17Okj71NE/jgIM/pEZNS+oOYZ8rnjv6Ow=";
|
||||
};
|
||||
|
||||
kernel = buildGo123Module {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-oy2t5IBn9JJY5cm16Yak6e9dDl0KAEVtCE6SJ205vok=";
|
||||
vendorHash = "sha256-i/hpP9S9vGS/jP3gKceDY00wgnBDkmsfYRZtsYQOjck=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-nmkoGsrF75k9AWFlBhIj+vO4e3eW1dJN+y2VWokKe4s=";
|
||||
hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/app";
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subtitleedit";
|
||||
version = "4.0.11";
|
||||
version = "4.0.12";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
|
||||
lib.replaceStrings [ "." ] [ "" ] version
|
||||
}.zip";
|
||||
hash = "sha256-j024PnRie48M9vQMIduREF1W/DZhvOmmoppHN69svxk=";
|
||||
hash = "sha256-UlkFTsdssrjrPA0oOXJuSckEf1uMxh+POojfDX7NUu8=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.46.0";
|
||||
version = "0.46.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -34,11 +34,11 @@ rustPlatform.buildRustPackage {
|
||||
owner = "vectordotdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7zz2Kzl1Mg/Y/f9jAYk1QZ4QweHPwQfeRQkSPyRy354=";
|
||||
hash = "sha256-ouPCBaG/wwjIyzXA5PgBRpAtOJ5IuOrS+k4p6/KRzzY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-XEr7Hhx/Aj7phL6mKY4TSjsQGf0C1QPYkNCnuu1s6uY=";
|
||||
cargoHash = "sha256-Bl/dgkoF9Hx1hLt9+kZiyK42GNr+5UGJYy5QZOnHDV4=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -98,7 +98,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.181.8";
|
||||
version = "0.182.11";
|
||||
|
||||
outputs =
|
||||
[ "out" ]
|
||||
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gkbiV0kfeM1Ito8jVOBVneNjaXCA4PFayXJLIUmjqn4=";
|
||||
hash = "sha256-q7kE+CdQtUboL/NSBDx8E8Hktkr+CnygxwzOS0Athf4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -128,7 +128,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PMLu2PeyRNu6VbHByL+clUoY/P8Rlrc+SvP5gDKrN/E=";
|
||||
cargoHash = "sha256-rQImMVrFNOT43tdDpoSrRAqk7K5V8f+gzqEdrwJfO90=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
mkXfceDerivation,
|
||||
fetchpatch,
|
||||
ffmpegthumbnailer,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
@@ -25,6 +26,16 @@ mkXfceDerivation {
|
||||
|
||||
sha256 = "sha256-GmEMdG8Ikd4Tq/1ntCHiN0S7ehUXqzMX7OtXsycLd6E=";
|
||||
|
||||
patches = [
|
||||
# Fixes PDF previews staying low resolution
|
||||
# https://gitlab.xfce.org/xfce/tumbler/-/merge_requests/35
|
||||
(fetchpatch {
|
||||
name = "only-use-embedded-pdf-thumbnail-if-resolution-suffices.patch";
|
||||
url = "https://gitlab.xfce.org/xfce/tumbler/-/commit/69a704e0f4e622861ce4007f6f3f4f6f6b962689.patch";
|
||||
hash = "sha256-aFJoWWzTaikqCw6C1LH+BFxst/uKkOGT1QK9Mx8/8/c=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxfce4util
|
||||
ffmpegthumbnailer
|
||||
|
||||
@@ -39,12 +39,13 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
ansible-core
|
||||
pyyaml
|
||||
subprocess-tee
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
ansible-core
|
||||
ansible-core # ansible-config
|
||||
flaky
|
||||
pytest-mock
|
||||
pytest-instafail
|
||||
|
||||
@@ -46,6 +46,7 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"argcomplete"
|
||||
"decli"
|
||||
"termcolor"
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lingva";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "vacanza";
|
||||
repo = "lingva";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zKEGRLaqQSqbOP4ZAidIxMgGQbDIC9pAGfjWqoQTouc=";
|
||||
hash = "sha256-eGXUBSEO5n5WUENhJ+p5eKTdenBsONUWw1mDax7QcSA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
version = "2025.0";
|
||||
version = "2025.1";
|
||||
|
||||
# To get these, run:
|
||||
#
|
||||
# ```
|
||||
# for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.0/$tool-2025.0.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done
|
||||
# for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.1/$tool-2025.1.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done
|
||||
# ```
|
||||
sha256 = {
|
||||
alfred = "sha256-x7U5aZp0RuoKGLh9uF/Y+SCiv0mnAqkD+ACitygRI4s=";
|
||||
batctl = "sha256-3V9bcd0XUOuo1p3TrfcHiXQcbPY4zyvyzLwvuE9cFo8=";
|
||||
batman-adv = "sha256-uQxFRNPPOfbXzZIGEmsWL1EQ+7SYDeltRfvPUDPQhRo=";
|
||||
alfred = "sha256-f7iz8cxOxIjo1D/ZFd2gp831thG/OdYN3rRIasACXxg=";
|
||||
batctl = "sha256-IPii4TWgeKrBblyK1TWhKhVc8Lea8YPeX7F9qVe8JHg=";
|
||||
batman-adv = "sha256-A61CkpeWH7Os2cLIBkMtA3sO16rA8KHmReMq9SELmOE=";
|
||||
};
|
||||
}
|
||||
|
||||
+2
-2
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-camera-card";
|
||||
version = "7.6.1";
|
||||
version = "7.6.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
|
||||
hash = "sha256-CfS3KdoFiGBWrhJZw5BCCAolXn1n6nuO3OAJL5U2UBY=";
|
||||
hash = "sha256-q7zn/7xovGLTNq4FRdoEOMB3wy/IZ80QOYqVNLRNAZA=";
|
||||
};
|
||||
|
||||
# TODO: build from source once yarn berry support lands in nixpkgs
|
||||
|
||||
@@ -20,12 +20,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "isync";
|
||||
version = "1.5.0-unstable-2024-09-29";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/isync/isync";
|
||||
rev = "3c4b5f1c83a568f18c14c93aab95c9a853edfd15";
|
||||
hash = "sha256-MRjWr88sxd3C+YTMCqEymxmLj5h+uJKh9mcG+aEqf64=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l0jL4CzAdFtQGekbywic1Kuihy3ZQi4ozhSEcbJI0t0=";
|
||||
};
|
||||
|
||||
# Fixes "Fatal: buffer too small" error
|
||||
@@ -33,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000";
|
||||
|
||||
autoreconfPhase = ''
|
||||
echo "1.5.0-3c4b5" > VERSION
|
||||
echo "See https://sourceforge.net/p/isync/isync/ci/3c4b5f1c83a568f18c14c93aab95c9a853edfd15/log/?path=" > ChangeLog
|
||||
echo "${finalAttrs.version}" > VERSION
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
@@ -61,19 +60,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://isync.sourceforge.net/";
|
||||
# https://sourceforge.net/projects/isync/
|
||||
changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS";
|
||||
changelog = "https://sourceforge.net/p/isync/isync/ci/v${finalAttrs.version}/tree/NEWS";
|
||||
description = "Free IMAP and MailDir mailbox synchronizer";
|
||||
longDescription = ''
|
||||
mbsync (formerly isync) is a command line application which synchronizes
|
||||
mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New
|
||||
messages, message deletions and flag changes can be propagated both ways.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ primeos ];
|
||||
mainProgram = "mbsync";
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user