Merge pull request #26 from j4m3s-s/fix-gitignore

Fix gitignore
hlolli · Jun 2, 2023 · 66ae6a1 · 66ae6a1
2 parents 04b0dfb + f8e8a2a
commit 66ae6a1
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 86 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,8 +6,8 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v15
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v10

diff --git a/clj2nix.nix b/clj2nix.nix
@@ -2,22 +2,15 @@
   stdenv, lib, coreutils, clojure,
   makeWrapper, nix-prefetch-git,
   fetchMavenArtifact, fetchgit,
-  openjdk, fetchFromGitHub, git
+  openjdk, fetchFromGitHub, git, gitignore
 }:
 
 let cljdeps = import ./deps.nix { inherit fetchMavenArtifact fetchgit lib; };
     classp  = cljdeps.makeClasspaths {
       extraClasspaths = [ "${placeholder "out"}/lib" ];
     };
     version = "1.1.0-rc";
-    gitignoreSrc = fetchFromGitHub {
-      owner = "hercules-ci";
-      repo = "gitignore.nix";
-      rev = "a20de23b925fd8264fd7fad6454652e142fd7f73";
-      sha256 = "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=";
-    };
-
-    inherit (import gitignoreSrc { inherit lib; }) gitignoreSource;
+    inherit (import gitignore { inherit lib; }) gitignoreSource;
 
 in stdenv.mkDerivation rec {