nix:bumpup and solved #408 (#412)

* nix:bumpup and solved #408

* nix: fix sha256

Author: GTrunSec

.github/workflows/checks.yaml

@@ -0,0 +1,35 @@
+name: "CI"
+on:
+  pull_request:
+  push:
+jobs:
+  nix-build:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+    - uses: actions/[email protected]
+      with:
+        fetch-depth: 0
+    - uses: cachix/install-nix-action@v14
+      with:
+        install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.5pre20211026_5667822/install
+
+    # Configure Nix to enable flakes
+    - run: echo "experimental-features = nix-command flakes" | sudo tee -a /etc/nix/nix.conf
+
+
+    - name: Nix Flake Check
+      run: nix -Lv flake check
+    - name: Build emacsNg Rust Dependency
+      # remove when nix build is fixed
+      continue-on-error: true
+      run: nix -Lv build .#emacsNg-rust
+
+    - uses: cachix/cachix-action@v10
+      with:
+        name: emacsng
+        authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+    - name: Run Emacsng Exec
+      run: nix -Lv develop -c -- emacs --version

flake.lock

@@ -91,14 +91,15 @@
             {
               name = pkgs.nvfetcher-bin.pname;
               help = pkgs.nvfetcher-bin.meta.description;
-              command = "cd $DEVSHELL_ROOT/nix; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@;";
+              command = "export NIX_PATH=nixpkgs=${pkgs.path}; cd $PRJ_ROOT/nix; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
             }
           ];
         };
 
 
         apps = {
           emacsNg = flake-utils.lib.mkApp { drv = packages.emacsNg; exePath = "/bin/emacs"; };
+          emacsclient = flake-utils.lib.mkApp { drv = packages.emacsNg; exePath = "/bin/emacsclient"; };
         };
 
         defaultApp = apps.emacsNg;
@@ -152,7 +153,7 @@
                       cp -r ${pathDir} crates
                       sed -i 's|../crates/lisp_util|./crates/lisp_util|' Cargo.toml
                     '' + doVersionedUpdate;
-                  sha256 = "sha256-2g+nfnEtrp2oxy/wd0+G8dfR/tufkMLAfoFzxO+jv3g=";
+                  sha256 = "sha256-NL4fSYdlifV15h7/mCFTHlWgBJ6r9AXqiFnBnelyab0=";
                   inherit installPhase;
                 };
 
@@ -171,7 +172,7 @@
                     sed -e 's/@CARGO_.*@//' Cargo.toml.in > Cargo.toml
                   '' + doVersionedUpdate;
                   name = "remacsSrc";
-                  sha256 = "sha256-McGugFJUwgpw9bK/sIlzryBNz7y0quo+oQSBET2+Pc4=";
+                  sha256 = "sha256-ice5d4a6vyaxCO4mRjxGJsEvtdX7NKvFmoJK5CiE3TA=";
                   inherit installPhase;
                 };
 

flake.nix

@@ -1,16 +1,15 @@
 # This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl }:
+{ fetchgit, fetchurl, fetchFromGitHub }:
 {
   emacs-ng = {
     pname = "emacs-ng";
-    version = "93f38491a060f06ae4b85c8546b624a00e4750dc";
-    src = fetchgit {
-      url = "https://github.com/emacs-ng/emacs-ng";
-      rev = "93f38491a060f06ae4b85c8546b624a00e4750dc";
+    version = "b4bd1b8232a7d63690e48fc1946516265c9f2c83";
+    src = fetchFromGitHub ({
+      owner = "emacs-ng";
+      repo = "emacs-ng";
+      rev = "b4bd1b8232a7d63690e48fc1946516265c9f2c83";
       fetchSubmodules = true;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "181gpfc4qlm9dcyj19gqhxlhrqnn9nqw5ypf6isv733dpb0gzf3v";
-    };
+      sha256 = "sha256-wpWj9cvGcpWc24835Z4X5CZUKnn79jSCv49yJ1J3eVA=";
+    });
   };
 }

nix/_sources/generated.nix

@@ -41,17 +41,6 @@ with lib;
   };
 
   config = {
-    env = [{
-      # Used by tools like rust-analyzer
-      name = "RUST_SRC_PATH";
-      value =
-        let rust-src = rust-bin.nightly."${date}".default.override {
-          extensions = [ "rust-src" ];
-        };
-        in
-        (toString rust-src) + "/lib/rustlib/src/rust/library";
-    }];
-
     devshell.packages = map (tool: cfg.rustPackages.${tool}) cfg.rustPackagesSet
       ++ map (tool: cfg.rustOverlay.${tool}) cfg.rustOverlaySet ++ (with pkgs;[
       #custom nixpkgs packages