diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ae324fbeec5e..083bdc4280bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6905,12 +6905,6 @@ githubId = 187309685; name = "Drew Council"; }; - drewrisinger = { - email = "drisinger+nixpkgs@gmail.com"; - github = "drewrisinger"; - githubId = 10198051; - name = "Drew Risinger"; - }; dritter = { email = "dritter03@googlemail.com"; github = "dritter"; @@ -11080,6 +11074,13 @@ githubId = 54999; name = "Ariel Nunez"; }; + insipx = { + email = "github@andrewplaza.dev"; + github = "insipx"; + githubId = 6452260; + name = "Andrew Plaza"; + keys = [ { fingerprint = "843D 72A9 EB79 A869 2C58 5B3A E773 8A7A 0F5C DB89"; } ]; + }; Intuinewin = { email = "antoinelabarussias@gmail.com"; github = "Intuinewin"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index e21b526517d8..feed83cfc142 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -76,6 +76,8 @@ - [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable). +- [Linkwarden](https://linkwarden.app/) a self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place. Available as [services.linkwarden](#opt-services.linkwarden.enable). + - [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable). - [Pangolin](https://github.com/fosrl/pangolin), a tunneled reverse proxy server with access control. Available as [services.pangolin](#opt-services.pangolin.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d17ae2acafe2..5b285ee24580 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1628,6 +1628,7 @@ ./services/web-apps/lemmy.nix ./services/web-apps/libretranslate.nix ./services/web-apps/limesurvey.nix + ./services/web-apps/linkwarden.nix ./services/web-apps/mainsail.nix ./services/web-apps/mastodon.nix ./services/web-apps/matomo.nix diff --git a/nixos/modules/services/web-apps/linkwarden.nix b/nixos/modules/services/web-apps/linkwarden.nix new file mode 100644 index 000000000000..a7aa3cb1ee0b --- /dev/null +++ b/nixos/modules/services/web-apps/linkwarden.nix @@ -0,0 +1,293 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.services.linkwarden; + isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; + + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; + + commonServiceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + + EnvironmentFile = cfg.environmentFile; + StateDirectory = "linkwarden"; + CacheDirectory = "linkwarden"; + User = cfg.user; + Group = cfg.group; + + # Hardening + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + + secret = types.nullOr ( + types.str + // { + # We don't want users to be able to pass a path literal here but + # it should look like a path. + check = it: lib.isString it && lib.types.path.check it; + } + ); + + startupScript = + arg: + if cfg.secretFiles == { } then + "${lib.getExe cfg.package}" + arg + else + pkgs.writeShellScript "linkwarden-env" '' + ${lib.strings.concatStringsSep "\n" ( + lib.attrsets.mapAttrsToList (key: path: "export ${key}=$(< \"${path}\")") cfg.secretFiles + )} + ${lib.getExe cfg.package}${arg} + ''; +in +{ + options.services.linkwarden = { + enable = mkEnableOption "Linkwarden"; + package = lib.mkPackageOption pkgs "linkwarden" { }; + + storageLocation = mkOption { + type = types.path; + default = "/var/lib/linkwarden"; + description = "Directory used to store media files. If it is not the default, the directory has to be created manually such that the linkwarden user is able to read and write to it."; + }; + cacheLocation = mkOption { + type = types.path; + default = "/var/cache/linkwarden"; + description = "Directory used as cache. If it is not the default, the directory has to be created manually such that the linkwarden user is able to read and write to it."; + }; + + enableRegistration = mkEnableOption "registration for new users"; + + environment = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { + PAGINATION_TAKE_COUNT = "50"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options. + ''; + }; + + environmentFile = mkOption { + type = secret; + example = "/run/secrets/linkwarden"; + default = null; + description = '' + Path of a file with extra environment variables to be loaded from disk. + This file is not added to the nix store, so it can be used to pass secrets to linkwarden. + Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options. + + Linkwarden needs at least a nextauth secret. To set a database password use POSTGRES_PASSWORD: + ``` + NEXTAUTH_SECRET= + POSTGRES_PASSWORD= + ``` + ''; + }; + + secretFiles = mkOption { + type = types.attrsOf secret; + example = { + POSTGRES_PASSWORD = "/run/secrets/linkwarden_postgres_passwd"; + NEXTAUTH_SECRET = "/run/secrets/linkwarden_secret"; + }; + default = { }; + description = '' + Attribute set containing paths to files to add to the environment of linkwarden. + The files are not added to the nix store, so they can be used to pass secrets to linkwarden. + Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options. + + Linkwarden needs at least a nextauth secret. To set a database password use POSTGRES_PASSWORD: + ``` + NEXTAUTH_SECRET= + POSTGRES_PASSWORD= + ``` + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "The host that Linkwarden will listen on."; + }; + port = mkOption { + type = types.port; + default = 3000; + description = "The port that Linkwarden will listen on."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open the Linkwarden port in the firewall"; + }; + user = mkOption { + type = types.str; + default = "linkwarden"; + description = "The user Linkwarden should run as."; + }; + group = mkOption { + type = types.str; + default = "linkwarden"; + description = "The group Linkwarden should run as."; + }; + + database = { + createLocally = mkEnableOption "the automatic creation of the database for Linkwarden." // { + default = true; + }; + name = mkOption { + type = types.str; + default = "linkwarden"; + description = "The name of the Linkwarden database."; + }; + host = mkOption { + type = types.str; + default = "/run/postgresql"; + example = "localhost"; + description = "Hostname or address of the postgresql server. If an absolute path is given here, it will be interpreted as a unix socket path."; + }; + port = mkOption { + type = types.port; + default = 5432; + description = "Port of the postgresql server."; + }; + user = mkOption { + type = types.str; + default = "linkwarden"; + description = "The database user for Linkwarden."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.name == cfg.database.user; + message = "The postgres module requires the database name and the database user name to be the same."; + } + { + assertion = cfg.environmentFile == null -> cfg.secretFiles ? "NEXTAUTH_SECRET"; + message = '' + Linkwarden needs at least a nextauth secret to run. + Use either the environmentFile or secretFiles.NEXTAUTH_SECRET to provide one. + ''; + } + ]; + + services.postgresql = mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensureDBOwnership = true; + ensureClauses.login = true; + } + ]; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + services.linkwarden.environment = { + LINKWARDEN_HOST = cfg.host; + LINKWARDEN_PORT = toString cfg.port; + LINKWARDEN_CACHE_DIR = cfg.cacheLocation; + STORAGE_FOLDER = cfg.storageLocation; + NEXT_PUBLIC_DISABLE_REGISTRATION = mkIf (!cfg.enableRegistration) "true"; + NEXT_TELEMETRY_DISABLED = "1"; + DATABASE_URL = mkIf isPostgresUnixSocket "postgresql://${lib.strings.escapeURL cfg.database.user}@localhost/${lib.strings.escapeURL cfg.database.name}?host=${cfg.database.host}"; + DATABASE_PORT = toString cfg.database.port; + DATABASE_HOST = mkIf (!isPostgresUnixSocket) cfg.database.host; + DATABASE_NAME = cfg.database.name; + DATABASE_USER = cfg.database.user; + }; + + systemd.services.linkwarden = { + description = "Linkwarden (Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...)"; + requires = [ + "network-online.target" + ] + ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; + after = [ + "network-online.target" + ] + ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = cfg.environment // { + # Required, otherwise chrome dumps core + CHROME_CONFIG_HOME = cfg.cacheLocation; + }; + + serviceConfig = commonServiceConfig // { + ExecStart = startupScript ""; + }; + }; + + systemd.services.linkwarden-worker = { + description = "Linkwarden (worker process)"; + requires = [ + "network-online.target" + "linkwarden.service" + ] + ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; + after = [ + "network-online.target" + "linkwarden.service" + ] + ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = cfg.environment // { + # Required, otherwise chrome dumps core + CHROME_CONFIG_HOME = cfg.cacheLocation; + }; + + serviceConfig = commonServiceConfig // { + ExecStart = startupScript " worker"; + }; + }; + + users.users = mkIf (cfg.user == "linkwarden") { + linkwarden = { + name = "linkwarden"; + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "linkwarden") { linkwarden = { }; }; + + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; + }; +} diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index d5b2949b762f..56ba741dc2e4 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -164,6 +164,16 @@ in "vboxnetflt" ]; boot.extraModulePackages = [ kernelModules ]; + # See https://github.com/VirtualBox/virtualbox/issues/188 + boot.kernelParams = + lib.mkIf + ( + lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.12" + && lib.versionOlder config.boot.kernelPackages.kernel.version "6.16" + ) + [ + "kvm.enable_virt_at_load=0" + ]; services.udev.extraRules = '' KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a6c3ff57d737..e471baaf7849 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -831,6 +831,7 @@ in lighttpd = runTest ./lighttpd.nix; limesurvey = runTest ./limesurvey.nix; limine = import ./limine { inherit runTest; }; + linkwarden = runTest ./web-apps/linkwarden.nix; listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { }; litellm = runTest ./litellm.nix; litestream = runTest ./litestream.nix; diff --git a/nixos/tests/web-apps/linkwarden.nix b/nixos/tests/web-apps/linkwarden.nix new file mode 100644 index 000000000000..153c7e437599 --- /dev/null +++ b/nixos/tests/web-apps/linkwarden.nix @@ -0,0 +1,60 @@ +{ ... }: +{ + name = "linkwarden-nixos"; + + nodes.machine = + { pkgs, ... }: + let + secretsFile = pkgs.writeText "linkwarden-secret-env" '' + VERY_SENSITIVE_SECRET + ''; + webroot = pkgs.runCommand "webroot" { } '' + mkdir $out + cd $out + echo '

HELLO LINKWARDEN

' > index.html + ''; + in + { + services.linkwarden = { + enable = true; + enableRegistration = true; + secretFiles = { + NEXTAUTH_SECRET = toString secretsFile; + }; + environment = { + NEXTAUTH_URL = "http://localhost:3000/api/v1/auth"; + }; + }; + + services.nginx = { + enable = true; + virtualHosts.localhost.root = webroot; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("linkwarden.service") + machine.wait_for_unit("linkwarden-worker.service") + + machine.wait_for_open_port(3000) + machine.succeed("curl --fail -s http://localhost:3000/") + + machine.succeed("curl -L --fail -s --data '{\"name\":\"Admin\",\"username\":\"admin\",\"password\":\"adminadmin\"}' -H 'Content-Type: application/json' -X POST http://localhost:3000/api/v1/users") + + response = machine.succeed("curl -L --fail -s -c next_cookies.txt -H 'Content-Type: application/json' -X GET http://localhost:3000/api/v1/auth/csrf") + csrfToken = json.loads(response)['csrfToken'] + + machine.succeed("curl -L --fail -s -b next_cookies.txt -c next_cookies.txt -H 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'username=admin' --data-urlencode 'password=adminadmin' --data-urlencode 'csrfToken=%s' http://localhost:3000/api/v1/auth/callback/credentials" % csrfToken) + + curlCmd = "curl -L --fail -s -b next_cookies.txt -H 'Content-Type: application/json' " + + machine.succeed(curlCmd + "--data '{\"url\":\"http://localhost/\"}' -X POST http://localhost:3000/api/v1/links") + + machine.succeed(curlCmd + "-X GET http://localhost:3000/api/v1/links") + + machine.wait_for_file("/var/lib/linkwarden/archives/1/1.html") + machine.succeed("grep -q '

HELLO LINKWARDEN

' -Date: Tue, 26 Aug 2025 10:23:14 +0200 -Subject: [PATCH] build: enable specifying custom sass compiler path by env-var - -Signed-off-by: Christoph Heiss ---- - package.json | 5 ++++- - patches/sass-embedded.patch | 15 +++++++++++++++ - pnpm-lock.yaml | 27 ++++++++++++++++----------- - 3 files changed, 35 insertions(+), 12 deletions(-) - create mode 100644 patches/sass-embedded.patch - -diff --git a/package.json b/package.json -index a67d2c6..17f17b1 100644 ---- a/package.json -+++ b/package.json -@@ -32,6 +32,9 @@ - "license": "Apache-2.0", - "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748", - "pnpm": { -- "neverBuiltDependencies": [] -+ "neverBuiltDependencies": [], -+ "patchedDependencies": { -+ "sass-embedded": "patches/sass-embedded.patch" -+ } - } - } -diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch -new file mode 100644 -index 0000000..5e02bed ---- /dev/null -+++ b/patches/sass-embedded.patch -@@ -0,0 +1,15 @@ -+diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js -+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644 -+--- a/dist/lib/src/compiler-path.js -++++ b/dist/lib/src/compiler-path.js -+@@ -8,6 +8,10 @@ const p = require("path"); -+ const compiler_module_1 = require("./compiler-module"); -+ /** The full command for the embedded compiler executable. */ -+ exports.compilerCommand = (() => { -++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH; -++ if (binPath) { -++ return [binPath]; -++ } -+ try { -+ return [ -+ require.resolve(`${compiler_module_1.compilerModule}/dart-sass/src/dart` + -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index 8f98554..44d1691 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -4,6 +4,11 @@ settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -+patchedDependencies: -+ sass-embedded: -+ hash: 24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20 -+ path: patches/sass-embedded.patch -+ - importers: - - .: -@@ -29,7 +34,7 @@ importers: - version: 9.32.0 - '@vitejs/plugin-vue': - specifier: ^6.0.1 -- version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18) -+ version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18) - '@vue/eslint-config-prettier': - specifier: ^10.2.0 - version: 10.2.0(eslint@9.32.0)(prettier@3.6.2) -@@ -50,13 +55,13 @@ importers: - version: 3.6.2 - sass-embedded: - specifier: ^1.90.0 -- version: 1.90.0 -+ version: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20) - vite: - specifier: ^7.0.6 -- version: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) -+ version: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) - vite-plugin-pwa: - specifier: ^1.0.2 -- version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0) -+ version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0) - - packages: - -@@ -3634,10 +3639,10 @@ snapshots: - - '@types/trusted-types@2.0.7': {} - -- '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)': -+ '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)': - dependencies: - '@rolldown/pluginutils': 1.0.0-beta.29 -- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) -+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) - vue: 3.5.18 - - '@vue/compiler-core@3.5.18': -@@ -4869,7 +4874,7 @@ snapshots: - sass-embedded-win32-x64@1.90.0: - optional: true - -- sass-embedded@1.90.0: -+ sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20): - dependencies: - '@bufbuild/protobuf': 2.6.3 - buffer-builder: 0.2.0 -@@ -5184,18 +5189,18 @@ snapshots: - - varint@6.0.0: {} - -- vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0): -+ vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0): - dependencies: - debug: 4.4.1 - pretty-bytes: 6.1.1 - tinyglobby: 0.2.14 -- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) -+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1) - workbox-build: 7.3.0 - workbox-window: 7.3.0 - transitivePeerDependencies: - - supports-color - -- vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1): -+ vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1): - dependencies: - esbuild: 0.25.8 - fdir: 6.4.6(picomatch@4.0.3) -@@ -5206,7 +5211,7 @@ snapshots: - optionalDependencies: - fsevents: 2.3.3 - sass: 1.90.0 -- sass-embedded: 1.90.0 -+ sass-embedded: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20) - terser: 5.43.1 - yaml: 2.8.1 - --- -2.50.1 - diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 79c4cffde305..b1c8f9999a7b 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation rec { pname = "homer"; - version = "25.08.1"; + version = "25.09.1"; src = fetchFromGitHub { owner = "bastienwirtz"; repo = "homer"; rev = "v${version}"; - hash = "sha256-DA2gdh6o67QDC4y+N5DVG0ktjt/ORNbycU/y2cUjUE0="; + hash = "sha256-MwDDnfp21MoQ9hh0+cjUo+sc+u69rx1K9ATbBB6RX78="; }; pnpmDeps = pnpm_10.fetchDeps { @@ -24,15 +24,12 @@ stdenvNoCC.mkDerivation rec { pname version src - patches + ; fetcherVersion = 2; - hash = "sha256-y/4f/39NOVV46Eg3h7fw8K43/kUIBqtiokTRRlX7398="; + hash = "sha256-2cozIe70PGo1WRUeWrY8W1B6U2QYLbWYcwN5WllRwkg="; }; - # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable. - patches = [ ./0001-build-enable-specifying-custom-sass-compiler-path-by.patch ]; - nativeBuildInputs = [ nodejs dart-sass @@ -42,7 +39,9 @@ stdenvNoCC.mkDerivation rec { buildPhase = '' runHook preBuild - export SASS_EMBEDDED_BIN_PATH="${dart-sass}/bin/sass" + # force the sass npm dependency to use our own sass binary instead of the bundled one + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' pnpm build runHook postBuild @@ -54,6 +53,10 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out cp -R dist/* $out/ + # Remove sample/demo files from output + rm -f $out/assets/*.yml.dist + rm -f $out/assets/*.css.sample + runHook postInstall ''; diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix index 644c57812260..158571b48e6f 100644 --- a/pkgs/by-name/in/innoextract/package.nix +++ b/pkgs/by-name/in/innoextract/package.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, cmake, makeWrapper, boost, @@ -10,27 +9,20 @@ libiconv, withGog ? false, unar ? null, + unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "innoextract"; - version = "1.9"; + version = "1.9-unstable-2025-02-06"; - src = fetchurl { - url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz"; - sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; + src = fetchFromGitHub { + owner = "dscharrer"; + repo = "innoextract"; + rev = "6e9e34ed0876014fdb46e684103ef8c3605e382e"; + hash = "sha256-bgACPDo1phjIiwi336JEB1UAJKyL2NmCVOhyZxBFLJo="; }; - patches = [ - # Fix boost-1.86 build: - # https://github.com/dscharrer/innoextract/pull/169 - (fetchpatch { - name = "boost-1.86.patch"; - url = "https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387.patch"; - hash = "sha256-QYwrqLXC7FE4oYi6G1erpX/RUUtS5zNBv7/fO7AdZQg="; - }) - ]; - buildInputs = [ xz boost @@ -53,6 +45,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ unar ]} ''; + # use unstable as latest release does not yet support cmake-4 + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Tool to unpack installers created by Inno Setup"; homepage = "https://constexpr.org/innoextract/"; diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch new file mode 100644 index 000000000000..518accce964e --- /dev/null +++ b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch @@ -0,0 +1,77 @@ +From bc76a7087e4621269bdf9080581088a6c8f6b3a6 Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Tue, 20 May 2025 19:27:57 +0100 +Subject: [PATCH] Raise minimum CMake version to 3.5 + +For compatibility with CMake 4.0, which also removes CMP0043 OLD - there +are no uses of COMPILE_DEFINITIONS_. + +Signed-off-by: Chris Mayo +--- + IGC/MDAutogen/CMakeLists.txt | 2 +- + external/SPIRV-Tools/CMakeLists.txt | 2 +- + visa/CMakeLists.txt | 7 +------ + visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +----- + 4 files changed, 4 insertions(+), 13 deletions(-) + +diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt +index c9522feea29d..0a79b3c8e32b 100644 +--- a/igc/IGC/MDAutogen/CMakeLists.txt ++++ b/igc/IGC/MDAutogen/CMakeLists.txt +@@ -6,7 +6,7 @@ + # + #============================ end_copyright_notice ============================= + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + + set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py") + set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h") +diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt +index d2e3f63fb0d3..75f013409990 100644 +--- a/igc/external/SPIRV-Tools/CMakeLists.txt ++++ b/igc/external/SPIRV-Tools/CMakeLists.txt +@@ -6,7 +6,7 @@ + # + #============================ end_copyright_notice ============================= + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + + message(STATUS "============================ SPIRV-Tools project ============================") + +diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt +index a96924e907c5..1e4b57516ce8 100644 +--- a/igc/visa/CMakeLists.txt ++++ b/igc/visa/CMakeLists.txt +@@ -74,12 +74,7 @@ if (WIN32 OR UNIX) + add_subdirectory(iga/IGAExe) + endif (WIN32 OR UNIX) + +-if(WIN32) +- cmake_minimum_required(VERSION 3.1) +- cmake_policy(SET CMP0043 OLD) +-else() +- cmake_minimum_required(VERSION 2.8.12) +-endif(WIN32) ++cmake_minimum_required(VERSION 3.5) + + # In the case where this is the IGC build we need to add a dummy custom target check_headers + add_custom_target(check_headers) +diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt +index e40313fc1944..275fff1114a6 100644 +--- a/igc/visa/iga/GEDLibrary/GED_external/CMakeLists.txt ++++ b/igc/visa/iga/GEDLibrary/GED_external/CMakeLists.txt +@@ -7,11 +7,7 @@ + #============================ end_copyright_notice ============================= + + # GEDLibrary/GED +-if(WIN32) +- cmake_minimum_required(VERSION 3.1) +-else() +- cmake_minimum_required(VERSION 2.8.12) +-endif(WIN32) ++cmake_minimum_required(VERSION 3.5) + + project(GEDLibrary) + diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index d30b7b783e7b..2c3e65dcf9fe 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, git, @@ -58,6 +59,13 @@ stdenv.mkDerivation rec { }) ]; + patches = [ + # Raise minimum CMake version to 3.5 + # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d + # https://github.com/intel/intel-graphics-compiler/pull/364 + ./bump-cmake.patch + ]; + sourceRoot = "."; cmakeDir = "../igc"; diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix index 0e6fa2408c0a..a85880b587a5 100644 --- a/pkgs/by-name/li/libcint/package.nix +++ b/pkgs/by-name/li/libcint/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/sunqm/libcint"; changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; license = licenses.bsd2; - maintainers = with maintainers; [ drewrisinger ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix index 4f01a909114f..a7b2ca1748b7 100644 --- a/pkgs/by-name/li/libdaq/package.nix +++ b/pkgs/by-name/li/libdaq/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdaq"; - version = "3.0.19"; + version = "3.0.21"; src = fetchFromGitHub { owner = "snort3"; repo = "libdaq"; tag = "v${finalAttrs.version}"; - hash = "sha256-ma+M/rIbChqL0pjhE0a1UfJLm/r7I7IvIuSwcnQWvAQ="; + hash = "sha256-ifG7Ccuwus+ftTzjTrvgkGDAxEhYT9pJVrILn7K17P8="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { aycanirican brianmcgillion ]; - changelog = "https://github.com/snort3/libdaq/releases/tag/v${finalAttrs.version}/changelog.md"; + changelog = "https://github.com/snort3/libdaq/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2; outputsToInstall = [ "lib" diff --git a/pkgs/by-name/li/libunarr/package.nix b/pkgs/by-name/li/libunarr/package.nix index 2ea5d3025a24..bb5d2e88092f 100644 --- a/pkgs/by-name/li/libunarr/package.nix +++ b/pkgs/by-name/li/libunarr/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cmake, }: @@ -14,6 +15,16 @@ stdenv.mkDerivation rec { hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; + patches = [ + # cmake-4 compatibility: + # https://github.com/selmf/unarr/pull/30 + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/selmf/unarr/commit/1df8ab3d281409e9fe6bed8bf485976bb47f5bef.patch"; + hash = "sha256-u3shRgtRcHYxvXAHmYyQH1HLYV1PgWaJBY7BZCOYiL4="; + }) + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "-flto" "" \ diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 21b67ff7e9da..0aa89973b4f1 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lightningcss"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; tag = "v${finalAttrs.version}"; - hash = "sha256-imLbsQ2F5CQiepwWSMcXj0Fgyv4liCMmCwA/0SE07Mo="; + hash = "sha256-AuMboSZ7fX6UhnPeXjpnBEDGkQdK1EMKSUpw3TPZxRk="; }; - cargoHash = "sha256-aNho9NavEgY4dwGcNXsLDnlVCB2rODIPae3LnfOwJIA="; + cargoHash = "sha256-7oyDnT81G47SaceJ5st+1P3a2fb9Dj5Eu2c0glw8YW4="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/li/linkwarden/01-localfont.patch b/pkgs/by-name/li/linkwarden/01-localfont.patch new file mode 100644 index 000000000000..459ccc39a8f5 --- /dev/null +++ b/pkgs/by-name/li/linkwarden/01-localfont.patch @@ -0,0 +1,42 @@ +diff --git i/apps/web/components/Preservation/ReadableView.tsx w/apps/web/components/Preservation/ReadableView.tsx +index 64f14186..daff3636 100644 +--- i/apps/web/components/Preservation/ReadableView.tsx ++++ w/apps/web/components/Preservation/ReadableView.tsx +@@ -20,13 +20,13 @@ import { + } from "@linkwarden/router/highlights"; + import { Highlight } from "@linkwarden/prisma/client"; + import { useUser } from "@linkwarden/router/user"; +-import { Caveat } from "next/font/google"; +-import { Bentham } from "next/font/google"; ++import localFont from "next/font/local"; + import { Separator } from "../ui/separator"; + import { Button } from "../ui/button"; + +-const caveat = Caveat({ subsets: ["latin"] }); +-const bentham = Bentham({ subsets: ["latin"], weight: "400" }); ++ ++const caveat = localFont({ src: "../../public/caveat.ttf" }); ++const bentham = localFont({ src: "../../public/bentham.ttf" }); + + type Props = { + link: LinkIncludingShortenedCollectionAndTags; +diff --git i/apps/web/components/TextStyleDropdown.tsx w/apps/web/components/TextStyleDropdown.tsx +index a84587d9..59a291e4 100644 +--- i/apps/web/components/TextStyleDropdown.tsx ++++ w/apps/web/components/TextStyleDropdown.tsx +@@ -13,12 +13,11 @@ import { + import { Button } from "@/components/ui/button"; + import { FitWidth, FormatLineSpacing, FormatSize } from "@/components/ui/icons"; + import { useUpdateUserPreference, useUser } from "@linkwarden/router/user"; +-import { Caveat } from "next/font/google"; +-import { Bentham } from "next/font/google"; ++import localFont from "next/font/local"; + import { useTranslation } from "next-i18next"; + +-const caveat = Caveat({ subsets: ["latin"] }); +-const bentham = Bentham({ subsets: ["latin"], weight: "400" }); ++const caveat = localFont({ src: "../public/caveat.ttf" }); ++const bentham = localFont({ src: "../public/bentham.ttf" }); + + const fontSizes = [ + "12px", diff --git a/pkgs/by-name/li/linkwarden/package.nix b/pkgs/by-name/li/linkwarden/package.nix new file mode 100644 index 000000000000..626427b4e66b --- /dev/null +++ b/pkgs/by-name/li/linkwarden/package.nix @@ -0,0 +1,205 @@ +{ + lib, + stdenvNoCC, + buildNpmPackage, + fetchFromGitHub, + fetchYarnDeps, + makeBinaryWrapper, + nixosTests, + yarnConfigHook, + fetchpatch, + # dependencies + bash, + monolith, + nodejs, + openssl, + google-fonts, + playwright-driver, + prisma, + prisma-engines, +}: + +let + # The bcrypt package requires a gyp build and its dev dependencies. + # Linkwarden uses yarn for dependencies, bycrypt npm. Mixing the two causes issues. + bcrypt = buildNpmPackage rec { + pname = "bcrypt"; + version = "5.1.1"; + + src = fetchFromGitHub { + owner = "kelektiv"; + repo = "node.bcrypt.js"; + tag = "v${version}"; + hash = "sha256-mgfYEgvgC5JwgUhU8Kn/f1D7n9ljnIODkKotEcxQnDQ="; + }; + + npmDepsHash = "sha256-CPXZ/yLEjTBIyTPVrgCvb+UGZJ6yRZUJOvBSZpLSABY="; + + npmBuildScript = "install"; + + postInstall = '' + cp -r lib $out/lib/node_modules/bcrypt/ + ''; + }; + + google-fonts' = google-fonts.override { + fonts = [ + "Caveat" + "Bentham" + ]; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "linkwarden"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "linkwarden"; + repo = "linkwarden"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zoJ5y2J+lkmfAFdI/7FvFAC6D308IPxaLzpGtj42IrU="; + }; + + patches = [ + /* + Prevents NextJS from attempting to download fonts during build. The fonts + directory will be created in the derivation script. + + See similar patches: + pkgs/by-name/cr/crabfit-frontend/01-localfont.patch + pkgs/by-name/al/alcom/use-local-fonts.patch + pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch + */ + ./01-localfont.patch + + /* + https://github.com/linkwarden/linkwarden/pull/1290 + + Fixes an issue where linkwarden cannot save a plain HTTP (no TLS) website. + */ + (fetchpatch { + url = "https://github.com/linkwarden/linkwarden/commit/327826d760e5b1870c58a25f85501a7c9a468818.patch"; + hash = "sha256-kq1GIEW0chnPmzvg4eDSS/5WtRyWlrHlk41h4pSCMzg="; + }) + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-Z1EwecQGWHr6RZCDHAy7BA6BEoixj1dbKH3XE8sfeKQ="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + prisma + yarnConfigHook + ]; + + buildInputs = [ + openssl + ]; + + env.NODE_ENV = "production"; + + postPatch = '' + for f in packages/filesystem/*Folder.ts packages/filesystem/*File.ts; do + substituteInPlace $f \ + --replace-fail 'process.cwd(),' "" \ + --replace-fail '"../..",' "" + done + ''; + + preBuild = '' + export PRISMA_CLIENT_ENGINE_TYPE='binary' + export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines}/lib/libquery_engine.node" + export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines}/bin/query-engine" + export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines}/bin/schema-engine" + ''; + + buildPhase = '' + runHook preBuild + + cp ${google-fonts'}/share/fonts/truetype/Bentham-* ./apps/web/public/bentham.ttf + cp ${google-fonts'}/share/fonts/truetype/Caveat* ./apps/web/public/caveat.ttf + + yarn prisma:generate + yarn web:build + + runHook postBuild + ''; + + postBuild = '' + substituteInPlace node_modules/next/dist/server/image-optimizer.js \ + --replace-fail 'this.cacheDir = (0, _path.join)(distDir, "cache", "images");' 'this.cacheDir = (0, _path.join)(process.env.LINKWARDEN_CACHE_DIR, "cache", "images");' + ''; + + installPhase = '' + runHook preInstall + + # Shrink closure a bit + shopt -s extglob + rm -rf node_modules/bcrypt node_modules/@next/swc-* node_modules/lightningcss* node_modules/react-native* node_modules/@react-native* \ + node_modules/expo* node_modules/@expo node_modules/.bin node_modules/zeego/node_modules/.bin node_modules/@react-navigation/native* \ + node_modules/@react-navigation/*/node_modules/.bin node_modules/@native-html node_modules/jest-expo node_modules/@jsamr/react-native-li \ + node_modules/lucide-react-native node_modules/@esbuild/!(linux-x64) + shopt -u extglob + + ln -s ${bcrypt}/lib/node_modules/bcrypt node_modules/ + mkdir -p $out/share/linkwarden/apps/web/.next $out/bin + cp -r apps/web/.next apps/web/* $out/share/linkwarden/apps/web + cp -r apps/worker $out/share/linkwarden/apps/worker + cp -r packages $out/share/linkwarden/ + cp -r node_modules $out/share/linkwarden/ + rm -r $out/share/linkwarden/node_modules/@linkwarden/{mobile,react-native-render-html} + + echo "#!${lib.getExe bash} -e + export DATABASE_URL=\''${DATABASE_URL-"postgresql://\$DATABASE_USER:\$POSTGRES_PASSWORD@\$DATABASE_HOST:\$DATABASE_PORT/\$DATABASE_NAME"} + export npm_config_cache="\$LINKWARDEN_CACHE_DIR/npm" + + if [ \"\$1\" == \"worker\" ]; then + echo "Starting worker" + ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/worker + else + echo "Starting server" + ${lib.getExe prisma} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \ + && ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/web -- -H \$LINKWARDEN_HOST -p \$LINKWARDEN_PORT + fi + " > $out/bin/start.sh + chmod +x $out/bin/start.sh + + makeWrapper $out/bin/start.sh $out/bin/linkwarden \ + --prefix PATH : "${ + lib.makeBinPath [ + bash + monolith + openssl + ] + }" \ + --set-default PRISMA_CLIENT_ENGINE_TYPE 'binary' \ + --set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node" \ + --set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine" \ + --set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine" \ + --set-default PLAYWRIGHT_LAUNCH_OPTIONS_EXECUTABLE_PATH ${playwright-driver.browsers-chromium}/chromium-*/chrome-linux/chrome \ + --set-default LINKWARDEN_CACHE_DIR /var/cache/linkwarden \ + --set-default LINKWARDEN_HOST localhost \ + --set-default LINKWARDEN_PORT 3000 \ + --set-default STORAGE_FOLDER /var/lib/linkwarden \ + --set-default NEXT_TELEMETRY_DISABLED 1 + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests) linkwarden; + }; + + meta = { + description = "Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more..."; + homepage = "https://linkwarden.app/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "linkwarden"; + }; + +}) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index cc12dd32e0b3..d0e091b644b7 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "25.9.17"; + version = "25.10.7"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w="; + hash = "sha256-EzVMTJaxPeIOJUdwmaShMLEe1XQcJx+0i1Rl0ILi5+c="; }; - cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk="; + cargoHash = "sha256-ze82Iu2lH0n3ucKibLu3/VWMaaDWhs0oFFe/na2GbmY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 12edcbc57a75..aa0bf6970c25 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "25.9.17"; + version = "25.10.7"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w="; + hash = "sha256-EzVMTJaxPeIOJUdwmaShMLEe1XQcJx+0i1Rl0ILi5+c="; }; - cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk="; + cargoHash = "sha256-ze82Iu2lH0n3ucKibLu3/VWMaaDWhs0oFFe/na2GbmY="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index 7f0ec9b1faea..df7bf3ce6753 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; tag = "v${version}"; - hash = "sha256-td+rzfM4MtvuwnxDZbJOJAFMPzc/KzTWsHSiqJg2+a4="; + hash = "sha256-pWOGaVugfnwaA4alFP85ha+/iaN8x6KOVnx38vfFk78="; fetchSubmodules = true; }; - cargoHash = "sha256-vgnt76GyKYJhrnMqJNKj5YMXubDzSgsab07nd5Y8+qY="; + cargoHash = "sha256-cq7Sgq9f2XpVTgEOMfR/G7sTqcWLwuJBgG9U+h4IMWQ="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix index eca2e188eba1..e2719e11d978 100644 --- a/pkgs/by-name/ma/maim/package.nix +++ b/pkgs/by-name/ma/maim/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, zlib, @@ -23,13 +22,13 @@ stdenv.mkDerivation rec { pname = "maim"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "sha256-/tZqSJnKe8GiffSz9VIFKuxMktRld+hA4ZWP4TZQrlg="; + hash = "sha256-bbjV3+41cxAlKCEd1/nvnZ19GhctWOr5Lu4X+Vg3EAk="; }; nativeBuildInputs = [ @@ -53,15 +52,6 @@ stdenv.mkDerivation rec { icu ]; - patches = [ - # Use C++17 as required by icu - (fetchpatch { - name = "maim-c++-17.patch"; - url = "https://github.com/naelstrof/maim/commit/e7fe09b6734baeb59081b8805be542c92178cf0f.patch"; - sha256 = "0z9zvrr8msfli88jmhxm5knysi385s48j2w7zpacc7qhf4c5zh8c"; - }) - ]; - doCheck = false; meta = { diff --git a/pkgs/by-name/mo/moxnotify/package.nix b/pkgs/by-name/mo/moxnotify/package.nix new file mode 100644 index 000000000000..01456d62d31e --- /dev/null +++ b/pkgs/by-name/mo/moxnotify/package.nix @@ -0,0 +1,104 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + clang, + libclang, + makeWrapper, + lua5_4, + dbus, + wayland, + wayland-protocols, + pipewire, + vulkan-loader, + libxkbcommon, + libGL, + sqlite, + fontconfig, + freetype, +}: + +rustPlatform.buildRustPackage rec { + pname = "moxnotify"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mox-desktop"; + repo = "moxnotify"; + rev = "6726af08621072e0c95a147cf4ae63ea66c7e857"; + hash = "sha256-tTgY/813WaW3K8QKbj6qwCVKOAA8zMqy97Q7Z5qA0JM="; + }; + + cargoHash = "sha256-o2YyPa7bX9585lsicJjhj1xJ1jMdU5mlxbEn/6zSy8U="; + + nativeBuildInputs = [ + pkg-config + clang + makeWrapper + ]; + + buildInputs = [ + lua5_4 + dbus + wayland + wayland-protocols + pipewire + vulkan-loader + libxkbcommon + libGL + sqlite + fontconfig + freetype + libclang.lib + ]; + + # Set LIBCLANG_PATH for bindgen + env.LIBCLANG_PATH = "${libclang.lib}/lib"; + + # Workspace members - build both daemon and ctl + cargoBuildFlags = [ "--workspace" ]; + cargoTestFlags = [ "--workspace" ]; + + # Skip tests for now as they may require display/audio systems + doCheck = false; + + # Install both binaries with proper names + postInstall = '' + # Rename binaries to have more descriptive names + mv $out/bin/daemon $out/bin/moxnotify + mv $out/bin/ctl $out/bin/moxctl + + # Install D-Bus service file + mkdir -p $out/share/dbus-1/services + substitute ${src}/pl.mox.notify.service.in $out/share/dbus-1/services/pl.mox.notify.service \ + --replace-fail "@bindir@" "$out/bin" + ''; + + # Wrap binaries with runtime dependencies for graphics libraries + postFixup = '' + wrapProgram $out/bin/moxnotify \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + vulkan-loader + libGL + ] + } + wrapProgram $out/bin/moxctl \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + vulkan-loader + libGL + ] + } + ''; + + meta = { + description = "Feature-rich hardware-accelerated keyboard driven Wayland notification daemon"; + homepage = "https://github.com/mox-desktop/moxnotify"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ logger ]; + platforms = lib.platforms.linux; # Wayland-specific, Linux only + mainProgram = "moxnotify"; + }; +} diff --git a/pkgs/by-name/mu/muparserx/package.nix b/pkgs/by-name/mu/muparserx/package.nix index 4c1071eb2c68..d30fac0d67f6 100644 --- a/pkgs/by-name/mu/muparserx/package.nix +++ b/pkgs/by-name/mu/muparserx/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; - maintainers = with maintainers; [ drewrisinger ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 8094d74c5856..6d328b2213ce 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -14,7 +14,7 @@ let pname = "nezha"; - version = "1.13.2"; + version = "1.14.3"; frontendName = lib.removePrefix "nezha-theme-"; @@ -58,7 +58,7 @@ buildGo124Module { owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-IkB2V4KKSUfX+E9bMEGzCc3urAjgpXYhpO0Lfi4LYdY="; + hash = "sha256-ORPu7mCNqHfuXq/nB3TuNoevbw5ZMvZFetR6NPX/b3U="; }; proxyVendor = true; diff --git a/pkgs/by-name/ni/nixfmt/generated-package.nix b/pkgs/by-name/ni/nixfmt/generated-package.nix index df4a00eb9cf1..fc2566739ac9 100644 --- a/pkgs/by-name/ni/nixfmt/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt/generated-package.nix @@ -23,10 +23,10 @@ }: mkDerivation { pname = "nixfmt"; - version = "1.0.1"; + version = "1.1.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/v1.0.1.tar.gz"; - sha256 = "00ra92pq3926vr96wjzn9109zljbv1qy64nv9p2vgabnwwhx5nll"; + url = "https://github.com/nixos/nixfmt/archive/v1.1.0.tar.gz"; + sha256 = "19sydkdw1579qmvzx0zq06s23bm6m6l9wp1kvsfhxawk8pkz2pc2"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/on/onionbalance/package.nix b/pkgs/by-name/on/onionbalance/package.nix new file mode 100644 index 000000000000..c05141976dd0 --- /dev/null +++ b/pkgs/by-name/on/onionbalance/package.nix @@ -0,0 +1,38 @@ +{ + lib, + python3Packages, + fetchFromGitLab, +}: + +python3Packages.buildPythonApplication rec { + pname = "onionbalance"; + version = "0.2.4"; + + pyproject = true; + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + owner = "tpo"; + repo = "onion-services/onionbalance"; + tag = version; + hash = "sha256-amwKP9LJ7aHPECNUNTluFpgIFSRLxR7eHQxBxW5574I="; + }; + dependencies = with python3Packages; [ + cryptography + pycryptodomex + pyyaml + setproctitle + stem + ]; + build-system = with python3Packages; [ + setuptools + ]; + + meta = { + description = "Tool for loadbalancing onion services"; + homepage = "https://github.com/torproject/onionbalance"; + changelog = "https://github.com/torproject/onionbalance/blob/${version}/docs/changelog.md"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.ForgottenBeast ]; + mainProgram = "onionbalance"; + }; +} diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 81eb194a5fb9..81c9db239ab9 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fetchurl, cudaSupport ? opencv.cudaSupport or false, @@ -71,6 +72,14 @@ stdenv.mkDerivation rec { hash = "sha256-EtXHMOIk4hGcLiaoC0ZWYF6XZCD2qNtt1HeJoJIuuTA="; }; + patches = [ + (fetchpatch { + name = "cmake4-compat.patch"; + url = "https://github.com/openvinotoolkit/openvino/commit/677716c2471cadf1bf1268eca6343498a886a229.patch?full_index=1"; + hash = "sha256-iaifJBdl7+tQZq1d8SiczUaXz+AdfMrLtwzfTmSG+XA="; + }) + ]; + outputs = [ "out" "python" diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index 895959038d04..b4099c6c1285 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - hash = "sha256-52NTG+cZLOxCJZvDSZ9vqsyH+J8U38aGlQdWQ2dFOWE="; + hash = "sha256-XvNvVWEmJpsY2AxTYLT0/4IiJ2QTI4mWwDleMmZ2LgA="; }; - cargoHash = "sha256-SYJ+ABvIoOW0O+28ofM8YXJwIlFkR84yDZaaehhx0Ks="; + cargoHash = "sha256-PDYCO1ggKwtMR9tnokY7JqVM03FWsO4c2L4GV+7TKu4="; preBuild = '' version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])') diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index cecab11fc8b2..abdf921664eb 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.prisma.io/"; license = licenses.asl20; maintainers = with maintainers; [ aqrln ]; + mainProgram = "prisma"; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/re/redland-wayland/package.nix b/pkgs/by-name/re/redland-wayland/package.nix new file mode 100644 index 000000000000..d2ee300f496d --- /dev/null +++ b/pkgs/by-name/re/redland-wayland/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wayland, +}: + +let + version = "0.1.0"; +in +rustPlatform.buildRustPackage { + pname = "redland-wayland"; + inherit version; + + src = fetchFromGitHub { + owner = "domenkozar"; + repo = "redland"; + tag = "v${version}"; + hash = "sha256-iZtRpxloZzneAQ6+5cW0x1E7Qbx/8i9PqkpOHbCZ4Qk="; + }; + + cargoHash = "sha256-eE+0wvh2g7t3VhqLxQiQ4tu8oSv8w4HIIzRFAf2kxlc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + wayland + ]; + + meta = { + description = "Wayland screen color temperature adjuster with automatic day/night cycle support"; + homepage = "https://github.com/domenkozar/redland"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ domenkozar ]; + mainProgram = "redland"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 54909cfbfd48..2b7708c07d4a 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-09-27"; + version = "0-unstable-2025-10-05"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "0ef6041dc38ccfd1c87699170518a56f03e1d9e6"; - hash = "sha256-iVf8mGN+q/a3ftuWqXp24MQ7Dr+V0JplA77IsfKFUGw="; + rev = "cdc782ce0836f3d5566fafb93cb43cbae21b3f58"; + hash = "sha256-uXa78bFhCYkMCOTdNnQJLu7Yz3do+hZBUG3TIZWv544="; }; dontConfigure = true; diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index cf46356b6a79..2a58e87a1bb4 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.9.2.0"; + version = "3.9.6.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-LVAsCps5XLsj4acYWI42qdbvX6h9JTJJfM33FvVfWK0="; + hash = "sha256-YZCS2w4T9XskydnC4C2EMies9cUklvL56Umdw9EogLo="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { aycanirican brianmcgillion ]; - changelog = "https://github.com/snort3/snort3/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/snort3/snort3/blob/${finalAttrs.src.rev}/ChangeLog.md"; license = lib.licenses.gpl2; platforms = with lib.platforms; linux; }; diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix index 9db7a3e2e5df..ca09384217c3 100644 --- a/pkgs/by-name/sp/spicedb/package.nix +++ b/pkgs/by-name/sp/spicedb/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "spicedb"; - version = "1.45.4"; + version = "1.46.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; tag = "v${version}"; - hash = "sha256-q5szY9eJcmlxoA5FcBgOb81l5p8b9+SUSQffXV3KMgk="; + hash = "sha256-laLUhJkD4XbwKo4wjngBN1PkDpt2fHgMmVv2JTzZl6Q="; }; vendorHash = "sha256-XqXbQYUAQiOZ0MjWwFSRe0suaQzXb6KQb+KoGAvvceM="; diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 6393c7eab0f0..3fe9f6367f87 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,18 +14,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2025-08-18"; + version = "0-unstable-2025-10-06"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "6dbf17bb953342c844517d1b4eb672cbae7a1566"; - hash = "sha256-T9tWmgDIcmmRXAeWR7Pfjalkl6xogtuz1qfsSAuQmkg="; + rev = "60d3e362cf6983e7d7ebea7584a8bd84eb815f4c"; + hash = "sha256-GxJWGRm7N/TgvAtuWXjusyUT7Pnuw0uIySp6i6Kn7Gs="; }; postPatch = '' - substituteInPlace Makefile \ - --replace-fail pkg-config ''${PKG_CONFIG} substituteInPlace src/main.cpp \ --replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf substituteInPlace src/window.cpp \ @@ -65,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/syshud --prefix LD_LIBRARY_PATH : $out/lib ''; + strictDeps = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version" diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index c7309af24410..c10424acba80 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; tag = "v${version}"; - hash = "sha256-zF7Bbt4DrGb/PkKrHtynb6yskP+ZdIZY7BgLygZyvro="; + hash = "sha256-xVB4y80BFa9MRBsMYMSQmaRSNJVoeCiYW2UTJ+UpBYQ="; }; - cargoHash = "sha256-Msvp1gEwVoUb7DhBdPtjT/d+/I+G8pv+sBWxqqqdyEQ="; + cargoHash = "sha256-glaD8/CoHrtqRnZh0iMR55EQF9xbBbv+x+xt/xa1xTM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index dc2ae509e546..ae7147fac2e3 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - requireFile, autoPatchelfHook, undmg, fetchurl, @@ -18,6 +17,8 @@ openal, libmpg123, libxmp, + libiconv, + darwin, }: let @@ -84,6 +85,9 @@ stdenv.mkDerivation (finalAttrs: { libmpg123 libxmp stdenv.cc.cc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; nativeBuildInputs = @@ -94,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper undmg + darwin.autoSignDarwinBinariesHook ]; installPhase = @@ -116,6 +121,15 @@ stdenv.mkDerivation (finalAttrs: { cp -r "UnrealTournament.app" $out/Applications/ makeWrapper $out/Applications/UnrealTournament.app/Contents/MacOS/UnrealTournament \ $out/bin/${finalAttrs.meta.mainProgram} + # If the darwin build sandbox is enabled, system libiconv is not available + # https://github.com/OldUnreal/UnrealTournamentPatches/issues/1902 + # Even though ut1999 is able to unpack the map files at runtime, upstream advised to still do it at install time + # which is why the UCC binary is fixed to access a copy of iconv from the nix store + install_name_tool -change /usr/lib/libiconv.2.dylib \ + ${libiconv}/lib/libiconv.2.dylib \ + $out/Applications/UnrealTournament.app/Contents/MacOS/UCC + # Needs manual re-signing, as UCC is used during the build, and the auto signer is part of the fixup phase + signDarwinBinariesInAllOutputs '' + '' chmod -R 755 $out diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_104/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_104/package.nix new file mode 100644 index 000000000000..6cf00848f144 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_104/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.104"; + hash = "sha256-9kW+a7IreBcZ3dlUdsXjTKnclVW1C1TocYfY8gUgewE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-V0AV5jkve37a5B/UvJ9B3kwOW72vWblST8Zxs8oDctE="; + }; +} diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 642159e10f6f..5ff193745fc7 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -13,20 +13,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "36.0.2"; + version = "37.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-tcG78WubEm1zZXfNsDCwtw4QF5ip3ZjkxaLu8D4qBc4="; + hash = "sha256-IVnKZJyNyKd/+x/VhlRo9zaPppFuEXo7jUKC5+Cg8+g="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-iCYZLKjO1kD753S1CiwTHa9qVxg9Y2ZMCKg0wod7GbQ="; + cargoHash = "sha256-4Kxt1QauD6P5yJj+R/jPUR6itXvYubCukGMk7iij75w="; cargoBuildFlags = [ "--package" "wasmtime-cli" diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix index 515fb2b9cc8a..0ad51f9ee12f 100644 --- a/pkgs/by-name/xc/xcalib/package.nix +++ b/pkgs/by-name/xc/xcalib/package.nix @@ -8,6 +8,7 @@ libXxf86vm, libXrandr, samurai, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-o0pizV4Qrb9wfVKVNH2Ifb9tr7N7iveVHQB39WVCl8w="; }; + patches = [ + # bump min cmake to v3.5 + (fetchpatch { + url = "https://codeberg.org/OpenICC/xcalib/commit/e8566ead8c043b5f0003c3613b91deab6430eac8.patch"; + hash = "sha256-gZc4itfsP5T68ZucdYJWJ4sL11xFaw5ePABsmEYHxrU="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/xu/xunlei-uos/sources.nix b/pkgs/by-name/xu/xunlei-uos/sources.nix index eb08be168268..10722a2f10ca 100644 --- a/pkgs/by-name/xu/xunlei-uos/sources.nix +++ b/pkgs/by-name/xu/xunlei-uos/sources.nix @@ -1,11 +1,11 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-03-19 +# Last updated: 2025-09-24 { version = "1.0.0.5"; - amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_amd64.deb"; - arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_arm64.deb"; - loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_loongarch64.deb"; - amd64_hash = "sha256-K+eHPmG2tT5Z+RWxigg03itw6Rcnk5MZlODqS/JtAnk="; - arm64_hash = "sha256-iA9mbp0wSe66qC5lphMTFPzmOJjzHfWKubGRPiKcVdg="; - loongarch64_hash = "sha256-44QPnB/1uWHaQkd3DBMDvYXfXwch9HywZUvg71z8fts="; + amd64_url = "https://archive2.kylinos.cn/DEB/KYLIN_DEB/pool/all/com.xunlei.download_1.0.0.5_amd64.deb"; + arm64_url = "https://archive2.kylinos.cn/DEB/KYLIN_DEB/pool/all/com.xunlei.download_1.0.0.5_arm64.deb"; + loongarch64_url = "https://archive2.kylinos.cn/DEB/KYLIN_DEB/pool/all/com.xunlei.download_1.0.0.5_loongarch64.deb"; + amd64_hash = "sha256-7558/p0iyXHdelOvNQvbFqA5kBprv8oJJv178ysoeXg="; + arm64_hash = "sha256-CciKobahdbub+dGFYy/EY3DSSP6Ge5/bZi/LDuY2MOw="; + loongarch64_hash = "sha256-X5NIwWaLbajcTJrDUbCwoFICU3gk1kHX3gGvJ/MDYhE="; } diff --git a/pkgs/by-name/xu/xunlei-uos/update.sh b/pkgs/by-name/xu/xunlei-uos/update.sh old mode 100644 new mode 100755 index 78b1769b3504..b0aa254c0c0c --- a/pkgs/by-name/xu/xunlei-uos/update.sh +++ b/pkgs/by-name/xu/xunlei-uos/update.sh @@ -1,5 +1,9 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip +#! nix-shell -i bash --pure -p nix curl cacert gzip + +set -euo pipefail + +cd "$(dirname "$(readlink -f "$0")")" base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-" base_url_appendix="/Packages.gz" @@ -39,8 +43,8 @@ do } } ') - url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_"$version"_"$i".deb") - hash+=("$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $sha256sum)") + url+=("https://archive2.kylinos.cn/DEB/KYLIN_DEB/pool/all/com.xunlei.download_"$version"_"$i".deb") + hash+=("$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url "${url[-1]}")")") done cat >sources.nix <