Skip to content

Commit 56783d7

Browse files
committed
flake.nix: Adapt to new locked version
1 parent 259427a commit 56783d7

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
with:
1919
nix_path: nixpkgs=channel:${{ matrix.nixpkgs_channel }}
2020
#- run: nix build
21-
- run: nix-build -E '(import ./.).defaultPackage.${builtins.currentSystem}'
21+
- run: nix-build -E '(import ./.).packages.${builtins.currentSystem}'
2222
#- run: nix flake check
2323
- run: nix-build -E '(import ./.).checks.${builtins.currentSystem}'

flake.nix

+4-7
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
99
in {
1010
packages = forAllSystems (system: with (import nixpkgs { inherit system; }); {
11-
nix-mode = let
11+
default = let
1212
emacs = emacsWithPackages (epkgs: with epkgs; [
13-
org-plus-contrib
13+
org-contrib
1414
company
1515
mmm-mode
16-
f
1716
magit-section
1817
transient
1918
]);
20-
in stdenvNoCC.mkDerivation {
19+
in stdenv.mkDerivation {
2120
pname = "nix-mode";
2221
version = "1.5.0";
2322
src = self;
@@ -31,12 +30,10 @@
3130
};
3231
});
3332

34-
defaultPackage = forAllSystems (system: self.packages.${system}.nix-mode);
35-
3633
# checks are run in ‘make check’ right now we should probably move
3734
# these to its own derivation
3835
checks = forAllSystems (system: {
39-
inherit (self.packages.${system}) nix-mode;
36+
inherit (self.packages.${system}) default;
4037
});
4138
};
4239
}

0 commit comments

Comments
 (0)