Skip to content

nix: fix build when overriding inputs #1718

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

Merged
pazz merged 4 commits into from
Jun 2, 2026
+17 −5
Merged

nix: fix build when overriding inputs #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32e6a8d
nix: fix version attribute if overriding inputs
lucc May 31, 2026
134b901
ci: update nix install action
lucc May 31, 2026
e546ea7
nix: add derivation for theme_test.py script
lucc May 31, 2026
664cb93
Turn theme_test.py into an executable script
lucc Jun 1, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v31

- uses: actions/checkout@v4

Expand All @@ -55,7 +55,7 @@ jobs:

steps:
- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v31

- uses: actions/checkout@v4

Expand Down
1 change: 1 addition & 0 deletions extra/theme_test.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python3
"""
Theme tester
"""
Expand Down
17 changes: 14 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
eachSystem = nixpkgs.lib.genAttrs (import systems);
# the package is called gpg on PyPI and gpgme in nixpkgs
packageOverrides = final: prev: {gpg = final.gpgme;};
version = "0.dev+" + self.shortRev or self.dirtyShortRev or "override";
Comment thread
lucc marked this conversation as resolved.
in {
packages = eachSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
Expand All @@ -27,7 +28,7 @@
};
# overwrite these attributes in the buildPythonApplication call
overrides = {
version = "0.dev+${self.shortRev or self.dirtyShortRev}";
inherit version;
outputs = ["out" "doc" "man"];
postPatch = ''
substituteInPlace alot/settings/manager.py \
Expand All @@ -46,12 +47,22 @@
nativeBuildInputs = [python3.pkgs.sphinxHook pkgs.installShellFiles];
sphinxBuilders = ["html" "man"];
};
alot-pkg = python3.pkgs.buildPythonPackage (attrs // overrides);
alot-app = python3.pkgs.toPythonApplication alot-pkg;
in {
alot = python3.pkgs.buildPythonApplication (attrs // overrides);
alot = alot-app;
docs =
pkgs.lib.trivial.warn "The docs attribute moved to alot.doc"
self.packages.${system}.alot.doc;
default = self.packages.${system}.alot;
default = alot-app;
theme-test = pkgs.runCommand "theme-test.py" {
propagatedBuildInputs = [
(python3.withPackages (ps: [ alot-pkg ]))
];
} ''
install -Dm755 ${./extra/theme_test.py} $out/bin/theme-test.py
patchShebangs $out/bin
'';
Comment thread
lucc marked this conversation as resolved.
});
devShells = eachSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
Expand Down
Loading