From 170eca8088ee8456d698756a31fc03cb869b7f79 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Tue, 24 Aug 2021 14:48:32 -0500 Subject: [PATCH] remove gitignore --- flake.lock | 29 ++++++----------------------- flake.nix | 10 ++-------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index de857f1..1b2febc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1629481132, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", "type": "github" }, "original": { @@ -15,29 +15,13 @@ "type": "github" } }, - "gitignore": { - "flake": false, - "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", - "owner": "hercules-ci", - "repo": "gitignore", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1625766998, - "narHash": "sha256-icJ9QwkvdyhJI1vHizOGrshkrzf1K39Zr34Zm3z0vsE=", + "lastModified": 1629827341, + "narHash": "sha256-w7kg77NHTRtZzB8Xu18k/xRc6+tJuileIVwpWM86IRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "605634580515f6093d56c69165f67b5c6ad37be9", + "rev": "ae2717f11ba3d612d659336746c1170e0fad53e6", "type": "github" }, "original": { @@ -50,7 +34,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "gitignore": "gitignore", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 4dc28cd..14558f7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,24 +3,18 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs?ref=release-21.05"; - gitignore = { - url = "github:hercules-ci/gitignore"; - flake = false; - }; flake-utils.url = "github:numtide/flake-utils"; }; outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system: - let - pkgs = inputs.nixpkgs.legacyPackages.${system}; - gitignore = pkgs.callPackage inputs.gitignore { }; + let pkgs = inputs.nixpkgs.legacyPackages.${system}; in rec { # `nix build` packages.similar-sort = pkgs.stdenv.mkDerivation { name = "similar-sort"; buildInputs = [ pkgs.go ]; - src = gitignore.gitignoreSource ./.; + src = ./.; buildPhase = '' env HOME=$(pwd) GOPATH=$(pwd) go build similar-sort.go