diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2de240577e05..6220f6cb0660 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7449,11 +7449,6 @@ github = "EmanuelM153"; githubId = 134736553; }; - emaryn = { - name = "emaryn"; - github = "emaryn"; - githubId = 197520219; - }; emattiza = { email = "nix@mattiza.dev"; github = "emattiza"; @@ -18286,6 +18281,13 @@ ]; matrix = "@normalcea:matrix.org"; }; + norpol = { + name = "Syd Lightyear"; + email = "norpol+nixpkgs@exaple.org"; + matrix = "@phileas:asra.gr"; + github = "norpol"; + githubId = 98636020; + }; nosewings = { name = "Nicholas Coltharp"; email = "coltharpnicholas@gmail.com"; @@ -27540,7 +27542,7 @@ name = "Guillermo NWDD"; }; xokdvium = { - email = "xokdvium@proton.me"; + email = "sergei@zimmerman.foo"; github = "xokdvium"; githubId = 145775305; name = "Sergei Zimmerman"; diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index e053bd9400c4..9975bcc56672 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -107,7 +107,7 @@ in resolver.public-suffix = lib.mkDefault [ "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" ]; - spam-filter.resource = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml"; + spam-filter.resource = lib.mkDefault "file://${cfg.package.spam-filter}/spam-filter.toml"; webadmin = let hasHttpListener = builtins.any (listener: listener.protocol == "http") ( @@ -232,6 +232,7 @@ in happysalada euxane onny + norpol ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index d38cda59bfbc..f56f80ce564c 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.0.7"; - hash = "sha256-lhqF71ekIUCBTho4F1yXGMwFr4bNTYGuNE4derMLnKI="; + version = "25.2.0"; + hash = "sha256-9+bg3BGuEf1blS5CawbizflKrSosUMbktZjs4uIpZ44="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 9f82142adf50..9fecad5b302e 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.83.0"; - hash = "sha256-BicMVFpCmG3/NnBJUG5w8B/5039SWx6kAv8SC+Vaj5c="; + version = "1.85.0"; + hash = "sha256-AIZMj1v0zj9ZU5yV2MQhyqgT+1l20XPIb6LY7UREdb4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c0bd3fb5c3a6..c8b07ef0427b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -493,8 +493,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.6.1"; - hash = "sha256-Hd4pIjIUT1lAx6bjPu7LLL4RakRkjUtQ91mPI7iiquQ="; + version = "0.6.2"; + hash = "sha256-OQHNbzlTnpv2V5ICNTfAC1QM3bDnRgtJvgJKONxvU5M="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -527,8 +527,8 @@ let mktplcRef = { name = "vscode-bazel"; publisher = "bazelbuild"; - version = "0.11.0"; - sha256 = "sha256-c1Uvu9qBsQabdfhNxG0tCmCq3ub3wfgdoGor0cATo0c="; + version = "0.12.0"; + sha256 = "sha256-H0MAoqEQcT/tuDbiubCf9DCHt55M5Nx6IxzU5a3l5bo="; }; meta = { description = "Bazel support for Visual Studio Code"; @@ -1212,8 +1212,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.12.116"; - hash = "sha256-BticW7EwDiNmiEIr9eFpQBPfhsUaebzucc2F8vEuSE8="; + version = "3.13.22"; + hash = "sha256-pu02QJVAhPVeGGwN/NRctQpLjDphYqm4cn4qGJo3+es="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1264,8 +1264,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.10.1"; - hash = "sha256-MKcDefMpIOs90X1NI+b8mK0QWEhwA5GMKw5KdwDl1TU="; + version = "2.10.2"; + hash = "sha256-lZXC6tAgylqODtCElR+bM+AyL7+HXdzO/JnjkJ+2dM4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; @@ -3589,8 +3589,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.422.0"; - hash = "sha256-UMXCZe8nvwOAkrHxNKq+L+AYMoMvq2ojDn5NrMdTONk="; + version = "0.422.1"; + hash = "sha256-UT0vveuvdw47Bko05kHrIQzqtJX96xFtlGDKrWlULos="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -4004,8 +4004,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.7.0"; - hash = "sha256-ou/5MHiTFopeHSyEAspppejcvWnIz2qM62yCpedNW6s="; + version = "25.7.2"; + hash = "sha256-xQjoCkCLpvbHTSu0WqJO22Z1rzqB9p8dwiNTpI/K5V8="; }; meta = { description = "Ansible language support"; @@ -5339,8 +5339,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.0.1"; - hash = "sha256-nv9DmW7DuYVVsibpSJ8A7AawsL9cySgp2r5xgpE0WYM="; + version = "3.0.3"; + hash = "sha256-6iInkhGZ0r4xtJCiHrsTa6EMnNR4mXUARR4B9YXRm+I="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index d61b25530554..5e13ab158115 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.28.5"; - hash = "sha256-sxbikIUxaIVT0ySaicUIZIiHuy0kzz5xyYcKYds6+XE="; + version = "0.29.1"; + hash = "sha256-v9PP+3psOOMCrIgIaVqrwOUZ9tqTXiSjUUuOcCrEie4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix index 44288f382845..3b6ad3e6c9ac 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.342.0"; - hash = "sha256-81whQKh8CNNYk0tzgK77XeTmTxK1tiRzeuCIQ+7EgU4="; + version = "1.346.0"; + hash = "sha256-1i2zGBOrGFSi6gg7Y/plm4d5MN6LCbR8W8vEmT+6cn0="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index c7eddaf465cb..59082fd2bbec 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -19,6 +19,6 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline"; homepage = "https://github.com/RooVetGit/Roo-Code"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix index eeac9b8b2075..6d3086883b21 100644 --- a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix +++ b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker-french"; publisher = "streetsidesoftware"; - version = "0.4.3"; - hash = "sha256-FPnS/gU7+Kz3ZgbwiNIs/Rr1uiz5qIWsvpKB5lZGz+s="; + version = "0.4.4"; + hash = "sha256-9BVSQFysgKPKp1e6noSv2szVSQvYH7nOuphJeiso55s="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-french/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 5b27a8140a56..d64299c4807b 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.38.0"; - sha256 = "sha256-Lei2zNAI0Fg/PRpDxaTqCa5aIWXiGa39yRmJ2b3wENc="; + version = "0.38.1"; + sha256 = "sha256-RWv10/5H1UKkm/t7rwq5pkuB3Dp0XhttIibVM9l5aL4="; }; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix index 324f4fc9e477..ee30224960e7 100644 --- a/pkgs/by-name/al/alisthelper/package.nix +++ b/pkgs/by-name/al/alisthelper/package.nix @@ -71,7 +71,7 @@ flutter327.buildFlutterApplication { homepage = "https://github.com/Xmarmalade/alisthelper"; mainProgram = "alisthelper"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index df57d3a8209b..d411aa0d7986 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/open-ani/animeko"; mainProgram = "Ani"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix index e901b4d1c466..8d3aba9f1902 100644 --- a/pkgs/by-name/au/aurea/package.nix +++ b/pkgs/by-name/au/aurea/package.nix @@ -64,6 +64,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "aurea"; platforms = lib.platforms.linux; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ba/babelstone-han/package.nix b/pkgs/by-name/ba/babelstone-han/package.nix index d5f674109016..658fd90c89f1 100644 --- a/pkgs/by-name/ba/babelstone-han/package.nix +++ b/pkgs/by-name/ba/babelstone-han/package.nix @@ -4,14 +4,17 @@ fetchzip, }: +let + version = "16.0.3"; +in + stdenvNoCC.mkDerivation { pname = "babelstone-han"; - version = "13.0.3"; + inherit version; src = fetchzip { - # upstream download links are unversioned, so hash changes - url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; - hash = "sha256-LLhNtHu2hh5DY2XVSrLuVzzR6OtMdSSHetyA0k1IFs0="; + url = "https://babelstone.co.uk/Fonts/Download/BabelStoneHan-${version}.zip"; + hash = "sha256-HmmRJLs51hoHoKQYdjbiivnJl+RhcBwzkng+5PoqX10="; }; installPhase = '' diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix index f2985d19add5..da4665d51bc8 100644 --- a/pkgs/by-name/bl/bluebubbles/package.nix +++ b/pkgs/by-name/bl/bluebubbles/package.nix @@ -65,7 +65,6 @@ flutter327.buildFlutterApplication rec { license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - emaryn zacharyweiss ]; }; diff --git a/pkgs/by-name/ca/casilda/package.nix b/pkgs/by-name/ca/casilda/package.nix index 4ac7fd17c4a5..2fdb2017b70b 100644 --- a/pkgs/by-name/ca/casilda/package.nix +++ b/pkgs/by-name/ca/casilda/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/jpu/casilda"; description = "Simple Wayland compositor widget for Gtk 4 which can be used to embed other processes windows in Gtk 4 application"; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix index b0c6371bf75b..8787065520ed 100644 --- a/pkgs/by-name/ch/chatmcp/package.nix +++ b/pkgs/by-name/ch/chatmcp/package.nix @@ -65,6 +65,6 @@ flutter332.buildFlutterApplication rec { mainProgram = "chatmcp"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ch/chcase/package.nix b/pkgs/by-name/ch/chcase/package.nix index 6530a2b82035..b555d4f5907f 100644 --- a/pkgs/by-name/ch/chcase/package.nix +++ b/pkgs/by-name/ch/chcase/package.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Small library to convert case of a given string"; license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix index 95febb64eadb..55996833ee50 100644 --- a/pkgs/by-name/di/distroshelf/package.nix +++ b/pkgs/by-name/di/distroshelf/package.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "distroshelf"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 8aee6939f586..07c086943366 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.2.20"; + version = "6.2.21"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-3AFbzalyrdQxPEBuQwJydydh8YaIN9m5XfT2h6Rcd/Y="; + hash = "sha256-zyaur3CjSZ8Or2E0rQKubQ440xjwwzJE7i6QXfmn5vk="; }; buildInputs = [ php84 ]; @@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerNoScripts = true; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-1tgNR1WXFymIqmTgFRPOvvuondVolT9uil0HDMTEL8Q="; + vendorHash = "sha256-mo2oHmFtuY62AcT+ti/zPxxS39a6Qb0cPStyyvyVCag="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-FHJVaAWBxZ6IsGT5Sqrfv3yCJC0DPX1SrrLFD70TAFY="; + hash = "sha256-T8Kv4vbr5n+tVQntFEaNozvSu6CKJCA3V256Ml7yzHA="; }; preInstall = '' diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 0e6d8ee33284..d1579fe227a4 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -32,7 +32,7 @@ let description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; homepage = "https://github.com/chen08209/FlClash"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; libclash = buildGoModule { diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix index 5657c599d564..79b9adae63df 100644 --- a/pkgs/by-name/fv/fvm/package.nix +++ b/pkgs/by-name/fv/fvm/package.nix @@ -24,6 +24,6 @@ buildDartApplication rec { description = "Simple CLI to manage Flutter SDK versions"; homepage = "https://github.com/leoafarias/fvm"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 6b9b3690321b..6b0c6de1c5da 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.181.0"; + version = "2.183.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-+oDR+VSR0bGbTJIqNCe1WN1QWm+sEtMIuy/mNhumeyk="; + hash = "sha256-ejjuNNCp81UM0B6cvQTL31MO49/zDKPJsXY4dZV1X/E="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-vcn9vhpQlacfIxHFt8G67aB91nTr9IClvA9pb+4XFFI="; + npmDepsHash = "sha256-oApG8QOUteoqhVvAGIDMX0Zef2dV2E49EsekyhV7G4c="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 6347600790f3..b74978eb712c 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.4.1"; + version = "6.5.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-uRf+tfTiIrKc13GPSOVoEt5dFHSmJmspNc+b4cMv6Q4="; + hash = "sha256-nFOlzHrtkIYB2shaGnSboqI0HKycTBlu7IkmKwudP5w="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58="; + hash = "sha256-GEUI44QDi1ooq0qXP3lTFp7mVyVJY+TJKv3D1UCe8NI="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gp/gpt-box/package.nix b/pkgs/by-name/gp/gpt-box/package.nix index 05e7303298b4..cd4d8c871029 100644 --- a/pkgs/by-name/gp/gpt-box/package.nix +++ b/pkgs/by-name/gp/gpt-box/package.nix @@ -82,6 +82,6 @@ flutter329.buildFlutterApplication rec { mainProgram = "GPTBox"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ic/iconic/package.nix b/pkgs/by-name/ic/iconic/package.nix index 9a7ee856cce2..07cd692a27a0 100644 --- a/pkgs/by-name/ic/iconic/package.nix +++ b/pkgs/by-name/ic/iconic/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "folder_icon"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index 9718e3926900..271507158b53 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -50,6 +50,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/krillinai/KlicStudio/releases/tag/v${finalAttrs.version}"; mainProgram = "krillinai-desktop"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix index f11969aa70bb..b85c54e65ac1 100644 --- a/pkgs/by-name/le/learn6502/package.nix +++ b/pkgs/by-name/le/learn6502/package.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "eu.jumplink.Learn6502"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/li/lifeograph/package.nix b/pkgs/by-name/li/lifeograph/package.nix index 536b7a7bb3c8..7d99e2490c10 100644 --- a/pkgs/by-name/li/lifeograph/package.nix +++ b/pkgs/by-name/li/lifeograph/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://lifeograph.sourceforge.net/doku.php?id=start"; description = "Off-line and private journal and note taking application"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "lifeograph"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/mu/musicus/package.nix b/pkgs/by-name/mu/musicus/package.nix index d67f47fcbdf2..171de94aa11f 100644 --- a/pkgs/by-name/mu/musicus/package.nix +++ b/pkgs/by-name/mu/musicus/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "musicus"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix index 68de52fa7d01..1f92f6d06c6f 100644 --- a/pkgs/by-name/ne/neohtop/package.nix +++ b/pkgs/by-name/ne/neohtop/package.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "NeoHtop"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix index bbc81dc11798..75fd5230e469 100644 --- a/pkgs/by-name/ne/newelle/package.nix +++ b/pkgs/by-name/ne/newelle/package.nix @@ -99,6 +99,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "newelle"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix index 93904d3712b5..4457e8b21fa2 100644 --- a/pkgs/by-name/pa/pan/package.nix +++ b/pkgs/by-name/pa/pan/package.nix @@ -75,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://pan.rebelbase.com"; maintainers = with lib.maintainers; [ aleksana - emaryn ]; platforms = lib.platforms.linux; license = with lib.licenses; [ diff --git a/pkgs/by-name/pi/pike/package.nix b/pkgs/by-name/pi/pike/package.nix new file mode 100644 index 000000000000..421d5f95a840 --- /dev/null +++ b/pkgs/by-name/pi/pike/package.nix @@ -0,0 +1,214 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + pkg-config, + autoconf, + automake, + libtool, + bison, + flex, + gmp, + pcre, + nettle, + libjpeg, + libpng, + libtiff, + freetype, + sqlite, + libmysqlclient, + postgresql, + openssl, + zlib, + bzip2, + gdbm, + libffi, + expat, + libxml2, + libxslt, + gtk3, + pango, + cairo, + glib, + SDL2, + libGL, + dpkg, + autoPatchelfHook, + ncurses, + libnsl, + libxcrypt-legacy, + nix-update-script, + makeBinaryWrapper, +}: + +let + # Pre-built Pike binary from Debian for bootstrapping + pike-bootstrap = stdenv.mkDerivation (finalAttrs: { + pname = "pike-bootstrap"; + version = "8.0.1956"; + + src = fetchurl { + # Using Debian's pike8.0-core package + url = "http://deb.debian.org/debian/pool/main/p/pike8.0/pike8.0-core_${finalAttrs.version}-1_amd64.deb"; + hash = "sha256-kDaP7GZOW9Wlzg9dSxi+Q8IYduIZneWSsFqRfNh1NFQ="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeBinaryWrapper + ]; + + buildInputs = [ + gmp + zlib + ncurses + libxcrypt-legacy # for libcrypt.so.1 + nettle # for libnettle and libhogweed + libnsl # for libnsl.so + ]; + + # Ignore missing dependencies since this is just for bootstrapping + autoPatchelfIgnoreMissingDeps = [ + "libcrypt.so.1" + "libnsl.so.2" + ]; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r usr/* $out/ + + # The binary should be in bin/pike8.0 + if [ -f $out/bin/pike8.0 ]; then + ln -s pike8.0 $out/bin/pike + fi + + # Fix broken symlinks to Debian license files + rm -f $out/lib/pike8.0/modules/Tools.pmod/Legal.pmod/License.pmod/*.txt || true + + # Create wrapper to set proper paths + wrapProgram $out/bin/pike8.0 \ + --set PIKE_MODULE_PATH "$out/lib/pike8.0/modules" \ + --add-flags "-m$out/lib/pike8.0/master.pike" + runHook postInstall + ''; + meta = { + description = "Pike programming language bootstrap"; + longDescription = '' + Pike is a dynamic programming language with a syntax similar to Java and C. + It is simple to learn, does not require long compilation passes and has + powerful built-in data types allowing simple and really fast data manipulation. + ''; + homepage = "https://pike.lysator.liu.se/"; + license = with lib.licenses; [ + gpl2Only + # or + lgpl2Plus + # or + mpl20 + ]; + maintainers = with lib.maintainers; [ siraben ]; + platforms = with lib.platforms; unix ++ windows; + mainProgram = "pike"; + }; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "pike"; + version = "v8.0.2020"; + + src = fetchFromGitHub { + owner = "pikelang"; + repo = "Pike"; + rev = finalAttrs.version; + hash = "sha256-VHfMfICtvCHdFTIjiYw9tR5g9KycR7jqdg3wT+T37mA="; + }; + + nativeBuildInputs = [ + pkg-config + bison + flex + autoconf + automake + libtool + pike-bootstrap # built above + ]; + + buildInputs = [ + gmp + pcre + nettle + libjpeg + libpng + libtiff + freetype + sqlite + libmysqlclient + postgresql + openssl + zlib + bzip2 + gdbm + libffi + expat + libxml2 + libxslt + gtk3 + pango + cairo + glib + SDL2 + libGL + ]; + + # Pike uses a custom build system + preConfigure = '' + patchShebangs . + cd src + ./run_autoconfig + ''; + + env = { + RUNPIKE = "${pike-bootstrap}/bin/pike"; + PIKE = "${pike-bootstrap}/bin/pike"; + }; + + configureFlags = [ + "--with-gmp" + "--with-nettle" + "--with-mysql=${libmysqlclient}" + "--with-postgres" + "--with-gtk" + "--with-sdl" + "--with-gl" + ]; + + makeFlags = [ "INSTALLARGS=--traditional" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Pike programming language"; + longDescription = '' + Pike is a dynamic programming language with a syntax similar to Java and C. + It is simple to learn, does not require long compilation passes and has + powerful built-in data types allowing simple and really fast data manipulation. + ''; + homepage = "https://pike.lysator.liu.se/"; + license = with lib.licenses; [ + gpl2Only + # or + lgpl2Plus + # or + mpl20 + ]; + maintainers = with lib.maintainers; [ siraben ]; + platforms = with lib.platforms; unix ++ windows; + mainProgram = "pike"; + }; +}) diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix index 3318ff99ea94..6f36a8f01e98 100644 --- a/pkgs/by-name/pr/proxypin/package.nix +++ b/pkgs/by-name/pr/proxypin/package.nix @@ -46,6 +46,6 @@ flutter329.buildFlutterApplication rec { mainProgram = "ProxyPin"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/qd/qdocumentview/package.nix b/pkgs/by-name/qd/qdocumentview/package.nix index fc72f319be25..5a8348b42b8e 100644 --- a/pkgs/by-name/qd/qdocumentview/package.nix +++ b/pkgs/by-name/qd/qdocumentview/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "qdocumentview"; homepage = "https://gitlab.com/extraqt/qdocumentview"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/re/reflection-cpp/package.nix b/pkgs/by-name/re/reflection-cpp/package.nix index 5030321129fb..76f90c3ab854 100644 --- a/pkgs/by-name/re/reflection-cpp/package.nix +++ b/pkgs/by-name/re/reflection-cpp/package.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/contour-terminal/reflection-cpp"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index 8efa788b66fc..66415b4e162c 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "reqable"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/se/serigy/package.nix b/pkgs/by-name/se/serigy/package.nix index 75530d9159c4..6d30af93c8e3 100644 --- a/pkgs/by-name/se/serigy/package.nix +++ b/pkgs/by-name/se/serigy/package.nix @@ -60,6 +60,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "serigy"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 10482a1db3ef..c7b0bb324a38 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -84,6 +84,6 @@ flutter332.buildFlutterApplication rec { mainProgram = "ServerBox"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c59b70df0f08..c75a39e7f2dc 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-nMPBkAAah4qbatvtfkCJqdo6BVL0NuxFZEHhSiB4uXY="; + hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA="; }; pythonPath = with python3Packages; [ lxml ]; @@ -57,10 +57,28 @@ stdenv.mkDerivation rec { runHook postInstall ''; + dontWrapQtApps = true; + preFixup = '' qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; + fixupPhase = + let + sigil = + if stdenv.hostPlatform.isDarwin then + "$out/Applications/Sigil.app/Contents/MacOS/Sigil" + else + "$out/bin/sigil"; + in + '' + runHook preFixup + + wrapQtApp "${sigil}" + + runHook postFixup + ''; + meta = { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 34c895cebccd..259252dd49d4 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "7.3.2"; + version = "7.3.3"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-n4/beHoK8sz/dvPMNDdGT9CQV9fRfLtEd6dW4wmWlMI="; + hash = "sha256-oSXie1yEHO7CREjC1uo6i9yu5QTix7fxbniuGaTJOH8="; }; # Fix build on darwin diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix index 37caac36f600..ffca8e9a40d3 100644 --- a/pkgs/by-name/sp/sparkle/package.nix +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { ]; license = lib.licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 472a7824561a..8af1fadd963a 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -162,6 +162,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru = { inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts) webadmin = callPackage ./webadmin.nix { }; + spam-filter = callPackage ./spam-filter.nix { }; updateScript = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; }; @@ -187,6 +188,7 @@ rustPlatform.buildRustPackage (finalAttrs: { onny oddlama pandapip1 + norpol ]; }; }) diff --git a/pkgs/by-name/st/stalwart-mail/spam-filter.nix b/pkgs/by-name/st/stalwart-mail/spam-filter.nix new file mode 100644 index 000000000000..d0ca6c60b5af --- /dev/null +++ b/pkgs/by-name/st/stalwart-mail/spam-filter.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + stdenv, + stalwart-mail, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "spam-filter"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "stalwartlabs"; + repo = "spam-filter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NhD/qUiGhgESwR2IOzAHfDATRlgWMcCktlktvVfDONk="; + }; + + buildPhase = '' + bash ./build.sh + ''; + + installPhase = '' + mkdir -p $out + cp spam-filter.toml $out/ + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Secure & modern all-in-one mail server Stalwart (spam-filter module)"; + homepage = "https://github.com/stalwartlabs/spam-filter"; + changelog = "https://github.com/stalwartlabs/spam-filter/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + inherit (stalwart-mail.meta) maintainers; + }; +}) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 0d9021ee083f..ccb57af94675 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, + stalwart-mail, fetchFromGitHub, trunk, tailwindcss_3, @@ -14,20 +15,19 @@ zip, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "webadmin"; version = "0.1.28"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OgZ2qs84zVM2zNmBQSPnb9Uy4mahzNC81vbWM9wmrn4="; }; npmDeps = fetchNpmDeps { - inherit src; - name = "${pname}-npm-deps"; + name = "${finalAttrs.pname}-npm-deps"; hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; @@ -71,8 +71,8 @@ rustPlatform.buildRustPackage rec { meta = { description = "Secure & modern all-in-one mail server Stalwart (webadmin module)"; homepage = "https://github.com/stalwartlabs/webadmin"; - changelog = "https://github.com/stalwartlabs/webadmin/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/stalwartlabs/webadmin/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ onny ]; + inherit (stalwart-mail.meta) maintainers; }; -} +}) diff --git a/pkgs/by-name/st/stockpile/package.nix b/pkgs/by-name/st/stockpile/package.nix index 9310ee53f519..905b0edf6b03 100644 --- a/pkgs/by-name/st/stockpile/package.nix +++ b/pkgs/by-name/st/stockpile/package.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "stockpile"; license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index f514586713bf..40a962f9276e 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-cJIHyfnrzy0SM9qOxNGf9PGVapoGRWD8hT5L7XCKLjo="; + hash = "sha256-h9qNA9UPMLUEMXAWY8E0MW0rKkVy+Zf1lJ9dqbT/BNs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-cBaAndcF1RBxdmG196KFXKd9mEqyUQdGlaTPZSPln0I="; + vendorHash = "sha256-B6O62qdoWT8+sNJNUDrW0WqarQMNbPfjFlShzaI63i8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 69360a910be4..f2d4c63c15af 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-y4NS9IoGknHOKLJtAZBbruwRTqjUmQTKtEYNlixwyL8="; + hash = "sha256-fbaqRjYFDeGuCheg3EIUVh/QMhFzLNUb6MUoc/J51Ko="; }; vendorHash = "sha256-dWcf4X8/Wy/TULdT6PbiMaOd1d+haBlnII+6VKazrD4="; diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix index 661eb2246165..115e24975243 100644 --- a/pkgs/by-name/ti/tiny-rdm/package.nix +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -95,7 +95,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/tiny-craft/tiny-rdm"; mainProgram = "tiny-rdm"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index c968eb983df5..35db502a426a 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -46,6 +46,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/version-fox/vfox/releases/tag/v${finalAttrs.version}"; mainProgram = "vfox"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix index 35da5be07d58..b1405a986971 100644 --- a/pkgs/by-name/wi/windsend/package.nix +++ b/pkgs/by-name/wi/windsend/package.nix @@ -49,7 +49,7 @@ flutter329.buildFlutterApplication rec { homepage = "https://github.com/doraemonkeys/WindSend"; mainProgram = "WindSend"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index f06e7652d6aa..45ca8af4d834 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -35,7 +35,7 @@ let description = "Cross-platform launcher that simply works"; homepage = "https://github.com/Wox-launcher/Wox"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; ui-flutter = flutter332.buildFlutterApplication { diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix index 10064e91ccf0..743e5027f20c 100644 --- a/pkgs/by-name/ya/yay/package.nix +++ b/pkgs/by-name/ya/yay/package.nix @@ -68,6 +68,6 @@ buildGoModule (finalAttrs: { mainProgram = "yay"; platforms = lib.platforms.linux; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index 5541737acd16..0fd870d7b19f 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Zephyruso/zashboard/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index e36c34634919..cb0330b7cd75 100644 --- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -8,6 +8,7 @@ dune-configurator, zarith, integers, + stdlib-random, alcotest, bisect_ppx, }: @@ -15,14 +16,13 @@ buildDunePackage ( rec { pname = "class_group_vdf"; - version = "0.0.4"; - duneVersion = "3"; + version = "0.0.5"; src = fetchFromGitLab { owner = "nomadic-labs/cryptography"; repo = "ocaml-chia-vdf"; rev = "v${version}"; - hash = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs="; + hash = "sha256-/wPlS9JrQH+4kvEzsn2DCkAFhu0LMxlIIKQZ9jOJkco="; }; minimalOCamlVersion = "4.08"; @@ -40,6 +40,7 @@ buildDunePackage ( propagatedBuildInputs = [ zarith integers + stdlib-random ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/stdlib-random/default.nix b/pkgs/development/ocaml-modules/stdlib-random/default.nix new file mode 100644 index 000000000000..7532a979a516 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdlib-random/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + cppo, + version ? "1.2.0", +}: + +buildDunePackage { + pname = "stdlib-random"; + inherit version; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "ocaml"; + repo = "stdlib-random"; + tag = version; + hash = "sha256-rtdPQ/zXdywjhjLi60nMe1rks2yLP2TH4xUg5z/Bpjk="; + }; + + nativeBuildInputs = [ cppo ]; + + meta = { + license = lib.licenses.lgpl21Only; + description = "Compatibility library for Random number generation"; + homepage = "https://github.com/ocaml/stdlib-random"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 0a5bda3881c4..712579e067f4 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -3,23 +3,21 @@ fetchurl, buildDunePackage, camlp-streams, - cstruct, decompress, }: buildDunePackage rec { pname = "tar"; - version = "2.6.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; - hash = "sha256-yv8MtwRjQ+K/9/wPkhfk4xI1VV5MSIn7GUeSmFtvse4="; + hash = "sha256-89aw1nf9QP0euAvMxgu2EyIDWL5Y9mxfqL8CV/Pl65Y="; }; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ camlp-streams - cstruct decompress ]; diff --git a/pkgs/development/ocaml-modules/tar/eio.nix b/pkgs/development/ocaml-modules/tar/eio.nix new file mode 100644 index 000000000000..dbdf250447a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/tar/eio.nix @@ -0,0 +1,26 @@ +{ + buildDunePackage, + tar, + eio, + git, +}: + +buildDunePackage { + pname = "tar-eio"; + inherit (tar) version src doCheck; + + minimalOCamlVersion = "5.1"; + + propagatedBuildInputs = [ + tar + eio + ]; + + nativeCheckInputs = [ + git + ]; + + meta = tar.meta // { + description = "Decode and encode tar format files using Eio"; + }; +} diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 79f1950fefa0..c109b0e7a177 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,7 +1,6 @@ { buildDunePackage, tar, - cstruct-lwt, lwt, git, }: @@ -12,7 +11,6 @@ buildDunePackage { propagatedBuildInputs = [ tar - cstruct-lwt lwt ]; diff --git a/pkgs/development/python-modules/basswood-av/default.nix b/pkgs/development/python-modules/basswood-av/default.nix index 38b9997efb63..2d9f44b5b5be 100644 --- a/pkgs/development/python-modules/basswood-av/default.nix +++ b/pkgs/development/python-modules/basswood-av/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Python bindings for ffmpeg libraries"; homepage = "https://github.com/basswood-io/BasswoodAV"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bot-safe-agents/default.nix b/pkgs/development/python-modules/bot-safe-agents/default.nix index db9e87a6fe3e..d50ebd986727 100644 --- a/pkgs/development/python-modules/bot-safe-agents/default.nix +++ b/pkgs/development/python-modules/bot-safe-agents/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/ivan-sincek/bot-safe-agents"; changelog = "https://github.com/ivan-sincek/bot-safe-agents/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dynaconf/default.nix b/pkgs/development/python-modules/dynaconf/default.nix index c8540ba39bb0..8cf0598eda73 100644 --- a/pkgs/development/python-modules/dynaconf/default.nix +++ b/pkgs/development/python-modules/dynaconf/default.nix @@ -97,6 +97,6 @@ buildPythonPackage rec { changelog = "https://github.com/dynaconf/dynaconf/blob/${src.tag}/CHANGELOG.md"; mainProgram = "dynaconf"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/filesplit/default.nix b/pkgs/development/python-modules/filesplit/default.nix index 60d162d23f97..6c5f1bc14c93 100644 --- a/pkgs/development/python-modules/filesplit/default.nix +++ b/pkgs/development/python-modules/filesplit/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Split file into multiple chunks based on the given size"; homepage = "https://github.com/ram-jayapalan/filesplit"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/hatch-babel/default.nix b/pkgs/development/python-modules/hatch-babel/default.nix index c3e54cd69fc6..cbc1947b44ef 100644 --- a/pkgs/development/python-modules/hatch-babel/default.nix +++ b/pkgs/development/python-modules/hatch-babel/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/NiklasRosenstein/hatch-babel"; changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/housekeeping/default.nix b/pkgs/development/python-modules/housekeeping/default.nix index 5ecf01685479..51032fd41b89 100644 --- a/pkgs/development/python-modules/housekeeping/default.nix +++ b/pkgs/development/python-modules/housekeeping/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Reusable deprecation helpers for Python projects"; homepage = "https://github.com/beanbaginc/housekeeping"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/kgb/default.nix b/pkgs/development/python-modules/kgb/default.nix index 12a51c2c12f6..cc7c98fc6399 100644 --- a/pkgs/development/python-modules/kgb/default.nix +++ b/pkgs/development/python-modules/kgb/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python function spy support for unit tests"; homepage = "https://github.com/beanbaginc/kgb"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/newspaper3k/default.nix b/pkgs/development/python-modules/newspaper3k/default.nix index bfb26ae40d9e..0131830209dd 100644 --- a/pkgs/development/python-modules/newspaper3k/default.nix +++ b/pkgs/development/python-modules/newspaper3k/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Simplified python article discovery & extraction"; homepage = "https://pypi.org/project/newspaper3k"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index abca6b0f9772..30b05a04eead 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.10.2"; + version = "16.10.4"; pyproject = true; src = fetchFromGitHub { @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-kEPVufS8wpoGi/A4Eh1u9gLVIEdJmoPDmAiY38DYDv4="; + hash = "sha256-uHC1mIrWlvpL6SOFZQHWFlha7qSM3jhz2C/CH2cn2K0="; }; patches = [ @@ -53,8 +53,6 @@ buildPythonPackage rec { tesseract = lib.getExe tesseract; unpaper = lib.getExe unpaper; }) - # Fix crashing in tests on Python 3.13.4 - ./multiprocessing.patch ]; build-system = [ diff --git a/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch b/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch deleted file mode 100644 index 0ff85170082b..000000000000 --- a/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ocrmypdf/__main__.py b/src/ocrmypdf/__main__.py -index cec02d13..f554ab73 100755 ---- a/src/ocrmypdf/__main__.py -+++ b/src/ocrmypdf/__main__.py -@@ -77,7 +77,7 @@ def run(args=None): - - - if __name__ == '__main__': -- multiprocessing.freeze_support() -+ # multiprocessing.freeze_support() - if os.name == 'posix': - multiprocessing.set_start_method('forkserver') - sys.exit(run()) diff --git a/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch index c30706fc6fc0..74701d580404 100644 --- a/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch +++ b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch @@ -1,14 +1,14 @@ diff --git a/pyproject.toml b/pyproject.toml -index 451d83d9..817b27ea 100644 +index 7d665b6a..55f2f210 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ dependencies = [ "img2pdf>=0.5", "packaging>=20", "pdfminer.six>=20220319", -- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break -+ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break - "pikepdf>=8.10.1, != 9.8.0", +- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break ++ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break + "pikepdf>=8.10.1,!=9.8.0", "Pillow>=10.0.1", "pluggy>=1", diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index ea360f893c51..a36adedc8770 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { license = lib.licenses.asl20; description = "All-in-One Development Tool based on PaddlePaddle"; changelog = "https://github.com/PaddlePaddle/PaddleX/releases/tag/${src.tag}"; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/development/python-modules/pip-install-test/default.nix b/pkgs/development/python-modules/pip-install-test/default.nix index 6bc939c82f3d..57636a7dbf9d 100644 --- a/pkgs/development/python-modules/pip-install-test/default.nix +++ b/pkgs/development/python-modules/pip-install-test/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Minimal stub package to test success of pip install"; homepage = "https://pypi.org/project/pip-install-test"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pwdlib/default.nix b/pkgs/development/python-modules/pwdlib/default.nix index 53c1e226daeb..db85f55a3357 100644 --- a/pkgs/development/python-modules/pwdlib/default.nix +++ b/pkgs/development/python-modules/pwdlib/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { changelog = "https://github.com/frankie567/pwdlib/releases/tag/v${version}"; homepage = "https://github.com/frankie567/pwdlib"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pydiffx/default.nix b/pkgs/development/python-modules/pydiffx/default.nix index a9f48efd2dd2..9e98c6b17fc0 100644 --- a/pkgs/development/python-modules/pydiffx/default.nix +++ b/pkgs/development/python-modules/pydiffx/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "DiffX file format and utilities"; homepage = "https://github.com/beanbaginc/diffx"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix index bc1001a4c0cf..475646e64114 100644 --- a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix +++ b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/zhiyiYo/PyQt-Fluent-Widgets"; platforms = lib.platforms.linux; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix b/pkgs/development/python-modules/pysidesix-frameless-window/default.nix index a0fa029b0816..4180793dee5d 100644 --- a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix +++ b/pkgs/development/python-modules/pysidesix-frameless-window/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/zhiyiYo/PyQt-Frameless-Window"; platforms = lib.platforms.linux; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ emaryn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index ad072ca9ce3f..e55d66009ed5 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -57,6 +57,7 @@ let mainProgram = "comby"; license = lib.licenses.asl20; homepage = "https://comby.dev"; + broken = true; # Not compatible with ocamlPackages.tar ≥ 3 }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11aad2841346..3bb023614a19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10737,6 +10737,7 @@ with pkgs; }; stalwart-mail-webadmin = stalwart-mail.webadmin; + stalwart-mail-spam-filter = stalwart-mail.spam-filter; stalwart-mail-enterprise = stalwart-mail.override { stalwartEnterprise = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 523eaaf91e5a..8c2a3770961d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1934,6 +1934,8 @@ let stdint = callPackage ../development/ocaml-modules/stdint { }; + stdlib-random = callPackage ../development/ocaml-modules/stdlib-random { }; + stdlib-shims = callPackage ../development/ocaml-modules/stdlib-shims { }; stdune = callPackage ../development/ocaml-modules/stdune { }; @@ -1966,6 +1968,10 @@ let inherit (pkgs) git; }; + tar-eio = callPackage ../development/ocaml-modules/tar/eio.nix { + inherit (pkgs) git; + }; + tcpip = callPackage ../development/ocaml-modules/tcpip { }; tcslib = callPackage ../development/ocaml-modules/tcslib { };