colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

koreader-from-src: remove deepClone and keepDotGit options

Browse Source
This commit is contained in:
Colin 2023-07-19 23:09:07 +00:00
parent f95c45fb8e
commit 7b8af3e719
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/additional/koreader-from-src/default.nix
View File

@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
(name: src: fetchgit ( (name: src: fetchgit (
{ {
inherit name; inherit name;
leaveDotGit = true; # maybe not needed, but we'd need another way to query the rev during build process below
deepClone = true; # probably not needed
} // src // { } // src // {
# koreader sometimes specifies the rev as `tags/FOO`. # koreader sometimes specifies the rev as `tags/FOO`.
# we need to remember that to place the repo where it expects, but we have to strip it here for fetchgit to succeed. # we need to remember that to place the repo where it expects, but we have to strip it here for fetchgit to succeed.

26
pkgs/additional/koreader-from-src/sources.nix
View File

@ -3,71 +3,67 @@
curl = { curl = {
url = "https://github.com/curl/curl.git"; url = "https://github.com/curl/curl.git";
rev = "tags/curl-7_80_0"; rev = "tags/curl-7_80_0";
hash = "sha256-ivlhyCAOzaHw5H3tizKYdArSiueH3NPHRG6Jssy2UuE="; hash = "sha256-kzozc0Io+1f4UMivSV2IhzJDQXmad4wNhXN/Y2Lsg3Q=";
}; };
czmq = { czmq = {
url = "https://github.com/zeromq/czmq.git"; url = "https://github.com/zeromq/czmq.git";
rev = "2a0ddbc4b2dde623220d7f4980ddd60e910cfa78"; rev = "2a0ddbc4b2dde623220d7f4980ddd60e910cfa78";
hash = "sha256-FxeJa9u5PB4jsoI+yCfdx2w1jPoUBKkRkMfVi6ljM3c="; hash = "sha256-p4Cl2PLVgRQ0S4qr3VClJXjvAd2LUBU9oRUvOCfVnyw=";
}; };
djvulibre = { djvulibre = {
url = "https://gitlab.com/koreader/djvulibre.git"; url = "https://gitlab.com/koreader/djvulibre.git";
rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc"; rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc";
hash = "sha256-H0HWR+hpAYLGbBdY3BwxgKPUrWhrIsVMnoURdbn8iIE="; hash = "sha256-OWSbxdr93FH3ed0D+NSFWIah7VDTcL3LIGOciY+f4dk=";
}; };
fbink = { fbink = {
url = "https://github.com/NiLuJe/FBInk.git"; url = "https://github.com/NiLuJe/FBInk.git";
rev = "f562bc15a606524694a6d885bed5d83d03c7eb23"; rev = "f562bc15a606524694a6d885bed5d83d03c7eb23";
hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8="; hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8=";
leaveDotGit = false;
deepClone = false;
}; };
freetype2 = { freetype2 = {
url = "https://gitlab.com/koreader/freetype2.git"; url = "https://gitlab.com/koreader/freetype2.git";
rev = "VER-2-13-1"; rev = "VER-2-13-1";
hash = "sha256-rQN+hRzrs+KGgp8+n1VJzOOwtKUcRuSE/s/r8/xOUdI="; hash = "sha256-rQN+hRzrs+KGgp8+n1VJzOOwtKUcRuSE/s/r8/xOUdI=";
leaveDotGit = false;
deepClone = false;
}; };
fribidi = { fribidi = {
url = "https://github.com/fribidi/fribidi.git"; url = "https://github.com/fribidi/fribidi.git";
rev = "tags/v1.0.12"; rev = "tags/v1.0.12";
hash = "sha256-RXi3i+vA0PCbBj4s4FtYydU4dN7+vwCZBxG1oVIRtlw="; hash = "sha256-L4m/F9rs8fiv9rSf8oy7P6cthhupc6R/lCv30PLiQ4M=";
}; };
leptonica = { leptonica = {
url = "https://github.com/DanBloomberg/leptonica.git"; url = "https://github.com/DanBloomberg/leptonica.git";
rev = "1.74.1"; rev = "1.74.1";
hash = "sha256-vpgKAPBMQpbF2iCvtX8V+RQ9ynjpWRKN22fOehWxHNE="; hash = "sha256-SDXKam768xvZZvTbXe3sssvZyeLEEiY97Vrzx8hoc6g=";
}; };
libjpeg-turbo = { libjpeg-turbo = {
url = "https://github.com/libjpeg-turbo/libjpeg-turbo.git"; url = "https://github.com/libjpeg-turbo/libjpeg-turbo.git";
rev = "3.0.0"; rev = "3.0.0";
hash = "sha256-CEqlV/LzF5okvPwUDyqDBvL4bTGc6TYqfADHtRLPJb4="; hash = "sha256-mIeSBP65+rWOCRS/33MPqGUpemBee2qR45CZ6H00Hak=";
}; };
libk2pdfopt = { libk2pdfopt = {
url = "https://github.com/koreader/libk2pdfopt.git"; url = "https://github.com/koreader/libk2pdfopt.git";
rev = "60b82eeecf71d1776951da970fe8cd2cc5735ded"; rev = "60b82eeecf71d1776951da970fe8cd2cc5735ded";
hash = "sha256-JKf6vA5S7VNqk4GzOaX5k1OgAd0vLmoTXusAzR6Otto="; hash = "sha256-9UcDr9e4GZCZ78moRs1ADAt4Xl7z3vR93KDexXEHvhw=";
}; };
libpng = { libpng = {
url = "https://github.com/glennrp/libpng.git"; url = "https://github.com/glennrp/libpng.git";
rev = "v1.6.40"; rev = "v1.6.40";
hash = "sha256-/994yXMCaX0fVYH94oPPtwc8VDgZNMKXeGUyHd5H3KI="; hash = "sha256-Rad7Y5Z9PUCipBTQcB7LEP8fIVTG3JsnMeknUkZ/rRg=";
}; };
luajit = { luajit = {
url = "https://github.com/LuaJIT/LuaJIT"; url = "https://github.com/LuaJIT/LuaJIT";
rev = "8635cbabf3094c4d8bd00578c7d812bea87bb2d3"; rev = "8635cbabf3094c4d8bd00578c7d812bea87bb2d3";
hash = "sha256-8ij/Zjss8Rz5fKL9LJuRiTQdoT9OVMNOY1a4D2hRcEU="; hash = "sha256-pfMNQFulW6AEwAVPxn9wUdbRg3ViHbGVCCke5NSIgTo=";
}; };
tesseract = { tesseract = {
url = "https://github.com/tesseract-ocr/tesseract.git"; url = "https://github.com/tesseract-ocr/tesseract.git";
rev = "60176fc5ae5e7f6bdef60c926a4b5ea03de2bfa7"; rev = "60176fc5ae5e7f6bdef60c926a4b5ea03de2bfa7";
hash = "sha256-xPhXnMdJJFL0UPAzOWUyx2l4lfjVU154/WgbStq9RDo="; hash = "sha256-FQvlrJ+Uy7+wtUxBuS5NdoToUwNRhYw2ju8Ya8MLyQw=";
}; };
zstd = { zstd = {
url = "https://github.com/facebook/zstd.git"; url = "https://github.com/facebook/zstd.git";
rev = "tags/v1.5.5"; rev = "tags/v1.5.5";
hash = "sha256-cxoBEwrCA1qrH8o5l0PvKJDcr2M4z1Ek76MISeToENE="; hash = "sha256-tHHHIsQU7vJySrVhJuMKUSq11MzkmC+Pcsj00uFJdnQ=";
}; };
}; };