Revert "uchiwa: 0.22.1 -> 0.25.3-1"

This reverts commit 5dc5dfdefb9719b8567c13de691cf2ccdbde95a3.

This breaks evaluation:
error: invalid character ‘/’ in name ‘angular-tools/ng-jsoneditor-ea138469f157d8f2b54ec5b8dcf4b08a55b61459’

cc @peterhoeg

4 files changed, 33 insertions, 40 deletions

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 8a4e0e571b1..80e73d63235 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,25 +1,23 @@
 # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v")
-  (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73")
+  (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj")
+  (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
-  (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p")
-  (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk")
-  (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244")
-  (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy")
-  (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g")
-  (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87")
+  (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a")
+  (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6")
+  (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5")
+  (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf")
+  (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk")
+  (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs")
+  (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
-  (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
   (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh")
   (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371")
   (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5")
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f")
-  (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2")
-  (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm")
-  (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1")
-  (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8")
-  (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah")
+  (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z")
+  (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd")
+  (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json
new file mode 100644
index 00000000000..1eb94f73e6b
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/bower.json
@@ -0,0 +1,6 @@
+{
+  "name": "uchiwa",
+  "dependencies": {
+    "uchiwa-web": "0.21.0"
+  }
+}
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index c0ddf9cb7a4..68aaa4a5249 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.25.3-1";
-  sha256  = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks";
+  version = "0.22.1";
+  sha256  = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
index 33e3dacdda5..2802037a4f5 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix
+#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out
 
 set -euo pipefail
 IFS=$'\n\t'
@@ -7,36 +7,25 @@ IFS=$'\n\t'
 # set -x
 
 REPO=sensu/uchiwa
-SHA="1111111111111111111111111111111111111111111111111111"
 
-write_src() {
-  cat <<_EOF > src.nix
-{
-  version = "${VERSION}";
-  sha256  = "${SHA}";
-}
-_EOF
-}
-
-t=$(mktemp -d)
+VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
 
-LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
-echo "Latest version: ${LATEST_VERSION}"
+t=$(mktemp)
 
-VERSION=${1:-${LATEST_VERSION}}
 echo "Updating to: ${VERSION}"
 
-write_src
-
-curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json
-bower2nix $t/bower.json $t/bower-packages.nix
-mv $t/bower-packages.nix .
-# sed -i 's@/@-@g' bower-packages.nix
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t
+bower2nix $t bower-packages.nix
 
 pushd $(git rev-parse --show-toplevel)
-SHA=$(nix-prefetch-url -A uchiwa.src)
+sha=$(nix-prefetch-url -A uchiwa.src)
 popd
 
-write_src
+cat <<_EOF > src.nix
+{
+  version = "${VERSION}";
+  sha256  = "${sha}";
+}
+_EOF
 
-rm -r $t
+rm $t