build against release nixos-18.09 branch also

5 files changed, 27 insertions, 23 deletions

diff --git a/README.md b/README.md
index 055085c..28104e8 100644
--- a/README.md
+++ b/README.md
@@ -71,5 +71,5 @@ nix-build build.nix | cachix push nixpkgs-wayland
 
 ## Notes
 
-* This is meant to be used with (and is built [and partially tested] against) a nixpkgs near `nixos-unstable`.
+* This is meant to be used with (and is built [and partially tested] against) a nixpkgs near `nixos-unstable` or `nixos-18.09`.
 
diff --git a/build.nix b/build.nix
index 853a240..92b73b2 100644
--- a/build.nix
+++ b/build.nix
@@ -1,8 +1,10 @@
 let
-  nixpkgs = (import ./nixpkgs);
-  pkgs = import nixpkgs {
-    overlays = [ (import ./default.nix) ];
-  };
-
+  overlays = [ (import ./default.nix) ];
+  pkgs-unstable= import (import ./nixpkgs-nixos-unstable) { inherit overlays; };
+  pkgs-release = import (import ./nixpkgs-nixos-18.09) { inherit overlays; };
 in
-  pkgs.swaypkgs
+  [
+    pkgs-unstable.swaypkgs
+    pkgs-release.swaypkgs
+  ]
+
diff --git a/nixpkgs-nixos-18.09/metadata.nix b/nixpkgs-nixos-18.09/metadata.nix
new file mode 100644
index 0000000..3fe0787
--- /dev/null
+++ b/nixpkgs-nixos-18.09/metadata.nix
@@ -0,0 +1,4 @@
+{
+  rev = "06fb0253afabb8cc7dc85db742e2de94a4d68ca0";
+  sha256 = "0jkldgvdm8pl9cfw5faw90n0qbbzrdssgwgbihk1by4xq66khf1b";
+}
diff --git a/nixpkgs-nixos-unstable/metadata.nix b/nixpkgs-nixos-unstable/metadata.nix
new file mode 100644
index 0000000..8bd92c0
--- /dev/null
+++ b/nixpkgs-nixos-unstable/metadata.nix
@@ -0,0 +1,4 @@
+{
+  rev = "c70ad805d216f18f91d2b0786b4ce248917153bb";
+  sha256 = "0fn9flz870lgiwzvl64gwb9gy5ahhv4zsvkfh1khxf5jl4dwvjwv";
+}
diff --git a/update.sh b/update.sh
index b28a7cc..184d627 100755
--- a/update.sh
+++ b/update.sh
@@ -29,21 +29,17 @@ 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}")"
-  builtattrs=("${builtattrs[@]}" "${out[@]}")
+  if [[ "${attr}" == nixpkgs* ]]; then return; fi
 
   d="$(date '+%Y-%m-%d %H:%M' --date="${commitdate}")"
-  m='(.*)'
   txt="| ${attr} | [${d}](https://github.com/${owner}/${repo}/commits/${rev}) |"
   pkgentries=("${pkgentries[@]}" "${txt}")
 }
 
+update "nixpkgs-nixos-unstable" "nixos" "nixpkgs-channels" "nixos-unstable"
+update "nixpkgs-nixos-18.09"    "nixos" "nixpkgs-channels" "nixos-18.09"
+
 #      attr_name          repo_owner   repo_name          repo_rev
-update "nixpkgs"          "nixos"      "nixpkgs-channels" "nixos-unstable"
 update "fmt"              "fmtlib"     "fmt"              "master"
 
 update "wlroots"          "swaywm"     "wlroots"          "master"
@@ -74,16 +70,14 @@ for p in "${pkgentries[@]}"; do
 done
 replace="$(printf "%s\n<!--pkgs-->" "${replace}")"
 
-rg \
-  --multiline '(?s)(.*)<!--pkgs-->(.*)<!--pkgs-->(.*)' \
-  "README.md" \
+rg --multiline '(?s)(.*)<!--pkgs-->(.*)<!--pkgs-->(.*)' "README.md" \
   --replace "\$1${replace}\$3" \
-  > README2.md; mv README2.md README.md
-rg \
-  --multiline '(?s)(.*)<!--update-->(.*)<!--update-->(.*)' \
-  "README.md" \
+    > README2.md; mv README2.md README.md
+
+rg --multiline '(?s)(.*)<!--update-->(.*)<!--update-->(.*)' "README.md" \
   --replace "\$1<!--update-->$(date '+%Y-%m-%d %H:%M')<!--update-->\$3" \
-  > README2.md; mv README2.md README.md
+    > README2.md; mv README2.md README.md
 
+# build all and push to cachix
 nix-build build.nix | cachix push "${cachixremote}"