diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index a73997c761d1..6834819c3c40 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -20,9 +20,12 @@ You can configure the former via: ```nix neovim.override { + withPython3 = true; # see `:h g:python3_host_prog` + withNodeJs = false; + withRuby = false; configure = { customRC = '' - # here your custom configuration goes! + # here your custom viml configuration goes! ''; packages.myVimPackage = with pkgs.vimPlugins; { # See examples below on how to use custom packages. @@ -44,7 +47,7 @@ neovim-qt.override { neovim = neovim.override { configure = { customRC = '' - # your custom configuration + # your custom viml configuration ''; }; }; @@ -61,6 +64,8 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `wrapRc`: Nix, not being able to write in your `$HOME`, loads the generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`. - `plugins`: A list of plugins to add to the wrapper. +- `withPython3`, `withNodeJs`, `withRuby` control when to enable neovim + providers (see `:h provider`). ``` wrapNeovimUnstable neovim-unwrapped { @@ -85,6 +90,9 @@ wrapNeovimUnstable neovim-unwrapped { (nvim-treesitter.withPlugins (p: [ p.nix p.python ])) hex-nvim ]; + withPython3 = true; + withNodeJs = false; + withRuby = false; } ``` diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 7600899c8c84..eb2d6bfd24c7 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -563,7 +563,6 @@ "members": { "Ericson2314": 1055245, "emilazy": 18535642, - "lovek323": 265084, "rrbutani": 7833358, "sternenseemann": 3154475 }, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 07748eb80747..c0e6a4ce672f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13336,10 +13336,12 @@ name = "Julius Rickert"; }; julm = { - email = "julm+nixpkgs@sourcephile.fr"; + email = "julm@sourcephile.fr"; + matrix = "@julm:matrix.org"; github = "ju1m"; githubId = 21160136; name = "Julien Moutinho"; + keys = [ { fingerprint = "4FE4 6703 4C11 017B 429B AC53 A58C D81C 3863 926F"; } ]; }; Julow = { email = "jules@j3s.fr"; @@ -15483,12 +15485,6 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; - lovek323 = { - email = "jason@oconal.id.au"; - github = "lovek323"; - githubId = 265084; - name = "Jason O'Conal"; - }; lovesegfault = { email = "meurerbernardo@gmail.com"; matrix = "@lovesegfault:matrix.org"; @@ -25716,6 +25712,12 @@ githubId = 12984845; name = "Subhrajyoti Sen"; }; + sudo-mac = { + email = "dreems2reality@gmail.com"; + github = "sudo-mac"; + githubId = 90754995; + name = "sudo-mac"; + }; sudoforge = { github = "sudoforge"; githubId = 3893293; diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index d1f4f3f22a7e..440f32c2b669 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -21,6 +21,11 @@ in supports multiple aura devices since version 6.0.0. '' ) + (lib.mkRemovedOptionModule [ + "services" + "asusd" + "enableUserService" + ] "The asusd user service is no longer required.") ]; options = { @@ -51,14 +56,6 @@ in package = lib.mkPackageOption pkgs "asusctl" { }; - enableUserService = lib.mkOption { - type = bool; - default = false; - description = '' - Activate the asusd-user service. - ''; - }; - animeConfig = lib.mkOption { type = nullOr configType; default = null; @@ -145,8 +142,6 @@ in services.dbus.packages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; services.supergfxd.enable = lib.mkDefault true; - - systemd.user.services.asusd-user.enable = cfg.enableUserService; }; meta.maintainers = pkgs.asusctl.meta.maintainers; diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index de418521c3c9..06faa0cd7f89 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -699,6 +699,15 @@ in environment = { CONFIG_FILE = "/run/frigate/frigate.yml"; HOME = "/var/lib/frigate"; + # Extract libavformat version in the same way Docker scripts in frigate directory do. This + # environment variable changes the flags given to `ffmpeg` improving compatibility. + LIBAVFORMAT_VERSION_MAJOR = lib.strings.trim ( + builtins.readFile ( + pkgs.runCommandLocal "libavformat-major-version" { } '' + ${cfg.settings.ffmpeg.path}/bin/ffmpeg -version | grep -Po "libavformat\W+\K\d+" > $out + '' + ) + ); PYTHONPATH = cfg.package.pythonPath; } // optionalAttrs (cfg.vaapiDriver != null) { diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index 35efbeb767d6..77a19e60a074 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -398,7 +398,10 @@ in }; systemd.tmpfiles.rules = [ + "d /var/lib/mobilizon 700 mobilizon mobilizon - -" "d /var/lib/mobilizon/sitemap 700 mobilizon mobilizon - -" + "d /var/lib/mobilizon/uploads 700 mobilizon mobilizon - -" + "d /var/lib/mobilizon/uploads/exports 700 mobilizon mobilizon - -" "d /var/lib/mobilizon/uploads/exports/csv 700 mobilizon mobilizon - -" "Z /var/lib/mobilizon 700 mobilizon mobilizon - -" ]; diff --git a/nixos/tests/mobilizon.nix b/nixos/tests/mobilizon.nix index 1a07c5fc2732..5800ac702f16 100644 --- a/nixos/tests/mobilizon.nix +++ b/nixos/tests/mobilizon.nix @@ -43,5 +43,11 @@ in server.wait_for_unit("mobilizon.service") server.wait_for_open_port(${toString port}) server.succeed("curl --fail https://${mobilizonDomain}/") + + # Verify ownership is set up correctly + owner = server.succeed("stat -c '%U' /var/lib/mobilizon/sitemap").rstrip() + assert owner == "mobilizon", f"unexpected owner: {owner}" + owner = server.succeed("stat -c '%U' /var/lib/mobilizon/uploads").rstrip() + assert owner == "mobilizon", f"unexpected owner: {owner}" ''; } diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 468ea813ee42..0b6b3ad7a563 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -85,7 +85,6 @@ let AndersonTorres adisbladis jwiegley - lovek323 panchoh ]; "macport" = with lib.maintainers; [ diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 58666db8fea9..02424724f631 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-6zmuYl34QMG3W5h/gCfiW9atK4CpdoQJvttw6y4sy9Q="; - x86_64-darwin = "sha256-0TD+ez+/jc6nZEoZO3j467ouMbmnek6iQQ6SMo57oL0="; - aarch64-linux = "sha256-Cz7mjcm0HcoRK5EA5xi9AHOxbiEOt9JL+Drfd6/tYBw="; - aarch64-darwin = "sha256-8Rfjr8WShCwrJlJapkALNPubPVBpKGZRtHKtTi5Xslc="; - armv7l-linux = "sha256-eUvAvFIP8/5KIIyZFD6VY6RBR97kus6PFb7Inxgh30A="; + x86_64-linux = "sha256-cBYBA8DdpQ9lGjfuJ6ZammSmk4c0zxoLzUnYNhK9sac="; + x86_64-darwin = "sha256-84PnRIUTfsf4T36GkgNaeaKAcz0Ul/BsP6Sd93G/F2g="; + aarch64-linux = "sha256-nncqNGnODOgu66jp7ok/spblLSl0iZ1lPJqrkSDncIA="; + aarch64-darwin = "sha256-ckwFJ4P2hCy7TTUS+peUNad00ydk4RnAthkggrbYzAQ="; + armv7l-linux = "sha256-I5Phy1eY+oYAVBklvtUldkYbmgJUYCBr7hAGIxnNTvA="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.109.4"; + version = "1.109.5"; # This is used for VS Code - Remote SSH test - rev = "c3a26841a84f20dfe0850d0a5a9bd01da4f003ea"; + rev = "072586267e68ece9a47aa43f8c108e0dcbf44622"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-tv7BPcSnejWzURVB3/HpiyqjjeDxsn4dS/NTonsuEs4="; + hash = "sha256-E9Oruk0rwp1TcJ0QXwBoNMStJYmhzvXXkY0SA8bQv3Y="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json index 5da05dfcef7f..6d9b48b982df 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.gz", - "sha256": "8a1c1f25d62d3395fbb2b37d55cf3d836ca4bc68e6358d21b6573f42d295c6f0" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "469e9ecafbd69565d8f55cb451ca968edbe7aa872bfd783acd3058bb3b1cbe01" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.zst", - "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "e60dfb27f3c5ffb9a32db8fdfdd8447d01618f29d1d132a3f0891dd8bbc00674" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.gz", - "sha256": "8659dda950ab0ddff37b2c8d59f527489e1accde30f652b6c3b434385825b8b5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "49a39c18db7883ef02914cea098e228610330d689313273ab0c5486fbc78a5b2" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.zst", - "sha256": "fab2006d48153f278332504c1aa8b03e5683c14924f66ecbd5eeb7db3a5dedd9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "2a93722994fb58faa36fa6293a7e454fa1c621eaa0a82e08e996f767e61c0c88" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.gz", - "sha256": "ec9a3d8b04445afe24093dd0f4e65a1da6b3a5d73f3c739746aaa8ec0aaa03cb" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "e653d4fe9e8bd24600f27a247086ef3c3b2bcc068da457a3cc16c70dfd60c7b1" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.zst", - "sha256": "4c6a31ffa5bc267986f47f36396c51232f55b5db22253630bf7e8b48ea41084f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix index 420e5f4422c0..9c3f60380ec9 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.35.0+k3s3"; - k3sCommit = "323b95245012f0d56a863d8c23964399814191c2"; - k3sRepoSha256 = "1h6az9xj074pj8s60p2yw9gbqz2dabrxvrq41igcw0nq7ymcwaaz"; - k3sVendorHash = "sha256-4Qs03mrOJBxsyQe4RrDG9vvS23JwjUPhPec/TebS4Yw="; + k3sVersion = "1.35.1+k3s1"; + k3sCommit = "50fa2d70c239b3984dab99a2fb1ddaa35c3f2051"; + k3sRepoSha256 = "0ha0vw1k6sawmd1zi81ni4c662761hp3iaj5ssi8klg93cp8hg0p"; + k3sVendorHash = "sha256-5XPbp0wizwAGlA8Km4uwLKy9dIqWzzQuuXWgKnICmCw="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; @@ -17,5 +17,5 @@ flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.9.12-build20251215"; + helmJobVersion = "v0.9.14-build20260210"; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4f43ca3f42aa..637824e7430a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -544,13 +544,13 @@ "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw=" }, "hashicorp_consul": { - "hash": "sha256-SlXzhH9EQJAAcSAog6XzbeenzseXNEUfXdYtURpUcUw=", + "hash": "sha256-iYt4TxyVQIYjrOgVS+olDcDgTddaVmYVy8M/Y9IkTpQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.22.1", + "rev": "v2.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HQXioE9mbc+0Qf6MGiXKXSfmbUUtkUafA01GEXbLQfE=" + "vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU=" }, "hashicorp_dns": { "hash": "sha256-ErvlkaFiIHEXUZYDJZmqEgGpZ75mnLRhhsULRvTm7Rc=", @@ -580,11 +580,11 @@ "vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg=" }, "hashicorp_google-beta": { - "hash": "sha256-frRtwDdgNNux875U9rgSbZict8//X/WzxM7EBSxRqW4=", + "hash": "sha256-ypC8av5GnFBlUp2eVDZWqnPGrZT8QihYnxsIHw8g+oA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.20.0", + "rev": "v7.21.0", "spdx": "MPL-2.0", "vendorHash": "sha256-KnB6R5yrEeaf4Z+LzQjCeQJjAgHK0kJEJzT1rb3pimY=" }, diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 5e0b96969a82..58a84a759c1b 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -171,7 +171,7 @@ let license = lib.licenses.asl20; homepage = "https://subversion.apache.org/"; mainProgram = "svn"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 4d9db85dbc2f..2891e7a9f529 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -179,8 +179,7 @@ stdenv.mkDerivation rec { description = "Highly configurable, dynamic window manager for X"; homepage = "https://awesomewm.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - lovek323 + maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js index b045e4e0918c..71225738fd46 100644 --- a/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js +++ b/pkgs/build-support/node/import-npm-lock/hooks/link-node-modules.js @@ -2,6 +2,8 @@ const fs = require("fs"); const path = require("path"); +const node_modules = process.env.NODE_PATH || "node_modules" + async function asyncFilter(arr, pred) { const filtered = []; for (const elem of arr) { @@ -16,7 +18,7 @@ async function asyncFilter(arr, pred) { // This means every file in node_modules that is _not_ a symlink to the Nix store. async function getUnmanagedFiles(storePrefix, files) { return await asyncFilter(files, async (file) => { - const filePath = path.join("node_modules", file); + const filePath = path.join(node_modules, file); // Is file a symlink const stat = await fs.promises.lstat(filePath); @@ -37,14 +39,14 @@ async function main() { // Ensure node_modules exists try { - await fs.promises.mkdir("node_modules"); + await fs.promises.mkdir(node_modules); } catch (err) { if (err.code !== "EEXIST") { throw err; } } - const files = await fs.promises.readdir("node_modules"); + const files = await fs.promises.readdir(node_modules); // Get deny list of files that we don't manage. // We do manage nix store symlinks, but not other files. @@ -58,7 +60,7 @@ async function main() { await Promise.all( sourceFiles.map(async (file) => { const sourcePath = path.join(sourceModules, file); - const targetPath = path.join("node_modules", file); + const targetPath = path.join(node_modules, file); // Skip file if it's not a symlink to a store path if (unmanaged.includes(file)) { @@ -86,7 +88,7 @@ async function main() { // Clean up store symlinks not included in this generation of node_modules await Promise.all( Array.from(managed).map((file) => - fs.promises.unlink(path.join("node_modules", file)), + fs.promises.unlink(path.join(node_modules, file)), ) ); } diff --git a/pkgs/by-name/ae/aescrypt/package.nix b/pkgs/by-name/ae/aescrypt/package.nix index 3d83142a94a1..eb62d9061d88 100644 --- a/pkgs/by-name/ae/aescrypt/package.nix +++ b/pkgs/by-name/ae/aescrypt/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.aescrypt.com/"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - lovek323 qknight ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index 14b4a78fc1de..16cc3002081a 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron_39, + electron_40, fetchFromGitHub, makeDesktopItem, makeWrapper, @@ -10,8 +10,8 @@ }: let - electron = electron_39; - version = "2026.1.3"; + electron = electron_40; + version = "2026.2.1"; in buildNpmPackage { @@ -22,10 +22,10 @@ buildNpmPackage { owner = "appium"; repo = "appium-inspector"; tag = "v${version}"; - hash = "sha256-9WhSQq3is2qucL1cGQIYPuLM9VkCFIWq2XVU2QioRMo="; + hash = "sha256-89u8MifBPh5AwaMFp+aGSzsiwp75Skca/t6OyDSzrGo="; }; - npmDepsHash = "sha256-2DNUTvZ6yFL9U8JKw4ZFR81a6Mv9rPXtRu/v/Il/Rhw="; + npmDepsHash = "sha256-mwNn7TllWCtr4sif9Wc3FDtK2Icu72/iI+IllhBswHQ="; npmFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 3f3f831d726b..e74c15e6d837 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -18,16 +18,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "asusctl"; - version = "6.3.2"; + version = "6.3.3"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; tag = finalAttrs.version; - hash = "sha256-6dZkQ8cPL8dbtvfuc/a5G1BxEaZyNbvy3eRBctFFwVU="; + hash = "sha256-nc6pGxLutxKyd4LiI23e7UfWK45aQiLQRKL6zX7rVO0="; }; - cargoHash = "sha256-FlEuv/iaNlfXLhHRSmZedPwroCozaEqIvYRqbgJhgEw="; + cargoHash = "sha256-LZsSnIGTemu+SvJxszPWkA5EIdu8XzruZXaYIibV31Q="; postPatch = '' files=" @@ -49,9 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace data/asusd.service \ --replace-fail /usr/bin/asusd $out/bin/asusd \ --replace-fail /bin/sleep ${lib.getExe' coreutils "sleep"} - substituteInPlace data/asusd-user.service \ - --replace-fail /usr/bin/asusd-user $out/bin/asusd-user \ - --replace-fail /usr/bin/sleep ${lib.getExe' coreutils "sleep"} substituteInPlace Makefile \ --replace-fail /usr/bin/grep ${lib.getExe gnugrep} diff --git a/pkgs/by-name/au/audiofile/package.nix b/pkgs/by-name/au/audiofile/package.nix index 4a14e99965d8..1223e52a49ab 100644 --- a/pkgs/by-name/au/audiofile/package.nix +++ b/pkgs/by-name/au/audiofile/package.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for reading and writing audio files in various formats"; homepage = "http://www.68k.org/~michael/audiofile/"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/av/avahi/package.nix b/pkgs/by-name/av/avahi/package.nix index bff96b955396..09b9a602af55 100644 --- a/pkgs/by-name/av/avahi/package.nix +++ b/pkgs/by-name/av/avahi/package.nix @@ -232,8 +232,7 @@ stdenv.mkDerivation rec { homepage = "http://avahi.org"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - lovek323 + maintainers = [ ]; longDescription = '' diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix index 6e1f0c1562da..3fa8bc29d497 100644 --- a/pkgs/by-name/ba/bacula/package.nix +++ b/pkgs/by-name/ba/bacula/package.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { bsd2 ]; maintainers = with lib.maintainers; [ - lovek323 eleanor ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/bi/bindfs/package.nix b/pkgs/by-name/bi/bindfs/package.nix index aa1b715bbd70..5cc6c5028bc2 100644 --- a/pkgs/by-name/bi/bindfs/package.nix +++ b/pkgs/by-name/bi/bindfs/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bindfs.org"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - lovek323 lovesegfault ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index e2e677dbf97a..6fa1d7602c82 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-release"; - version = "0.25.22"; + version = "1.1.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${finalAttrs.version}"; - hash = "sha256-NFI7UIHbo1xcH+pXim3ar8hvkn2EdIFpI2rpsivhVHg="; + hash = "sha256-+whbVQs2zaPrckR8CZYS35DHqCOv/B/4bv+fffu+onw="; }; - cargoHash = "sha256-RJfg11FyecDKFIsXx5c3R/qC5c81N3WYjd2pU4sw/ng="; + cargoHash = "sha256-jqs1b6edoR1OgileF0T9LNw1QtxALn3Nz+QUF3R8epg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix index 650d258eef6a..858e6e30a152 100644 --- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix +++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tarpaulin"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; tag = finalAttrs.version; - hash = "sha256-l4Sn9EkIphBSEUfuRPhCRPtNENiGyP7lQcN4lx2Osks="; + hash = "sha256-DI1xkRLW/RAAw41SfsoJqk8D7cGTrTV1jj63Rwe+E4A="; }; - cargoHash = "sha256-lHYYDdlm+axyuGY2ulPmuLhVu6p5u6JAf2x6Xcpo8Dc="; + cargoHash = "sha256-+OBjBo5PtcqrePQc9qEAUYyErLsHMZaGYrU2kIyuKZE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix index 7d83121ca99d..eb93138b5b41 100644 --- a/pkgs/by-name/ca/cargo-zigbuild/package.nix +++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-zigbuild"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "messense"; repo = "cargo-zigbuild"; tag = "v${finalAttrs.version}"; - hash = "sha256-vW5SDi4oIJ2ScAdpZhLmP5RY9C1fN38XsBauaNrx9Nw="; + hash = "sha256-t96yIRfXLGN92xoygl32Q1rpsebySdOsrmkwQ5zH5xQ="; }; - cargoHash = "sha256-DLg91rS+fjo7QhmQr1NaZE+vpVVxs+5euPqM1QySDlE="; + cargoHash = "sha256-HOzkO81xVcKwe4ySe1IkOYcX5i1Un0mGNX7824/eh0k="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix index 0625735ec621..07574e7282ac 100644 --- a/pkgs/by-name/co/cogl/package.nix +++ b/pkgs/by-name/co/cogl/package.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { meta = { description = "Small open source library for using 3D graphics hardware for rendering"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; longDescription = '' Cogl is a small open source library for using 3D graphics hardware for diff --git a/pkgs/by-name/cr/cracklib/package.nix b/pkgs/by-name/cr/cracklib/package.nix index 886428ae7652..9a1c37363f51 100644 --- a/pkgs/by-name/cr/cracklib/package.nix +++ b/pkgs/by-name/cr/cracklib/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Password checking library"; changelog = "https://github.com/cracklib/cracklib/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 422f2ff3a7bf..8826a80a752f 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -283,7 +283,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://curl.se/"; license = lib.licenses.curl; maintainers = with lib.maintainers; [ - lovek323 Scrumplex ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/di/dico/package.nix b/pkgs/by-name/di/dico/package.nix index d6a393762f5a..0c39ca041d66 100644 --- a/pkgs/by-name/di/dico/package.nix +++ b/pkgs/by-name/di/dico/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = "https://www.gnu.org/software/dico/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; longDescription = '' diff --git a/pkgs/by-name/di/distrobuilder/nixos-generator.patch b/pkgs/by-name/di/distrobuilder/nixos-generator.patch index 44e668dfb552..bb32e11c00c7 100644 --- a/pkgs/by-name/di/distrobuilder/nixos-generator.patch +++ b/pkgs/by-name/di/distrobuilder/nixos-generator.patch @@ -1,6 +1,6 @@ -diff --git c/distrobuilder/lxc.generator w/distrobuilder/lxc.generator -index 5f854d3..927f2df 100644 ---- c/distrobuilder/lxc.generator +diff --git i/distrobuilder/lxc.generator w/distrobuilder/lxc.generator +index f7692af..f617b89 100644 +--- i/distrobuilder/lxc.generator +++ w/distrobuilder/lxc.generator @@ -16,16 +16,6 @@ is_lxc_privileged_container() { grep -qw 4294967295$ /proc/self/uid_map @@ -166,3 +166,12 @@ index 5f854d3..927f2df 100644 # Allow masking units created by the lxc system-generator. for d in /etc/systemd/system /usr/lib/systemd/system /lib/systemd/system; do if ! [ -d "${d}" ]; then +@@ -247,7 +176,7 @@ if [ "${SYSTEMD}" -ge 258 ]; then + cat <<-EOF > /run/systemd/system/console-getty.service.d/override.conf + [Service] + ExecStart= +- ExecStart=-/sbin/agetty -o '-- \\\\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 console ++ ExecStart=-/run/current-system/sw/bin/agetty -o '-- \\\\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 console + StandardInput=null + StandardOutput=null + EOF diff --git a/pkgs/by-name/di/distrobuilder/package.nix b/pkgs/by-name/di/distrobuilder/package.nix index d2f30a70d03b..676a891d4e84 100644 --- a/pkgs/by-name/di/distrobuilder/package.nix +++ b/pkgs/by-name/di/distrobuilder/package.nix @@ -35,15 +35,15 @@ let in buildGoModule (finalAttrs: { pname = "distrobuilder"; - version = "3.2"; + version = "3.3.1"; - vendorHash = "sha256-nlqapWxuSZlbt22F3Y9X1uXFxJHvEoUBZDl078x8ZnA="; + vendorHash = "sha256-7dYfY6u8URJDMADY6yTW2SjOeSiRwqIh7oxUup6BHMg="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; - tag = "distrobuilder-${finalAttrs.version}"; - sha256 = "sha256-aDCx2WGAKdTNf0uMzwxG0AUmbuuWBFPYzNyycKklYOY="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-l9HtpeG4BSN9saDsNaF9uyOJbHGyLN0PwJ728IJfN/s="; }; buildInputs = bins; @@ -57,6 +57,12 @@ buildGoModule (finalAttrs: { ] ++ bins; + # upstream only supports make targets due to GOFLAGS, but none of the targets work for us + # this could be fragile, but the alternative is copying them here + preBuild = '' + export GOFLAGS="$(grep 'export GOFLAGS' Makefile | sed 's/export GOFLAGS=//') -trimpath" + ''; + postInstall = '' wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins} ''; @@ -74,6 +80,7 @@ buildGoModule (finalAttrs: { meta = { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; + changelog = "https://github.com/lxc/distrobuilder/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; teams = [ lib.teams.lxc ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index 391b24b27f08..e851036fbafa 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -113,6 +113,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { homepage = "https://www.fail2ban.org/"; description = "Program that scans log files for repeated failing login attempts and bans IP addresses"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 00fe283c9c45..f14cd75e2c04 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.fluidsynth.org"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ - lovek323 guylamar2006 ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 8c2e8e005ebd..0627d0b65bc5 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -42,7 +42,7 @@ glslang, hwdata, stb, - wlroots_0_17, + wlroots_0_18, libdecor, lcms, lib, @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers ] ++ lib.optionals enableExecutable ( - wlroots_0_17.buildInputs + wlroots_0_18.buildInputs ++ [ # gamescope uses a custom wlroots branch libxcomposite diff --git a/pkgs/by-name/gi/ginac/package.nix b/pkgs/by-name/gi/ginac/package.nix index d67f294402bb..1021b935e875 100644 --- a/pkgs/by-name/gi/ginac/package.nix +++ b/pkgs/by-name/gi/ginac/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GiNaC C++ library for symbolic manipulations"; homepage = "https://www.ginac.de/"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; license = lib.licenses.gpl2; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index d73ac866477c..933f26a2894e 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.23.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-p0XKjQhw0c40+m6QevMnHLaknKYc8Qf6WhTKLkPORP0="; + hash = "sha256-Zt4PG3pWJ0h22fBJnsIVqcSk2BwwuOHdmSOrAMENN70="; }; vendorHash = "sha256-tlAex6SFTprJtpMexMjAUNanamqraHYJuwtABx52rWQ="; diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index c9f8ba26d34b..44b9c0f87d1b 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -374,7 +374,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/glib"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ - lovek323 raskin ]; teams = [ lib.teams.gnome ]; diff --git a/pkgs/by-name/go/goreplay/package.nix b/pkgs/by-name/go/goreplay/package.nix index d1c033d9b143..7ec6997e7301 100644 --- a/pkgs/by-name/go/goreplay/package.nix +++ b/pkgs/by-name/go/goreplay/package.nix @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/buger/goreplay"; license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; mainProgram = "goreplay"; }; }) diff --git a/pkgs/by-name/gr/grc/package.nix b/pkgs/by-name/gr/grc/package.nix index 0e27a537686b..4ddd21ce51e3 100644 --- a/pkgs/by-name/gr/grc/package.nix +++ b/pkgs/by-name/gr/grc/package.nix @@ -54,7 +54,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ azahi - lovek323 peterhoeg ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gt/gtk2/package.nix b/pkgs/by-name/gt/gtk2/package.nix index 18db8a17783d..3f05469c1afc 100644 --- a/pkgs/by-name/gt/gtk2/package.nix +++ b/pkgs/by-name/gt/gtk2/package.nix @@ -164,7 +164,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ - lovek323 raskin ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index fc800e8bff86..2a63d6d1f9e7 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-12-18"; + version = "0.1-unstable-2026-02-19"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690"; - hash = "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ="; + rev = "918f266dddae39fa4184a1b8bf51ec5381cf29f7"; + hash = "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; diff --git a/pkgs/by-name/ir/irssi/package.nix b/pkgs/by-name/ir/irssi/package.nix index a31f93863f41..f6e3b47d1956 100644 --- a/pkgs/by-name/ir/irssi/package.nix +++ b/pkgs/by-name/ir/irssi/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ fab - lovek323 ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/js/json_c/package.nix b/pkgs/by-name/js/json_c/package.nix index 44fe5db5ba5e..9cddf3fa93dc 100644 --- a/pkgs/by-name/js/json_c/package.nix +++ b/pkgs/by-name/js/json_c/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/json-c/json-c/wiki"; changelog = "https://github.com/json-c/json-c/blob/${finalAttrs.src.rev}/ChangeLog"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index 9b3e6a8aee35..25fafa78cf2d 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "lakectl"; - version = "1.77.0"; + version = "1.78.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-PGOCDWyocj91po7vL6IOwUGNzWERv0rwEAYp6LK2E30="; + hash = "sha256-jap9xErA4WzP7p6TASG1lxdFTBWHletvyrhJ/9RXa/I="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-a37Cv7Wcf74hscMxVvZ7g6zZgBTqz/0wmSNamExM/Tc="; + vendorHash = "sha256-6XOJBDdAERD6mcneQ7UFqAPGq+pXroNlzQGNvycpVBc="; ldflags = [ "-s" diff --git a/pkgs/by-name/li/libgsf/package.nix b/pkgs/by-name/li/libgsf/package.nix index 6d073e648605..aede43ff621f 100644 --- a/pkgs/by-name/li/libgsf/package.nix +++ b/pkgs/by-name/li/libgsf/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/libgsf"; changelog = "https://gitlab.gnome.org/GNOME/libgsf/-/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.lgpl21Only; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; longDescription = '' diff --git a/pkgs/by-name/li/libmad/package.nix b/pkgs/by-name/li/libmad/package.nix index de7aa13cb928..e2f1cf59cc2e 100644 --- a/pkgs/by-name/li/libmad/package.nix +++ b/pkgs/by-name/li/libmad/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sourceforge.net/projects/mad/"; description = "High-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libmikmod/package.nix b/pkgs/by-name/li/libmikmod/package.nix index f16a9286fe24..4666ed47a7da 100644 --- a/pkgs/by-name/li/libmikmod/package.nix +++ b/pkgs/by-name/li/libmikmod/package.nix @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "libmikmod-config"; homepage = "https://mikmod.shlomifish.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ - lovek323 + maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libmpack/package.nix b/pkgs/by-name/li/libmpack/package.nix index 8a64dd0e3f7e..3e50880ecde5 100644 --- a/pkgs/by-name/li/libmpack/package.nix +++ b/pkgs/by-name/li/libmpack/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple implementation of msgpack in C"; homepage = "https://github.com/tarruda/libmpack/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/li/liboil/package.nix b/pkgs/by-name/li/liboil/package.nix index 787a893e6abc..1d9789a75a9c 100644 --- a/pkgs/by-name/li/liboil/package.nix +++ b/pkgs/by-name/li/liboil/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "oil-bugreport"; homepage = "https://liboil.freedesktop.org"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/li/libsamplerate/package.nix b/pkgs/by-name/li/libsamplerate/package.nix index 2840f7b39beb..7064c788bcf2 100644 --- a/pkgs/by-name/li/libsamplerate/package.nix +++ b/pkgs/by-name/li/libsamplerate/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Sample Rate Converter for audio"; homepage = "https://libsndfile.github.io/libsamplerate/"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.all; # Linker is unhappy with the `.def` file. broken = stdenv.hostPlatform.isMinGW; diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix index cb3297ee0902..18beb16107b4 100644 --- a/pkgs/by-name/li/libsndfile/package.nix +++ b/pkgs/by-name/li/libsndfile/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libsndfile.github.io/libsndfile/"; changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.all; longDescription = '' diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix index c6068d05b232..c946cb1013d7 100644 --- a/pkgs/by-name/li/libxcb-cursor/package.nix +++ b/pkgs/by-name/li/libxcb-cursor/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { description = "XCB port of libxcursor"; homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"; license = lib.licenses.x11; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; pkgConfigModules = [ "xcb-cursor" ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 3d88c5900e66..edded182be56 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,19 +14,19 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.147.1"; + version = "1.148.0"; pyproject = true; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-PD+XyUk1DyhqQ100uJYwXdT6FjhRXuafajH0TM8zJOI="; + hash = "sha256-MQOjuVBxwOKO11wc/FafqndI0QgZT3jaigpjRsJXxRA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-nB7gLPDK8sB65xZkTn5W4MCqx4QwWKDUr8hB8KIu0qY="; + hash = "sha256-LKO4Qa81AeUxEcUdvm43Bc8ANJJqtYEv5ucV0743yy0="; }; build-system = diff --git a/pkgs/by-name/mp/mpdcron/package.nix b/pkgs/by-name/mp/mpdcron/package.nix index 8b74a4eb86a8..d158d4a91f75 100644 --- a/pkgs/by-name/mp/mpdcron/package.nix +++ b/pkgs/by-name/mp/mpdcron/package.nix @@ -63,8 +63,7 @@ stdenv.mkDerivation { homepage = "http://alip.github.io/mpdcron/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - lovek323 + maintainers = [ ]; }; } diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix index deb4fa6a1d90..b52d07f5a2d4 100644 --- a/pkgs/by-name/nc/ncmpcpp/package.nix +++ b/pkgs/by-name/nc/ncmpcpp/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ koral - lovek323 ]; platforms = lib.platforms.all; mainProgram = "ncmpcpp"; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 5e59d3204026..a4331bbe8679 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -29,13 +29,13 @@ lndir, }: let - version = "2.20.7"; + version = "2.20.8"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-NVlV+iHtUx05EIuHx/WePRf558DH977oZ7C8iNW0QR4="; + hash = "sha256-P+yZfCEdSDwThE48loJ234scTjfZ+wlgqO8Ecl503BI="; }; python = python3.override { diff --git a/pkgs/by-name/po/portaudio/package.nix b/pkgs/by-name/po/portaudio/package.nix index 48e6a2883533..0da5ab231b15 100644 --- a/pkgs/by-name/po/portaudio/package.nix +++ b/pkgs/by-name/po/portaudio/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.portaudio.com/"; # Not exactly a bsd license, but alike license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index b3d89964854b..d73c4bfd38c2 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -57,13 +57,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; - version = "4.9.7-unstable-2025-12-28"; + version = "4.9.9"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; - rev = "7ea4e95508a7898bc63c3b5e1588066184d4c79b"; - hash = "sha256-pj6YQc7e4I6XvGq/uGGq2z/UhAs3ZeKrsJd8oLWjauA="; + tag = finalAttrs.version; + hash = "sha256-HFq3oYz6KQcq3P92bTg2O5XFtZZcZBfiCOOJSfnV1ro="; }; postPatch = '' @@ -74,9 +74,6 @@ stdenv.mkDerivation (finalAttrs: { -e 's/Icon=.*qemu.svg/Icon=qemu/' \ -e 's,\[ -x "\$(command -v smbd)" \],true,' \ quickemu - - substituteInPlace quickemu \ - --replace-fail 'readonly VERSION="4.9.8"' 'readonly VERSION="${finalAttrs.version}"' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index d69310d26e7f..7d105488af7f 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "saga"; - version = "9.11.1"; + version = "9.11.3"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; - hash = "sha256-cNk6/IcgqLgOrw2LaeM97pydFwLmDL6Mr169pjBNYDE="; + hash = "sha256-eBjsmF0hzaDRpC3xbuQhbxFKN2r6IQgqwG2/KshjChA="; }; sourceRoot = "saga-${finalAttrs.version}/saga-gis"; diff --git a/pkgs/by-name/sc/scss-lint/package.nix b/pkgs/by-name/sc/scss-lint/package.nix index 9957fe44cfcd..99050ed45ac4 100644 --- a/pkgs/by-name/sc/scss-lint/package.nix +++ b/pkgs/by-name/sc/scss-lint/package.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "https://github.com/brigade/scss-lint"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - lovek323 nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/sd/sdcv/package.nix b/pkgs/by-name/sd/sdcv/package.nix index 5fc3ce0d999d..6545f22be100 100644 --- a/pkgs/by-name/sd/sdcv/package.nix +++ b/pkgs/by-name/sd/sdcv/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://dushistov.github.io/sdcv/"; description = "Console version of StarDict"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; license = lib.licenses.gpl2; platforms = lib.platforms.unix; mainProgram = "sdcv"; diff --git a/pkgs/by-name/sh/shishi/package.nix b/pkgs/by-name/sh/shishi/package.nix index 71b3c96b2477..7b826ca7bba0 100644 --- a/pkgs/by-name/sh/shishi/package.nix +++ b/pkgs/by-name/sh/shishi/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/shishi/"; description = "Implementation of the Kerberos 5 network security system"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix index 4ad3f3d36339..85ca54ef16ef 100644 --- a/pkgs/by-name/sp/spicedb/package.nix +++ b/pkgs/by-name/sp/spicedb/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "spicedb"; - version = "1.48.0"; + version = "1.49.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-m0Om+Wil8ig6t8w5IDmfrx8N/Uugn3PayoFJD0xq9OQ="; + hash = "sha256-FqgNtHh2eDy48uFWMmqjpVnrGHBUEM+CG3ukkPhEOqY="; }; - vendorHash = "sha256-kA4Smkc88vYgR4B7DdqQc5dkzywDXTbYwmRRZYDcg0c="; + vendorHash = "sha256-wK5GDMkWesWRO5J2M5ambZShAw7b4U0+/lmAgXn8Ags="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" diff --git a/pkgs/by-name/st/stfl/package.nix b/pkgs/by-name/st/stfl/package.nix index ef8e8b5b191a..7334b5ba4d7d 100644 --- a/pkgs/by-name/st/stfl/package.nix +++ b/pkgs/by-name/st/stfl/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = "https://web.archive.org/web/20211113222004/http://www.clifford.at/stfl/"; description = "Library which implements a curses-based widget set for text terminals"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; license = lib.licenses.lgpl3; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 2ad9ab51c95b..6646c5140edd 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -18,7 +18,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "17.1.8"; + version = "17.2.1"; inherit nodejs; @@ -26,7 +26,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-76rgW97ElM/6Sy3JwmrqA+nV5ONWqYBoK1uK+UEYf24="; + hash = "sha256-yt3HXOhpy2uzzpFInZbTHCWA9LfHB2bqEFCHzHwIv70="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -69,7 +69,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-epDGYONJgLJsNG0f6GiIbXwoPdjAsLGGQa0giPiBMYs="; + hash = "sha256-hNmM8Ln0klZBnC5TwtL7Bog82MlC4D0sCb9+uMqB0D0="; } ); diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index d313199cb683..a851e34dcb65 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-XNy4VO9sdh1RoqYPPuE/NaiYRaxbtPd7M6YhaIzH2ho="; + hash = "sha256-833iKblvIwMADXvzpJS8z2y+3b0puvyw3IFilrlylk8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index e738edb61638..b5aa5b0ca575 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "url-parser"; - version = "2.1.13"; + version = "2.1.14"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${finalAttrs.version}"; - hash = "sha256-/eu3smf3CeAO+cwhKTL0DB7UVJJ4AJjFjZbNyBbwIZg="; + hash = "sha256-jTytdeIAU59DjtFT2eOx9Tf1hZcWYRVOD577mAfx2Ag="; }; - vendorHash = "sha256-bcMcooi5dYWs5bIOwSC/rOeb3+FBSFnWjaflTeaA4OU="; + vendorHash = "sha256-cs1dPW2AYdSM786Ei7Zle/audU2o866vDIhpOzWdMkI="; ldflags = [ "-s" diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 216ea9e87055..42a395edfa13 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.26.1"; + version = "0.26.4"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-HyclcItaSsBhzyYM9sgloSG6TBWvsUkRs+oIPezvO0E="; + hash = "sha256-hsuLerOQONc2CMywQWKO8wbFMf2lVQlF0eEx3O6oD7s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/valdi/package.nix b/pkgs/by-name/va/valdi/package.nix index d36d6d38e127..c43ebd9b4dc1 100644 --- a/pkgs/by-name/va/valdi/package.nix +++ b/pkgs/by-name/va/valdi/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "valdi"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "Snapchat"; repo = "Valdi"; - rev = "592fc9d13065022fc7da1f0c07928f1764062074"; - hash = "sha256-B0j4R07M9/nTf0RxnKEfv84B5Xh41cWLz9VgV9O4+VA="; + rev = "57fba0055df5351fa5019168fa164b6e80ed7816"; + hash = "sha256-vduG/WPhh6zRC5JACav2FPQQZHhdFHfo3wsnncgfFvE="; }; sourceRoot = "${src.name}/npm_modules/cli"; - npmDepsHash = "sha256-LGgyMdhDQ4UwdtENZT/89yiQawn8SxKdth/p7evDAgk="; + npmDepsHash = "sha256-h1DuH8HE5T7mEBQKlegbqkvRQSx3yEFJhcNVHh5Uo6Y="; meta = { description = "Cross-platform UI framework CLI by Snapchat"; diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix index ab466cabed16..cdc83367027b 100644 --- a/pkgs/by-name/vi/vikunja-desktop/package.nix +++ b/pkgs/by-name/vi/vikunja-desktop/package.nix @@ -15,12 +15,12 @@ let executableName = "vikunja-desktop"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-xxfn3UoKreRDRC5GR7pLL8gkBLe6VmBYdps9eFc5c3g="; + hash = "sha256-EfAhJq2LPuCF8Pwyg0TYqSjNCaG15iZ2paDLfA6JI5w="; }; in stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmInstallFlags ; fetcherVersion = 1; - hash = "sha256-mzrck/JdfN3Qu+xhf/iM4HFamVmQkVSwUwU2KBK5XsA="; + hash = "sha256-9KPQaRLep4n+2b9mk8KQoK22zdlMFrCb1VT6SEHxanQ="; }; env = { diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index b88b3d9d4a6c..10bf66ed8a78 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -14,12 +14,12 @@ }: let - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-xxfn3UoKreRDRC5GR7pLL8gkBLe6VmBYdps9eFc5c3g="; + hash = "sha256-EfAhJq2LPuCF8Pwyg0TYqSjNCaG15iZ2paDLfA6JI5w="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -37,7 +37,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 1; - hash = "sha256-NrysokKNmKAUdiC0o4qEPvsHr7KH7mMrcrEjxwmgb+g="; + hash = "sha256-ME9sGKGRY3vaOTFwbFyzsDT20HnEnrfq3Z5nrL19k0A="; }; nativeBuildInputs = [ @@ -97,7 +97,7 @@ buildGoModule { mage ]; - vendorHash = "sha256-PV6WlJlG839FtWUR6QONMuuBnmo+AA53xmUNbodQdzk="; + vendorHash = "sha256-VLy5yybeueVEjb9SijYPQnXoTz7lxBksHTzBxt+TdG4="; inherit frontend; diff --git a/pkgs/by-name/vk/vkdt/package.nix b/pkgs/by-name/vk/vkdt/package.nix index 02935d80b1f3..22ab9fb1b9e7 100644 --- a/pkgs/by-name/vk/vkdt/package.nix +++ b/pkgs/by-name/vk/vkdt/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/hanatos/vkdt/releases/download/${version}/vkdt-${version}.tar.xz"; - hash = "sha256-+oVPZRI01IxMSPXOjvUXJutYXftQM7GxwVLG8wqoaY4="; + hash = "sha256-oLJ5IlWOJoe2vUBaI9nyAhfjuw/lF63ZCdhMSF5D0pE="; }; cargoRoot = "src/pipe/modules/i-raw/rawloader-c"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version; inherit src cargoRoot; - hash = "sha256-DTC9I4y01bofjgjuGn5asyxhin1yrO6JlASGZtq8z60="; + hash = "sha256-8+gJVe9A1w9VlQpKjVnO/ZX44GKvh4yXKlGf4HqyW2M="; }; strictDeps = true; @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "prefix=" + "VKDT_USE_MCRAW=false" # TODO: support mcraw ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/we/weathr/package.nix b/pkgs/by-name/we/weathr/package.nix new file mode 100644 index 000000000000..693d018b22ce --- /dev/null +++ b/pkgs/by-name/we/weathr/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "weathr"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "veirt"; + repo = "weathr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BaG8K17RNuswtGx74CEBzMKjFMaNW0RZ5FjM3EfSVTE="; + }; + + cargoHash = "sha256-xIjFleANgzoTS+4Yky+mvtX1IeU6IdaH1YuB8W8bYIo="; + + # These test fail due to internet access requirement + checkFlags = [ + "--skip=test_cache_invalidation" + "--skip=test_weather_client_integration_cache_behavior" + "--skip=test_weather_client_integration_cache_invalidation" + "--skip=test_weather_client_integration_realistic_weather_ranges" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { + description = "Terminal weather app with ascii animation"; + homepage = "https://github.com/veirt/weathr"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ + sudo-mac + phanirithvij + ]; + mainProgram = "weathr"; + }; +}) diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix index 622b9e4b6714..57e100c0b306 100644 --- a/pkgs/by-name/xv/xvidcore/package.nix +++ b/pkgs/by-name/xv/xvidcore/package.nix @@ -73,9 +73,7 @@ stdenv.mkDerivation (finalAttrs: { description = "MPEG-4 video codec for PC"; homepage = "https://www.xvid.com/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ - lovek323 - ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 13eed9ff34e1..049afee9bb99 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "yggdrasil"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${finalAttrs.version}"; - hash = "sha256-NlNQnYmK//p35pj2MInD6RVsajM/bGDhOuzOZZYoWRw="; + hash = "sha256-L4eNrytAklblRrAQPf4zzgvrtHaZWmpTMcOLwkKMPCc="; }; - vendorHash = "sha256-xZpUWIR3xTjhhNSwPoHx7GLUgcZJrWfF0FMExlluBmg="; + vendorHash = "sha256-z09K/ZDw9mM7lfqeyZzi0WRSedzgKED0Sywf1kJXlDk="; subPackages = [ "cmd/genkeys" diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 965a83747ae2..0308a3135396 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://developer-old.gnome.org/ORBit2/"; description = "CORBA 2.4-compliant Object Request Broker"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; longDescription = '' ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix index ac4c4fbacd7f..e146f1d896b8 100644 --- a/pkgs/development/compilers/llvm/common/lldb/default.nix +++ b/pkgs/development/compilers/llvm/common/lldb/default.nix @@ -156,15 +156,24 @@ stdenv.mkDerivation ( fi ''; - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : ''${!outputLib}/${python3.sitePackages}/ + postInstall = + let + # Needed after https://github.com/llvm/llvm-project/commit/5f0f0fcd62227fb864203acc1a57e3ebf7a254a3 + packageJsonPath = + if lib.versionAtLeast release_version "22" then + "../tools/${vscodeExt.name}/extension/package.json" + else + "../tools/${vscodeExt.name}/package.json"; + in + '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : ''${!outputLib}/${python3.sitePackages}/ - # Editor support - # vscode: - install -D ../tools/${vscodeExt.name}/package.json $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin - ln -s $out/bin/*${vscodeExt.name} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin - ''; + # Editor support + # vscode: + install -D ${packageJsonPath} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin + ln -s $out/bin/*${vscodeExt.name} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin + ''; passthru.vscodeExtName = vscodeExt.name; passthru.vscodeExtPublisher = "llvm"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 49c0852c3236..eaf7cf401709 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = with lib.maintainers; [ - lovek323 artturin ]; teams = [ lib.teams.gnome ]; diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 9eaa4a2ab272..84d4e018aefb 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "26.0.0"; + version = "26.0.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-CUJi0qWmxjC6MxmXDKrza6bOjYwbh//NcTTI2Z165lI="; + hash = "sha256-t9IDsEikGvQWxJ7SCIwRGUaoxtlG0s633J1/dmrIr6c="; }; meta = { diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix index ee82d7458730..7353f68357ab 100644 --- a/pkgs/development/libraries/pangomm/2.42.nix +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { lgpl21 ]; maintainers = with lib.maintainers; [ - lovek323 raskin ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index bcaee631a005..3cc2d8a93b28 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://www.pango.org/"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ - lovek323 raskin ]; teams = [ lib.teams.gnome ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index c572f36ced93..7e2c5f652a14 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { lgpl21 ]; maintainers = with lib.maintainers; [ - lovek323 raskin ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 5756580d1680..d59d4fcb5c57 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -27,6 +27,7 @@ libliftoff, libdisplay-info, lcms2, + evdev-proto, nixosTests, testers, @@ -88,7 +89,6 @@ let libliftoff libdisplay-info libGL - libcap libxkbcommon libgbm pixman @@ -102,10 +102,18 @@ let libxcb-render-util libxcb-wm ] + ++ lib.optional stdenv.hostPlatform.isLinux libcap + ++ lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; - mesonFlags = lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"; + mesonFlags = [ + (lib.mesonEnable "xwayland" finalAttrs.enableXWayland) + ] + # The other allocator, udmabuf, is a linux-specific API + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + (lib.mesonOption "allocators" "gbm") + ]; postFixup = '' # Install ALL example programs to $examples: @@ -136,7 +144,7 @@ let inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ synthetica wineee diff --git a/pkgs/development/ocaml-modules/curl/default.nix b/pkgs/development/ocaml-modules/curl/default.nix new file mode 100644 index 000000000000..4750685328b7 --- /dev/null +++ b/pkgs/development/ocaml-modules/curl/default.nix @@ -0,0 +1,34 @@ +{ + buildDunePackage, + pkg-config, + dune-configurator, + fetchurl, + lib, + curl, +}: + +buildDunePackage (finalAttrs: { + pname = "curl"; + version = "0.10.0"; + minimalOCamlVersion = "4.11"; + src = fetchurl { + url = "https://github.com/ygrek/ocurl/releases/download/${finalAttrs.version}/curl-${finalAttrs.version}.tbz"; + hash = "sha256-wU4hX9p/lCkqdY2a6Q97y8IVZMkZGQBkAR/M3PehKRQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + curl + ]; + + checkInputs = [ ]; + doCheck = true; + + meta = { + description = "Bindings to libcurl"; + homepage = "https://ygrek.org/p/ocurl/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vog ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/curl/lwt.nix b/pkgs/development/ocaml-modules/curl/lwt.nix new file mode 100644 index 000000000000..2bed9772d809 --- /dev/null +++ b/pkgs/development/ocaml-modules/curl/lwt.nix @@ -0,0 +1,23 @@ +{ + buildDunePackage, + curl, + lib, + lwt, +}: + +buildDunePackage (finalAttrs: { + pname = "curl_lwt"; + inherit (curl) version src; + + propagatedBuildInputs = [ + curl + lwt + ]; + + checkInputs = [ ]; + doCheck = true; + + meta = curl.meta // { + description = "Bindings to libcurl (lwt variant)"; + }; +}) diff --git a/pkgs/development/ocaml-modules/gdal/default.nix b/pkgs/development/ocaml-modules/gdal/default.nix new file mode 100644 index 000000000000..4dc5e7b71a4f --- /dev/null +++ b/pkgs/development/ocaml-modules/gdal/default.nix @@ -0,0 +1,34 @@ +{ + buildDunePackage, + ctypes-foreign, + fetchurl, + gdal, + lib, +}: + +buildDunePackage (finalAttrs: { + pname = "gdal"; + version = "0.11.0"; + src = fetchurl { + url = "https://github.com/ocaml-gdal/ocaml-gdal/archive/refs/tags/v${finalAttrs.version}.tar.gz"; + hash = "sha256-fW6bX4cv8eW2dsbv0SaeQwRpuPWB0mGzokQVjCaA8Z8="; + }; + postPatch = '' + substituteInPlace src/lib.ml \ + --replace-fail '"libgdal.so"' '"${gdal}/lib/libgdal.so"' + ''; + + propagatedBuildInputs = [ + ctypes-foreign + gdal + ]; + + doCheck = true; + + meta = { + description = "OCaml GDAL and OGR bindings"; + homepage = "https://github.com/ocaml-gdal/ocaml-gdal"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vog ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 625e59ff5bb5..aed74a0360bf 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - description = "OCaml bindings to libcurl"; + description = "OCaml bindings to libcurl (deprecated)"; license = lib.licenses.mit; homepage = "http://ygrek.org.ua/p/ocurl/"; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/ocaml-modules/pgx/default.nix b/pkgs/development/ocaml-modules/pgx/default.nix new file mode 100644 index 000000000000..97ae2ff1d30a --- /dev/null +++ b/pkgs/development/ocaml-modules/pgx/default.nix @@ -0,0 +1,45 @@ +{ + alcotest, + buildDunePackage, + camlp-streams, + fetchurl, + hex, + ipaddr, + lib, + ppx_compare, + ppx_custom_printf, + ppx_sexp_conv, + re, + uuidm, +}: + +buildDunePackage (finalAttrs: { + pname = "pgx"; + version = "2.3"; + minimalOCamlVersion = "4.08"; + src = fetchurl { + url = "https://github.com/pgx-ocaml/pgx/archive/refs/tags/${finalAttrs.version}.tar.gz"; + hash = "sha256-Rp9PXsWI4cBc1YHD7uqKATrRt5tgNJowbaAFg1aeVKM="; + }; + + propagatedBuildInputs = [ + camlp-streams + hex + ipaddr + ppx_compare + ppx_custom_printf + ppx_sexp_conv + re + uuidm + ]; + + checkInputs = [ alcotest ]; + doCheck = true; + + meta = { + description = "Pure-OCaml PostgreSQL client library"; + homepage = "https://github.com/pgx-ocaml/pgx"; + license = lib.licenses.lgpl2Only; + maintainers = [ lib.maintainers.vog ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/pgx/eio.nix b/pkgs/development/ocaml-modules/pgx/eio.nix new file mode 100644 index 000000000000..18a0f2126b65 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgx/eio.nix @@ -0,0 +1,29 @@ +{ + alcotest, + base64, + buildDunePackage, + eio, + eio_main, + pgx, +}: + +buildDunePackage (finalAttrs: { + pname = "pgx_eio"; + inherit (pgx) version src; + + propagatedBuildInputs = [ + eio + pgx + ]; + + checkInputs = [ + alcotest + base64 + eio_main + ]; + doCheck = true; + + meta = pgx.meta // { + description = "Pgx using Eio for IO"; + }; +}) diff --git a/pkgs/development/ocaml-modules/pgx/lwt.nix b/pkgs/development/ocaml-modules/pgx/lwt.nix new file mode 100644 index 000000000000..55531389c535 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgx/lwt.nix @@ -0,0 +1,23 @@ +{ + buildDunePackage, + logs, + lwt, + pgx, +}: + +buildDunePackage (finalAttrs: { + pname = "pgx_lwt"; + inherit (pgx) version src; + + propagatedBuildInputs = [ + logs + lwt + pgx + ]; + + doCheck = true; + + meta = pgx.meta // { + description = "Pgx using Lwt for IO"; + }; +}) diff --git a/pkgs/development/ocaml-modules/pgx/lwt_unix.nix b/pkgs/development/ocaml-modules/pgx/lwt_unix.nix new file mode 100644 index 000000000000..b9fdb01d85c5 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgx/lwt_unix.nix @@ -0,0 +1,24 @@ +{ + alcotest-lwt, + base64, + buildDunePackage, + pgx, + pgx_lwt, +}: + +buildDunePackage (finalAttrs: { + pname = "pgx_lwt_unix"; + inherit (pgx) version src; + + propagatedBuildInputs = [ pgx_lwt ]; + + checkInputs = [ + alcotest-lwt + base64 + ]; + doCheck = true; + + meta = pgx.meta // { + description = "Pgx using Lwt and Unix libraries for IO"; + }; +}) diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 71f90ae67c07..fb297754b330 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -27,16 +27,16 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "botorch"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "botorch"; - tag = "v${version}"; - hash = "sha256-8tmNw1Qa3lXxvndljRijGNN5RMjsYlT8zFFau23yp1U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NDdXsmVdrTEXMXXVf89EkGXVOYnEcXwtzarB5niTNaw="; }; build-system = [ @@ -102,10 +102,10 @@ buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; meta = { - changelog = "https://github.com/meta-pytorch/botorch/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/meta-pytorch/botorch/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Bayesian Optimization in PyTorch"; homepage = "https://botorch.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 14b3f5ab212e..3efefe5656e4 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -8,7 +8,6 @@ librouteros, mako, packaging, - passlib, pyyaml, requests, setuptools, @@ -19,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "bundlewrap"; - version = "4.24.0"; + version = "5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "bundlewrap"; repo = "bundlewrap"; tag = finalAttrs.version; - hash = "sha256-ayLceqYZC4cNuz9C6v2+W2TuiGWQeLMssbvwZ0N0n78="; + hash = "sha256-kU76WvT4VE/78HTMjByoDHgkrg/5MlS5vnc6z6lAANw="; }; build-system = [ setuptools ]; @@ -37,7 +36,6 @@ buildPythonPackage (finalAttrs: { jinja2 mako packaging - passlib pyyaml requests tomlkit diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 84eeceeeb9c9..1c45e6152ee3 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://nedbatchelder.com/code/cog"; changelog = "https://github.com/nedbat/cog/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 033ead543807..56fdbb9cc594 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/nicfit/eyeD3"; homepage = "https://eyed3.nicfit.net/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; longDescription = '' eyeD3 is a Python module and command line program for processing ID3 diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index c15988dbd5c4..7a5549113695 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { mainProgram = "faker"; homepage = "http://faker.rtfd.org"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 61ecabf3b925..c0c97a5849e6 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { homepage = "https://github.com/PyFilesystem/pyfilesystem2"; changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 1e2eb55fe82b..41df6ade307c 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -20,7 +20,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gpytorch"; version = "1.15.1"; pyproject = true; @@ -28,10 +28,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cornellius-gp"; repo = "gpytorch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ftiAY02K0EwVQZufk8xR+/21A+2ONWchuWPF3a5lRW0="; }; + # AttributeError: module 'numpy' has no attribute 'trapz' + postPatch = '' + substituteInPlace gpytorch/kernels/spectral_mixture_kernel.py \ + --replace-fail \ + "np.trapz(emp_spect, freq)" \ + "np.trapezoid(emp_spect, freq)" + ''; + build-system = [ setuptools setuptools-scm @@ -73,8 +81,8 @@ buildPythonPackage rec { description = "Highly efficient and modular implementation of Gaussian Processes, with GPU acceleration"; homepage = "https://gpytorch.ai"; downloadPage = "https://github.com/cornellius-gp/gpytorch"; - changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${src.tag}"; + changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index fdbf4f48199b..b66e11bc5f27 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -40,6 +40,6 @@ buildPythonPackage { description = "Library collecting some useful snippets"; homepage = "https://gitlab.com/hcs/hcs_utils"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index f08c690823ef..ad1c10a1b2ce 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -81,7 +81,6 @@ buildPythonPackage rec { license = lib.licenses.mit; mainProgram = "keyring"; maintainers = with lib.maintainers; [ - lovek323 dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d07dfb2c0254..3f737f14eef7 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -204,7 +204,6 @@ buildPythonPackage rec { bsd0 ]; maintainers = with lib.maintainers; [ - lovek323 veprbl ]; }; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 69caaedc1126..d90a1b89fbdc 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -8,6 +8,7 @@ attrs, yarl, # optional deps + base58, python-magic, python-olm, unpaddedbase64, @@ -46,6 +47,7 @@ buildPythonPackage rec { optional-dependencies = { detect_mimetype = [ python-magic ]; encryption = [ + base58 python-olm unpaddedbase64 pycryptodome diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index d76ec52cb8bf..a78d24afe9d2 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { homepage = "https://mpmath.org/"; description = "Pure-Python library for multiprecision floating arithmetic"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix index 894b71e0712f..630155548bdb 100644 --- a/pkgs/development/python-modules/notobuilder/default.nix +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -21,14 +21,14 @@ buildPythonPackage { pname = "notobuilder"; - version = "0-unstable-2026-01-30"; + version = "0-unstable-2026-02-25"; pyproject = true; src = fetchFromGitHub { owner = "notofonts"; repo = "notobuilder"; - rev = "0fa2bd755e02d57630d1f5ff7cda965454e68022"; - hash = "sha256-ZqB/jv3KwRIiZST2Ghe3DLxnfeRDpx83LooCAdYwh5E="; + rev = "5c15f266be1f24587adad807e2f1f3ff9ff537a8"; + hash = "sha256-Tw1riTHORtIpOq8PjSspIR044TBupYgXkI8fBiBkgJI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 3d18bdbfb804..5259b70f5937 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "paver"; homepage = "https://github.com/paver/paver"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 40cdf546bc36..b3e112a03267 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.12.1"; + version = "1.12.2"; pyproject = true; src = fetchFromGitHub { owner = "psd-tools"; repo = "psd-tools"; tag = "v${version}"; - hash = "sha256-FmxxLa9KasDE5hl/Hi6fRMnmUKawpm04fHJf7yXJmSI="; + hash = "sha256-YasCeRl9oF0ES1E9D7WXCOFTGKhQZltu7EPu6llndrM="; }; build-system = [ diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 4a7f17dced0d..77d23b4cb627 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/pync"; license = lib.licenses.mit; platforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 6641f4097222..ea3b98783ba1 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -100,7 +100,6 @@ let homepage = "https://docs.pytest.org"; changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; maintainers = with lib.maintainers; [ - lovek323 madjar ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index f1549f01001f..576bbb9cac06 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -40,13 +40,13 @@ }: let - version = "39.3.0"; + version = "39.3.1"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-IfHxm6T3tEMT35h8Fd0nvrhBmXdcghO+01+1MjmxMCk="; + hash = "sha256-MRMMPITyjpEvWuzbeM1wTsmuHIbDDbczbFulKmOeNcU="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index caa47fb8bde8..d43da3a34288 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index e787bf2decb9..d4a2cfadd22d 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -62,8 +62,7 @@ buildPythonPackage rec { mainProgram = "sip"; homepage = "https://riverbankcomputing.com/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - lovek323 + maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a06f80ce2a2f..ef1e4183e307 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { mainProgram = "isympy"; homepage = "https://www.sympy.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; teams = [ lib.teams.sage ]; }; } diff --git a/pkgs/development/python-modules/syne-tune/default.nix b/pkgs/development/python-modules/syne-tune/default.nix index c5cbaf7fc275..21645320fe63 100644 --- a/pkgs/development/python-modules/syne-tune/default.nix +++ b/pkgs/development/python-modules/syne-tune/default.nix @@ -36,7 +36,7 @@ ray, writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "syne-tune"; version = "0.15.0"; pyproject = true; @@ -44,17 +44,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "syne-tune"; repo = "syne-tune"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UNBpfC+aLXhkbyvCG2K00yedJnpYpfldqisZ/wDPtuA="; }; - postPatch = '' - substituteInPlace syne_tune/optimizer/schedulers/synchronous/hyperband.py \ - --replace-fail 'metric_val=np.NAN' 'metric_val=np.nan' - substituteInPlace syne_tune/optimizer/schedulers/synchronous/dehb.py \ - --replace-fail 'result_failed.metric_val = np.NAN' 'result_failed.metric_val = np.nan' - ''; - build-system = [ setuptools ]; @@ -108,12 +101,12 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ ray.optional-dependencies.tune - ++ optional-dependencies.blackbox-repository - ++ optional-dependencies.bore - ++ optional-dependencies.botorch - ++ optional-dependencies.gpsearchers - ++ optional-dependencies.kde - ++ optional-dependencies.sklearn; + ++ finalAttrs.passthru.optional-dependencies.blackbox-repository + ++ finalAttrs.passthru.optional-dependencies.bore + ++ finalAttrs.passthru.optional-dependencies.botorch + ++ finalAttrs.passthru.optional-dependencies.gpsearchers + ++ finalAttrs.passthru.optional-dependencies.kde + ++ finalAttrs.passthru.optional-dependencies.sklearn; disabledTests = [ # NameError: name 'HV' is not defined @@ -129,11 +122,6 @@ buildPythonPackage rec { "test_cholesky_factorization" ]; - disabledTestPaths = [ - # legacy test - "tst/schedulers/test_legacy_schedulers_api.py" - ]; - pythonImportsCheck = [ "syne_tune" ]; @@ -141,8 +129,8 @@ buildPythonPackage rec { meta = { description = "Large scale asynchronous hyperparameter and architecture optimization library"; homepage = "https://github.com/syne-tune/syne-tune"; - changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${src.tag}"; + changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ daspk04 ]; }; -} +}) diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix index 82c71552339d..c7e5298da2a8 100644 --- a/pkgs/development/python-modules/tyro/default.nix +++ b/pkgs/development/python-modules/tyro/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system hatchling, @@ -23,18 +24,19 @@ pydantic, pytestCheckHook, torch, + universal-pathlib, }: buildPythonPackage rec { pname = "tyro"; - version = "1.0.5"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "brentyi"; repo = "tyro"; tag = "v${version}"; - hash = "sha256-/6z3XDN5WdVPVfA1LckpIAUis3dNOwg5hobR2sHlocA="; + hash = "sha256-GTgbzGIIZrkMUgjqMWZVXRVhp9mcxfnDQ/dRApotjww="; }; build-system = [ hatchling ]; @@ -57,6 +59,20 @@ buildPythonPackage rec { pydantic pytestCheckHook torch + universal-pathlib + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + # Bash path completion relies on the programmable-completion builtin `compgen`, + # which is unavailable in the stdenv build shell. + "test_bash_path_completion_marker" + + # In Nix builds, the long `python -m pytest` argv[0] path gets line-wrapped in + # argparse error output, splitting `class-b` and `)` so this literal-match fails. + "test_similar_arguments_subcommands_multiple_contains_match" + + # Same wrapped-output literal-match issue as above for the cascading-args variant. + "test_similar_arguments_subcommands_multiple_contains_match_cascading" ]; pythonImportsCheck = [ "tyro" ]; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 1a0aec24a8d3..181102c6bd1a 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -207,6 +207,14 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${hipClang} $out/llvm ''; + # libamdhip64.so dlopens its own bare name for hipGetProcAddress symbol resolution. + # Add its own directory to its RPATH so it can find itself + # Must be in postFixup so it runs after patchelf --shrink-rpath which removes + # the apparently useless rpath + postFixup = '' + patchelf --add-rpath "$out/lib" "$out/lib/libamdhip64.so" + ''; + disallowedRequisites = [ gcc-unwrapped ]; diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 34e10fe37192..606d6fea7846 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,14 +1,14 @@ { - version = "2025.5"; + version = "2026.0"; # 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.5/$tool-2025.5.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command 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-2026.0/$tool-2026.0.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { - alfred = "sha256-dcEsHDw5zbIkb2H8pdTZ9h4kD+KCcSn6t6A97vhV/+g="; - batctl = "sha256-HgvNSfku7aDXa8aDVirfNmAk4u5MGZ+kAgNva5PLsUc="; - batman-adv = "sha256-GtvoI5kelxjjB/N2bqlkBf4fKEwZvLmMZi16H6oyTDU="; + alfred = "sha256-35EVL+Mftjd6JM6TEwRFlzUQRpr5N35MycX10l4451E="; + batctl = "sha256-tLcNrmIBBuRe492x9RL2kHVpKxI0PQUhJnQDyyEqSiY="; + batman-adv = "sha256-lGHWE8T4OgojOp9wBq1tFed514nEm9NePMCNfiiG/Ko="; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 0fdcd9c680ab..7fb86808a605 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -164,6 +164,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index f0cb92c52684..16446fd21597 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -287,7 +287,7 @@ stdenv.mkDerivation rec { description = "Sound server for POSIX and Win32 systems"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1089 diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 85de713bcc54..1b9b19f8c41f 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { mainProgram = "qpaeq"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0bfe40708a63..c1c75403d5fa 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { description = "Portable command-line driven graphing utility for many platforms"; platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gnuplot; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; mainProgram = "gnuplot"; }; } diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index 4242ac59a666..70c52da296f9 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -23,9 +23,10 @@ qtwayland, provider ? "riseup", }: -let - version = "0.24.8"; +buildGoModule (finalAttrs: { + pname = "${provider}-vpn"; + version = "0.24.8"; src = fetchFromGitLab { domain = "0xacab.org"; owner = "leap"; @@ -34,39 +35,6 @@ let leaveDotGit = true; sha256 = "sha256-XUgCVHnTLZXFU+r0s1yuYryWNBJRgQrFlf3g1iRrLWs="; }; - - # bitmask-root is only used on GNU/Linux - # and may one day be replaced by pkg/helper - bitmask-root = stdenv.mkDerivation { - inherit src version; - sourceRoot = "${src.name}/helpers"; - pname = "bitmask-root"; - nativeBuildInputs = [ python3Packages.wrapPython ]; - postPatch = '' - substituteInPlace bitmask-root \ - --replace 'swhich("ip")' '"${iproute2}/bin/ip"' \ - --replace 'swhich("iptables")' '"${iptables}/bin/iptables"' \ - --replace 'swhich("ip6tables")' '"${iptables}/bin/ip6tables"' \ - --replace 'swhich("sysctl")' '"${procps}/bin/sysctl"' \ - --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn - substituteInPlace se.leap.bitmask.policy \ - --replace /usr/sbin/bitmask-root $out/bin/bitmask-root - ''; - installPhase = '' - runHook preInstall - - install -m 755 -D -t $out/bin bitmask-root - install -m 444 -D -t $out/share/polkit-1/actions se.leap.bitmask.policy - wrapPythonPrograms - - runHook postInstall - ''; - }; -in - -buildGoModule rec { - inherit src version; - pname = "${provider}-vpn"; vendorHash = null; patches = [ @@ -90,7 +58,7 @@ buildGoModule rec { --replace "provider = bitmask" "provider = ${provider}" substituteInPlace branding/templates/debian/app.desktop-template \ - --replace "Icon=icon" "Icon=${pname}" + --replace "Icon=icon" "Icon=${finalAttrs.pname}" patchShebangs gui/build.sh wrapPythonProgramsIn branding/scripts @@ -100,7 +68,7 @@ buildGoModule rec { --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn substituteInPlace pkg/launcher/launcher_linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \ - --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \ + --replace /usr/sbin/bitmask-root ${finalAttrs.passthru.bitmask-root}/bin/bitmask-root \ --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \ --replace '"polkit-gnome-authentication-agent-1",' '"polkit-gnome-authentication-agent-1","polkitd",' ''; @@ -125,6 +93,19 @@ buildGoModule rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + # Workaround qmake looking for lrelease in wrong package + # Issue: https://github.com/NixOS/nixpkgs/issues/214765 + qmakeFlags = [ + "QT_TOOL.lrelease.binary=${lib.getDev qttools}/bin/lrelease" + ]; + + preConfigure = '' + # Workaround QMAKE being set by qtbase-setup-hook.sh + # https://github.com/NixOS/nixpkgs/blob/f6ca41c08b059c0836d6868a4e43be346d8e2a7c/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh#L19 + # to @qttools@/bin/qmake, which does not exist. + unset QMAKE + ''; + # FIXME: building on Darwin currently fails # due to missing debug symbols for Qt, # this should be fixable once darwin.apple_sdk >= 10.13 @@ -149,22 +130,50 @@ buildGoModule rec { ''; postInstall = '' - install -m 755 -D -t $out/bin build/qt/release/${pname} + install -m 755 -D -t $out/bin build/qt/release/${finalAttrs.pname} - VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json + VERSION=${finalAttrs.version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) - install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop - install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg + install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${finalAttrs.pname}.desktop + install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${finalAttrs.pname}.svg '' + lib.optionalString stdenv.hostPlatform.isLinux '' - install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy + install -m 444 -D -t $out/share/polkit-1/actions ${finalAttrs.passthru.bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy ''; # Some tests need access to the Internet: # Post "https://api.black.riseup.net/3/cert": dial tcp: lookup api.black.riseup.net on [::1]:53: read udp [::1]:56553->[::1]:53: read: connection refused doCheck = false; - passthru = { inherit bitmask-root; }; + passthru = { + # bitmask-root is only used on GNU/Linux + # and may one day be replaced by pkg/helper + bitmask-root = stdenv.mkDerivation { + inherit (finalAttrs) src version; + sourceRoot = "${finalAttrs.src.name}/helpers"; + pname = "bitmask-root"; + nativeBuildInputs = [ python3Packages.wrapPython ]; + postPatch = '' + substituteInPlace bitmask-root \ + --replace 'swhich("ip")' '"${iproute2}/bin/ip"' \ + --replace 'swhich("iptables")' '"${iptables}/bin/iptables"' \ + --replace 'swhich("ip6tables")' '"${iptables}/bin/ip6tables"' \ + --replace 'swhich("sysctl")' '"${procps}/bin/sysctl"' \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn + substituteInPlace se.leap.bitmask.policy \ + --replace /usr/sbin/bitmask-root $out/bin/bitmask-root + ''; + installPhase = '' + runHook preInstall + + install -m 755 -D -t $out/bin bitmask-root + install -m 444 -D -t $out/share/polkit-1/actions se.leap.bitmask.policy + wrapPythonPrograms + + runHook postInstall + ''; + }; + }; meta = { description = "Generic VPN client by LEAP"; @@ -175,7 +184,7 @@ buildGoModule rec { a variety of trusted service provider all from one app. Current providers include Riseup Networks and The Calyx Institute, where the former is default. - The ${pname} executable should appear + The ${finalAttrs.pname} executable should appear in your desktop manager's XDG menu or could be launch in a terminal to get an execution log. A new icon should then appear in your systray to control the VPN and configure some options. @@ -186,4 +195,4 @@ buildGoModule rec { # darwin requires apple_sdk >= 10.13 platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/networking/bitmask-vpn/fix_paths.patch b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch index afc444952fbb..87efa3fbaf51 100644 --- a/pkgs/tools/networking/bitmask-vpn/fix_paths.patch +++ b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch @@ -10,4 +10,4 @@ index a858a81..ac43f52 100755 + sed -i 's|@qtbase@/bin/lrelease|@qttools@/bin/lrelease|g' $QTBUILD/Makefile } - function renameOutput { \ No newline at end of file + function renameOutput { diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index f38a0445daf9..962bbbf1fc17 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -194,7 +194,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "pass"; maintainers = with lib.maintainers; [ - lovek323 fpletz tadfisher globin diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index aa59df137e2f..8c41116bb333 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -59,7 +59,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/roddhjav/pass-import/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - lovek323 fpletz tadfisher ]; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index 16d0b6858e1f..2a8c62757e7a 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/roddhjav/pass-tomb"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - lovek323 fpletz tadfisher ]; diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 767be885f613..af8725c70f10 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/roddhjav/pass-update"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - lovek323 fpletz tadfisher ]; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index f2c6be3a08b6..dd283c8aa0de 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured (La)TeX distribution"; homepage = "http://www.tug.org/tetex/"; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = [ ]; platforms = lib.platforms.unix; hydraPlatforms = [ ]; }; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 71c598a69680..ab8dec7e63c1 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -357,7 +357,6 @@ rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ veprbl - lovek323 raskin jwiegley ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b751fbaebd43..04d368e4c4c4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -358,6 +358,9 @@ let cudf = callPackage ../development/ocaml-modules/cudf { }; + curl = callPackage ../development/ocaml-modules/curl { inherit (pkgs) curl; }; + curl_lwt = callPackage ../development/ocaml-modules/curl/lwt.nix { }; + curly = callPackage ../development/ocaml-modules/curly { inherit (pkgs) curl; }; @@ -701,6 +704,8 @@ let gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; }; + gdal = callPackage ../development/ocaml-modules/gdal { inherit (pkgs) gdal; }; + gen = callPackage ../development/ocaml-modules/gen { }; gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { }; @@ -1606,7 +1611,7 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; - ocurl = callPackage ../development/ocaml-modules/ocurl { }; + ocurl = callPackage ../development/ocaml-modules/ocurl { inherit (pkgs) curl; }; odate = callPackage ../development/ocaml-modules/odate { }; @@ -1720,6 +1725,14 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; + pgx = callPackage ../development/ocaml-modules/pgx { }; + + pgx_eio = callPackage ../development/ocaml-modules/pgx/eio.nix { }; + + pgx_lwt = callPackage ../development/ocaml-modules/pgx/lwt.nix { }; + + pgx_lwt_unix = callPackage ../development/ocaml-modules/pgx/lwt_unix.nix { }; + phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; piaf = callPackage ../development/ocaml-modules/piaf { };