diff --git a/flake.lock b/flake.lock index 7fc72233..8e0854dc 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734833734, - "narHash": "sha256-CGB1DifhWz3sbeLEFrQ8gxQQltbGonqrxD6xWvccQ+o=", + "lastModified": 1735765398, + "narHash": "sha256-tU7wFUNkThhYMAttCpuKyqHC+UgPRpBAr9dHtDKxGhk=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "c4452c6f95cebde539f316d806644837f8b5e75f", + "rev": "387f1ba65022e4ae17b4d64f44657bea8497aa10", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1734729217, - "narHash": "sha256-UaBik0h7veLw+VqsK5EP2ucC68BEkHLDJkcfmY+wEuY=", + "lastModified": 1735160684, + "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "98c1c2e934995a2c6ce740d4ff43ce0daa19b79f", + "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734435836, - "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", + "lastModified": 1735873913, + "narHash": "sha256-2aXF7GlIMN5ruk0OL+GkbquQY5Psgo+NqdHYthEaDGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4989a246d7a390a859852baddb1013f825435cee", + "rev": "d33cc2bd23b6b1d5c1af1a5dba9b774216bc0312", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734529975, - "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -302,11 +302,11 @@ ] }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { @@ -338,11 +338,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1735135567, + "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", "type": "github" }, "original": { diff --git a/pkgs/by-name/gpgme_1_24_0/package.nix b/pkgs/by-name/gpgme_1_24_0/package.nix deleted file mode 100644 index 84165ec3..00000000 --- a/pkgs/by-name/gpgme_1_24_0/package.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - python3, - gpgme, - fetchurl, - lib, - swig, -}: -let - gpgme_1_24_0 = gpgme.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "1.24.0"; - src = fetchurl { - url = "mirror://gnupg/gpgme/gpgme-${finalAttrs.version}.tar.bz2"; - hash = "sha256-YeOmrYkyP+z6/xdrwXKPuMMxLy+qg0JNnVB3uiD199o="; - }; - patches = - if lib.versionAtLeast previousAttrs.version finalAttrs.version then - previousAttrs.patches - else - lib.lists.drop 1 previousAttrs.patches; - postPatch = - if lib.versionAtLeast previousAttrs.version finalAttrs.version then - previousAttrs.postPatch - else - null; - } - ); -in -python3.pkgs.buildPythonPackage { - pname = "gpgme"; - inherit (gpgme_1_24_0) version src patches; - pyproject = true; - - postPatch = '' - substituteInPlace lang/python/setup.py.in \ - --replace-fail "gpgme_h = '''" "gpgme_h = '${lib.getDev gpgme_1_24_0}/include/gpgme.h'" - ''; - - configureFlags = gpgme_1_24_0.configureFlags ++ [ - "--enable-languages=python" - ]; - - postConfigure = " - cd lang/python - "; - - preBuild = '' - make copystamp - ''; - - build-system = [ - python3.pkgs.setuptools - ]; - - nativeBuildInputs = [ - swig - ]; - - buildInputs = [ - gpgme_1_24_0 - ]; - - pythonImportsCheck = [ "gpg" ]; - - meta = gpgme_1_24_0.meta // { - description = "Python bindings to the GPGME API of the GnuPG cryptography library"; - homepage = "https://dev.gnupg.org/source/gpgme/browse/master/lang/python/"; - }; -} diff --git a/pkgs/by-name/libervia-backend/package.nix b/pkgs/by-name/libervia-backend/package.nix index 46d04e62..950da3bd 100644 --- a/pkgs/by-name/libervia-backend/package.nix +++ b/pkgs/by-name/libervia-backend/package.nix @@ -28,7 +28,6 @@ writeScript, x3dh, xeddsa, - gpgme_1_24_0, }: python3Packages.buildPythonApplication rec { pname = "libervia-backend"; @@ -115,7 +114,7 @@ python3Packages.buildPythonApplication rec { cryptography dbus-python emoji - gpgme_1_24_0 + gpgme gst-python html2text jinja2 diff --git a/pkgs/by-name/libresoc-nmigen/nmigen.nix b/pkgs/by-name/libresoc-nmigen/nmigen.nix index 597e161e..2a7cf8db 100644 --- a/pkgs/by-name/libresoc-nmigen/nmigen.nix +++ b/pkgs/by-name/libresoc-nmigen/nmigen.nix @@ -9,7 +9,7 @@ }: python39Packages.buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2024-03-31"; + version = "0-unstable-2022-09-27"; realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; # libresoc's nmigen fork has been renamed to https://github.com/amaranth-lang/amaranth @@ -22,6 +22,11 @@ python39Packages.buildPythonPackage rec { rev = "29dec30f628356828aa2aa2b91ce205a570d664e"; # HEAD @ version date }; + # https://github.com/YosysHQ/yosys/pull/4704 + postPatch = '' + sed -i "s/read_ilang/read_rtlil/g" nmigen/back/*.py nmigen/vendor/*.py tests/*.py + ''; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; diff --git a/pkgs/by-name/libresoc-nmigen/nmutil.nix b/pkgs/by-name/libresoc-nmigen/nmutil.nix index 34d2e074..53a645a8 100644 --- a/pkgs/by-name/libresoc-nmigen/nmutil.nix +++ b/pkgs/by-name/libresoc-nmigen/nmutil.nix @@ -7,9 +7,9 @@ nmigen, pytest-output-to-files, }: -python39Packages.buildPythonPackage rec { +python39Packages.buildPythonPackage { pname = "libresoc-nmutil"; # Libre-SOC's bespoke fork - version = "unstable-2024-03-31"; + version = "0-unstable-2022-11-16"; src = fetchFromLibresoc { pname = "nmutil"; @@ -17,6 +17,11 @@ python39Packages.buildPythonPackage rec { hash = "sha256-8jXQGO4IeB6WjGtjuHO8UBh9n3ei7LukmRoXSbNJ1vM="; }; + # https://github.com/YosysHQ/yosys/pull/4704 + postPatch = '' + sed -i "s/read_ilang/read_rtlil/g" build/lib/nmutil/*.py src/nmutil/*.py + ''; + propagatedNativeBuildInputs = [ symbiyosys diff --git a/pkgs/by-name/wokkel/package.nix b/pkgs/by-name/wokkel/package.nix index 2dcfd4b3..d690d725 100644 --- a/pkgs/by-name/wokkel/package.nix +++ b/pkgs/by-name/wokkel/package.nix @@ -21,6 +21,11 @@ python3Packages.buildPythonPackage rec { ./0001-Remove-py2-compat.patch ]; + postPatch = '' + substituteInPlace wokkel/muc.py \ + --replace-fail "twisted.python.constants" "constantly" + ''; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ diff --git a/projects/Cryptpad/default.nix b/projects/Cryptpad/default.nix index a88737de..7f6fc5c4 100644 --- a/projects/Cryptpad/default.nix +++ b/projects/Cryptpad/default.nix @@ -7,7 +7,8 @@ packages = { inherit (pkgs) cryptpad; }; nixos = { modules.services.cryptpad = "${sources.inputs.nixpkgs}/nixos/modules/services/web-apps/cryptpad.nix"; - tests.cryptpad = import "${sources.inputs.nixpkgs}/nixos/tests/cryptpad.nix" args; + # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.cryptpad.x86_64-linux + # tests.cryptpad = import "${sources.inputs.nixpkgs}/nixos/tests/cryptpad.nix" args; examples = null; }; }