summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2018-10-27 17:10:38 -0700
committerCole Mickens <cole.mickens@gmail.com>2018-10-27 17:10:38 -0700
commite1a99598c6520440ff8bb9a48dfecff1ba3045d8 (patch)
treed3c7432473f15c32f8addbfd2dfd1ebfc4ef4449
parentb570dc87f7742ffdee263a5939337ea8c49010c6 (diff)
update.sh: change special handling of nixpkgs
-rw-r--r--build.nix3
-rwxr-xr-xupdate.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/build.nix b/build.nix
index 64dd71d..853a240 100644
--- a/build.nix
+++ b/build.nix
@@ -5,5 +5,4 @@ let
};
in
- pkgs.swaypkgs // { nixpkgs = {}; }
-
+ pkgs.swaypkgs
diff --git a/update.sh b/update.sh
index 43e9476..c8ade26 100755
--- a/update.sh
+++ b/update.sh
@@ -28,6 +28,8 @@ function update() {
mkdir -p "./${attr}"
printf '{\n rev = "%s";\n sha256 = "%s";\n}\n' "${rev}" "${sha256}" > "./${attr}/metadata.nix"
+ if [[ "${attr}" == "nixpkgs" ]]; then return; fi
+
printf '==> build: %s/%s: %s\n' "${owner}" "${repo}" "${rev}"
results="$(nix-build --no-out-link build.nix -A "${attr}")"
readarray -t out <<< "$(echo "${results}")"