chore: bump Pandoc to 3.0.1 (#181)

plt-amy · web-flow · commit e3192bea2d42 · 2023-01-29T11:46:55.000-03:00
diff --git a/default.nix b/default.nix
@@ -7,7 +7,7 @@ let
   pkgs = import ./support/nix/nixpkgs.nix;
   inherit (pkgs) lib;
 
-  our-ghc = pkgs.haskellPackages.ghcWithPackages (ps: with ps; [
+  our-ghc = pkgs.labHaskellPackages.ghcWithPackages (ps: with ps; [
     shake directory tagsoup
     text containers uri-encode
     process aeson Agda pandoc SHA
@@ -48,8 +48,8 @@ let
   ] ++ (if interactive then [
     our-ghc
   ] else [
-    haskellPackages.Agda.data
-    haskellPackages.pandoc.data
+    labHaskellPackages.Agda.data
+    labHaskellPackages.pandoc.data
   ]);
 in
   pkgs.stdenv.mkDerivation rec {
diff --git a/support/nix/build-shake.nix b/support/nix/build-shake.nix
@@ -3,9 +3,8 @@
 , our-ghc
 , makeWrapper
 , removeReferencesTo
-, haskellPackages
+, labHaskellPackages
 , stdenv
-, upx
 , lua5_3
 , gmp
 , name
@@ -33,7 +32,7 @@ in
 stdenv.mkDerivation {
   inherit name;
   src = nix-gitignore.gitignoreSource [] ../shake;
-  nativeBuildInputs = [ our-ghc makeWrapper removeReferencesTo upx ];
+  nativeBuildInputs = [ our-ghc makeWrapper removeReferencesTo ];
   propagatedBuildInputs = [ lua5_3 gmp ];
 
   buildPhase = ''
@@ -43,22 +42,21 @@ stdenv.mkDerivation {
   installPhase = ''
   mkdir -p $out/bin
   strip ${main}
-  remove-references-to -t ${haskellPackages.pandoc-types} ${main}
-  remove-references-to -t ${haskellPackages.pandoc}       ${main}
-  remove-references-to -t ${haskellPackages.Agda}         ${main}
-  remove-references-to -t ${haskellPackages.shake}        ${main}
-  remove-references-to -t ${haskellPackages.HTTP}         ${main}
-  remove-references-to -t ${haskellPackages.js-flot}      ${main}
-  remove-references-to -t ${haskellPackages.js-jquery}    ${main}
-  remove-references-to -t ${haskellPackages.js-dgtable}   ${main}
-  upx ${main}
+  remove-references-to -t ${labHaskellPackages.pandoc-types} ${main}
+  remove-references-to -t ${labHaskellPackages.pandoc}       ${main}
+  remove-references-to -t ${labHaskellPackages.Agda}         ${main}
+  remove-references-to -t ${labHaskellPackages.shake}        ${main}
+  remove-references-to -t ${labHaskellPackages.HTTP}         ${main}
+  remove-references-to -t ${labHaskellPackages.js-flot}      ${main}
+  remove-references-to -t ${labHaskellPackages.js-jquery}    ${main}
+  remove-references-to -t ${labHaskellPackages.js-dgtable}   ${main}
   cp ${main} $out/bin/${name}
   wrapProgram $out/bin/${name} \
     --prefix PATH : ${nodeDependencies}/bin \
     --prefix NODE_PATH : ${nodeDependencies}/lib/node_modules
   '';
 
-  disallowedReferences = with haskellPackages; [
+  disallowedReferences = with labHaskellPackages; [
     shake directory tagsoup
     text containers uri-encode
     process aeson Agda pandoc SHA pandoc-types HTTP
diff --git a/support/nix/dep/citeproc/default.nix b/support/nix/dep/citeproc/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/citeproc/github.json b/support/nix/dep/citeproc/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/commonmark-hs/default.nix b/support/nix/dep/commonmark-hs/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/commonmark-hs/github.json b/support/nix/dep/commonmark-hs/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/doclayout/default.nix b/support/nix/dep/doclayout/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/doclayout/github.json b/support/nix/dep/doclayout/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/doctemplates/default.nix b/support/nix/dep/doctemplates/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/doctemplates/github.json b/support/nix/dep/doctemplates/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/gridtables/default.nix b/support/nix/dep/gridtables/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/gridtables/github.json b/support/nix/dep/gridtables/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/jira-wiki-markup/default.nix b/support/nix/dep/jira-wiki-markup/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/jira-wiki-markup/github.json b/support/nix/dep/jira-wiki-markup/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/pandoc-types/default.nix b/support/nix/dep/pandoc-types/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/pandoc-types/github.json b/support/nix/dep/pandoc-types/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/pandoc/default.nix b/support/nix/dep/pandoc/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/pandoc/github.json b/support/nix/dep/pandoc/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/skylighting/default.nix b/support/nix/dep/skylighting/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/skylighting/github.json b/support/nix/dep/skylighting/github.json
@@ -0,0 +1,8 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/texmath/default.nix b/support/nix/dep/texmath/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/texmath/github.json b/support/nix/dep/texmath/github.json
@@ -0,0 +1,7 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/dep/wai/default.nix b/support/nix/dep/wai/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/support/nix/dep/wai/github.json b/support/nix/dep/wai/github.json
@@ -0,0 +1,8 @@
+{
+  "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
@@ -0,0 +1,12 @@
+# 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
diff --git a/support/nix/haskell-packages.nix b/support/nix/haskell-packages.nix
diff --git a/support/nix/nixpkgs.nix b/support/nix/nixpkgs.nix
diff --git a/support/shake/app/Shake/Markdown.hs b/support/shake/app/Shake/Markdown.hs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# DO NOT HAND-EDIT THIS FILE`
	`2`	`+import (import ./thunk.nix)`