diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 9d987e0b33a0..006170c2ee53 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -1030,7 +1030,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 - [eris-server](https://codeberg.org/eris/eris-go), an implementation of the Encoding for Robust Immutable Storage (ERIS). Available as - [services.eris-server](#opt-services.eris-server.enable). + `services.eris-server`. - [forgejo](https://forgejo.org/), a git forge and drop-in replacement for Gitea. Available as [services.forgejo](#opt-services.forgejo.enable). diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 3e3b8f10a74a..a5e1b84ae48a 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -222,6 +222,8 @@ - `services.clamsmtp` is unmaintained and was removed from Nixpkgs. +- `services.eris-server` was removed from Nixpkgs due to a hostile upstream. + - `prosody` gained a config check option named `services.prosody.checkConfig` which runs `prosodyctl check config` and is turned on by default. - `services.dependency-track` removed its configuration of the JVM heap size. This lets the JVM choose its maximum heap size automatically, which should work much better in practice for most users. For deployments on systems with little RAM, it may now be necessary to manually configure a maximum heap size using {option}`services.dependency-track.javaArgs`. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 03c880b3705d..d0b01c034caa 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1052,7 +1052,6 @@ ./services/network-filesystems/davfs2.nix ./services/network-filesystems/diod.nix ./services/network-filesystems/drbd.nix - ./services/network-filesystems/eris-server.nix ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/kbfs.nix diff --git a/nixos/modules/services/network-filesystems/eris-server.nix b/nixos/modules/services/network-filesystems/eris-server.nix deleted file mode 100644 index 5782d76f2661..000000000000 --- a/nixos/modules/services/network-filesystems/eris-server.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.services.eris-server; - stateDirectoryPath = "\${STATE_DIRECTORY}"; - nullOrStr = with lib.types; nullOr str; -in -{ - - options.services.eris-server = { - - enable = lib.mkEnableOption "an ERIS server"; - - package = lib.mkOption { - type = lib.types.package; - default = pkgs.eris-go; - defaultText = lib.literalExpression "pkgs.eris-go"; - description = "Package to use for the ERIS server."; - }; - - decode = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether the HTTP service (when enabled) will decode ERIS content at /uri-res/N2R?urn:eris:. - Enabling this is recommended only for private or local-only servers. - ''; - }; - - listenCoap = lib.mkOption { - type = nullOrStr; - default = ":5683"; - example = "[::1]:5683"; - description = '' - Server CoAP listen address. Listen on all IP addresses at port 5683 by default. - Please note that the server can service client requests for ERIS-blocks by - querying other clients connected to the server. Whether or not blocks are - relayed back to the server depends on client configuration but be aware this - may leak sensitive metadata and trigger network activity. - ''; - }; - - listenHttp = lib.mkOption { - type = nullOrStr; - default = null; - example = "[::1]:8080"; - description = "Server HTTP listen address. Do not listen by default."; - }; - - backends = lib.mkOption { - type = with lib.types; listOf str; - description = '' - List of backend URLs. - Add "get" and "put" as query elements to enable those operations. - ''; - example = [ - "badger+file:///var/db/eris.badger?get&put" - "coap+tcp://eris.example.com:5683?get" - ]; - }; - - mountpoint = lib.mkOption { - type = nullOrStr; - default = null; - example = "/eris"; - description = '' - Mountpoint for FUSE namespace that exposes "urn:eris:…" files. - ''; - }; - - }; - - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = lib.strings.versionAtLeast cfg.package.version "20231219"; - message = "Version of `config.services.eris-server.package` is incompatible with this module"; - } - ]; - - systemd.services.eris-server = - let - cmd = - "${cfg.package}/bin/eris-go server" - + (lib.optionalString (cfg.listenCoap != null) " --coap '${cfg.listenCoap}'") - + (lib.optionalString (cfg.listenHttp != null) " --http '${cfg.listenHttp}'") - + (lib.optionalString cfg.decode " --decode") - + (lib.optionalString (cfg.mountpoint != null) " --mountpoint '${cfg.mountpoint}'"); - in - { - description = "ERIS block server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment.ERIS_STORE_URL = toString cfg.backends; - script = lib.mkIf (cfg.mountpoint != null) '' - export PATH=${config.security.wrapperDir}:$PATH - ${cmd} - ''; - serviceConfig = - let - umounter = lib.mkIf ( - cfg.mountpoint != null - ) "-${config.security.wrapperDir}/fusermount -uz ${cfg.mountpoint}"; - in - if (cfg.mountpoint == null) then - { - ExecStart = cmd; - } - else - { - ExecStartPre = umounter; - ExecStopPost = umounter; - } - // { - Restart = "always"; - RestartSec = 20; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - }; - }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cf347fc92061..74b116a7de37 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -494,7 +494,6 @@ in }; ergo = runTest ./ergo.nix; ergochat = runTest ./ergochat.nix; - eris-server = runTest ./eris-server.nix; esphome = runTest ./esphome.nix; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; activation = pkgs.callPackage ../modules/system/activation/test.nix { }; diff --git a/nixos/tests/eris-server.nix b/nixos/tests/eris-server.nix deleted file mode 100644 index a87e5cad3400..000000000000 --- a/nixos/tests/eris-server.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, lib, ... }: -{ - name = "eris-server"; - - nodes.server = { - environment.systemPackages = [ - pkgs.eris-go - pkgs.eriscmd - ]; - services.eris-server = { - enable = true; - decode = true; - listenHttp = "[::1]:80"; - backends = [ "badger+file:///var/cache/eris.badger?get&put" ]; - mountpoint = "/eris"; - }; - }; - - testScript = '' - start_all() - server.wait_for_unit("eris-server.service") - server.wait_for_open_port(5683) - server.wait_for_open_port(80) - server.succeed("eriscmd get http://[::1] $(echo 'Hail ERIS!' | eriscmd put coap+tcp://[::1]:5683)") - ''; -} diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix deleted file mode 100644 index c0f833a94e8d..000000000000 --- a/pkgs/by-name/er/eris-go/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitea, - nixosTests, - installShellFiles, -}: - -buildGoModule rec { - pname = "eris-go"; - version = "20241028"; - outputs = [ - "out" - "man" - ]; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "eris"; - repo = "eris-go"; - rev = version; - hash = "sha256-v4pN+fVwYoir3GLneWhg/azsg7ifvcKAksoqDkkQGwk="; - }; - - vendorHash = "sha256-0BI4U9p4R7umyXtHAQBLa5t5+ni4dDndLNXgTIAMsqw="; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - install -D *.1.gz -t $man/share/man/man1 - installShellCompletion --cmd eris-go \ - --fish completions/eris-go.fish - ''; - - env.skipNetworkTests = true; - - passthru.tests = { inherit (nixosTests) eris-server; }; - - meta = src.meta // { - description = "Implementation of ERIS for Go"; - homepage = "https://codeberg.org/eris/eris-go"; - license = lib.licenses.bsd3; - mainProgram = "eris-go"; - }; -} diff --git a/pkgs/by-name/er/eriscmd/lock.json b/pkgs/by-name/er/eriscmd/lock.json deleted file mode 100644 index af543908cf4b..000000000000 --- a/pkgs/by-name/er/eriscmd/lock.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "depends": [ - { - "method": "fetchzip", - "packages": [ - "base32" - ], - "path": "/nix/store/qcnchjsak3hyn4c6r0zd6qvm7j8y1747-source", - "ref": "0.1.3", - "rev": "f541038fbe49fdb118cc2002d29824b9fc4bfd61", - "sha256": "16gh1ifp9hslsg0is0v1ya7rxqfhq5hjqzc3pfdqvcgibp5ybh06", - "srcDir": "", - "url": "https://github.com/OpenSystemsLab/base32.nim/archive/f541038fbe49fdb118cc2002d29824b9fc4bfd61.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "cbor" - ], - "path": "/nix/store/70cqa9s36dqnmsf179cn9psj77jhqi1l-source", - "ref": "20230619", - "rev": "a4a1affd45ba90bea24e08733ae2bd02fe058166", - "sha256": "005ib6im97x9pdbg6p0fy58zpdwdbkpmilxa8nhrrb1hnpjzz90p", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/nim_cbor/archive/a4a1affd45ba90bea24e08733ae2bd02fe058166.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "coap" - ], - "path": "/nix/store/pqj933cnw7r7hp46jrpjlwh1yr0jvckp-source", - "ref": "20230331", - "rev": "a134213b51a8d250684f2ba26802ffa97fae4ffb", - "sha256": "1wbix6d8l26nj7m3xinh4m2f27n4ma0yzs3x5lpann2ha0y51k8b", - "srcDir": "src", - "url": "https://codeberg.org/eris/nim-coap/archive/a134213b51a8d250684f2ba26802ffa97fae4ffb.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "configparser" - ], - "path": "/nix/store/4zl5v7i6cj3f9sayvsjcx2h20lqwr9a6-source", - "ref": "newSection", - "rev": "695f1285d63f1954c25eb1f42798d90fa7bcbe14", - "sha256": "0b0pb5i0kir130ia2zf8zcgdz8awms161i6p83ri3nbgibbjnr37", - "srcDir": "src", - "url": "https://github.com/ehmry/nim-configparser/archive/695f1285d63f1954c25eb1f42798d90fa7bcbe14.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "freedesktop_org" - ], - "path": "/nix/store/98wncmx58cfnhv3y96lzwm22zvyk9b1h-source", - "ref": "20230210", - "rev": "fb04d0862aca4be2edcc0eafa94b1840030231c8", - "sha256": "0wj5m09x1pr36gv8p5r72p6l3wwl01y8scpnlzx7q0h5ij6jaj6s", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/freedesktop_org/archive/fb04d0862aca4be2edcc0eafa94b1840030231c8.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "getdns" - ], - "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source", - "ref": "20221222", - "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6", - "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "illwill" - ], - "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source", - "ref": "v0.3.2", - "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625", - "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z", - "srcDir": "", - "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "taps" - ], - "path": "/nix/store/did1li0xk9qih80pvxqhjc4np3ijlfjj-source", - "ref": "20230331", - "rev": "4f9c9972d74eb39c662b43ed79d761e109bf00f1", - "sha256": "12qsizmisr1q0q4x37c5q6gmnqb5mp0bid7s3jlcsjvhc4jw2q57", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/nim_taps/archive/4f9c9972d74eb39c662b43ed79d761e109bf00f1.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "tkrzw" - ], - "path": "/nix/store/4x9wxyli4dy719svg1zaww0c0b3xckp0-source", - "ref": "20220922", - "rev": "efd87edb7b063182c1a1fa018006a87b515d589b", - "sha256": "1h0sdvai4gkkz48xfh67wa1xz2k8bkkba8q6snnbllmhmywd9apb", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/nim-tkrzw/archive/efd87edb7b063182c1a1fa018006a87b515d589b.tar.gz" - } - ] -} diff --git a/pkgs/by-name/er/eriscmd/package.nix b/pkgs/by-name/er/eriscmd/package.nix deleted file mode 100644 index bc3b2ff66ffe..000000000000 --- a/pkgs/by-name/er/eriscmd/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildNimPackage, - fetchFromGitea, -}: - -buildNimPackage ( - final: prev: { - pname = "eris"; - version = "20230722"; - outputs = [ - "bin" - "out" - ]; - requiredNimVersion = 1; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "eris"; - repo = "nim-eris"; - rev = final.version; - hash = "sha256-JVl2/PmFVYuD4s9hKoQwVDKUa3PBWK5SBDEmVHVSuig="; - }; - lockFile = ./lock.json; - postInstall = '' - mkdir -p "$bin/share/recoll/filters" - mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/" - - mkdir -p "$bin/share/applications" - substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\ - --replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd " - - install -D "eris-link.xml" -t "$bin/share/mime/packages" - install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png" - ''; - meta = final.src.meta // { - homepage = "https://codeberg.org/eris/nim-eris"; - license = lib.licenses.unlicense; - mainProgram = "eriscmd"; - badPlatforms = lib.platforms.darwin; - }; - } -) diff --git a/pkgs/by-name/pr/preserves-nim/package.nix b/pkgs/by-name/pr/preserves-nim/package.nix deleted file mode 100644 index 93e9ebe0535e..000000000000 --- a/pkgs/by-name/pr/preserves-nim/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildNimSbom, - fetchFromGitea, -}: - -buildNimSbom (finalAttrs: { - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "preserves-nim"; - rev = finalAttrs.version; - hash = "sha256-A1v72ToSLEEUZTNcPl82t8OKvr5heQCWVWYEJh362Eo="; - }; - - # Tests requires balls which is not listed in the lockfilee. - doCheck = false; - - postInstall = '' - pushd $out/bin - for link in preserves-decode \ - preserves-from-json preserves-to-json \ - preserves-from-xml preserves-to-xml - do ln -s preserves-encode $link - done - popd - ''; - - meta = { - description = "Utilities for working with Preserves documents and schemas"; - license = lib.licenses.unlicense; - homepage = "https://git.syndicate-lang.org/ehmry/preserves-nim"; - }; -}) ./sbom.json diff --git a/pkgs/by-name/pr/preserves-nim/sbom.json b/pkgs/by-name/pr/preserves-nim/sbom.json deleted file mode 100644 index 8af7db0163fe..000000000000 --- a/pkgs/by-name/pr/preserves-nim/sbom.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "bomFormat": "CycloneDX", - "specVersion": "1.6", - "metadata": { - "component": { - "type": "application", - "bom-ref": "pkg:nim/preserves", - "name": "preserves", - "description": "data model and serialization format", - "version": "20241201", - "authors": [ - { - "name": "Emery Hemingway" - } - ], - "licenses": [ - { - "license": { - "id": "Unlicense" - } - } - ], - "properties": [ - { - "name": "nim:skipExt", - "value": "nim" - }, - { - "name": "nim:bin:preserves-encode", - "value": "preserves/private/preserves_encode" - }, - { - "name": "nim:bin:preserves-schema-nim", - "value": "preserves/preserves_schema_nim" - }, - { - "name": "nim:bin:preserves-schemac", - "value": "preserves/preserves_schemac" - }, - { - "name": "nim:srcDir", - "value": "src" - }, - { - "name": "nim:backend", - "value": "c" - } - ] - } - }, - "components": [ - { - "type": "library", - "bom-ref": "pkg:nim/npeg", - "name": "npeg", - "version": "1.2.2", - "externalReferences": [ - { - "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/zevv/npeg.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source" - }, - { - "name": "nix:fod:rev", - "value": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d" - }, - { - "name": "nix:fod:sha256", - "value": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "1.2.2" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/bigints", - "name": "bigints", - "version": "20231006", - "externalReferences": [ - { - "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/ehmry/nim-bigints.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source" - }, - { - "name": "nix:fod:rev", - "value": "86ea14d31eea9275e1408ca34e6bfe9c99989a96" - }, - { - "name": "nix:fod:sha256", - "value": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20231006" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - } - ], - "dependencies": [ - { - "ref": "pkg:nim/preserves", - "dependsOn": [ - "pkg:nim/npeg", - "pkg:nim/bigints" - ] - }, - { - "ref": "pkg:nim/npeg", - "dependsOn": [] - }, - { - "ref": "pkg:nim/bigints", - "dependsOn": [] - } - ] -} diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix deleted file mode 100644 index fb819917d425..000000000000 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildNimSbom, - fetchFromGitea, - libxml2, - libxslt, - openssl, - libpq, - sqlite, -}: - -buildNimSbom (finalAttrs: { - pname = "syndicate_utils"; - - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "syndicate_utils"; - rev = finalAttrs.version; - hash = "sha256-zHVL2A5mAZX73Xk6Pcs02wHCAVfsOYxDO8/yKX0FvBs="; - }; - - buildInputs = [ - libpq - sqlite - libxml2 - libxslt - openssl - ]; - - meta = finalAttrs.src.meta // { - description = "Utilities for the Syndicated Actor Model"; - homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; - license = lib.licenses.unlicense; - }; -}) ./sbom.json diff --git a/pkgs/by-name/sy/syndicate_utils/sbom.json b/pkgs/by-name/sy/syndicate_utils/sbom.json deleted file mode 100644 index c524b9cb0ec9..000000000000 --- a/pkgs/by-name/sy/syndicate_utils/sbom.json +++ /dev/null @@ -1,657 +0,0 @@ -{ - "bomFormat": "CycloneDX", - "specVersion": "1.6", - "metadata": { - "component": { - "type": "application", - "bom-ref": "pkg:nim/syndicate_utils", - "name": "syndicate_utils", - "description": "Utilities for Syndicated Actors and Synit", - "version": "20250422", - "authors": [ - { - "name": "Emery Hemingway" - } - ], - "licenses": [ - { - "license": { - "id": "Unlicense" - } - } - ], - "properties": [ - { - "name": "nim:skipExt", - "value": "nim" - }, - { - "name": "nim:bin:dns-actor", - "value": "dns_actor" - }, - { - "name": "nim:bin:esc-printer-driver", - "value": "esc_printer_driver" - }, - { - "name": "nim:bin:mintsturdyref", - "value": "mintsturdyref" - }, - { - "name": "nim:bin:mount-actor", - "value": "mount_actor" - }, - { - "name": "nim:bin:msg", - "value": "msg" - }, - { - "name": "nim:bin:postgre-actor", - "value": "postgre_actor" - }, - { - "name": "nim:bin:preserve-process-environment", - "value": "preserve_process_environment" - }, - { - "name": "nim:bin:rofi-script-actor", - "value": "rofi_script_actor" - }, - { - "name": "nim:bin:sqlite-actor", - "value": "sqlite_actor" - }, - { - "name": "nim:bin:syndesizer", - "value": "syndesizer" - }, - { - "name": "nim:bin:syndump", - "value": "syndump" - }, - { - "name": "nim:bin:synqa", - "value": "synqa" - }, - { - "name": "nim:bin:xslt-actor", - "value": "xslt_actor" - }, - { - "name": "nim:srcDir", - "value": "src" - }, - { - "name": "nim:backend", - "value": "c" - } - ] - } - }, - "components": [ - { - "type": "library", - "bom-ref": "pkg:nim/syndicate", - "name": "syndicate", - "version": "trunk", - "externalReferences": [ - { - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/crza0j3plp9a0bw78cinyk6hwhn3llcf-source" - }, - { - "name": "nix:fod:rev", - "value": "9c3dbbaa661dfc191ccb5be791a78cf977adec8b" - }, - { - "name": "nix:fod:sha256", - "value": "08pa25f7d0x1228hmrpzn7g2jd1bwip4fvihvw4mx335ssx317kw" - }, - { - "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "trunk" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/preserves", - "name": "preserves", - "version": "20250214", - "externalReferences": [ - { - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/1d8nbd5nfqpl6l3c7c783h6r0gc47vwf-source" - }, - { - "name": "nix:fod:rev", - "value": "21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e" - }, - { - "name": "nix:fod:sha256", - "value": "136kr6pj5rv3184ykishbkmg86ss85nzygy5wc1lr9l0pgwx6936" - }, - { - "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20250214" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - }, - { - "name": "nix:fod:date", - "value": "2024-05-23T15:58:40+03:00" - }, - { - "name": "nix:fod:hash", - "value": "sha256-JvdvLdPajDgIPbLblO0LbOm0wEp530fs8LYmgH885sk=" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/sys", - "name": "sys", - "version": "4ef3b624db86e331ba334e705c1aa235d55b05e1", - "externalReferences": [ - { - "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/ehmry/nim-sys.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source" - }, - { - "name": "nix:fod:rev", - "value": "4ef3b624db86e331ba334e705c1aa235d55b05e1" - }, - { - "name": "nix:fod:sha256", - "value": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/taps", - "name": "taps", - "version": "20240405", - "externalReferences": [ - { - "url": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://git.sr.ht/~ehmry/nim_taps", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/6y14ia52kr7jyaa0izx37mlablmq9s65-source" - }, - { - "name": "nix:fod:rev", - "value": "8c8572cd971d1283e6621006b310993c632da247" - }, - { - "name": "nix:fod:sha256", - "value": "1dp166bv9x773jmfqppg5i3v3rilgff013vb11yzwcid9l7s3iy8" - }, - { - "name": "nix:fod:url", - "value": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20240405" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/nimcrypto", - "name": "nimcrypto", - "version": "traditional-api", - "externalReferences": [ - { - "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/cheatfate/nimcrypto", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source" - }, - { - "name": "nix:fod:rev", - "value": "602c5d20c69c76137201b5d41f788f72afb95aa8" - }, - { - "name": "nix:fod:sha256", - "value": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "traditional-api" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/npeg", - "name": "npeg", - "version": "1.2.2", - "externalReferences": [ - { - "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/zevv/npeg.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source" - }, - { - "name": "nix:fod:rev", - "value": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d" - }, - { - "name": "nix:fod:sha256", - "value": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "1.2.2" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/bigints", - "name": "bigints", - "version": "20231006", - "externalReferences": [ - { - "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/ehmry/nim-bigints.git", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source" - }, - { - "name": "nix:fod:rev", - "value": "86ea14d31eea9275e1408ca34e6bfe9c99989a96" - }, - { - "name": "nix:fod:sha256", - "value": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20231006" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/cps", - "name": "cps", - "version": "0.10.4", - "externalReferences": [ - { - "url": "https://github.com/nim-works/cps/archive/2a4d771a715ba45cfba3a82fa625ae7ad6591c8b.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/nim-works/cps", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/m9vpcf3dq6z2h1xpi1vlw0ycxp91s5p7-source" - }, - { - "name": "nix:fod:rev", - "value": "2a4d771a715ba45cfba3a82fa625ae7ad6591c8b" - }, - { - "name": "nix:fod:sha256", - "value": "0c62k5wpq9z9mn8cd4rm8jjc4z0xmnak4piyj5dsfbyj6sbdw2bf" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/nim-works/cps/archive/2a4d771a715ba45cfba3a82fa625ae7ad6591c8b.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "0.10.4" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/stew", - "name": "stew", - "version": "3c91b8694e15137a81ec7db37c6c58194ec94a6a", - "externalReferences": [ - { - "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://github.com/status-im/nim-stew", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source" - }, - { - "name": "nix:fod:rev", - "value": "3c91b8694e15137a81ec7db37c6c58194ec94a6a" - }, - { - "name": "nix:fod:sha256", - "value": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w" - }, - { - "name": "nix:fod:url", - "value": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/getdns", - "name": "getdns", - "version": "20241222", - "externalReferences": [ - { - "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://git.sr.ht/~ehmry/getdns-nim", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/k662j228f0xh75d75jb212zhy5qd85dv-source" - }, - { - "name": "nix:fod:rev", - "value": "7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7" - }, - { - "name": "nix:fod:sha256", - "value": "1j80pv2kv7hxcmxpy6ykil01jywffaagcb1jad5aam4m9r2bfbp0" - }, - { - "name": "nix:fod:url", - "value": "https://git.sr.ht/~ehmry/getdns-nim/archive/7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20241222" - }, - { - "name": "nix:fod:srcDir", - "value": "src" - } - ] - }, - { - "type": "library", - "bom-ref": "pkg:nim/solo5_dispatcher", - "name": "solo5_dispatcher", - "version": "20240522", - "externalReferences": [ - { - "url": "https://git.sr.ht/~ehmry/solo5_dispatcher/archive/cc64ef99416b22b12e4a076d33de9e25a163e57d.tar.gz", - "type": "source-distribution" - }, - { - "url": "https://git.sr.ht/~ehmry/solo5_dispatcher", - "type": "vcs" - } - ], - "properties": [ - { - "name": "nix:fod:method", - "value": "fetchzip" - }, - { - "name": "nix:fod:path", - "value": "/nix/store/4jj467pg4hs6warhksb8nsxn9ykz8c7c-source" - }, - { - "name": "nix:fod:rev", - "value": "cc64ef99416b22b12e4a076d33de9e25a163e57d" - }, - { - "name": "nix:fod:sha256", - "value": "1v9i9fqgx1g76yrmz2xwj9mxfwbjfpar6dsyygr68fv9031cqxq7" - }, - { - "name": "nix:fod:url", - "value": "https://git.sr.ht/~ehmry/solo5_dispatcher/archive/cc64ef99416b22b12e4a076d33de9e25a163e57d.tar.gz" - }, - { - "name": "nix:fod:ref", - "value": "20240522" - }, - { - "name": "nix:fod:srcDir", - "value": "pkg" - } - ] - } - ], - "dependencies": [ - { - "ref": "pkg:nim/syndicate_utils", - "dependsOn": [ - "pkg:nim/syndicate" - ] - }, - { - "ref": "pkg:nim/syndicate", - "dependsOn": [ - "pkg:nim/nimcrypto", - "pkg:nim/preserves", - "pkg:nim/sys", - "pkg:nim/taps" - ] - }, - { - "ref": "pkg:nim/preserves", - "dependsOn": [ - "pkg:nim/npeg", - "pkg:nim/bigints" - ] - }, - { - "ref": "pkg:nim/sys", - "dependsOn": [ - "pkg:nim/cps", - "pkg:nim/stew" - ] - }, - { - "ref": "pkg:nim/taps", - "dependsOn": [ - "pkg:nim/getdns", - "pkg:nim/sys", - "pkg:nim/cps", - "pkg:nim/solo5_dispatcher" - ] - }, - { - "ref": "pkg:nim/nimcrypto", - "dependsOn": [] - }, - { - "ref": "pkg:nim/npeg", - "dependsOn": [] - }, - { - "ref": "pkg:nim/bigints", - "dependsOn": [] - }, - { - "ref": "pkg:nim/cps", - "dependsOn": [] - }, - { - "ref": "pkg:nim/stew", - "dependsOn": [] - }, - { - "ref": "pkg:nim/getdns", - "dependsOn": [] - }, - { - "ref": "pkg:nim/solo5_dispatcher", - "dependsOn": [ - "pkg:nim/cps" - ] - } - ] -} diff --git a/pkgs/development/python-modules/eris/default.nix b/pkgs/development/python-modules/eris/default.nix deleted file mode 100644 index 957f438296a6..000000000000 --- a/pkgs/development/python-modules/eris/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - aiocoap, - pycryptodome, -}: - -buildPythonPackage rec { - pname = "eris"; - version = "1.0.0"; - pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-aiPmf759Cd3SeKfQtqgszcKkhZPM4dNY2x9YxJFPRh0="; - }; - build-system = [ setuptools ]; - dependencies = [ - aiocoap - pycryptodome - ]; - meta = { - description = "Python implementation of the Encoding for Robust Immutable Storage (ERIS)"; - homepage = "https://eris.codeberg.page/python-eris/"; - license = [ lib.licenses.agpl3Plus ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b8905d31c3fc..3b228177352b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -846,6 +846,9 @@ mapAliases { ephemeral = throw "'ephemeral' has been archived upstream since 2022-04-02"; # added 2025-04-12 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 + eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 + eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 + erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01 @@ -1935,6 +1938,7 @@ mapAliases { posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 powerdns = pdns; # Added 2022-03-28 presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24 + preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10 cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19 @@ -2292,6 +2296,7 @@ mapAliases { syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; + syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 ### T ### diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f21e5ef1cd17..a21199a8ef40 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -242,6 +242,7 @@ mapAliases ({ enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 + eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81523a7049d6..478a19181288 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4765,8 +4765,6 @@ self: super: with self; { eradicate = callPackage ../development/python-modules/eradicate { }; - eris = callPackage ../development/python-modules/eris { }; - es-client = callPackage ../development/python-modules/es-client { }; escapism = callPackage ../development/python-modules/escapism { };