diff --git a/misc/plover.nix b/misc/plover.nix index 298247d..e6920a4 100644 --- a/misc/plover.nix +++ b/misc/plover.nix @@ -54,7 +54,12 @@ in rec { buildPythonPackage rec { inherit (tarballs.plover-yaml-dictionary-src.passthru) pname version; src = tarballs.plover-yaml-dictionary-src; - propagatedBuildInputs = [plover]; + propagatedBuildInputs = [plover ruamel-yaml]; + }; + ruamel-yaml = with python3Packages; + buildPythonPackage rec { + inherit (tarballs.ruamel-yaml-src.passthru) pname version; + src = tarballs.ruamel-yaml-src; }; regenpfeifer-env = pypy3.withPackages (ps: [ps.marisa-trie]); wortformliste = pkgs.stdenvNoCC.mkDerivation { diff --git a/python/tarballs.nix b/python/tarballs.nix index d7483c2..2e280c6 100644 --- a/python/tarballs.nix +++ b/python/tarballs.nix @@ -52,4 +52,10 @@ in rec { passthru.pname = "simplefuzzyset"; passthru.version = "0.0.12"; }; + ruamel-yaml-src = fetchurl { + url = "https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c/ruamel.yaml-0.17.21.tar.gz"; + sha256 = "8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af"; + passthru.pname = "ruamel.yaml"; + passthru.version = "0.17.21"; + }; } diff --git a/python/update.sh b/python/update.sh index 81b1ab3..4e0504a 100755 --- a/python/update.sh +++ b/python/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl jq set -e -PACKAGES="plover-plugins-manager plover-stroke rtf-tokenize plover-regenpfeifer plover-emoji plover-tapey-tape plover-yaml-dictionary simplefuzzyset" +PACKAGES="plover-plugins-manager plover-stroke rtf-tokenize plover-regenpfeifer plover-emoji plover-tapey-tape plover-yaml-dictionary simplefuzzyset ruamel.yaml" cat > tarballs.nix << EOF { inputs, pkgs }: let @@ -15,8 +15,9 @@ for package in $PACKAGES; do VERSION=$(echo -E "$JSON" | jq -r '.info.version') URL=$(echo "$FILE_INFO" | jq -r '.url') SHA256=$(echo "$FILE_INFO" | jq -r '.digests.sha256') + sanitized_package=$(echo $package | sed 's/\./-/g') cat >> tarballs.nix << EOF - $package-src = fetchurl { + $sanitized_package-src = fetchurl { url = "$URL"; sha256 = "$SHA256"; passthru.pname = "$package";