emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/nix-mode 56783d7219 3/4: flake.nix: Adapt to new locked ve


From: ELPA Syncer
Subject: [nongnu] elpa/nix-mode 56783d7219 3/4: flake.nix: Adapt to new locked version
Date: Wed, 29 Mar 2023 16:00:06 -0400 (EDT)

branch: elpa/nix-mode
commit 56783d72193c44da82b7364559287cac6919ec93
Author: Daniel Nagy <danielnagy@posteo.de>
Commit: Daniel Nagy <danielnagy@posteo.de>

    flake.nix: Adapt to new locked version
---
 .github/workflows/test.yml |  2 +-
 flake.nix                  | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9598e395f1..d71613df03 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,6 +18,6 @@ jobs:
       with:
         nix_path: nixpkgs=channel:${{ matrix.nixpkgs_channel }}
     #- run: nix build
-    - run: nix-build -E '(import ./.).defaultPackage.${builtins.currentSystem}'
+    - run: nix-build -E '(import ./.).packages.${builtins.currentSystem}'
     #- run: nix flake check
     - run: nix-build -E '(import ./.).checks.${builtins.currentSystem}'
diff --git a/flake.nix b/flake.nix
index bffea7cd0d..5757957691 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,16 +8,15 @@
     forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
   in {
     packages = forAllSystems (system: with (import nixpkgs { inherit system; 
}); {
-      nix-mode = let
+      default = let
         emacs = emacsWithPackages (epkgs: with epkgs; [
-          org-plus-contrib
+          org-contrib
           company
           mmm-mode
-          f
           magit-section
           transient
         ]);
-      in stdenvNoCC.mkDerivation {
+      in stdenv.mkDerivation {
         pname = "nix-mode";
         version = "1.5.0";
         src = self;
@@ -31,12 +30,10 @@
       };
     });
 
-    defaultPackage = forAllSystems (system: self.packages.${system}.nix-mode);
-
     # checks are run in ‘make check’ right now we should probably move
     # these to its own derivation
     checks = forAllSystems (system: {
-      inherit (self.packages.${system}) nix-mode;
+      inherit (self.packages.${system}) default;
     });
   };
 }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]