update.sh: fixup bug

10 files changed, 29 insertions, 16 deletions

diff --git a/README.md b/README.md
index f158aa0..5181e36 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,10 @@ This is a `nixpkgs` overlay containing `HEAD` revisions of:
 | waybar | [2018-11-03 05:36](https://github.com/Alexays/waybar/commits/26182c222b6994666640ea0a89cfa97fbcf7229f) |
 | wayfire | [2018-11-01 03:05](https://github.com/WayfireWM/wayfire/commits/f634aff42ae8a29794d3977675a09e72832f2414) |
 | wf-config | [2018-10-22 00:05](https://github.com/WayfireWM/wf-config/commits/8f7046e6c67d4a277b0793b56ff6535f53997bc5) |
-| redshift-wayland | [2018-07-05 21:11](https://github.com/minus7/redshift/commits/910c4c6aabe9783f3b611c3cdc18081a4b55fe71) |
+| redshift-wayland | [2018-09-01 12:25](https://github.com/minus7/redshift/commits/a2177ed9942477868ccc514372f32a0fbcbe189e) |
 <!--pkgs-->
 
-Auto-update script last run: <!--update-->2018-11-03 17:28<!--update-->.
+Auto-update script last run: <!--update-->2018-11-03 18:00<!--update-->.
 
 Please open an issue if something is out of date.
 
diff --git a/build.nix b/build.nix
index 92b73b2..c8cbbea 100644
--- a/build.nix
+++ b/build.nix
@@ -1,7 +1,7 @@
 let
   overlays = [ (import ./default.nix) ];
-  pkgs-unstable= import (import ./nixpkgs-nixos-unstable) { inherit overlays; };
-  pkgs-release = import (import ./nixpkgs-nixos-18.09) { inherit overlays; };
+  pkgs-unstable= import (import ./pkgs-unstable) { inherit overlays; };
+  pkgs-release = import (import ./pkgs-18.09) { inherit overlays; };
 in
   [
     pkgs-unstable.swaypkgs
diff --git a/nixpkgs-nixos-unstable/metadata.nix b/nixpkgs-nixos-unstable/metadata.nix
deleted file mode 100644
index aa6361d..0000000
--- a/nixpkgs-nixos-unstable/metadata.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  rev = "c70ad805d216f18f91d2b0786b4ce248917153bb";
-  sha256 = "0fn9flz870lgiwzvl64gwb9gy5ahhv4zsvkfh1khxf5jl4dwvjwv";
-  revdate = "2018-10-24T14:53:16Z";
-}
diff --git a/nixpkgs-nixos-18.09/default.nix b/pkgs-18.09/default.nix
index 1d43220..1d43220 100644
--- a/nixpkgs-nixos-18.09/default.nix
+++ b/pkgs-18.09/default.nix
diff --git a/pkgs-18.09/metadata.nix b/pkgs-18.09/metadata.nix
new file mode 100644
index 0000000..0e28871
--- /dev/null
+++ b/pkgs-18.09/metadata.nix
@@ -0,0 +1,5 @@
+{
+  rev = "06fb0253afabb8cc7dc85db742e2de94a4d68ca0";
+  sha256 = "0jkldgvdm8pl9cfw5faw90n0qbbzrdssgwgbihk1by4xq66khf1b";
+  revdate = "2018-10-24T14:53:16Z";
+}
diff --git a/nixpkgs-nixos-unstable/default.nix b/pkgs-unstable/default.nix
index 1d43220..1d43220 100644
--- a/nixpkgs-nixos-unstable/default.nix
+++ b/pkgs-unstable/default.nix
diff --git a/nixpkgs-nixos-18.09/metadata.nix b/pkgs-unstable/metadata.nix
index aa6361d..aa6361d 100644
--- a/nixpkgs-nixos-18.09/metadata.nix
+++ b/pkgs-unstable/metadata.nix
diff --git a/redshift-wayland/metadata.nix b/redshift-wayland/metadata.nix
index f4f65fd..e8ec421 100644
--- a/redshift-wayland/metadata.nix
+++ b/redshift-wayland/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "910c4c6aabe9783f3b611c3cdc18081a4b55fe71";
-  sha256 = "0vdrg1bd47sc48wi5xhf2cq8fsmbb576hpm6h5n8iyq07bb1fiam";
-  revdate = "2018-07-06T04:11:47Z";
+  rev = "a2177ed9942477868ccc514372f32a0fbcbe189e";
+  sha256 = "1ka8gjjddkjvcxnnyk9y9rqj1askjcf6ikajyh7a7wfj6z5j9c2j";
+  revdate = "2018-09-01T19:25:25Z";
 }
diff --git a/update.sh b/update.sh
index 046e5f6..4ce3e9d 100755
--- a/update.sh
+++ b/update.sh
@@ -15,7 +15,7 @@ function update() {
 
   rev=""
   url="https://api.github.com/repos/${owner}/${repo}/commits?sha=${ref}"
-  rev="$(git ls-remote "https://github.com/${owner}/${repo}" HEAD | cut -d '	' -f1)"
+  rev="$(git ls-remote "https://github.com/${owner}/${repo}" "${ref}" | cut -d '	' -f1)"
   [[ -f "./${attr}/metadata.nix" ]] && oldrev="$(nix eval -f "./${attr}/metadata.nix" rev --raw)"
   if [[ "${oldrev:-}" != "${rev}" ]]; then
     revdata="$(curl -L --fail "https://api.github.com/repos/${owner}/${repo}/commits/${rev}")"
@@ -26,7 +26,7 @@ function update() {
     echo "${attr}" was updated to "${rev}" "${revdate}"
   fi
 
-  if [[ "${attr}" == nixpkgs* ]]; then return; fi
+  if [[ "${attr}" == pkgs* ]]; then return; fi
 
   commitdate="$(nix eval -f "./${attr}/metadata.nix" revdate --raw)"
   d="$(date '+%Y-%m-%d %H:%M' --date="${commitdate}")"
@@ -34,10 +34,11 @@ function update() {
   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 "pkgs-unstable"    "nixos"      "nixpkgs-channels" "nixos-unstable"
+update "pkgs-18.09"       "nixos"      "nixpkgs-channels" "nixos-18.09"
+
 update "fmt"              "fmtlib"     "fmt"              "master"
 
 update "wlroots"          "swaywm"     "wlroots"          "master"
diff --git a/vm.nix b/vm.nix
new file mode 100644
index 0000000..4add75e
--- /dev/null
+++ b/vm.nix
@@ -0,0 +1,12 @@
+{  }:
+
+let
+  nixpkgs = (import ./nixpkgs);
+  pkgs = import nixpkgs {
+    overlays = [ (import ./default.nix) ];
+  };
+in
+{
+  
+}
+