diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98a3cbacd816..c65dcc3e0882 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -157,6 +157,11 @@ githubId = 105598867; matrix = "@0xmrtt:envs.net"; }; + _0xSA7 = { + name = "Saleh Diaa Ahmed"; + github = "0xSA7"; + githubId = 153073356; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; @@ -329,12 +334,6 @@ githubId = 381298; name = "9R"; }; - _9yokuro = { - email = "xzstd099@protonmail.com"; - github = "9yokuro"; - githubId = 119095935; - name = "9yokuro"; - }; a-camarillo = { name = "Anthony Camarillo"; email = "anthony.camarillo.96@gmail.com"; @@ -8387,11 +8386,6 @@ githubId = 16175276; keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678 F294 CC7A 7E3C 6CF3 1343"; } ]; }; - EstebanMacanek = { - name = "Esteban Macanek"; - github = "EstebanMacanek"; - githubId = 75503218; - }; esteve = { name = "Esteve Fernandez"; email = "nixpkgs@nara.ac"; @@ -13457,12 +13451,6 @@ github = "joshprk"; githubId = 123624726; }; - joshuafern = { - name = "Joshua Fern"; - email = "joshuafern@protonmail.com"; - github = "JoshuaFern"; - githubId = 4300747; - }; joshvanl = { email = " me@joshvanl.dev "; github = "JoshVanL"; @@ -19259,12 +19247,6 @@ name = "Nasir Hussain"; keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; } ]; }; - nasrally = { - email = "suffer.ring@ya.ru"; - github = "nasrally"; - githubId = 50599445; - name = "Nikita Grishko"; - }; nat-418 = { github = "nat-418"; githubId = 93013864; @@ -22332,12 +22314,6 @@ githubId = 6314611; keys = [ { fingerprint = "EEC7 53FC EAAA FD9E 4DC0 9BB5 CAEB 4185 C226 D76B"; } ]; }; - prominentretail = { - email = "me@jakepark.me"; - github = "ProminentRetail"; - githubId = 94048404; - name = "Jake Park"; - }; proofconstruction = { email = "source@proof.construction"; github = "proofconstruction"; @@ -22786,11 +22762,6 @@ matrix = "@qyriad:katesiria.org"; name = "Qyriad"; }; - qzylinra = { - github = "qzylinra"; - githubId = 225773816; - name = "qzylinra"; - }; r-aizawa = { github = "Xantibody"; githubId = 109563705; diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 27fe409579f1..96cdff8a3e82 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -194,7 +194,7 @@ For an upgrade, a script like this can be used to simplify the process: # XXX specify the postgresql package you'd like to upgrade to. # Do not forget to list the extensions you need. newPostgres = pkgs.postgresql_15.withPackages (pp: [ - # pp.plv8 + # pp.pl_cron ]); cfg = config.services.postgresql; in diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 2040d2be5bb1..2f3e0b20de8b 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -705,9 +705,6 @@ in "~@privileged" = true; "~@resources" = true; }) - (mkIf (any extensionInstalled [ "plv8" ]) { - "@pkey" = true; - }) (mkIf (any extensionInstalled [ "citus" ]) { "getpriority" = true; "setpriority" = true; @@ -807,9 +804,7 @@ in PrivateTmp = true; ProtectHome = true; ProtectSystem = "strict"; - MemoryDenyWriteExecute = lib.mkDefault ( - cfg.settings.jit == "off" && (!any extensionInstalled [ "plv8" ]) - ); + MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off"); NoNewPrivileges = true; LockPersonality = true; PrivateDevices = true; diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index d832f5caa4e9..6fa8351bcae0 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -31,17 +31,6 @@ let INSERT INTO sth (id) VALUES (1); CREATE TABLE xmltest ( doc xml ); INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - - -- check if hardening gets relaxed - CREATE EXTENSION plv8; - -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute - DO $$ - let xs = []; - for (let i = 0, n = 400000; i < n; i++) { - xs.push(Math.round(Math.random() * n)) - } - console.log(xs.reduce((acc, x) => acc + x, 0)); - $$ LANGUAGE plv8; ''; in @@ -60,9 +49,6 @@ let identMap = '' postgres root postgres ''; - # TODO(@Ma27) split this off into its own VM test and move a few other - # extension tests to use postgresqlTestExtension. - extensions = ps: with ps; [ plv8 ]; }; services.postgresqlBackup = { diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 159d7df1b9d2..af7effe05fc5 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "30.0.8"; - hash = "sha256-IRpjwlLzof2Ll2s/k9K6LPFYp4NTvpfZWfMbMMk+rbY="; + version = "30.2.0"; + hash = "sha256-abXaPmdxBNsIEYvyuHu1fZGmCgv1Tpp9azj6O2zKXLs="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 54593282150a..f65cdbcba280 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.572"; - hash = "sha256-Tv4bZdfROJbnhgJ65lP+F4f2xkICr4X+P08P66Kuu7A="; + version = "2.0.591"; + hash = "sha256-VgRBah9j/4g2fG/qkrwxwqQ7gUw95UjzMkun/BZBpZs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 06b34fcebfa9..1f6b8f072645 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -727,8 +727,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.16.5"; - hash = "sha256-ppWHZFQfC2bje1rNZh8Pu+BKQdAI60kpxRwUg8EfD8M="; + version = "1.18.4"; + hash = "sha256-fGvQq8pGpDQc9q+uhouXNaWAHDGTl0cFla0qivhNaFQ="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -1929,6 +1929,23 @@ let }; }; + ginfuru.better-solarized = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/ginfuru.ginfuru-better-solarized-dark-theme/changelog"; + description = "A Better Solarized theme for Visual Studio Code include light and dark versions"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ginfuru.ginfuru-better-solarized-dark-theme"; + homepage = "https://github.com/ginfuru/vscode-better-solarized"; + license = lib.licenses.mit; + maintainers = [ ]; + }; + mktplcRef = { + name = "ginfuru-better-solarized-dark-theme"; + publisher = "ginfuru"; + version = "0.10.9"; + hash = "sha256-Zh3u1iq/kSzwtOY1RmG4cwvN6nJO6ys88BXn/EH/wTs="; + }; + }; + github.codespaces = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; @@ -1998,8 +2015,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.78.1"; - hash = "sha256-N6M8HLSpnfUqMaPaWZuedWbA7ITwKhLS1n+uuwudpkU="; + version = "6.81.0"; + hash = "sha256-0IN00IpgON/2nNl5/eQn+KABNtmG2ymVULOBPvi2dYA="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2048,6 +2065,21 @@ let gplane.wasm-language-tools = callPackage ./gplane.wasm-language-tools { }; + grafana.grafana-alloy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "grafana-alloy"; + publisher = "grafana"; + version = "0.2.0"; + hash = "sha256-XcoiEDCPp6GzYQDhJArZBEWxSnZrSTHofIyLFegsbh0="; + }; + meta = { + changelog = "https://github.com/grafana/vscode-alloy/releases"; + description = "Grafana Alloy support for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grafana.grafana-alloy"; + license = lib.licenses.asl20; + }; + }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { mktplcRef = { name = "gc-excelviewer"; @@ -2112,17 +2144,7 @@ let }; }; - gruntfuggly.todo-tree = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "todo-tree"; - publisher = "Gruntfuggly"; - version = "0.0.226"; - hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; - }; - meta = { - license = lib.licenses.mit; - }; - }; + gruntfuggly.todo-tree = callPackage ./gruntfuggly.todo-tree { }; hars.cppsnippets = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3147,8 +3169,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "3.0.0"; - hash = "sha256-RA7skgj6yFZxk2XuJZtcDrI4dFrAbwODmwqSx4xWFUY="; + version = "3.1.0"; + hash = "sha256-jmdf/l82dEMNY+KNLcBatA82yElOlUnnnTmV1yGxP1o="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3432,8 +3454,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.447.0"; - hash = "sha256-JUTwzde97CQK/0Hp3E8JPrS3UY6vh9jud1ho1R0ODus="; + version = "0.459.1"; + hash = "sha256-e5azL+9hluC/YyWb9uQxrr9p/9K2cYcUhalc9nZlOEg="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -4142,8 +4164,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.65.0"; - hash = "sha256-Ob4F+MZI1hKi4bK8zM5kn0kjzhMklUqEB/B+hh612nU="; + version = "1.66.0"; + hash = "sha256-hC2YR67hRfk9QuKVbmK1IzHIGyQ3XTBNvaCP66eC/no="; }; meta = { license = lib.licenses.asl20; @@ -5200,8 +5222,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.3.3"; - hash = "sha256-Q2PnfjO7wzHrmWAeD4dOFT+GFe8qGG8wHU1FpwYeDnA="; + version = "3.3.5"; + hash = "sha256-Oz4or7AtfrlcAXmFB4lkNk4Uqmpm1AsGP4RLcdpzRbo="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index f21f58fc6b29..978bfbcbd4fe 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.39.6"; - hash = "sha256-shxV0g1XDu7qjrGiwyHGpY2qBCJt23tz7SuDbm5AXws="; + version = "1.39.7"; + hash = "sha256-hm5jDcBVaRfmzhDTXFOpReN227lFyYT/i+HGPcpdkX0="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix index 55f7767f06b4..2c7b9fef6eb7 100644 --- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix +++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "fstar-vscode-assistant"; publisher = "FStarLang"; - version = "0.25.0"; - hash = "sha256-sya3P9Kn3DM/z5p8xF6TLEUPgrCs5+jgD89Y1KSJAgY="; + version = "0.25.4"; + hash = "sha256-9gPM/T3Kbwt40V2ZuzN/OkQVNATsp4AYK9HuOu/Ui+0="; }; meta = { description = "Interactive editing mode VS Code extension for F*"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 042f86577079..f6c355e0ed3e 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.45.1"; - hash = "sha256-xxJ+h0/XyT8otXUzIYW9/KMxKLk5zoEE/fiqj4SZK+A="; + version = "0.48.1"; + hash = "sha256-eFLfYMFxvgtZtmwLsxfneMjD4jOg8/Uk0Eu/6+A6odY="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix new file mode 100644 index 000000000000..5a169aee2a20 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix @@ -0,0 +1,47 @@ +{ + jq, + lib, + moreutils, + ripgrep, + vscode-utils, + vscode-extension-update-script, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "todo-tree"; + publisher = "Gruntfuggly"; + version = "0.0.226"; + hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ ripgrep ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '(.contributes.configuration[] | select(.title == "%todo-tree.configuration.regex%") | .properties."todo-tree.ripgrep.ripgrep".default) = $s' \ + --arg s "${lib.getExe ripgrep}" \ + package.json | sponge package.json + ''; + + passthru.updateScript = vscode-extension-update-script { }; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/Gruntfuggly.todo-tree/changelog"; + description = "Show TODO, FIXME, etc. comment tags in a tree view"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree"; + homepage = "https://github.com/Gruntfuggly/todo-tree"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + sandarukasa + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index 5e9772aefe0d..d1d0f74562f3 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.39.2"; - hash = "sha256-Lb20IdQcroJ/9Jn+epcIDvciFb/GDmklR9pDzrC5JbQ="; + version = "2.39.3"; + hash = "sha256-oU3kAhIsuadjyBvi+gJ6h19A3KueQYCZWLIN0ZUhoOE="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index 2542e6c955c8..60a20f2ae3cc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.42.1"; - hash = "sha256-rlLR/95DcxwkLxvyJgt3ptBvelL5VCIQvDl72eqk63s="; + version = "0.43.8"; + hash = "sha256-OweBVc8s+CEaCW4IZu43HaXOAL/PBjnunCEoPsq0pI0="; }; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 00df6cd1e9a1..b0bb0e750ec8 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -18,19 +18,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-DtvdlODo0tbFxHTXR0MBOCM2wxWYqUCYbJRU1um+Pck="; + hash = "sha256-FTS8cK9ovmxGLnywOGTIP7oUOHZ4RLE5t7lfhltdmIc="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-WduoZivxgoePof1H/DGEdnqXN7sLvQMq9I0z9NzwDnI="; + hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-a5njdsMEvqVcbfzaB5APzoGCHhl0Fcmo4tylckcv80U="; + hash = "sha256-i2cALeaSXfwIdfXNeWfND99nFYIiOFwsxbqU7/Effx8="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-6tFj6Am2SyhF/rHBhQIR7eL866Jq6Vqfl3IKWYu85zY="; + hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -52,7 +52,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.131.79"; + version = "2.140.8"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 827152ef6b6c..7a5474be70d5 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.408"; - hash = "sha256-IxfqzPBKqslpKaEP2eD+DS0BdSUDfo2w4u1FK0Uzvwo="; + version = "1.1.410"; + hash = "sha256-Ds1G+sRrfCxgNah9kj3w4LU86gF8dn3se7plNg3rvmE="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix index 9887ca490d02..e5f996c1c976 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2025.18.0"; - hash = "sha256-UegvlhgIjbwv9SgZIdtzX8FDOL9qjBLOFm0jaTexNrQ="; + version = "2026.6.0"; + hash = "sha256-zgfBcgIKc78f9qpcl9ULoQTUQ1ETAxfwpH/SSOhyaZc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index ebfa123e5996..47caca24fb58 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -42,15 +42,15 @@ let isDarwin = stdenv.hostPlatform.isDarwin; supported = { x86_64-linux = { - hash = "sha256-5L4PrwcZ/Q3g6qlCsCebx3czLZVD2sDrDf99l9nooSo="; + hash = "sha256-KTGDbX/T1BhoYxEjqPmPTAkyNjGDEV1Ao4nMIhHpGys="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-nQNDPfk6BRHp7veyx18GMlEt3Xa8iDuqtHG7qzJcPS4="; + hash = "sha256-4gl6sVgWAkV2XJFOipVbBUDGG1ncm41TjSoFnRW78m0="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-jhoa9UcYg2Uj8x9AZwAh68k7WCi6mpgNUUx2YsRIkjw="; + hash = "sha256-EMkq7Y0Eo629GzW6pDL1UYijyvLU6sp7YxPaKm0va6s="; arch = "darwin-arm64"; }; }; @@ -63,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.31.5"; + version = "1.32.2"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 6e9d6f6d72eb..1e1b60a79010 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "1.0.1"; - hash = "sha256-85bFomfGcFiXJuTUv46B47PEtzFP6H7rggCZzf5/fK8="; + version = "1.4.2"; + hash = "sha256-0Jg6kKnQAQfIgxH5l0v1V+ikStPHITdfHh02G0iZJxc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix index 85066de0f914..0493204a18bd 100644 --- a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ndonfris"; name = "fish-lsp"; - version = "0.1.20"; - hash = "sha256-aDqAbzWaMJ1k/2Pu3j+WRaIGMrS6J2bImbSfBmelDKM="; + version = "0.1.22"; + hash = "sha256-rbxjPThdqVSbE6aZ8pcN2awMNypPaN0KQ/BzgO2Aqog="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index ce082884d3d2..64137bc9fd95 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -16,20 +16,20 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; - version = "3.52.0"; + version = "3.54.0"; src = fetchFromGitHub { owner = "RooCodeInc"; repo = "Roo-Code"; tag = "v${finalAttrs.version}"; - hash = "sha256-DvuL1WByEJER+v73pCvwNdRNfM8j+c1VQGGjAyV79p8="; + hash = "sha256-pVJcFAI/xxNflzf+wj0fOASP8Fx9oybu9V6dGrDx7do="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; + hash = "sha256-VD4DDLpZdnsfZNkg2oD0DT+zoxsk4CUh2pFll8n3mu4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 93a8d164f8c5..dba6740771e6 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -6,13 +6,31 @@ zlib, }: -vscode-utils.buildVscodeMarketplaceExtension { +let + inherit (stdenv.hostPlatform) system; +in +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + passthru.platformTable = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-Iqe4KZXQHenKAypXK/qzG2BCXbk2cZ0i/0xhWhlfQxo="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U="; + }; + }; + mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.37.0"; - hash = "sha256-ovCxcr1m3GmRu45hr5DG781xkQdANbQYLvV2gFhG4eQ="; - }; + version = "1.43.0"; + } + // finalAttrs.passthru.platformTable.${system} or (throw "Unsupported platform ${system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -28,9 +46,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/sourcery-ai/sourcery-vscode"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ tomasajt ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; + platforms = lib.attrNames finalAttrs.passthru.platformTable; }; -} +}) diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index 54e6a13d1b7c..c02660aadfee 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lua"; publisher = "sumneko"; - version = "3.18.1"; - hash = "sha256-TmQFl2+4hiu1qlGA6D+3kynC4m4kVJMoMn3b+TLZaz8="; + version = "3.18.2"; + hash = "sha256-8mvauayksFk/3A7VMJ3EZYyRK8YLgX03W7bzEIdGkXQ="; }; # Running chmod in runtime will lock up extension diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index db9db86a0813..b7289bf725e2 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.39.3"; - sha256 = "sha256-A87dG+bBNCMZ8ERDGpVJIP7lXL8rfRely2Uo/ZMsgVI="; + version = "0.39.5"; + sha256 = "sha256-8f9LGmNE8ilPYZmbJpmmAx9DkKJXbQzAia11rM3wTec="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix index 8fd8e3c5f538..c01f05fc1f05 100644 --- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-sqlite3-editor"; publisher = "yy0931"; - version = "1.0.212"; - hash = "sha256-mG75eEK7agZ8R4LNN5xM7GqaBQC5JKhUR0/ZogZTHpY="; + version = "1.0.214"; + hash = "sha256-lxH+j83R2ZYCWrEB0c70DRSCMn5iH1Xz/vXLZBE42Eg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix index 677f2268981f..09ff8759c46b 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "0-unstable-2026-05-16"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2010"; - rev = "bc82e8281ddbbd487875866f5db27cdb9838d319"; - hash = "sha256-laAXE4U5ROKe2QnYbUrvJ4xRPv1hzllDZ8ei01IwqKA="; + rev = "780e4259f096797931a3030d08ffaeec62f2a593"; + hash = "sha256-l7+WCiY7Pf0/5GzsmHT/C67uNF8JEzblDlr7oKiYcgA="; }; makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; diff --git a/pkgs/applications/misc/xppen/generic.nix b/pkgs/applications/misc/xppen/generic.nix index a48a20b2ef4c..8dd7b39b14fe 100644 --- a/pkgs/applications/misc/xppen/generic.nix +++ b/pkgs/applications/misc/xppen/generic.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation { mainProgram = "PenTablet"; maintainers = with lib.maintainers; [ gepbird - nasrally ]; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bfddf2080ff8..c913aa33c5aa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -391,11 +391,11 @@ "vendorHash": "sha256-WFlKj1IO9ylXn5frdnLcctQawjUXBTqcoMhQUQTU06A=" }, "exoscale_exoscale": { - "hash": "sha256-eK9XWu1Hh/sFWkUO5r0HIcw8tIhhP1nzkI41B0DpMZg=", + "hash": "sha256-JSDlAtLvbk36OBUV22JoSrxV7nRegDirdyOUobUwrWg=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.69.2", + "rev": "v0.69.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -481,13 +481,13 @@ "vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww=" }, "grafana_grafana": { - "hash": "sha256-STYK0M5eq5hECKJUrk2Q4qhOrPt+eiyIGi0boukSHBM=", + "hash": "sha256-TyO5Owo8LFQVQmsAD40/L0VaAY1+X3h4pSPbJIE97mY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.36.2", + "rev": "v4.38.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VEAtUCVZ3nJ1jfDYkkek+VQ1LjNQgRstRNtsM05ebZo=" + "vendorHash": "sha256-Fnn5/UiSQtvv/XykeXhbR4GuSrGBy/j03vzyBI2LnGg=" }, "gridscale_gridscale": { "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=", diff --git a/pkgs/by-name/_7/_7zip-zstd/package.nix b/pkgs/by-name/_7/_7zip-zstd/package.nix index 2614b4b43472..a8017ed31a25 100644 --- a/pkgs/by-name/_7/_7zip-zstd/package.nix +++ b/pkgs/by-name/_7/_7zip-zstd/package.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "7zip-zstd"; - version = "25.01-v1.5.7-R4"; + version = "26.01-v1.5.7-R1"; src = fetchFromGitHub { owner = "mcmilk"; @@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: { tag = "v${finalAttrs.version}"; hash = if enableUnfree then - "sha256-qP4L5PIG7CHsmYbRock+cbCOGdgujUFG4LHenvvlqzw=" + "sha256-P6kwg3McroMwqB5bryfoS9dIBsxcd84bVzsjUv5Bk5k=" else - "sha256-R9AUWL35TPh0anyRDhnF28ZYG9FeOxntVIwnnW9e2xA="; + "sha256-WowqcjcA/DUwj7DJrKDTYKpCDWd/tTIZ3yiuBgqXpmU="; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index ce9a144b87b9..186eda0ad93d 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-temp"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${finalAttrs.version}"; - hash = "sha256-F7KIYEWZN4KAVoBRquL7/VH0p+MSFGO0n2PkbXljyPM="; + hash = "sha256-5GTsVqQOS0HL2q++t4ms9srFx1t1DJkdyUx150H6CT0="; }; - cargoHash = "sha256-ho5HriiViW2FxxPz4RA1nCkmlG7cdt5VuhVrSdGzzuY="; + cargoHash = "sha256-wiFEsnBHFaQH7WyJv5FEEWXPiRfFFWm8NUjd0ea05Ko="; meta = { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix index f2de5c352eca..75fafed8c07f 100644 --- a/pkgs/by-name/ch/changie/package.nix +++ b/pkgs/by-name/ch/changie/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "changie"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${finalAttrs.version}"; - hash = "sha256-wxIe/Hlp8qYzWC7ijQ7fqp+l75GCHxbbmZkYR/2v3Mw="; + hash = "sha256-mstq+iOqPc8rU1lLmS0ZvguxjS0GC8DrS+G4rQVThdg="; }; - vendorHash = "sha256-ozYaMiM2syI+0DkYj7PFTWajJ9/pmow9QLFuOGtBros="; + vendorHash = "sha256-VoiGg0K89S98j2q68U0oYENgAYjynl3EeFC47l3Hq9Q="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix index b0ad9f5a174b..86cc50a708bb 100644 --- a/pkgs/by-name/ch/chiri/package.nix +++ b/pkgs/by-name/ch/chiri/package.nix @@ -41,16 +41,16 @@ rustPlatform.buildRustPackage ( in { pname = "chiri"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "chiriapp"; repo = "chiri"; tag = "app-v${finalAttrs.version}"; - hash = "sha256-rkkyp36EIfvD0DXq0Tn+uLS/cBtgGk4x4sVkppTDaLg="; + hash = "sha256-zBv/egEvmsZXklhKtN5fd2DOKH+UWcaGUUkFxz0G+JI="; }; - cargoHash = "sha256-nSK4oyaW+chFHKrCI80d9785UsqBlX8YAdU26b/aa0s="; + cargoHash = "sha256-69r9ILhSov7A9zdWcPphGMXur/8lYyZYo7qSGPW9IzM="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/co/coulomb/package.nix b/pkgs/by-name/co/coulomb/package.nix index 62ebb35f1ce8..66705cdd84e2 100644 --- a/pkgs/by-name/co/coulomb/package.nix +++ b/pkgs/by-name/co/coulomb/package.nix @@ -16,6 +16,8 @@ gdk-pixbuf, atk, cairo, + adwaita-icon-theme, + librsvg, }: stdenv.mkDerivation (finalAttrs: { @@ -51,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf atk cairo + adwaita-icon-theme + librsvg ]; mitmCache = gradle.fetchDeps { @@ -75,14 +79,15 @@ stdenv.mkDerivation (finalAttrs: { cp -r app/build/resources/main/icons/vector/* $out/share/icons/ cp app/build/resources/main/icons/vector/light/coulomb.svg $out/share/icons/hicolor/scalable/apps/io.github.hamza_algohary.Coulomb.svg - makeWrapper ${jdk21_headless}/bin/java $out/bin/coulomb \ - --add-flags "-Djava.library.path=${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "-jar $out/share/coulomb/app-all.jar" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - ''${gappsWrapperArgs[@]} - runHook postInstall ''; + postFixup = '' + makeWrapper ${jdk21_headless}/bin/java $out/bin/coulomb \ + --add-flags "-Djava.library.path=${lib.makeLibraryPath finalAttrs.buildInputs}" \ + --add-flags "-jar $out/share/coulomb/app-all.jar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ + ''${gappsWrapperArgs[@]} + ''; passthru.updateScript = nix-update-script { }; @@ -90,7 +95,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple and beautiful circuit simulator app"; homepage = "https://github.com/hamza-algohary/Coulomb"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ thtrf ]; + maintainers = with lib.maintainers; [ + thtrf + _0xSA7 + ]; platforms = lib.platforms.linux; mainProgram = "coulomb"; }; diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix index 771510a5ff7d..60c07cfa4630 100644 --- a/pkgs/by-name/da/davmail/package.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "davmail"; - version = "6.7.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "mguessan"; repo = "davmail"; tag = finalAttrs.version; - hash = "sha256-bQyZ+Sela70fOle+uqqG+y3fACeItvkmidXOFXW+DOk="; + hash = "sha256-I5MQTxCU3SCIAj6Y6idJ9KbBRhvSbzZhZ9nY82BXM7k="; }; buildPhase = '' diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index 6702fad34cba..d289fcb95db8 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -1,39 +1,121 @@ { lib, - fetchurl, - appimageTools, - nix-update-script, - makeWrapper, + stdenv, + fetchFromGitHub, + buildNpmPackage, + electron_40, + python3, + xcodebuild, }: -appimageTools.wrapType2 rec { +buildNpmPackage (finalAttrs: { pname = "dopamine"; - version = "3.0.4"; + version = "3.0.6"; - src = fetchurl { - url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-sm8/ZzSqa1CsQJ7XfQ67yAKX5rR9E8J/Z6v1rLVhNwI="; + src = fetchFromGitHub { + owner = "digimezzo"; + repo = "dopamine"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HTPWejm5Wi6yGJyS/f1RhjIluTz01ue8lAsnAcQY3IY="; }; - nativeBuildInputs = [ makeWrapper ]; + npmDepsHash = "sha256-JkGS0YmjsdUiOD48HcGXy/fPTP33JQAtJui0mQWicmc="; - extraInstallCommands = - let - contents = appimageTools.extract { inherit pname version src; }; - in - '' - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + patches = [ + # register-scheme contains install scripts, but has no lockfile + ./remove-register-scheme.patch - install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop - substituteInPlace $out/share/applications/dopamine.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=dopamine' - cp -r ${contents}/usr/share/icons $out/share - ''; + # fixes node-addon-api errors with aarch64-darwin + ./update-node-addon-api.patch + ]; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ distutils ])) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + buildPhase = '' + runHook preBuild + + # needed for better-sqlite3 rebuild + export npm_config_nodedir="${electron_40.headers}" + export npm_config_target="${electron_40.version}" + + npm rebuild --verbose --no-progress --offline + + # reduce better-sqlite3 size + pushd node_modules/better-sqlite3 + rm -rf src deps build/{deps,Release/{.deps,obj,obj.target,test_extension.node}} + popd + + npm run build:prod + + # otherwise angular uses up ~150MB space + rm -rf .angular + + ${ + if stdenv.hostPlatform.isDarwin then + '' + cp -r ${electron_40.dist}/Electron.app ./ + find ./Electron.app -name 'Info.plist' -exec chmod +rw {} \; + + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=false \ + -c.mac.identity=null \ + -c.electronDist=./ \ + -c.electronVersion=${electron_40.version} \ + -c.extraMetadata.version=v${finalAttrs.version} \ + --config electron-builder.config.js + '' + else + '' + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=false \ + -c.electronDist=${electron_40.dist} \ + -c.electronVersion=${electron_40.version} \ + -c.extraMetadata.version=v${finalAttrs.version} \ + --config electron-builder.config.js + '' + } + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${ + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/{Applications,bin} + cp -r release/mac*/Dopamine.app $out/Applications + makeWrapper $out/Applications/Dopamine.app/Contents/MacOS/Dopamine $out/bin/dopamine + '' + else + '' + mkdir -p $out/share/dopamine + cp -r release/linux*unpacked/{locales,resources{,.pak}} $out/share/dopamine + + makeWrapper ${lib.getExe electron_40} $out/bin/dopamine \ + --add-flags $out/share/dopamine/resources/app.asar \ + --inherit-argv0 + + for size in 16 24 32 48 64 96 128 256 512; do + install -Dm644 "build/icons/"$size"x"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/dopamine.png" + done + + install -Dm644 deployment/AUR/Dopamine.desktop $out/share/applications/dopamine.desktop + '' + } + + runHook postInstall + ''; meta = { - changelog = "https://github.com/digimezzo/dopamine/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/digimezzo/dopamine/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Audio player that keeps it simple"; homepage = "https://github.com/digimezzo/dopamine"; license = lib.licenses.gpl3Only; @@ -42,7 +124,6 @@ appimageTools.wrapType2 rec { Guanran928 ern775 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/do/dopamine/remove-register-scheme.patch b/pkgs/by-name/do/dopamine/remove-register-scheme.patch new file mode 100644 index 000000000000..1b375aa56a33 --- /dev/null +++ b/pkgs/by-name/do/dopamine/remove-register-scheme.patch @@ -0,0 +1,32 @@ +diff --git a/package-lock.json b/package-lock.json +index c0db8fd5..a060c1cc 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -12156,9 +12156,6 @@ + "dependencies": { + "node-fetch": "^2.6.1", + "ws": "^7.3.1" +- }, +- "optionalDependencies": { +- "register-scheme": "github:devsnek/node-register-scheme" + } + }, + "node_modules/dmg-builder": { +@@ -21476,17 +21473,6 @@ + "node": ">=4" + } + }, +- "node_modules/register-scheme": { +- "version": "0.0.2", +- "resolved": "git+ssh://git@github.com/devsnek/node-register-scheme.git#e7cc9a63a1f512565da44cb57316d9fb10750e17", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "dependencies": { +- "bindings": "^1.3.0", +- "node-addon-api": "^1.3.0" +- } +- }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", diff --git a/pkgs/by-name/do/dopamine/update-node-addon-api.patch b/pkgs/by-name/do/dopamine/update-node-addon-api.patch new file mode 100644 index 000000000000..2b43263391af --- /dev/null +++ b/pkgs/by-name/do/dopamine/update-node-addon-api.patch @@ -0,0 +1,39 @@ +diff --git a/package-lock.json b/package-lock.json +index c0db8fd5..d98f8cfe 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -18303,12 +18303,15 @@ + } + }, + "node_modules/nice-napi/node_modules/node-addon-api": { +- "version": "3.2.1", +- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", +- "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", ++ "version": "8.7.0", ++ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.7.0.tgz", ++ "integrity": "sha512-9MdFxmkKaOYVTV+XVRG8ArDwwQ77XIgIPyKASB1k3JPq3M8fGQQQE3YpMOrKm6g//Ktx8ivZr8xo1Qmtqub+GA==", + "dev": true, + "license": "MIT", +- "optional": true ++ "optional": true, ++ "engines": { ++ "node": "^18 || ^20 || >= 21" ++ } + }, + "node_modules/nice-try": { + "version": "1.0.5", +diff --git a/package.json b/package.json +index 2eecf247..94a0cf8d 100644 +--- a/package.json ++++ b/package.json +@@ -116,5 +116,10 @@ + "tinycolor2": "1.6.0", + "tslib": "2.0.0", + "uuid": "9.0.0" ++ }, ++ "overrides": { ++ "nice-napi": { ++ "node-addon-api": "^8.0.0" ++ } + } + } diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 44db68ed9cb7..9fe868545a09 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - joshuafern Zaechus ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix index 0cc59ad32857..9cf6540a13ce 100644 --- a/pkgs/by-name/go/go-httpbin/package.nix +++ b/pkgs/by-name/go/go-httpbin/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "go-httpbin"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "mccutchen"; repo = "go-httpbin"; tag = "v${finalAttrs.version}"; - hash = "sha256-BQf6G02BRtVGcPVEfHPWwBfEh8CCbHRkaLV2FX6SeJc="; + hash = "sha256-IB+uqCt5kb08z2O8ex/npMjXIpUX8BQoME57Dd1b/9w="; }; vendorHash = null; diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index d0c1b4d9c399..3c2fab6e0722 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "hyprls"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${finalAttrs.version}"; - hash = "sha256-020bEXaFKZ74dJF5keIXMyRf/MQj0eKNYZXHajHgKUI="; + hash = "sha256-w9tUGArzHFy7JurhE9IGfVBTRQi8CCAPfjtT1Q7IX4U="; }; - vendorHash = "sha256-av3IZlfb09j6Dakc9lm8rPr85I/+pscjhEcZD04scUo="; + vendorHash = "sha256-thlILlWil618GJzPWkp4u7jmmuexmFtKqnAiZnokP0c="; checkFlags = [ # Not yet implemented @@ -30,6 +30,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/hyprland-community/hyprls/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprls"; }; }) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/by-name/ip/iperf2/package.nix similarity index 93% rename from pkgs/tools/networking/iperf/2.nix rename to pkgs/by-name/ip/iperf2/package.nix index adf7d57d5249..15e393afa8b2 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/by-name/ip/iperf2/package.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "iperf"; version = "2.2.1"; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { url = "mirror://sourceforge/iperf2/files/iperf-${finalAttrs.version}.tar.gz"; hash = "sha256-dUqwp+KAM9vqgTCO9CS8ffTW4v4xtgzFNrYbUf772Ps="; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/by-name/ip/iperf3/package.nix similarity index 81% rename from pkgs/tools/networking/iperf/3.nix rename to pkgs/by-name/ip/iperf3/package.nix index a88acec2192f..eabc0312af4c 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/by-name/ip/iperf3/package.nix @@ -7,12 +7,15 @@ lksctp-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iperf"; version = "3.21"; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { - url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; + url = "https://downloads.es.net/pub/iperf/iperf-${finalAttrs.version}.tar.gz"; hash = "sha256-ZW5EBevWIBId587KPq9DqI956huFfQQaagsTFIAazdg="; }; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb"; name = "remove-pg-flags.patch"; - sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi"; + hash = "sha256-cT3etRWaNRQrw7Gz4oTp6L5SJdKI/lrDywhYelzVf3w="; }) ]; @@ -47,4 +50,4 @@ stdenv.mkDerivation rec { mainProgram = "iperf3"; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index 1c842c896b04..aa0f33dc8aa7 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "kargo"; - version = "1.9.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${finalAttrs.version}"; - hash = "sha256-1r6XHtYbY107KwXHXv+AZd/y0TFa/LgU513bAhQPvPk="; + hash = "sha256-Gd/3bc0PhfitQyRaOPhg2BMhqJeipJbZGYGR5DQHHAc="; }; - vendorHash = "sha256-ir73yLXLOs6/6YX72EeyMcGLsImRkGmH4vppwKeOD+A="; + vendorHash = "sha256-tucXuZhcCVplFAmRzWJtxbBQccxiVTAheTA55wHMkyw="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index c4ba83df55eb..883f0a4c5bab 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.58.0"; + version = "2.59.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-JS4Mjn8fUr9CCQiELnCVH1Arg7uk7KbRwYWF1ECuMRM="; + hash = "sha256-tOybMpMe8pc2PAPUd5JGwqx6Qo6ZjeDX9UvP6i6BPDM="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-bPEc/uOPorBo2EXNVBvvuy7yV3Poif2GrjD5jhY974M="; + vendorHash = "sha256-rhuj+7RsS9vngfKeUZiKIYHed0+5QN1JDrDc4YCJYDk="; composerNoPlugins = false; postInstall = '' diff --git a/pkgs/by-name/la/lazytrivy/package.nix b/pkgs/by-name/la/lazytrivy/package.nix index e4e26b363b8b..da5af6e914a5 100644 --- a/pkgs/by-name/la/lazytrivy/package.nix +++ b/pkgs/by-name/la/lazytrivy/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "lazytrivy"; - version = "1.4.0"; + version = "1.4.1"; env.GOEXPERIMENT = "jsonv2"; @@ -17,10 +17,10 @@ buildGoModule (finalAttrs: { owner = "owenrumney"; repo = "lazytrivy"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZg8hXTZhgIkPNrzP7hQ7fwMDUL9MP5kUVdg8Smq5l4="; + hash = "sha256-0VWmsZKp0IEQ93AuMoYXN8pF0G3fwaP7Lzh3JsN2CtU="; }; - vendorHash = "sha256-2t6PckucJTr/2anqG8zarQOAlmGpOVvDxHkhhHfVaOo="; + vendorHash = "sha256-HKD7vpQAw3G4uMLUMhbv6tsFCOxfp62Phynun4HkFrg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix index 5efb69144bb9..8a056268bd01 100644 --- a/pkgs/by-name/ls/lsp-plugins/package.nix +++ b/pkgs/by-name/ls/lsp-plugins/package.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "lsp-plugins"; - version = "1.2.29"; + version = "1.2.31"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz"; - hash = "sha256-QEKXw63YecUI2wbVEZ4R78HQRzUn0qae057HfB0ZcvI="; + hash = "sha256-JZCnxqzgujGcgUXvFCYea7OfMomkmJ1LscFPRwGxzeI="; }; # By default, GStreamer plugins are installed right alongside GStreamer itself diff --git a/pkgs/by-name/mo/modprobed-db/package.nix b/pkgs/by-name/mo/modprobed-db/package.nix index f3252ccde446..528349100e86 100644 --- a/pkgs/by-name/mo/modprobed-db/package.nix +++ b/pkgs/by-name/mo/modprobed-db/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "modprobed-db"; - version = "2.48"; + version = "2.50"; src = fetchFromGitHub { owner = "graysky2"; repo = "modprobed-db"; rev = "v${finalAttrs.version}"; - hash = "sha256-rMkPBRg0QluMmSCAWSvET7rS/A2aUL6H31KKoZ6NTEs="; + hash = "sha256-JcotyXFrxE9DmrGS8cx/+BvHeQ8rLd+0h4jIYD2NZmY="; }; strictDeps = true; diff --git a/pkgs/by-name/op/opl3bankeditor/package.nix b/pkgs/by-name/op/opl3bankeditor/package.nix index 636128d6c6ff..76c641788803 100644 --- a/pkgs/by-name/op/opl3bankeditor/package.nix +++ b/pkgs/by-name/op/opl3bankeditor/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "opl3bankeditor"; - version = "1.5.1-unstable-2026-05-23"; + version = "1.5.1-unstable-2026-06-06"; src = fetchFromGitHub { owner = "Wohlstand"; repo = "opl3bankeditor"; - rev = "e347a35c3a29d5512b4b5c18f4e569e35238bc9f"; + rev = "992008e2edbaabcd8809df6be6bc91925597f1a9"; fetchSubmodules = true; - hash = "sha256-FOIHsIbX5WweKFIqu5zRJQD6wn5R74OVx2jQs42oGYk="; + hash = "sha256-D/WlF4Em5hXavXm85Zx2q9EmG6o61wzzmI0Umf5JqGA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix index 8ce8abf1da1f..6f71dffe6366 100644 --- a/pkgs/by-name/se/seanime/package.nix +++ b/pkgs/by-name/se/seanime/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "seanime"; - version = "3.8.4"; + version = "3.8.6"; src = fetchFromGitHub { owner = "5rahim"; repo = "seanime"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sfd+HF+Of+dDFmK7v2D05ZxffEzu/m6N31ScEklA2ZM="; + hash = "sha256-k3bUytIJPyCXjo6/6JbOg7WB6b26Uqj7HKrAzjmWmPU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix index b6551a61213c..b202ed843ccf 100644 --- a/pkgs/by-name/sh/shotwell/package.nix +++ b/pkgs/by-name/sh/shotwell/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.16"; + version = "0.32.17"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-tzpL4XQIGq8nR12+wIjPoeHzJ5AtwVgI12qk7e+dL4M="; + sha256 = "sha256-ClZoTpiBfDED9Upkj+lABCfHaiWnsRFFf8HYYMMWdnI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index c76bbb6647c3..97ebe712375d 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.60"; + version = "2.0.62"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-6fi3v+h3i5J1j4xDP1QUlGfrY8o9kiXtMCWmYZ9zgng="; + hash = "sha256-zlyAEdj/CxNuaPOvWToOltwc0GBPlx3lQP6shoYpKzk="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index 0d6a4894a706..f3de616a6d4e 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -8,30 +8,39 @@ }: let - platformInfos = { - "x86_64-linux" = { - platform = "manylinux1_x86_64"; - hash = "sha256-tnRFcgMgHGcWtTGPFZZPkE9IKDfvejLmvvD2iwPbbLY="; - }; - "x86_64-darwin" = { - platform = "macosx_10_9_universal2"; - hash = "sha256-6dbLiFUku0F+UiFV6P6nXpR6dezSntriVJyTfFaIgP0="; - }; - }; - inherit (stdenv.hostPlatform) system; - platformInfo = platformInfos.${system} or (throw "Unsupported platform ${system}"); in python3Packages.buildPythonApplication (finalAttrs: { pname = "sourcery"; - version = "1.37.0"; + version = "1.43.0"; format = "wheel"; - src = fetchPypi { - inherit (finalAttrs) pname version; - format = "wheel"; - inherit (platformInfo) platform hash; - }; + passthru.sources = + let + fetchWheel = + { platform, hash }: + fetchPypi { + format = "wheel"; + inherit (finalAttrs) pname version; + inherit platform hash; + }; + in + { + "x86_64-linux" = fetchWheel { + platform = "manylinux1_x86_64"; + hash = "sha256-oUL7EVbfwgV1K1Rv0kzW5r1AXr167BCXwzntDgVyTc0="; + }; + "x86_64-darwin" = fetchWheel { + platform = "macosx_10_9_x86_64"; + hash = "sha256-Ynn1BUBrmzRV2sL5ZGwOEQ/ccoV0edwFt4iiz9KN+k8="; + }; + "aarch64-darwin" = fetchWheel { + platform = "macosx_11_0_arm64"; + hash = "sha256-iQNOSoAClAk2FMjAExfgsFHDXS56vwieePGDCYRRbgQ="; + }; + }; + + src = finalAttrs.passthru.sources.${system} or (throw "Unsupported platform ${system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -45,9 +54,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.unfree; mainProgram = "sourcery"; maintainers = with lib.maintainers; [ tomasajt ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; + platforms = lib.attrNames finalAttrs.passthru.sources; }; }) diff --git a/pkgs/by-name/sw/swpui/package.nix b/pkgs/by-name/sw/swpui/package.nix index ed6e1375d4b1..39cb978db0c4 100644 --- a/pkgs/by-name/sw/swpui/package.nix +++ b/pkgs/by-name/sw/swpui/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "swpui"; - version = "0.8.0"; + version = "0.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "beeb"; repo = "swpui"; tag = "v${finalAttrs.version}"; - hash = "sha256-w9JQPSIMQUAUu6wkOH7wZH9ZV8eGSieXHlrppovicjY="; + hash = "sha256-JnWm+UFditTpDTLvWycSmS1jAJs5KaOF+ymVCeGzgAw="; }; - cargoHash = "sha256-JWeUv98zcgVQl1qXqD9wmpu4Dk0Qan0F9ypvcFpRxRM="; + cargoHash = "sha256-FkQs9FLJ8JxvmfHwWx8kvv7UcX3YX+wyXinGeX5sNVQ="; meta = { description = "TUI utility to search and replace with a focus on ergonomics, speed and case-awareness"; diff --git a/pkgs/by-name/sy/syncrclone/package.nix b/pkgs/by-name/sy/syncrclone/package.nix index e7408a6c30ed..25438cf9aeae 100644 --- a/pkgs/by-name/sy/syncrclone/package.nix +++ b/pkgs/by-name/sy/syncrclone/package.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { changelog = "https://github.com/Jwink3101/syncrclone/blob/${finalAttrs.src.rev}/docs/changelog.md"; sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ prominentretail ]; + maintainers = [ ]; mainProgram = "syncrclone"; }; }) diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 1963260b1c63..654d37ab94dc 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.tradingview.com/support/solutions/43000673888/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ prominentretail ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "tradingview"; }; diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix index 601296e63301..3a8d72df53b5 100644 --- a/pkgs/by-name/up/upsies/package.nix +++ b/pkgs/by-name/up/upsies/package.nix @@ -18,14 +18,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "upsies"; - version = "2026.05.24"; + version = "2026.06.12"; pyproject = true; src = fetchFromCodeberg { owner = "plotski"; repo = "upsies"; tag = "v${finalAttrs.version}"; - hash = "sha256-2gb5eGtEXPaFfFdfE6tBVQGPVmWwnA9Nm2N7OyinWEM="; + hash = "sha256-Hf26kYWnThpcemEerpx9cHlBVUa1pQ9ZP+AZeeJahSo="; }; patches = [ diff --git a/pkgs/by-name/vi/vim-startuptime/package.nix b/pkgs/by-name/vi/vim-startuptime/package.nix index 7cfd276de190..f47e236fcb1b 100644 --- a/pkgs/by-name/vi/vim-startuptime/package.nix +++ b/pkgs/by-name/vi/vim-startuptime/package.nix @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/rhysd/vim-startuptime"; description = "Small Go program for better `vim --startuptime` alternative"; - maintainers = with lib.maintainers; [ _9yokuro ]; + maintainers = [ ]; license = lib.licenses.mit; mainProgram = "vim-startuptime"; }; diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index cc74de7dcc75..65e9e01b0aa7 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmi"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "wasmi-labs"; repo = "wasmi"; tag = "v${finalAttrs.version}"; - hash = "sha256-eFQ0dBOFE/vpRXfAYYZNncAVKMlaGf8jHvBT/a5UQRo="; + hash = "sha256-54mZxX7ygmX93V3l1ZRqDdbGe5uk772GSaNmXnV3iEQ="; fetchSubmodules = true; }; - cargoHash = "sha256-Vo5MGp3I/8sMDchNQORzlXS8z9Bp6cILnK4aYot9/FE="; + cargoHash = "sha256-v38ThWgelSmxWLhOHqmJIbh1sisB1K56825ut/mZoMs="; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix index 18c19acc20ed..6ee2a617c167 100644 --- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix +++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication { mainProgram = "wtsexporter"; maintainers = with lib.maintainers; [ bbenno - EstebanMacanek ]; }; } diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix index d6d23a276c21..252e4c369277 100644 --- a/pkgs/by-name/xe/xephem/package.nix +++ b/pkgs/by-name/xe/xephem/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xephem"; homepage = "https://xephem.github.io/XEphem/Site/xephem.html"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ EstebanMacanek ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index e43db9cfd37b..a0885810336c 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "aioamazondevices"; - version = "14.0.0"; + version = "14.0.4"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZF3w5lg6NijVBkJKoItmblay90VzUsDqPVxk712sXRU="; + hash = "sha256-C0cwPtAiA63DXqs8x0zlJ+y1BXgVe87Q56WKER/cmnk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 9ec742b2c354..0f7fd3529bdf 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "bthome-ble"; - version = "3.23.2"; + version = "3.23.4"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-t8AOz1riqwXAoovN/DXBzfQ/btCZqzgC72U9OBdSPHU="; + hash = "sha256-ZXCqwadNWl2Yct+rlZViFO2pFV4ZY0glKvD3xElY3Mg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index bcf1f4c54b3f..0d90983c8a07 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "3.5.0"; + version = "3.7.0"; in buildPythonPackage rec { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-ei4+eGNCzBZQYghgVuQIPgFA2Y1kf8aNtl6ZjwzxIEE="; + hash = "sha256-C3nx8w0y4RsHq9txwdSfgS9BMcY4TyZiBOq4QIq5w+0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxst/default.nix b/pkgs/development/python-modules/lxst/default.nix index d50f6127098e..50d413bc13b7 100644 --- a/pkgs/development/python-modules/lxst/default.nix +++ b/pkgs/development/python-modules/lxst/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + libpulseaudio, audioop-lts, lxmf, numpy, @@ -24,6 +25,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-MAJ1n6EUZ6FmIfKKuM2ppbTVrWkxpjC5KIICo5stc+k="; }; + postPatch = '' + substituteInPlace LXST/Platforms/linux/soundcard.py \ + --replace-fail "libpulse.so" "${lib.getLib libpulseaudio}/lib/libpulse.so" + ''; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index b5852c250ed5..e4acb47de4e9 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -49,14 +49,15 @@ in buildPythonPackage (finalAttrs: { pname = "osqp"; - version = "1.1.1"; + version = "1.1.3"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "osqp"; repo = "osqp-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-v7Kyiu5L9/GvnJFx2e6G38hkQvFQeecZNy09NJRjuA0="; + hash = "sha256-xK7ljAwVwsmj84s5yxeU64nwT6N/Ec58aYjiUUOr4Ig="; }; patches = [ diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index e442616559e7..39e1f17ed42a 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "pytrydan"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "dgomes"; repo = "pytrydan"; tag = "v${finalAttrs.version}"; - hash = "sha256-oXnTDwCY2Z/K7YwWNTwbbB0W47bZD+W6uFxZQRF3KgQ="; + hash = "sha256-vxIY+BCo3o4FBI1otiMx3swWTxtmEgYfVCWQAq2OuUM="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 2d30c70055e1..616cb5aaab56 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "reolink-aio"; - version = "0.20.1"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = finalAttrs.version; - hash = "sha256-0uJ1iGWbGy6sFhWVxUwLhkR9U1MtqF+82AYU0/gHhdU="; + hash = "sha256-MbIU4Hk/9b491EBzNktZiZU5UJddAIx3wVeS0mCk6No="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index 0b8fdbecb630..9891a3aca8f8 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { mainProgram = "vpk"; homepage = "https://github.com/ValvePython/vpk"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ joshuafern ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2885826325b6..b2fef65e07a5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2026.6.2"; + version = "2026.6.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix index 2f08bc82c0f7..30cd2e4552a3 100644 --- a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "KartoffelToby"; domain = "better_thermostat"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "KartoffelToby"; repo = "better_thermostat"; tag = version; - hash = "sha256-jxC8Xxhr1OjcAREggNaiB89TMFSdQyDr4QfdWGcmeU4="; + hash = "sha256-VSTGYs97ro65rrV80D6b3/XEeGi86FzXwU5nPabS5gE="; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix index 1939ed7bf96b..712f554aaacd 100644 --- a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix +++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "luuquangvu"; domain = "blueprints_updater"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { inherit owner; repo = "blueprints-updater"; tag = version; - hash = "sha256-Sb4ZUuOw4S8kh8N3fSgE35lD38LyvLW2oouot2zIWYg="; + hash = "sha256-8vq/tU9a0faioSmy9CdJerIx1ry67B+gqdlnSNiEFGU="; }; patches = [ diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix index c7942bb4d5ce..9f395dff5ab2 100644 --- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "JeffSteinbok"; domain = "dreo"; - version = "1.9.12"; + version = "1.9.13"; src = fetchFromGitHub { inherit owner; repo = "hass-dreo"; tag = "v${version}"; - hash = "sha256-CMp3UIpLSpqTL0EGH6z5bvqOd68Ay8o7bDDdjNMawWg="; + hash = "sha256-45O21kF/gq49Dbz1Za0le++a90qz+mQnZvRD45Jzxpo="; }; dependencies = [ websockets ]; diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix index d0866b0336df..c374f4f1e039 100644 --- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix +++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "samoswall"; domain = "polaris"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "samoswall"; repo = "polaris-mqtt"; tag = "v${version}"; - hash = "sha256-G0DWgDLS62yKXE6gktb8z2xKFeH7Cu2zssQhEiuhwD0="; + hash = "sha256-NViyBWTN18DQV3WywD6AXdoOw6W+PgMIV5tuKyRgN2w="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix index e0184650f843..3d20ca0510ea 100644 --- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "yandex_station"; - version = "3.21.1"; + version = "3.21.2"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "YandexStation"; tag = "v${version}"; - hash = "sha256-5a+631Gu7xaPq8EF+34bybm40YVTXPA/ylq6k8LPBNU="; + hash = "sha256-TjrBb7MatydixSEEAcM7ezQ8hDGKxTapD2h40c/0AxQ="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix index 18d09de8104b..e2d79d248149 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "auto-entities"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Lint-Free-Technology"; repo = "lovelace-auto-entities"; tag = "v${version}"; - hash = "sha256-l6bg68PP+d9AiTAkT7MtuyIeSl9dmi9bMEaV+eByOIs="; + hash = "sha256-2uZtL2w/KntBReF//3WTrHAQrYJO24jJYWJZ8/mpsIY="; }; - npmDepsHash = "sha256-1rJeyYn4QzYGxztFwJ812RjCApHlqnvrnFe69CUKCzM="; + npmDepsHash = "sha256-UYpkIKr4/lAfvf+H09uZ8tksnucjpHWiWvWvPKfva2I="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c2cc8014607..80cbb9803774 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -265,7 +265,7 @@ let extraBuildInputs = extraPackages python3Packages; # Don't forget to run update-component-packages.py after updating - hassVersion = "2026.6.2"; + hassVersion = "2026.6.3"; in python3Packages.buildPythonApplication rec { @@ -286,13 +286,13 @@ python3Packages.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-wDGXJoo1R2YX2qNRsMYNHm94WCsSHsC7ihCW6w8YAD8="; + hash = "sha256-I9vmwlCoxEK3o04e1x5LissX3u0fgxVOu6Uzq88e9kI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-XpFnxxa1liRUm8KEoI73t9wAfnsLKC3G56vrgkcIqR0="; + hash = "sha256-23tqASXXrhYh1x7Qy+ZR4T7z+XKkhW0Qn6YGM2iNJOk="; }; build-system = with python3Packages; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 45e989922e15..fb2368b8e5f2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20260527.5"; + version = "20260527.6"; format = "wheel"; src = fetchPypi { @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-DLuwjy3Gyqp8Y2N7Vbv4AbhFbFwaMOEvDzvkRncqmQE="; + hash = "sha256-tvJXB+lFrlDA3eUnE5NPQwXbWn8XGggPJ9I1f9U1ddk="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index bfb1b0df374c..6dc6cbfe0876 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.338"; + version = "0.13.339"; pyproject = true; disabled = pythonOlder "3.13"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-O4h8vHjYo/cIBOqd+ag8jIoje9j1/zyBfuQq6IIFa3w="; + hash = "sha256-4BmtdmQyeYaOPPMDnnBNCvB0EgWcw9umC5hV4rFRTLA="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 3351436b518d..001d73d97934 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2026.6.2"; + version = "2026.6.3"; pyproject = true; disabled = python.version != home-assistant.python3Packages.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-Rf5HHXNJR6TJnB0Gtg6mwlqteMUf2Yw7stonsoO2EHE="; + hash = "sha256-YJT0/2NJiuh7Do3gik2Rr2a1A2rMJYVEjrV6xrxF9Ww="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 8d6c1fb02425..fa4eadd027ba 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -73,6 +73,7 @@ EXTRA_COMPONENT_DEPS = { OUR_VERSION_IS_NEWER_THAN = { "blinkstick": "1.2.0", "gps3": "0.33.3", + "ouman-eh-800-api": "0.5.0", "proxmoxer": "2.2.0", "py-cpuinfo": "9.0.0", "pybluez": "0.22", diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix index 43fee0a937f3..bbfd54fb60b6 100644 --- a/pkgs/servers/sql/postgresql/ext.nix +++ b/pkgs/servers/sql/postgresql/ext.nix @@ -24,4 +24,5 @@ in cstore_fdw = throw "PostgreSQL extension `cstore_fdw` has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; pgvecto-rs = throw "PostgreSQL extension `pgvecto-rs` has been removed since the project has been abandoned. Upstream's recommendation is to use vectorchord instead (https://docs.vectorchord.ai/vectorchord/admin/migration.html#from-pgvecto-rs) "; # Added 2026-03-13 + plv8 = throw "PostgreSQL extension `plv8` has been removed due to depending on the insecure NodeJS 20"; # Added 2026-06-13 } diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch deleted file mode 100644 index e6099771ea1a..000000000000 --- a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Makefile b/Makefile -index a705c11..08b952b 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,11 +13,14 @@ OBJS = $(SRCS:.cc=.o) - MODULE_big = plv8-$(PLV8_VERSION) - EXTENSION = plv8 - PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql -+USE_SYSTEM_V8 = 0 - - ifeq ($(OS),Windows_NT) - # noop for now - else -+ ifeq ($(USE_SYSTEM_V8),0) - SHLIB_LINK += -Ldeps/v8-cmake/build -+ endif - UNAME_S := $(shell uname -s) - ifeq ($(UNAME_S),Darwin) - CCFLAGS += -stdlib=libc++ -@@ -34,6 +37,7 @@ ifeq ($(NUMPROC),0) - NUMPROC = 1 - endif - -+ifeq ($(USE_SYSTEM_V8),0) - SHLIB_LINK += -Ldeps/v8-cmake/build - - all: v8 $(OBJS) -@@ -46,11 +50,16 @@ deps/v8-cmake/build/libv8_libbase.a: - @cd deps/v8-cmake && mkdir -p build && cd build && cmake -Denable-fPIC=ON -DCMAKE_BUILD_TYPE=Release ../ && make -j $(NUMPROC) - - v8: deps/v8-cmake/build/libv8_libbase.a -+else -+all: $(OBJS) -+endif - - # enable direct jsonb conversion by default - CCFLAGS += -DJSONB_DIRECT_CONVERSION - -+ifeq ($(USE_SYSTEM_V8),0) - CCFLAGS += -Ideps/v8-cmake/v8/include -std=c++17 -+endif - - ifdef EXECUTION_TIMEOUT - CCFLAGS += -DEXECUTION_TIMEOUT diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix deleted file mode 100644 index ad7935687f1a..000000000000 --- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix +++ /dev/null @@ -1,141 +0,0 @@ -{ - fetchFromGitHub, - lib, - nodejs-slim_20, - perl, - postgresql, - postgresqlBuildExtension, - stdenv, - # For test - coreutils, - gnugrep, - runCommand, -}: - -let - libv8 = nodejs-slim_20.libv8; -in -postgresqlBuildExtension (finalAttrs: { - pname = "plv8"; - version = "3.2.4"; - - src = fetchFromGitHub { - owner = "plv8"; - repo = "plv8"; - tag = "v${finalAttrs.version}"; - hash = "sha256-v4r/6qwDwb3+PQPYV3FqmIcDEkSr8F46PVlFnhUWUGc="; - }; - - patches = [ - # Allow building with system v8. - # https://github.com/plv8/plv8/pull/505 (rejected) - ./0001-build-Allow-using-V8-from-system.patch - ]; - - nativeBuildInputs = [ - perl - ]; - - buildInputs = [ - libv8 - ]; - - buildFlags = [ "all" ]; - - makeFlags = [ - # Nixpkgs build a v8 monolith instead of separate v8_libplatform. - "USE_SYSTEM_V8=1" - "SHLIB_LINK=-lv8" - "V8_OUTDIR=${libv8}/lib" - ]; - - # No configure script. - dontConfigure = true; - - postPatch = '' - patchShebangs ./generate_upgrade.sh - ''; - - passthru = { - tests = - let - postgresqlWithSelf = postgresql.withPackages (_: [ - finalAttrs.finalPackage - ]); - in - { - smoke = runCommand "plv8-smoke-test" { } '' - export PATH=${ - lib.makeBinPath [ - postgresqlWithSelf - coreutils - gnugrep - ] - } - db="$PWD/testdb" - initdb "$db" - postgres -k "$db" -D "$db" & - pid="$!" - - for i in $(seq 1 100); do - if psql -h "$db" -d postgres -c "" 2>/dev/null; then - break - elif ! kill -0 "$pid"; then - exit 1 - else - sleep 0.1 - fi - done - - psql -h "$db" -d postgres -c 'CREATE EXTENSION plv8; DO $$ plv8.elog(NOTICE, plv8.version); $$ LANGUAGE plv8;' 2> "$out" - grep -q "${finalAttrs.version}" "$out" - kill -0 "$pid" - ''; - - regression = stdenv.mkDerivation { - name = "plv8-regression"; - inherit (finalAttrs) - src - patches - nativeBuildInputs - buildInputs - dontConfigure - ; - - buildPhase = '' - runHook preBuild - - # The regression tests need to be run in the order specified in the Makefile. - echo -e "include Makefile\nprint_regress_files:\n\t@echo \$(REGRESS)" > Makefile.regress - REGRESS_TESTS=$(make -f Makefile.regress print_regress_files) - - ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ - --bindir='${postgresqlWithSelf}/bin' \ - --temp-instance=regress-instance \ - --dbname=contrib_regression \ - $REGRESS_TESTS - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - touch "$out" - - runHook postInstall - ''; - }; - }; - }; - - meta = { - description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; - homepage = "https://plv8.github.io/"; - changelog = "https://github.com/plv8/plv8/blob/v${finalAttrs.version}/Changes"; - maintainers = [ ]; - platforms = postgresql.meta.platforms; - license = lib.licenses.postgresql; - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af7a2024028..6ba3eba8821e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2408,8 +2408,6 @@ with pkgs; iocsearcher = with python3Packages; toPythonApplication iocsearcher; - iperf2 = callPackage ../tools/networking/iperf/2.nix { }; - iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; i-pi = with python3Packages; toPythonApplication i-pi;