From 71cb456414a47e2ad1141266d90df9393aa8bc1c Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Tue, 12 Sep 2023 14:21:09 +0100 Subject: [PATCH] Update nixpkgs (#257) This allows us to use the binary cache for everything but Agda. This allows us to use HLS without rebuilding everything (see #255). There has been a [breaking change to fsnotify](https://hackage.haskell.org/package/fsnotify-0.4.0.0/changelog), hence the slight change to the shakefile. --- support/nix/dep/citeproc/default.nix | 2 - support/nix/dep/citeproc/github.json | 7 ---- support/nix/dep/citeproc/thunk.nix | 12 ------ support/nix/dep/commonmark-hs/default.nix | 2 - support/nix/dep/commonmark-hs/github.json | 7 ---- support/nix/dep/commonmark-hs/thunk.nix | 12 ------ support/nix/dep/doclayout/default.nix | 2 - support/nix/dep/doclayout/github.json | 7 ---- support/nix/dep/doclayout/thunk.nix | 12 ------ support/nix/dep/doctemplates/default.nix | 2 - support/nix/dep/doctemplates/github.json | 7 ---- support/nix/dep/doctemplates/thunk.nix | 12 ------ support/nix/dep/gridtables/default.nix | 2 - support/nix/dep/gridtables/github.json | 7 ---- support/nix/dep/gridtables/thunk.nix | 12 ------ support/nix/dep/jira-wiki-markup/default.nix | 2 - support/nix/dep/jira-wiki-markup/github.json | 7 ---- support/nix/dep/jira-wiki-markup/thunk.nix | 12 ------ support/nix/dep/pandoc-types/default.nix | 2 - support/nix/dep/pandoc-types/github.json | 7 ---- support/nix/dep/pandoc-types/thunk.nix | 12 ------ support/nix/dep/pandoc/default.nix | 2 - support/nix/dep/pandoc/github.json | 7 ---- support/nix/dep/pandoc/thunk.nix | 12 ------ support/nix/dep/skylighting/default.nix | 2 - support/nix/dep/skylighting/github.json | 8 ---- support/nix/dep/skylighting/thunk.nix | 12 ------ support/nix/dep/texmath/default.nix | 2 - support/nix/dep/texmath/github.json | 7 ---- support/nix/dep/texmath/thunk.nix | 12 ------ support/nix/dep/wai/default.nix | 2 - support/nix/dep/wai/github.json | 8 ---- support/nix/dep/wai/thunk.nix | 12 ------ support/nix/haskell-packages.nix | 42 +------------------- support/nix/nixpkgs.nix | 4 +- support/shake/1lab-shake.cabal | 2 +- support/shake/app/Main.hs | 9 +++-- 37 files changed, 10 insertions(+), 280 deletions(-) delete mode 100644 support/nix/dep/citeproc/default.nix delete mode 100644 support/nix/dep/citeproc/github.json delete mode 100644 support/nix/dep/citeproc/thunk.nix delete mode 100644 support/nix/dep/commonmark-hs/default.nix delete mode 100644 support/nix/dep/commonmark-hs/github.json delete mode 100644 support/nix/dep/commonmark-hs/thunk.nix delete mode 100644 support/nix/dep/doclayout/default.nix delete mode 100644 support/nix/dep/doclayout/github.json delete mode 100644 support/nix/dep/doclayout/thunk.nix delete mode 100644 support/nix/dep/doctemplates/default.nix delete mode 100644 support/nix/dep/doctemplates/github.json delete mode 100644 support/nix/dep/doctemplates/thunk.nix delete mode 100644 support/nix/dep/gridtables/default.nix delete mode 100644 support/nix/dep/gridtables/github.json delete mode 100644 support/nix/dep/gridtables/thunk.nix delete mode 100644 support/nix/dep/jira-wiki-markup/default.nix delete mode 100644 support/nix/dep/jira-wiki-markup/github.json delete mode 100644 support/nix/dep/jira-wiki-markup/thunk.nix delete mode 100644 support/nix/dep/pandoc-types/default.nix delete mode 100644 support/nix/dep/pandoc-types/github.json delete mode 100644 support/nix/dep/pandoc-types/thunk.nix delete mode 100644 support/nix/dep/pandoc/default.nix delete mode 100644 support/nix/dep/pandoc/github.json delete mode 100644 support/nix/dep/pandoc/thunk.nix delete mode 100644 support/nix/dep/skylighting/default.nix delete mode 100644 support/nix/dep/skylighting/github.json delete mode 100644 support/nix/dep/skylighting/thunk.nix delete mode 100644 support/nix/dep/texmath/default.nix delete mode 100644 support/nix/dep/texmath/github.json delete mode 100644 support/nix/dep/texmath/thunk.nix delete mode 100644 support/nix/dep/wai/default.nix delete mode 100644 support/nix/dep/wai/github.json delete mode 100644 support/nix/dep/wai/thunk.nix diff --git a/support/nix/dep/citeproc/default.nix b/support/nix/dep/citeproc/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/citeproc/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/citeproc/github.json b/support/nix/dep/citeproc/github.json deleted file mode 100644 index 1c22c7bbb..000000000 --- a/support/nix/dep/citeproc/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "citeproc", - "private": false, - "rev": "7e0a9a39811098577f037e12bd8a897e109e8753", - "sha256": "0r4x3sxvm25m7w3xccajk9w2n30q6nw9ppdw2d0vbj45f2kcfqw6" -} diff --git a/support/nix/dep/citeproc/thunk.nix b/support/nix/dep/citeproc/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/citeproc/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/commonmark-hs/default.nix b/support/nix/dep/commonmark-hs/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/commonmark-hs/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/commonmark-hs/github.json b/support/nix/dep/commonmark-hs/github.json deleted file mode 100644 index 927e023d8..000000000 --- a/support/nix/dep/commonmark-hs/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "commonmark-hs", - "private": false, - "rev": "869bbce6b5e7e82bfce2ce36a38391176fb0fe4a", - "sha256": "0ycxbf5m9kxx0ikg53hqzk5hq79vd5xm8pm6li2k3jgx9pl75aks" -} diff --git a/support/nix/dep/commonmark-hs/thunk.nix b/support/nix/dep/commonmark-hs/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/commonmark-hs/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/doclayout/default.nix b/support/nix/dep/doclayout/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/doclayout/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/doclayout/github.json b/support/nix/dep/doclayout/github.json deleted file mode 100644 index e52921b54..000000000 --- a/support/nix/dep/doclayout/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "doclayout", - "private": false, - "rev": "621dcce9daa744cd7a7e30d96f3abc3ad28ccadd", - "sha256": "0ilfc4sgr6dd8m88jgwvj94vnainb7f81qwcj0ncwhsq9vkikjh9" -} diff --git a/support/nix/dep/doclayout/thunk.nix b/support/nix/dep/doclayout/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/doclayout/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/doctemplates/default.nix b/support/nix/dep/doctemplates/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/doctemplates/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/doctemplates/github.json b/support/nix/dep/doctemplates/github.json deleted file mode 100644 index d0c163a36..000000000 --- a/support/nix/dep/doctemplates/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "doctemplates", - "private": false, - "rev": "f7db8cd54c108eeafa2048bb8135a0c68d858e68", - "sha256": "19h224a5c3viyx59j0laphmjw66bnh1r8d8vilr5i9dyyqkbgni8" -} diff --git a/support/nix/dep/doctemplates/thunk.nix b/support/nix/dep/doctemplates/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/doctemplates/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/gridtables/default.nix b/support/nix/dep/gridtables/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/gridtables/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/gridtables/github.json b/support/nix/dep/gridtables/github.json deleted file mode 100644 index 7b5ae9d55..000000000 --- a/support/nix/dep/gridtables/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "tarleb", - "repo": "gridtables", - "private": false, - "rev": "644430f1b45629ed1fcf347635236553051b8c19", - "sha256": "0m3kapaffngplizy28z73z5lal1s7d3gr74p1n0f7mlknvbpy7nq" -} diff --git a/support/nix/dep/gridtables/thunk.nix b/support/nix/dep/gridtables/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/gridtables/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/jira-wiki-markup/default.nix b/support/nix/dep/jira-wiki-markup/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/jira-wiki-markup/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/jira-wiki-markup/github.json b/support/nix/dep/jira-wiki-markup/github.json deleted file mode 100644 index 7aa043b4c..000000000 --- a/support/nix/dep/jira-wiki-markup/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "tarleb", - "repo": "jira-wiki-markup", - "private": false, - "rev": "553d525355f75314d0c439cc77e11118e8736a73", - "sha256": "1xwqhvzr58cv5v0xwmyh9l936yw1akm72s698m2jgdgk71l05gc2" -} diff --git a/support/nix/dep/jira-wiki-markup/thunk.nix b/support/nix/dep/jira-wiki-markup/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/jira-wiki-markup/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/pandoc-types/default.nix b/support/nix/dep/pandoc-types/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/pandoc-types/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/pandoc-types/github.json b/support/nix/dep/pandoc-types/github.json deleted file mode 100644 index 3a03b71db..000000000 --- a/support/nix/dep/pandoc-types/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "pandoc-types", - "private": false, - "rev": "8c0c60fd22f453136d456e301e68e397451e24dd", - "sha256": "0cb9yfrmrp3j09lh3kdl9kwiggblr34fdvyzlwhcan08wc7jnd7f" -} diff --git a/support/nix/dep/pandoc-types/thunk.nix b/support/nix/dep/pandoc-types/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/pandoc-types/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/pandoc/default.nix b/support/nix/dep/pandoc/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/pandoc/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/pandoc/github.json b/support/nix/dep/pandoc/github.json deleted file mode 100644 index 87e0818bb..000000000 --- a/support/nix/dep/pandoc/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "pandoc", - "private": false, - "rev": "dba779cf1ff11c9bfa82dbca1eef7362c6b183b0", - "sha256": "06ys7ix9i1vdwkwwh21mpj267d3gg8yfcpc887xw5c6w5af51y30" -} diff --git a/support/nix/dep/pandoc/thunk.nix b/support/nix/dep/pandoc/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/pandoc/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/skylighting/default.nix b/support/nix/dep/skylighting/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/skylighting/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/skylighting/github.json b/support/nix/dep/skylighting/github.json deleted file mode 100644 index 2bb1dc604..000000000 --- a/support/nix/dep/skylighting/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "jgm", - "repo": "skylighting", - "branch": "master", - "private": false, - "rev": "876ef141746bc6e777bd0d4eed33ed31b528f9db", - "sha256": "1696n65l60frw0jig5pcicalnq9njq0bbd9cqq7xvx1qhffb3axl" -} diff --git a/support/nix/dep/skylighting/thunk.nix b/support/nix/dep/skylighting/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/skylighting/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/texmath/default.nix b/support/nix/dep/texmath/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/texmath/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/texmath/github.json b/support/nix/dep/texmath/github.json deleted file mode 100644 index 6e9adb81b..000000000 --- a/support/nix/dep/texmath/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "jgm", - "repo": "texmath", - "private": false, - "rev": "d1f8cb4a2f62e240ff38129af448a3d3944cdbfa", - "sha256": "0lnqy8yk9fshggvzdci1rv0arzg93kkkihbggmgh1b5zvh5m19mn" -} diff --git a/support/nix/dep/texmath/thunk.nix b/support/nix/dep/texmath/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/texmath/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/dep/wai/default.nix b/support/nix/dep/wai/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/support/nix/dep/wai/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/support/nix/dep/wai/github.json b/support/nix/dep/wai/github.json deleted file mode 100644 index d035bc9b6..000000000 --- a/support/nix/dep/wai/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "yesodweb", - "repo": "wai", - "branch": "master", - "private": false, - "rev": "6d9bca5262b808d172abcebbe75a5a0f0aae4e1d", - "sha256": "12pcq8dhcbpz8wgrigc3d20zd97la8a3k6hvl2j6h46lsk92rfbb" -} diff --git a/support/nix/dep/wai/thunk.nix b/support/nix/dep/wai/thunk.nix deleted file mode 100644 index 20f2d28c2..000000000 --- a/support/nix/dep/wai/thunk.nix +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; - sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; -}) {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/support/nix/haskell-packages.nix b/support/nix/haskell-packages.nix index 68c918882..da3c570ce 100644 --- a/support/nix/haskell-packages.nix +++ b/support/nix/haskell-packages.nix @@ -14,49 +14,9 @@ in { # Can't just override all Haskell packages because callCabal2nix # somehow depends on mime-types - labHaskellPackages = super.haskell.packages.ghc943.override (old: { + labHaskellPackages = super.haskell.packages.ghc946.override (old: { overrides = self: super: { Agda = noProfile (noJunk (super.callCabal2nixWithOptions "Agda" (thunkSource ./dep/Agda) "-f optimise-heavily" {})); - - - # Currently broken (set to 0 so other packages which depend on - # it explode) - hspec-contrib = 0; - hspec-core = 0; - - # Depend on hspec for their test suites. Just don't test them - JuicyPixels = noJunk super.JuicyPixels; - doctest = noJunk super.doctest; - shelly = noJunk super.shelly; - hls-graph = noJunk super.hls-graph; - - pandoc = noJunk (self.callCabal2nix "pandoc" (thunkSource ./dep/pandoc) {}); - pandoc-types = noJunk (self.callCabal2nix "pandoc-types" (thunkSource ./dep/pandoc-types) {}); - commonmark = noJunk (self.callCabal2nix "commonmark" ((thunkSource ./dep/commonmark-hs) + "/commonmark") {}); - commonmark-extensions = noJunk (self.callCabal2nix "commonmark-extensions" ((thunkSource ./dep/commonmark-hs) + "/commonmark-extensions") {}); - commonmark-pandoc = noJunk (self.callCabal2nix "commonmark-pandoc" ((thunkSource ./dep/commonmark-hs) + "/commonmark-pandoc") {}); - texmath = noJunk (self.callCabal2nix "texmath" (thunkSource ./dep/texmath) {}); - citeproc = noJunk (self.callCabal2nix "citeproc" (thunkSource ./dep/citeproc) {}); - doclayout = noJunk (self.callCabal2nix "doclayout" (thunkSource ./dep/doclayout) {}); - doctemplates = noJunk (self.callCabal2nix "doctemplates" (thunkSource ./dep/doctemplates) {}); - gridtables = noJunk (self.callCabal2nix "gridtables" (thunkSource ./dep/gridtables) {}); - jira-wiki-markup = noJunk (self.callCabal2nix "jira-wiki-markup" (thunkSource ./dep/jira-wiki-markup) {}); - mime-types = noJunk (self.callCabal2nix "mime-types" ((thunkSource ./dep/wai) + "/mime-types") {}); - skylighting = noJunk (pkgs.haskell.lib.overrideCabal - (self.callCabal2nix "skylighting" ((thunkSource ./dep/skylighting) + "/skylighting") {}) - { - preConfigure = '' - rm changelog.md - cp ${((thunkSource ./dep/skylighting) + "/changelog.md")} . - ${self.skylighting-core}/bin/skylighting-extract ${((thunkSource ./dep/skylighting) + "/skylighting-core/xml")} - ''; - }); - skylighting-format-ansi = noJunk (self.callCabal2nix "skylighting-format-ansi" ((thunkSource ./dep/skylighting) + "/skylighting-format-ansi") {}); - skylighting-format-blaze-html = noJunk (self.callCabal2nix "skylighting-format-blaze-html" ((thunkSource ./dep/skylighting) + "/skylighting-format-blaze-html") {}); - skylighting-format-context = noJunk (self.callCabal2nix "skylighting-format-context" ((thunkSource ./dep/skylighting) + "/skylighting-format-context") {}); - skylighting-format-latex = noJunk (self.callCabal2nix "skylighting-format-latex" ((thunkSource ./dep/skylighting) + "/skylighting-format-latex") {}); - skylighting-core = noJunk - (self.callCabal2nixWithOptions "skylighting-core" ((thunkSource ./dep/skylighting) + "/skylighting-core") "-fexecutable" {}); }; }); } diff --git a/support/nix/nixpkgs.nix b/support/nix/nixpkgs.nix index 26ccda5ed..373fa787a 100644 --- a/support/nix/nixpkgs.nix +++ b/support/nix/nixpkgs.nix @@ -1,7 +1,7 @@ args: import (builtins.fetchTarball { name = "1lab-nixpkgs"; - url = "https://github.com/nixos/nixpkgs/archive/cc4bb87f5457ba06af9ae57ee4328a49ce674b1b.tar.gz"; - sha256 = "sha256:072q50x5p06qjf0cvz68gcrbkpv94bdl55h71j0rz6bgfhaqmiwy"; + url = "https://github.com/nixos/nixpkgs/archive/bf39054f8666a98196671269351e42db7e0db6bc.tar.gz"; + sha256 = "sha256:0f9k3c6qjsn2aw5jhyz8pqs5saajgi4wkrbj0yrsp1k0vpx4yqx6"; }) ({ overlays = [ (import ./haskell-packages.nix) ]; } // args) diff --git a/support/shake/1lab-shake.cabal b/support/shake/1lab-shake.cabal index 3a2e0aa0c..25e951c9d 100644 --- a/support/shake/1lab-shake.cabal +++ b/support/shake/1lab-shake.cabal @@ -65,7 +65,7 @@ executable shake citeproc, doctemplates, extra, - fsnotify >= 0.3 && < 0.4, + fsnotify >= 0.4 && < 0.5, network-uri, pandoc, pandoc-types, diff --git a/support/shake/app/Main.hs b/support/shake/app/Main.hs index 403ad4d4e..5ed10f467 100755 --- a/support/shake/app/Main.hs +++ b/support/shake/app/Main.hs @@ -261,15 +261,18 @@ main = do -- | Watch config with 10ms (0.01 / 1e-12) watchConfig :: Watch.WatchConfig - watchConfig = Watch.defaultConfig { Watch.confDebounce = Watch.Debounce 1e-10 } + watchConfig = Watch.defaultConfig + + isFile Watch.IsFile = True + isFile Watch.IsDirectory = False buildMany :: ShakeDatabase -> [Action ()] -> Maybe String -> IO (Bool, [IO ()]) buildMany db wanted cmd = Watch.withManagerConf watchConfig \mgr -> do (_, clean) <- buildOnce db wanted toRebuild <- atomically $ newTVar Set.empty - _ <- Watch.watchTree mgr "src" (not . Watch.eventIsDirectory) (logEvent toRebuild) - _ <- Watch.watchTree mgr "support" (not . Watch.eventIsDirectory) (logEvent toRebuild) + _ <- Watch.watchTree mgr "src" (isFile . Watch.eventIsDirectory) (logEvent toRebuild) + _ <- Watch.watchTree mgr "support" (isFile . Watch.eventIsDirectory) (logEvent toRebuild) root <- Dir.canonicalizePath "."