Skip to content

Commit e3192be

Browse files
plt-amyplt-amy
authored
chore: bump Pandoc to 3.0.1 (#181)
1 parent 47ca1d2 commit e3192be

38 files changed

+304
-30
lines changed

‎default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let
77
pkgs = import ./support/nix/nixpkgs.nix;
88
inherit (pkgs) lib;
99

10-
our-ghc = pkgs.haskellPackages.ghcWithPackages (ps: with ps; [
10+
our-ghc = pkgs.labHaskellPackages.ghcWithPackages (ps: with ps; [
1111
shake directory tagsoup
1212
text containers uri-encode
1313
process aeson Agda pandoc SHA
@@ -48,8 +48,8 @@ let
4848
] ++ (if interactive then [
4949
our-ghc
5050
] else [
51-
haskellPackages.Agda.data
52-
haskellPackages.pandoc.data
51+
labHaskellPackages.Agda.data
52+
labHaskellPackages.pandoc.data
5353
]);
5454
in
5555
pkgs.stdenv.mkDerivation rec {

‎support/nix/build-shake.nix

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
, our-ghc
44
, makeWrapper
55
, removeReferencesTo
6-
, haskellPackages
6+
, labHaskellPackages
77
, stdenv
8-
, upx
98
, lua5_3
109
, gmp
1110
, name
@@ -33,7 +32,7 @@ in
3332
stdenv.mkDerivation {
3433
inherit name;
3534
src = nix-gitignore.gitignoreSource [] ../shake;
36-
nativeBuildInputs = [ our-ghc makeWrapper removeReferencesTo upx ];
35+
nativeBuildInputs = [ our-ghc makeWrapper removeReferencesTo ];
3736
propagatedBuildInputs = [ lua5_3 gmp ];
3837

3938
buildPhase = ''
@@ -43,22 +42,21 @@ stdenv.mkDerivation {
4342
installPhase = ''
4443
mkdir -p $out/bin
4544
strip ${main}
46-
remove-references-to -t ${haskellPackages.pandoc-types} ${main}
47-
remove-references-to -t ${haskellPackages.pandoc} ${main}
48-
remove-references-to -t ${haskellPackages.Agda} ${main}
49-
remove-references-to -t ${haskellPackages.shake} ${main}
50-
remove-references-to -t ${haskellPackages.HTTP} ${main}
51-
remove-references-to -t ${haskellPackages.js-flot} ${main}
52-
remove-references-to -t ${haskellPackages.js-jquery} ${main}
53-
remove-references-to -t ${haskellPackages.js-dgtable} ${main}
54-
upx ${main}
45+
remove-references-to -t ${labHaskellPackages.pandoc-types} ${main}
46+
remove-references-to -t ${labHaskellPackages.pandoc} ${main}
47+
remove-references-to -t ${labHaskellPackages.Agda} ${main}
48+
remove-references-to -t ${labHaskellPackages.shake} ${main}
49+
remove-references-to -t ${labHaskellPackages.HTTP} ${main}
50+
remove-references-to -t ${labHaskellPackages.js-flot} ${main}
51+
remove-references-to -t ${labHaskellPackages.js-jquery} ${main}
52+
remove-references-to -t ${labHaskellPackages.js-dgtable} ${main}
5553
cp ${main} $out/bin/${name}
5654
wrapProgram $out/bin/${name} \
5755
--prefix PATH : ${nodeDependencies}/bin \
5856
--prefix NODE_PATH : ${nodeDependencies}/lib/node_modules
5957
'';
6058

61-
disallowedReferences = with haskellPackages; [
59+
disallowedReferences = with labHaskellPackages; [
6260
shake directory tagsoup
6361
text containers uri-encode
6462
process aeson Agda pandoc SHA pandoc-types HTTP

‎support/nix/dep/citeproc/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/citeproc/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "citeproc",
4+
"private": false,
5+
"rev": "7e0a9a39811098577f037e12bd8a897e109e8753",
6+
"sha256": "0r4x3sxvm25m7w3xccajk9w2n30q6nw9ppdw2d0vbj45f2kcfqw6"
7+
}

‎support/nix/dep/citeproc/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/commonmark-hs/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/commonmark-hs/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "commonmark-hs",
4+
"private": false,
5+
"rev": "869bbce6b5e7e82bfce2ce36a38391176fb0fe4a",
6+
"sha256": "0ycxbf5m9kxx0ikg53hqzk5hq79vd5xm8pm6li2k3jgx9pl75aks"
7+
}

‎support/nix/dep/commonmark-hs/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/doclayout/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/doclayout/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "doclayout",
4+
"private": false,
5+
"rev": "621dcce9daa744cd7a7e30d96f3abc3ad28ccadd",
6+
"sha256": "0ilfc4sgr6dd8m88jgwvj94vnainb7f81qwcj0ncwhsq9vkikjh9"
7+
}

‎support/nix/dep/doclayout/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/doctemplates/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/doctemplates/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "doctemplates",
4+
"private": false,
5+
"rev": "f7db8cd54c108eeafa2048bb8135a0c68d858e68",
6+
"sha256": "19h224a5c3viyx59j0laphmjw66bnh1r8d8vilr5i9dyyqkbgni8"
7+
}

‎support/nix/dep/doctemplates/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/gridtables/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/gridtables/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "tarleb",
3+
"repo": "gridtables",
4+
"private": false,
5+
"rev": "644430f1b45629ed1fcf347635236553051b8c19",
6+
"sha256": "0m3kapaffngplizy28z73z5lal1s7d3gr74p1n0f7mlknvbpy7nq"
7+
}

‎support/nix/dep/gridtables/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/jira-wiki-markup/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/jira-wiki-markup/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "tarleb",
3+
"repo": "jira-wiki-markup",
4+
"private": false,
5+
"rev": "553d525355f75314d0c439cc77e11118e8736a73",
6+
"sha256": "1xwqhvzr58cv5v0xwmyh9l936yw1akm72s698m2jgdgk71l05gc2"
7+
}

‎support/nix/dep/jira-wiki-markup/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/pandoc-types/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/pandoc-types/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "pandoc-types",
4+
"private": false,
5+
"rev": "8c0c60fd22f453136d456e301e68e397451e24dd",
6+
"sha256": "0cb9yfrmrp3j09lh3kdl9kwiggblr34fdvyzlwhcan08wc7jnd7f"
7+
}

‎support/nix/dep/pandoc-types/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/pandoc/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/pandoc/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "pandoc",
4+
"private": false,
5+
"rev": "dba779cf1ff11c9bfa82dbca1eef7362c6b183b0",
6+
"sha256": "06ys7ix9i1vdwkwwh21mpj267d3gg8yfcpc887xw5c6w5af51y30"
7+
}

‎support/nix/dep/pandoc/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/skylighting/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/skylighting/github.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "skylighting",
4+
"branch": "master",
5+
"private": false,
6+
"rev": "876ef141746bc6e777bd0d4eed33ed31b528f9db",
7+
"sha256": "1696n65l60frw0jig5pcicalnq9njq0bbd9cqq7xvx1qhffb3axl"
8+
}

‎support/nix/dep/skylighting/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/texmath/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/texmath/github.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"owner": "jgm",
3+
"repo": "texmath",
4+
"private": false,
5+
"rev": "d1f8cb4a2f62e240ff38129af448a3d3944cdbfa",
6+
"sha256": "0lnqy8yk9fshggvzdci1rv0arzg93kkkihbggmgh1b5zvh5m19mn"
7+
}

‎support/nix/dep/texmath/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

‎support/nix/dep/wai/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎support/nix/dep/wai/github.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"owner": "yesodweb",
3+
"repo": "wai",
4+
"branch": "master",
5+
"private": false,
6+
"rev": "6d9bca5262b808d172abcebbe75a5a0f0aae4e1d",
7+
"sha256": "12pcq8dhcbpz8wgrigc3d20zd97la8a3k6hvl2j6h46lsk92rfbb"
8+
}

‎support/nix/dep/wai/thunk.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

0 commit comments

Comments
 (0)