Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake: Update flake.lock #473

Merged
merged 6 commits into from
Jan 3, 2025
Merged

flake: Update flake.lock #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9f7282
flake.lock: Update
github-actions[bot] Jan 2, 2025
442f285
gpgme_1_24_0: drop
wegank Jan 2, 2025
1d529af
wokkel: fix build
wegank Jan 2, 2025
44b01e3
flake.lock: update
wegank Jan 2, 2025
3f7f7f4
libresoc: fix build with yosys 0.48
wegank Jan 3, 2025
2157443
cryptpad: disable failing tests
wegank Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 0 additions & 69 deletions pkgs/by-name/gpgme_1_24_0/package.nix
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/by-name/libervia-backend/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
writeScript,
x3dh,
xeddsa,
gpgme_1_24_0,
}:
python3Packages.buildPythonApplication rec {
pname = "libervia-backend";
Expand Down Expand Up @@ -115,7 +114,7 @@ python3Packages.buildPythonApplication rec {
cryptography
dbus-python
emoji
gpgme_1_24_0
gpgme
gst-python
html2text
jinja2
Expand Down
7 changes: 6 additions & 1 deletion pkgs/by-name/libresoc-nmigen/nmigen.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
'';
Expand Down
9 changes: 7 additions & 2 deletions pkgs/by-name/libresoc-nmigen/nmutil.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,21 @@
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";
rev = "4bf2f20bddc057df1597d14e0b990c0b9bdeb10e"; # HEAD @ version date
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
Expand Down
5 changes: 5 additions & 0 deletions pkgs/by-name/wokkel/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; [
Expand Down
3 changes: 2 additions & 1 deletion projects/Cryptpad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}