From 2d8cbdb5250692fb901723ce3cfe4afcb9760df7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 7 Oct 2025 21:27:36 +0200 Subject: [PATCH] languageMachines: drop --- .../libraries/languagemachines/packages.nix | 18 ----- .../libraries/languagemachines/update | 79 ------------------- pkgs/top-level/aliases.nix | 12 +++ pkgs/top-level/all-packages.nix | 6 -- 4 files changed, 12 insertions(+), 103 deletions(-) delete mode 100644 pkgs/development/libraries/languagemachines/packages.nix delete mode 100755 pkgs/development/libraries/languagemachines/update diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix deleted file mode 100644 index 9fccc23f1eee..000000000000 --- a/pkgs/development/libraries/languagemachines/packages.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs }: -let - inherit (pkgs) callPackage; - icu = pkgs.icu60; -in -{ - ticcutils = pkgs.ticcutils; - libfolia = pkgs.libfolia; - ucto = pkgs.ucto; - uctodata = pkgs.uctodata; - timbl = pkgs.timbl; - timblserver = pkgs.timblserver; - mbt = pkgs.mbt; - frog = pkgs.frog; - frogdata = pkgs.frogdata; - - test = pkgs.frog.tests.simple; -} diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update deleted file mode 100755 index 3189637df746..000000000000 --- a/pkgs/development/libraries/languagemachines/update +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell --packages curl -#!nix-shell --packages jq -#!nix-shell --packages parallel -#!nix-shell -i bash - -# Exit immediately if a command exits with a non-zero status. -# Exit when a producer fails in a pipe -# Treat undefined variable references as errors -set -e -o pipefail -u - -# Check if working directory is (probably) right -test "./update" = $0 || { - echo "The working directory ought to be the same is the update script location. Please invoke as ./update" 1>&2 - exit 1 -} - -# Create temporary directory with automatic cleanup -readonly MY_TMP="$(mktemp -d)" -cleanup () { - rm -rf "$MY_TMP" -} -trap cleanup EXIT - -# stdout: file containing release info and a convenient placeholder -# for the sha256 attribute -getRelease () { - local owner="$1" - local repo="$2" - local out="$MY_TMP/$owner--$repo-release" - curl -fSs https://api.github.com/repos/"$owner"/"$repo"/releases/latest \ - | jq '{ version: .name, url: .tarball_url, sha256: "__SHA256__" }' \ - > "$out" - echo "$out" -} - -# 'getters' for the release info file - -# stdout: unquoted tarball url -releaseUrl () { - local file="$1" - jq -r '.url' <"$file" -} - -# stdout: unquoted version -releaseVersion () { - local file="$1" - jq -r '.version' <"$file" -} - -# Fetch release tarball and compute hash -# stdout: base32 sha256 to be used in fetchurl -getReleaseHash () { - local file="$1" - local name="$2" - nix-prefetch-url "$(releaseUrl "$file")" --name "$name-$(releaseVersion "$file").tar.gz" -} - -# Write a release info file to release-info/$owner-$repo.json -updateRelease () { - local owner="$1" - local repo="$2" - local r="$(getRelease "$owner" "$repo")" - local hash="$(getReleaseHash "$r" "$repo")" - sed \ - -e s/__SHA256__/"$hash"/\ - <"$r" \ - >"release-info/$owner-$repo.json" -} - -updateRelease LanguageMachines frogdata -updateRelease LanguageMachines frog -updateRelease LanguageMachines libfolia -updateRelease LanguageMachines mbt -updateRelease LanguageMachines ticcutils -updateRelease LanguageMachines timbl -updateRelease LanguageMachines timblserver -updateRelease LanguageMachines ucto -updateRelease LanguageMachines uctodata diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b68aeeb3cf5f..d3c69bd85fe4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1304,6 +1304,18 @@ mapAliases { ### L ### l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14 + languageMachines = { + ticcutils = ticcutils; + libfolia = libfolia; + ucto = ucto; + uctodata = uctodata; + timbl = timbl; + timblserver = timblserver; + mbt = mbt; + frog = frog; + frogdata = frogdata; + test = frog.tests.simple; + }; # Added 2025-10-07 larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48e2ab540f29..8b63b3f30b07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7755,12 +7755,6 @@ with pkgs; stdenv = gccStdenv; }; - languageMachines = recurseIntoAttrs ( - import ../development/libraries/languagemachines/packages.nix { - inherit pkgs; - } - ); - lcms = lcms2; libagar = callPackage ../development/libraries/libagar { };