Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -9963,6 +9963,12 @@
|
||||
githubId = 782440;
|
||||
name = "Luna Nova";
|
||||
};
|
||||
lurkki = {
|
||||
email = "jussi.kuokkanen@protonmail.com";
|
||||
github = "Lurkki14";
|
||||
githubId = 44469719;
|
||||
name = "Jussi Kuokkanen";
|
||||
};
|
||||
lux = {
|
||||
email = "lux@lux.name";
|
||||
github = "luxzeitlos";
|
||||
|
||||
@@ -232,8 +232,8 @@ in {
|
||||
proxy_connect_timeout 90;
|
||||
proxy_send_timeout 90;
|
||||
proxy_read_timeout 90;
|
||||
proxy_buffer_size 4k;
|
||||
proxy_buffers 4 32k;
|
||||
proxy_buffer_size 64k;
|
||||
proxy_buffers 8 64k;
|
||||
proxy_busy_buffers_size 64k;
|
||||
proxy_temp_file_write_size 64k;
|
||||
client_max_body_size 50m;
|
||||
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.80";
|
||||
version = "6.81";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash = {
|
||||
x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg=";
|
||||
aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI=";
|
||||
x86_64-linux = "sha256-Zzt/g96yAztE0NjVa4uaWXBckSvnGxP0K87Hmq82Mi0=";
|
||||
aarch64-linux = "sha256-PNUUm7xNpPRyQaZm9YDXysJ1yo/IzxUz+kqI6/Z6fpo=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stellar-core";
|
||||
version = "19.11.0";
|
||||
version = "19.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stellar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
|
||||
sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "3.166.9",
|
||||
"version": "3.167.2",
|
||||
"deb": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb",
|
||||
"hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb",
|
||||
"hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb",
|
||||
"hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb",
|
||||
"hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.26.4";
|
||||
version = "1.26.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w=";
|
||||
hash = "sha256-6/acpPMHsMj/8GkLGNE8yg/apt8ynhN3O35lkA95HYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig";
|
||||
version = "6.19.3";
|
||||
version = "6.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mvEmxN7spyQkavAcjW4bVt7xjtRTP77OwHzJ5UqsSoE=";
|
||||
hash = "sha256-csJfmjKm/uAlINhijeqUsDVTemchlzWqJg/YHtmNlAk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -35,16 +35,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.4.7";
|
||||
version = "3.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jvrt8CwYkeZky5xg9a2U/CuenoBe86yX31x2iCb/7EY=";
|
||||
hash = "sha256-cN1uLy0QHABks99BJqEpLDf2VbYUzLM2iCTTBvcY0es=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6vHZxBcmhu6s3qQSX0iNIAR0hvXQB/bbpTA1/R08pj0=";
|
||||
vendorHash = "sha256-kO4ME0r3MoOjn+83X+8bbkgF7zL/Id2+hKabQjEob+Y=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.11";
|
||||
version = "1.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uI81dz0rU2/UnLvoQffuFOB3NGaTK0MJmCWGvGQKw24=";
|
||||
hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1456";
|
||||
version = "1460";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9DkmqqovVqaahoHoY30CfINEHTKn3Rqb9yVtU4fIgKw=";
|
||||
hash = "sha256-9Er15zsq9Xrw66M8QOmARC1S/O5NvmpdUvOZUGc92P0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fricas";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2";
|
||||
sha256 = "sha256-amAGPLQo70nKATyZM7h3yX5mMUxCwOFwb/fTIWB5hUQ=";
|
||||
sha256 = "sha256-5RPcffM0GN0l6r8IgHJlwdxwwp2y4kIdJ5M3JnGZCzc=";
|
||||
};
|
||||
|
||||
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
|
||||
|
||||
@@ -42,11 +42,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "labplot";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/labplot/labplot-${version}.tar.xz";
|
||||
sha256 = "sha256-XfxnQxCQSkOHXWnj4mCh/t2WjmwbHs2rp1WrGqOMupA=";
|
||||
sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "booster";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anatol";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mUmh2oAD3G9cpv7yiKcFaXJkEdo18oMD/sttnYnAQL8=";
|
||||
hash = "sha256-+0pY4/f/qfIT1lLn2DXmJBZcDDEOil4H3zNY3911ACQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-czzNAUO4eRYTwfnidNLqyvIsR0nyzR9cb+G9/5JRvKs=";
|
||||
vendorHash = "sha256-RmRY+HoNuijfcK8gNbOIyWCOa50BVJd3IZv2+Pc3FYw=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck"
|
||||
|
||||
@@ -22,7 +22,14 @@ const exec = async (...args) => {
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
|
||||
return new Promise((resolve, reject) => {
|
||||
https.get(url, (res) => {
|
||||
const get = (url, redirects = 0) => https.get(url, (res) => {
|
||||
if(redirects > 10) {
|
||||
reject('Too many redirects!');
|
||||
return;
|
||||
}
|
||||
if(res.statusCode === 301 || res.statusCode === 302) {
|
||||
return get(res.headers.location, redirects + 1)
|
||||
}
|
||||
const file = fs.createWriteStream(fileName)
|
||||
const hash = crypto.createHash(hashType)
|
||||
res.pipe(file)
|
||||
@@ -35,6 +42,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => {
|
||||
})
|
||||
res.on('error', e => reject(e))
|
||||
})
|
||||
get(url)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ with pkgs;
|
||||
rec {
|
||||
|
||||
sourceTarball = args: import ./source-tarball.nix (
|
||||
{ inherit stdenv autoconf automake libtool;
|
||||
{ inherit lib stdenv autoconf automake libtool;
|
||||
} // args);
|
||||
|
||||
makeSourceTarball = sourceTarball; # compatibility
|
||||
|
||||
@@ -154,8 +154,8 @@ stdenv.mkDerivation (
|
||||
|
||||
//
|
||||
|
||||
(if buildOutOfSourceTree
|
||||
then {
|
||||
(lib.optionalAttrs buildOutOfSourceTree
|
||||
{
|
||||
preConfigure =
|
||||
# Build out of source tree and make the source tree read-only. This
|
||||
# helps catch violations of the GNU Coding Standards (info
|
||||
@@ -170,5 +170,5 @@ stdenv.mkDerivation (
|
||||
${lib.optionalString (preConfigure != null) preConfigure}
|
||||
'';
|
||||
}
|
||||
else {})
|
||||
)
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
if officialRelease
|
||||
then ""
|
||||
else "pre${toString (src.rev or src.revCount or "")}"
|
||||
, src, stdenv, autoconf, automake, libtool
|
||||
, src, lib, stdenv, autoconf, automake, libtool
|
||||
, # By default, provide all the GNU Build System as input.
|
||||
bootstrapBuildInputs ? [ autoconf automake libtool ]
|
||||
, ... } @ args:
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (
|
||||
}
|
||||
|
||||
# Then, the caller-supplied attributes.
|
||||
// args //
|
||||
// (builtins.removeAttrs args [ "lib" ]) //
|
||||
|
||||
# And finally, our own stuff.
|
||||
{
|
||||
@@ -117,7 +117,7 @@ stdenv.mkDerivation (
|
||||
version = version + versionSuffix;
|
||||
};
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
meta = (lib.optionalAttrs (args ? meta) args.meta) // {
|
||||
description = "Source distribution";
|
||||
|
||||
# Tarball builds are generally important, so give them a high
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "25.0.1";
|
||||
version = "25.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
||||
@@ -1,95 +1,95 @@
|
||||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "0lmr4xqmyr4pz1xz0iw71zjwa9xn0nbkzxr1q3mdv3x12pdp0r11";
|
||||
iosevka-aile = "1l4bmn1cangjn91rq2w40np6dkcw34l8yvfbsqpmbzfqsz34ga61";
|
||||
iosevka-curly = "1sp8ig31s8rq91vl2ziv3ixqh50qdvnnlx6fjiccyxza079kxjw0";
|
||||
iosevka-curly-slab = "08jmmshflmhwwaa184aggxbmwfj4q1czynl52cz1may3cgvjr9za";
|
||||
iosevka-etoile = "1zvd8n7vm5za2jlply796hvzar92g73ibkhdc4r8d38148xxmwp2";
|
||||
iosevka-slab = "1xfrs95d1dzjz9dlgyn49xryyjzm711frxi45931l6i2jxppgz74";
|
||||
iosevka-ss01 = "0q9q5vx4p1r29l404yadbi4qslrjzgkisk6hk04xrhhrmkhh4b5j";
|
||||
iosevka-ss02 = "1nd7lyjcciirq146lj9crxrbxp82q29lclbhmxvkszlymif36vr5";
|
||||
iosevka-ss03 = "1rkgqhbh3c77jzysn0hdci2lgw1ss0f98zdnc2xfwhzimhlcsb2n";
|
||||
iosevka-ss04 = "17dcgbjhvyjcmk4jzf55faqwb30inhx98qldpjx66rkjg274dady";
|
||||
iosevka-ss05 = "1prpxj9hphhpmjpn001gznwmphijv4fkd1m5yr6zyyq10zyawx1j";
|
||||
iosevka-ss06 = "0narnyrfk88rclgm1caaqd7rmisbviizzrp4g54naxsmwhxj6zvd";
|
||||
iosevka-ss07 = "00v615vs6kmnxv7zql04b01dxc0ngdkpin51qi8fdld1nwy3gw4j";
|
||||
iosevka-ss08 = "1rzjpp82s2y2zybyh20406c131wk1mfazc4fzc766an87gip8409";
|
||||
iosevka-ss09 = "0amq785n58f1f92vi7xv4zsx91v5a3rkksk5yifysnc6pkxjs56w";
|
||||
iosevka-ss10 = "062x74l5df1ahxb7a27nrya6nh49dl0pi5c88v78hi2m85baviar";
|
||||
iosevka-ss11 = "06ak3wlxf472vpl5z02fg92z4hiycxvqj411g9cpfz7kg6y006fb";
|
||||
iosevka-ss12 = "1jny1y27swpzm2cqbavkkkbi3k1v2z2hy17l9arr9dv54bnm2d57";
|
||||
iosevka-ss13 = "0aylmsnhbrjckj012s7j6x0gikldiln60grjnp4h1z80nhs6md3a";
|
||||
iosevka-ss14 = "0j6v8bihckwp0bhs80zwr1rsrdf4bhaqjzwjx2mr9d63dnhj5lp9";
|
||||
iosevka-ss15 = "0xs52nbmj1g43x943vvb4pnms1i98ffidkad79f63nhw0x0ygr01";
|
||||
iosevka-ss16 = "0p9g432d44rdiv9bs5z0irdamqsknsi82snxyrmjplgy7m1frv9k";
|
||||
iosevka-ss17 = "1bvc9782yry9klkinfwrbn59mclcpizmv3yndz4b1ixv8dgym65z";
|
||||
iosevka-ss18 = "1a4m0drdg4f3rpxcjm899rzpym2m0hhiypwg61506nww1jcl8kk8";
|
||||
sgr-iosevka = "1xwpg3cq2587m8az2sfpd0k3pmvd8w4ci1jl7717fap38drl86ba";
|
||||
sgr-iosevka-aile = "0qjds4jhdzgnar0xdbz315kb2f4hxgh6xi8sdqpfbg84wjaj9872";
|
||||
sgr-iosevka-curly = "1qxyncllbbi1pcq7ajq63127k4q119cag76yyh3xpwl2f235ybrx";
|
||||
sgr-iosevka-curly-slab = "1bp44hgmc81avvpwdckjkmh049igfdfppnmmmpxmy55xzpmy30ik";
|
||||
sgr-iosevka-etoile = "0jvnlrz7mxrm0lg7wkdh3pz529xmssw63rgi0nfdy77zga3gv8r4";
|
||||
sgr-iosevka-fixed = "0bqdfq1xaanqpv1s9skapch184hcvbmdpcnjh7skms5ggcal7s3n";
|
||||
sgr-iosevka-fixed-curly = "0a7agrgi4qi3dk8yix3p9kbjvyqbxvm4lc0b75ywa8330g42khf5";
|
||||
sgr-iosevka-fixed-curly-slab = "0kxgkhvhz4l7ifc591c1n112wkcimfl417p49s3k5rx19yadz3rv";
|
||||
sgr-iosevka-fixed-slab = "1aq7qc6jjm7wkd5ng937gbv5l82gqx9snm4ffpp2k5zk8nnm38lv";
|
||||
sgr-iosevka-fixed-ss01 = "12gfppvi8vfp6y6y96zd6yvpb8xlr907gzhz04vm3j9m2dx8mdpz";
|
||||
sgr-iosevka-fixed-ss02 = "1ip6yx99rfa09bx64ah8bk5jp8w0x1qsdjknda7fwd8n1ian9qb1";
|
||||
sgr-iosevka-fixed-ss03 = "0cbayci1j0qj0xbydkxl4g8p4rdhjpdkjy6vb5zsxrx8rcxzmh6r";
|
||||
sgr-iosevka-fixed-ss04 = "1nm1wbax6xlxhsnw3522wi9dzzzr8k92464p9w31krrajlji46bn";
|
||||
sgr-iosevka-fixed-ss05 = "0y68rh0352idl0ncmx0lngbc6jj98incsnlh8xn55qggawah2g7l";
|
||||
sgr-iosevka-fixed-ss06 = "0x4azqmmznzaimg3ahv8kl0zcl3bdmrq4lqrvy94qz5ivgfnr7zv";
|
||||
sgr-iosevka-fixed-ss07 = "1l29i7q8zyw4cz21dqz2bc74c60grmmasiy3l31awrbwmabncqms";
|
||||
sgr-iosevka-fixed-ss08 = "1zlfqrkbsysi2nzfmvmz4yfbjngx3wpi3c68b4nkd8wdabll7a4m";
|
||||
sgr-iosevka-fixed-ss09 = "1631yavmr59lvmqhp3940n19200zsphy2fvq9kdg0xnrr9hgcgk0";
|
||||
sgr-iosevka-fixed-ss10 = "131crnfgvhxakggmvgk6apji8w3wkbgzm9ma77sz9ib9hcfrcn1f";
|
||||
sgr-iosevka-fixed-ss11 = "1gwz51ck1jdfww1g2yxzrjhyl3i41mqm6cykm2587r9kr5igxbyq";
|
||||
sgr-iosevka-fixed-ss12 = "198v6chwk948q7yikv06s4lydhyg4vq4s6ssl4fvay7d7jg33s5j";
|
||||
sgr-iosevka-fixed-ss13 = "1fg77lzw05qijap03l8f5k5lmfrn6phxpswvmzvlzzdscb5f2f3a";
|
||||
sgr-iosevka-fixed-ss14 = "1rhlja6vl1rdgp3r1ls3ycdr19x4bb0azyras7pamv2g5wbcrzv8";
|
||||
sgr-iosevka-fixed-ss15 = "03i2cr65368w8naqqyvhmry2sphihcdy3vw7pbq2mknn1ygrhafp";
|
||||
sgr-iosevka-fixed-ss16 = "1zxjik8z4jmq73fwfzg3y74wfp8a4yiy1dvm5g73b1r3jjc413dz";
|
||||
sgr-iosevka-fixed-ss17 = "0hxsa0bkf6yfh4hvs3h83myp3iil40c0629biys6h5a79nvqgxpr";
|
||||
sgr-iosevka-fixed-ss18 = "1zrnzrrzv1iw1aqa24khcxpwsg8fhvcbbs71j91j7yp5s070szar";
|
||||
sgr-iosevka-slab = "1d9lffq7xd6liglrr8kcymkq2bkvnz9cxnq4m5bby5h48vxr72j5";
|
||||
sgr-iosevka-ss01 = "1aa36415rpn4ihsd43mj1pgsjsiy4y2wr4ybckjyg7av1wi0n0rs";
|
||||
sgr-iosevka-ss02 = "0khj2j30q5zdygabmx45wn20g140zafifyg93fk9zp0ivs7xm13g";
|
||||
sgr-iosevka-ss03 = "0qvhlqc51bislhdhs61vv21dw0rvvf5sg9m7zk81d74harxba0qz";
|
||||
sgr-iosevka-ss04 = "0zpx6dpgivmk4gnf5w17978pd7cpq0f4j7ly53ykwa6ngjwq7cxq";
|
||||
sgr-iosevka-ss05 = "0jsaf52jydp4hah5q8l7sky1d7j3amkj7hs08qraw1h4bxbhqdq2";
|
||||
sgr-iosevka-ss06 = "0yh39c3bb59imysb0jyb0w006lhf5627ck4lkbv3pffa3jaskfrm";
|
||||
sgr-iosevka-ss07 = "1pm7pml2y9hfl8xpf0ggprvzc9yqxf2dpi64zsrbh950d41wmxyj";
|
||||
sgr-iosevka-ss08 = "11dqssnw6bhvsplc4sd8jvwhnmk6k8f506m8j26v2gr5iqk773kj";
|
||||
sgr-iosevka-ss09 = "014182zym2rw5zakpjaf921mpvxlr6ic24ag09c79c0w9mi2jnff";
|
||||
sgr-iosevka-ss10 = "0wzfxrhx173yga3s1ln1709wwxf4hbqym4sdg9jz3dn2hdn1f55j";
|
||||
sgr-iosevka-ss11 = "0wh1dy6w3sgw9xw2nda0xpa931v66nxv4kd4q4s8r9g6s5kbpj35";
|
||||
sgr-iosevka-ss12 = "1dnh7gs5lyyc4n7jmnl6c9qcsj7fnhzlyy8kxmsgn5hxfzjn42i8";
|
||||
sgr-iosevka-ss13 = "0g47da6ah2skrxs522q9w3aamrpyfhixg9cpqy0sgyxraw2iaq3d";
|
||||
sgr-iosevka-ss14 = "1if7hs8wjw7fs0j46camazmc93p0z1hz43i0rrkjxnai6cjqkaqj";
|
||||
sgr-iosevka-ss15 = "05h5yzpzx9xlf8xwkw8inp16x0arpdcfrklc62qdi87mdnfpkw8w";
|
||||
sgr-iosevka-ss16 = "01d3w7yblfbca3l2cmazh72f5a0z3wnb5d77rlw9wlvgw0drj8b0";
|
||||
sgr-iosevka-ss17 = "0sl94iaw038kljr78ms42vjqyj55pbyslxbm0b81fg6xkjy6q60n";
|
||||
sgr-iosevka-ss18 = "17395mrpjz1rmh5661s1v1ja53qhygf3zalqabya7cwfb1hz0xqy";
|
||||
sgr-iosevka-term = "10zg4365w5f554zdcdq4h7ixq3aq1lm21qndffp4q5c0kv57ggak";
|
||||
sgr-iosevka-term-curly = "19lkavcwpy7hsgmxz2jwlvbx9lsi8wm3xrypcb0wbcy80hjgkms2";
|
||||
sgr-iosevka-term-curly-slab = "1asdfglxskg6cikhhxx83jpwqsq3adrb5zgk94h1m2sv2xpcd65i";
|
||||
sgr-iosevka-term-slab = "0rsl048jzbf4fwindxxrlb2fwivjjayydc3fs8v92xg239y45m35";
|
||||
sgr-iosevka-term-ss01 = "17hin55idhzvcvrpvgpgjwkn29zsckmvjygbsjf560vy3cv48nlg";
|
||||
sgr-iosevka-term-ss02 = "0xnr89bdifbydgy7xbkg1msqxyjxp7l0rxby19bayd6f5lyh552s";
|
||||
sgr-iosevka-term-ss03 = "1ijz7qjym1fdrrjyi4g7lkl75frbcyh5ds548szwdavffh9ad74d";
|
||||
sgr-iosevka-term-ss04 = "1xrmlsp0gggqzgqckgp5r3h445xyglqid2g6f0fblcv5a79kp04w";
|
||||
sgr-iosevka-term-ss05 = "1d4llq2g6s9pp3ajl9spca5bpkk24kba4ki847gi55i7lpw4d1kl";
|
||||
sgr-iosevka-term-ss06 = "1wbqsgng4r3b588lnip0li321ibrnc4i39jjmvrs9c8xmgzswfjg";
|
||||
sgr-iosevka-term-ss07 = "0jxq4ygc6afq4vfgzrpsvhdw52535yqk6702nb5frlf9bllxpali";
|
||||
sgr-iosevka-term-ss08 = "1hqs6j38sghi1v86l83rhkyl7frsph7dp9jnhmzzb6w70ikbmajx";
|
||||
sgr-iosevka-term-ss09 = "0h8cf76s7dsa6gfsf9sxiri98d8crsdq2a2cjmn5iz9cxwnnrf0h";
|
||||
sgr-iosevka-term-ss10 = "0p3643d444r03y74djhpmgdz4f6ydwkhddgw4fpjhx4sg226yvfc";
|
||||
sgr-iosevka-term-ss11 = "0ak3w6h58wnpcxahdmdij52izvlq49allvrlq1syziaqd6b95qpz";
|
||||
sgr-iosevka-term-ss12 = "0km4sfg4q1z6b999piiiaiv6qxnvanw1s0jgrvy933fxyv7n4h7a";
|
||||
sgr-iosevka-term-ss13 = "0xhimnsspan0mcmspvz1r412q4rzririjnj744mgxs339w1bi6bh";
|
||||
sgr-iosevka-term-ss14 = "0h1v4lvf367p7w5m8s3mncp2ssfncxrixn1grj1nigijdc53m7ws";
|
||||
sgr-iosevka-term-ss15 = "1pppczbfv0dh7dnf39rw23qmr1h8ixkgw3gc6yashjni0jd9rr3r";
|
||||
sgr-iosevka-term-ss16 = "06fradackj5xi8j79sv16mnrxv91s596n04w6l3s29dcsmahf3yv";
|
||||
sgr-iosevka-term-ss17 = "0g4pv6v09n0xpxai3i79bhjspabvadv4wd4r1ryms6jyfdn9n367";
|
||||
sgr-iosevka-term-ss18 = "00zv631z48ifkpaw4idr9r6q2zdjv7m7i19xb33gv8yvfv96s3hz";
|
||||
iosevka = "1qs8z085mwg3ay0pn2b7ka21cb4xd1hf9yziiszajb94bkxwl77s";
|
||||
iosevka-aile = "12dg6s8bhx739y8slp2s783af3ysipdb640xl67v8jnznmj2vyg1";
|
||||
iosevka-curly = "1ypbfv41qvwpg7dc9hhsyqrnavd6926568rcnvj9j99j5dm8nl37";
|
||||
iosevka-curly-slab = "0r7n83ddq8w8ih6fsij7v9xkr8z5cvnfq6i921jsm0l5x03f7rxh";
|
||||
iosevka-etoile = "1gazc1vz54lgg3hxcqryh5nl1grlngpkph4l4i292k014ky32gf6";
|
||||
iosevka-slab = "02lgwmvzcpjz8n78vvxm7w7pff9s6008ca5i8fvl4m24k051jfdy";
|
||||
iosevka-ss01 = "07gir5wszdnzrh32978kwg8rhychkjjqqwhdgslrxjfwnlrzpjq3";
|
||||
iosevka-ss02 = "15sqkk0w39cj8lyjfhs70if7k1adgql18kkmyf3bx1h92xys18ca";
|
||||
iosevka-ss03 = "0gi3gm0byg8vhicgfxvcvja1cz9qs8ahryk9yn5896yiyps1djfa";
|
||||
iosevka-ss04 = "19l3g2vdms6nnyhpi5fjnsk0ym0b8ypa30riha1z8pkzhfk650gp";
|
||||
iosevka-ss05 = "1zl2mc0yxb4gwx47pzhcg8q8vk3k269sf8x2i6l4iki5qapi3436";
|
||||
iosevka-ss06 = "1d28ks82y74wyla8y7203bpdi6rz304glwmkbv2blfn3n4d5ncga";
|
||||
iosevka-ss07 = "1fw0n005b8lhy36qcy0a8flnv6y0mi7s4d9dx6gjbl1hsyykhppl";
|
||||
iosevka-ss08 = "1w0invhhwqy2braxm6n99g33l8sxdi0y5lbdxrhdypqrrg32bk2n";
|
||||
iosevka-ss09 = "1ai0r32s5y1sjsidxal1ah5bj6agh33ljiklnjs3ni9f6kxcqbds";
|
||||
iosevka-ss10 = "1qwzzndnhivs3m7kk3izhyd07vb3zx7pankkq0vdxiynpais9pjy";
|
||||
iosevka-ss11 = "14nw87kcidm9hds4z0rw3c5alnilgzrkgrbxg7kvsb0xxvw2xlha";
|
||||
iosevka-ss12 = "0gpy6pmirsp69vyyq7v3cxvn5dyv5k740qs76a13n5x0lvvapjyj";
|
||||
iosevka-ss13 = "1gsggzar1kqk1mqncp7jry8pp8nmr9p2ip309dl6di4b4c6cfplh";
|
||||
iosevka-ss14 = "1km4a6jhjmwl4wmapfhshqvf64dc87bfi89n5m34x91qlnw1xmfw";
|
||||
iosevka-ss15 = "02pj2mhyx3j4md9v2n1kbr4b1cx84rc5fcggl9i718qwryh55bg5";
|
||||
iosevka-ss16 = "0a4nwl4am410nklvzmr66z5vmbmq2v243div3r73nkwx6qzn7g64";
|
||||
iosevka-ss17 = "1hmdhp87qy0q4wnrfnc5vrv0n8dfn3cnlmc6j817pazra5lv0b09";
|
||||
iosevka-ss18 = "12jhd998m976cz65y8r12jaiy6ybrzc0zxb1i9sl72k9c9qdsy87";
|
||||
sgr-iosevka = "16n0y3qa7914xv1x8md12hfv1fz1alfgj16lsxcb8zmp8phbswqd";
|
||||
sgr-iosevka-aile = "1dmyx30yq1avdnr7f9hz9mjyi4awd6k0sr4svmhxihr4lmvzabhn";
|
||||
sgr-iosevka-curly = "0mgyh6qf5c85z9j8kcnfzyzmak6pj9s6k2da0ggyrhv1iqsjnpai";
|
||||
sgr-iosevka-curly-slab = "0va38lmja77mnnyr3xzdqa37xv4cz7jf8hcxr1p21yhd681gznbg";
|
||||
sgr-iosevka-etoile = "1r6ai6ph5nbqxyrrzs945y02mcd4kdj2ckaadar4mlc8hwmdvdkx";
|
||||
sgr-iosevka-fixed = "0dwk1gvszq0d8x22fa57ka3l0n7c6yga2k2vdk2kpv9aq2rlb6p9";
|
||||
sgr-iosevka-fixed-curly = "11vwsdhkqwzmifx6snxffn503bli0ikqnhc12q1y4j8rccn7xyhz";
|
||||
sgr-iosevka-fixed-curly-slab = "06r4rl696250ny0jw9v8z13f10yp64g09kk8hpcm3rq9xwvfkra4";
|
||||
sgr-iosevka-fixed-slab = "1wi92bykv4v7dsnm6qbhh5ydy3mwzxwjkvmycvwjac64hpicj2as";
|
||||
sgr-iosevka-fixed-ss01 = "1nacy9lr64v0lfhq61b442b9fr1q14bchydbh33fvk7wnkydkfnl";
|
||||
sgr-iosevka-fixed-ss02 = "1cb55b07f339q6mbv1v5rqh37m3b4zhlzz2fg08h97xvb3vd7n7d";
|
||||
sgr-iosevka-fixed-ss03 = "1sjwndp4zmqjc95da9al24g5nzzlv7x9lsm9dljpcznfw88wrhsy";
|
||||
sgr-iosevka-fixed-ss04 = "07p9fv5aarwrbl9b9gbfwi26px53zfw14472jrasp10cl0dha12a";
|
||||
sgr-iosevka-fixed-ss05 = "1hvdnyibzkjd89vm6ir3bpskhi75ijjcbpr7y2iir6z7xj11mzmn";
|
||||
sgr-iosevka-fixed-ss06 = "1ram41z53w2khzhhf472a9qyhk3ikd180vnzvfasa0510c7fp2n0";
|
||||
sgr-iosevka-fixed-ss07 = "1kkbch8zx3dzacwhkqi6yxihf3w2g0kblhdicdfhqfb57pb63ka8";
|
||||
sgr-iosevka-fixed-ss08 = "1lw4917p842yp21m73n1k6inbdqacnqcrqr6f9995qvl9ls9l8qg";
|
||||
sgr-iosevka-fixed-ss09 = "033wyyxyza0lvq53gaaxy1r4f9li6rmvqdqw66jq2c5mr75xajs6";
|
||||
sgr-iosevka-fixed-ss10 = "0x0by1hbc6x89ac44x47bxn5r07znnsykhf8wx9dy82kj841h2wk";
|
||||
sgr-iosevka-fixed-ss11 = "10rlp2xl9509rhaccyy2asi95idddzvllnwgnlr3ny9n27a9bakn";
|
||||
sgr-iosevka-fixed-ss12 = "0jljdyya4mxxjcmfxr1q37cy95wi56swjryvn99m0d5sahim3y28";
|
||||
sgr-iosevka-fixed-ss13 = "0524p8xrhbn0vgbc2ls3l0hpkidkksxqysrjm9c10m9z88l46laj";
|
||||
sgr-iosevka-fixed-ss14 = "13gpnjh54583r1kl3ra3l36zmvg81kknij9a8jrgp27d3dad95wq";
|
||||
sgr-iosevka-fixed-ss15 = "1gmwckl83r9lfizsdc5f806vism27g54wwn849dhgp8ckpp8w3sp";
|
||||
sgr-iosevka-fixed-ss16 = "0r5r9gpjzws9j6z5a64j3sjfii7c28vshmly47rj5npgrzflanmf";
|
||||
sgr-iosevka-fixed-ss17 = "1yyx48liizjbprfh2pi74c26sqggvnya5ajx7gyg7z4nwgw8hirv";
|
||||
sgr-iosevka-fixed-ss18 = "0lcjcl33qsd6xmldqv4s46l9isjfgnv2xd61c71swag0qsqavwr9";
|
||||
sgr-iosevka-slab = "1hy9ldl53slr30zcpj1bz1nbcx2316yycmwmrrmd5pjbplbbm1kj";
|
||||
sgr-iosevka-ss01 = "1kxzidydpr8y0fxhzm892zpl1nk3a1xdpdcx3ndnkbj99rhqbkfv";
|
||||
sgr-iosevka-ss02 = "02fzavi20m00l4rg995811x97x7bnv5hgc6bfllqy5x7vwry2a0g";
|
||||
sgr-iosevka-ss03 = "0vb863m8gxy7iq7b4a9lmphn39pz1v46x131isqd2n1d06bbn80r";
|
||||
sgr-iosevka-ss04 = "0fv506x069bgcvrhyzqw1vmd9s553k8pixsgyqy86dn3gy7hdaxz";
|
||||
sgr-iosevka-ss05 = "1mk8f5kk41dpf16hf44ikb2a4hx9i7k1y9dnxnd3f2j8wwizg9mw";
|
||||
sgr-iosevka-ss06 = "1v0llv8s98fihim8ay01qv4jc5dyn0hcczh9m63ap733m5rsi97d";
|
||||
sgr-iosevka-ss07 = "1rbb6imadzlwrraa4y4bs967h4lz6jvxqjrlr6xgrc11ndb1zfng";
|
||||
sgr-iosevka-ss08 = "13h027413rsx8x9snmjq4d4apsxwgjx6nqxrr3ndm16w3qqv6hwx";
|
||||
sgr-iosevka-ss09 = "162m4rnad25gsgc80jvf9ipzxf32ls4pr5279ffypjglxb37vfmx";
|
||||
sgr-iosevka-ss10 = "1jywagwqna5sw4q7973g85fj93gbhzmbhhwnz56yziywc52nh050";
|
||||
sgr-iosevka-ss11 = "0y7fr7hd1gd6cbfhnfdbhxsa46i1mlh86qkp3397knjqx81i6mi0";
|
||||
sgr-iosevka-ss12 = "1hd9p48mg4i4h8agyc9wbss0870g76mr8b9cvzf9dpn2p3nf7s96";
|
||||
sgr-iosevka-ss13 = "1x6wvl2v8alqk3iybw05z8k8fwwv4j3si5f2308db9r9phhh5qj0";
|
||||
sgr-iosevka-ss14 = "1rgk6g80x6gllk5zkragsnlv38jyzlisjcc802xwpq163lvq135q";
|
||||
sgr-iosevka-ss15 = "010fqzcfv9i5z23wbd393vgwcy22am2ly3i44np2ihbkb47aq6v9";
|
||||
sgr-iosevka-ss16 = "01f8827cx7nhflrvw2qflz3ahb2a5fdl832x18vaz81qbgkrn9lj";
|
||||
sgr-iosevka-ss17 = "11z67iwj6njlg35wm35wx8wpx2vmg1w8pl3fhncm25vi245mjd9g";
|
||||
sgr-iosevka-ss18 = "1h7ggiqvc169fk66kmxfpgbpmh7949smlanjcxamicsdllrr1ib8";
|
||||
sgr-iosevka-term = "0bdshfvapw0c0l6jd2fbkyfz07nxjhi4hjvc8r18r8i1ij8ak4w7";
|
||||
sgr-iosevka-term-curly = "1smkblav040fh7jslqa20p9zprcan5cfb8q0bi767rrnmnwndxf7";
|
||||
sgr-iosevka-term-curly-slab = "07si1d5vly2q88hmws4fjaia3758dllhqjvbv67hyhfxrvr17nbg";
|
||||
sgr-iosevka-term-slab = "1kw395l5xs674y9g55074rvv4p24qvy61yvjvx9vs51h5il0cvp0";
|
||||
sgr-iosevka-term-ss01 = "11i2fymlaz841vc1m05ig6qr49sks1zymg3wi8a63gx8nq0m0c0d";
|
||||
sgr-iosevka-term-ss02 = "06nffhxmyzz1x28i4cmp5g6a07wm8f91715lngajgm6jzm168vgp";
|
||||
sgr-iosevka-term-ss03 = "1yrdaqdpcxx7d6cljlmna9zc9avsmv94156q9yg1q638rxj34kp6";
|
||||
sgr-iosevka-term-ss04 = "186s3b8zqid0yj6a0qwvi5pxnfw54yzs4vvw94apka0yl4857ipk";
|
||||
sgr-iosevka-term-ss05 = "177z1hlrk5agrsh2sn6xmggpq7xfjlh5nz4azi71nzg60c0k6312";
|
||||
sgr-iosevka-term-ss06 = "0l69ajjil23qr3p4xw0578nj666ry0q370fyzb0mv9jk3q9yv3yc";
|
||||
sgr-iosevka-term-ss07 = "0hr9ls5l6ik5i5j6kx6imr3m9ymdbnkf6gmvswlikw21q609nvxm";
|
||||
sgr-iosevka-term-ss08 = "11bs0swb8vz138yb91gx901r3cg0snz7334hbdl4nxsa8wrphrmw";
|
||||
sgr-iosevka-term-ss09 = "1279gxl2j81shnh6s85p6xgb651mn83f9g0dr0bic53gbqfjxs26";
|
||||
sgr-iosevka-term-ss10 = "1v0x771pk0qdpb50hsihqvzf0q8fgg9z8fliwjpgjfkzgx85fl95";
|
||||
sgr-iosevka-term-ss11 = "1jg92awghy3qgziw7shizc35pwdxnm6xi3ss4381xbcmg3vhr64j";
|
||||
sgr-iosevka-term-ss12 = "1jy5nq0zpv6bnxd4c5vi13p8p4fgsc3q6b4wbzq30hipq4ikq9ci";
|
||||
sgr-iosevka-term-ss13 = "1hnqmfz82a39myzw93pwx5jcv6hh626plysmsxv96qds3qyzz646";
|
||||
sgr-iosevka-term-ss14 = "181d1alrk0amdbpg96s0qgzmqgmgs248wmrmkrzzamj4r5a981qp";
|
||||
sgr-iosevka-term-ss15 = "1a0naw45cjq6pdizy9sqq0lqbv7aawy7cjy2mf98f5059hmarqr2";
|
||||
sgr-iosevka-term-ss16 = "1a5lby135y5l65fpz5fcd7hdf7xy7dmi8mrjc68ihb1b52p1vp99";
|
||||
sgr-iosevka-term-ss17 = "00m0f1infr6qgd7126szbp4xkz3x0wpnybwbchyf28rm3jrjcnrr";
|
||||
sgr-iosevka-term-ss18 = "0i0kp7jfwlb73dx44q8pfwpyzzn24hinfhaxnvf78dv2k9623q5a";
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.15.9";
|
||||
version = "0.15.10";
|
||||
|
||||
# These hashes can be updated automatically by running the ./update.sh script.
|
||||
src =
|
||||
@@ -25,17 +25,17 @@ in stdenv.mkDerivation rec {
|
||||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz";
|
||||
sha256 = "16ci26pgrw0zmnyn1zj129y9624cqwzrhqglc8mgfg4k7rxvqy2a";
|
||||
sha256 = "1pk6mkjy09qvh8lsygb5gb77i2fqwjzz8jdjkxlyzynp3wpkcjp7";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://123.github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f";
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "14yd00v3dsnnwj2f645vy0apnp1843ms9ffd2ccv7bj5p4kxsdzg";
|
||||
})
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3";
|
||||
sha256 = "03p5f2m5xvrqgiacs4yfc2dgz6frlxy90h6z1nm6wan40p2vd41r";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cjose";
|
||||
version = "0.6.2.1";
|
||||
version = "0.6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmartzone";
|
||||
repo = "cjose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QgSO4jFouowDJeUTT4kUEXD+ctQ7JiY/5DkiPyb+Z/I=";
|
||||
sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, icu
|
||||
, libarchive
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hfst-ospell";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hfst";
|
||||
repo = "hfst-ospell";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
libarchive
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# libxmlxx is listed as a dependency but Darwin build fails with it,
|
||||
# might also be better in general since libxmlxx in Nixpkgs is 8 years old
|
||||
# https://github.com/hfst/hfst-ospell/issues/48#issuecomment-546535653
|
||||
configureFlags = [
|
||||
"--without-libxmlpp"
|
||||
"--without-tinyxml2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hfst/hfst-ospell/";
|
||||
description = "HFST spell checker library and command line tool ";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, autoreconfHook
|
||||
, bison
|
||||
, flex
|
||||
, foma
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, icu
|
||||
, stdenv
|
||||
, swig
|
||||
, pkg-config
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hfst";
|
||||
version = "3.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hfst";
|
||||
repo = "hfst";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
pkg-config
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
foma
|
||||
gettext
|
||||
icu
|
||||
zlib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-all-tools"
|
||||
"--with-foma-upstream=true"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "FST language processing library";
|
||||
homepage = "https://github.com/hfst/hfst";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, autoreconfHook
|
||||
, hfst-ospell
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libvoikko";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voikko";
|
||||
repo = "corevoikko";
|
||||
rev = "refs/tags/rel-libvoikko-${finalAttrs.version}";
|
||||
hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libvoikko";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hfst-ospell
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://voikko.puimula.org/";
|
||||
description = "Finnish language processing library";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libzip";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8=";
|
||||
sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "movit";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
|
||||
sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb";
|
||||
sha256 = "sha256-I1l7k+pTdi1E33Y+zCtwIwj3b8Fzggmek4UiAIHOZhA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, cg3
|
||||
, fetchFromGitHub
|
||||
, hfst
|
||||
, hfst-ospell
|
||||
, icu
|
||||
, libvoikko
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, python3
|
||||
, zip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "omorfi";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flammie";
|
||||
repo = "omorfi";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY=";
|
||||
};
|
||||
|
||||
# Fix for omorfi-hyphenate.sh file not found error
|
||||
postInstall = ''
|
||||
ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
cg3
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
zip
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3.pkgs.hfst
|
||||
hfst-ospell
|
||||
libvoikko
|
||||
];
|
||||
|
||||
# Supplied pkg-config file doesn't properly expose these
|
||||
propagatedBuildInputs = [
|
||||
hfst
|
||||
icu
|
||||
];
|
||||
|
||||
# Wrap shell scripts so they find the Python scripts
|
||||
# omorfi.bash inexplicably fails when wrapped
|
||||
preFixup = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}"
|
||||
for i in "$out/bin"/*.{sh,bash}; do
|
||||
if [ $(basename "$i") != "omorfi.bash" ]; then
|
||||
wrapProgram "$i" --prefix "PATH" : "$out/bin/"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
# Enable all features
|
||||
configureFlags = [
|
||||
"--enable-labeled-segments"
|
||||
"--enable-lemmatiser"
|
||||
"--enable-segmenter"
|
||||
"--enable-hyphenator"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analysis for Finnish text";
|
||||
homepage = "https://github.com/flammie/omorfi";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
# Darwin build fails due to hfst not being found
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
@@ -39,9 +39,11 @@ in
|
||||
|
||||
mapAliases {
|
||||
"@antora/cli" = pkgs.antora; # Added 2023-05-06
|
||||
"@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
|
||||
"@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
|
||||
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
|
||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
readability-cli = pkgs.readability-cli; # Added 2023-06-12
|
||||
|
||||
-420
@@ -84332,426 +84332,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"@bitwarden/cli" = nodeEnv.buildNodePackage {
|
||||
name = "_at_bitwarden_slash_cli";
|
||||
packageName = "@bitwarden/cli";
|
||||
version = "2023.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.7.0.tgz";
|
||||
sha512 = "xFurknMuDhsHFcwhewZxES1rP6bWOUqI4CfHlHI+vY//vOqUGzpz3Wo/H77ki1ufpNQLq4NEFJBZsuEwF8PRgA==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@ampproject/remapping-2.2.1"
|
||||
sources."@babel/code-frame-7.22.5"
|
||||
sources."@babel/compat-data-7.22.9"
|
||||
sources."@babel/core-7.22.9"
|
||||
sources."@babel/generator-7.22.9"
|
||||
sources."@babel/helper-compilation-targets-7.22.9"
|
||||
sources."@babel/helper-environment-visitor-7.22.5"
|
||||
sources."@babel/helper-function-name-7.22.5"
|
||||
sources."@babel/helper-hoist-variables-7.22.5"
|
||||
sources."@babel/helper-module-imports-7.22.5"
|
||||
sources."@babel/helper-module-transforms-7.22.9"
|
||||
sources."@babel/helper-plugin-utils-7.22.5"
|
||||
sources."@babel/helper-simple-access-7.22.5"
|
||||
sources."@babel/helper-split-export-declaration-7.22.6"
|
||||
sources."@babel/helper-string-parser-7.22.5"
|
||||
sources."@babel/helper-validator-identifier-7.22.5"
|
||||
sources."@babel/helper-validator-option-7.22.5"
|
||||
sources."@babel/helpers-7.22.6"
|
||||
(sources."@babel/highlight-7.22.5" // {
|
||||
dependencies = [
|
||||
sources."chalk-2.4.2"
|
||||
];
|
||||
})
|
||||
sources."@babel/parser-7.22.7"
|
||||
sources."@babel/plugin-proposal-export-namespace-from-7.18.9"
|
||||
sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
|
||||
sources."@babel/plugin-transform-modules-commonjs-7.22.5"
|
||||
sources."@babel/template-7.22.5"
|
||||
sources."@babel/traverse-7.22.8"
|
||||
sources."@babel/types-7.22.5"
|
||||
sources."@jridgewell/gen-mapping-0.3.3"
|
||||
sources."@jridgewell/resolve-uri-3.1.0"
|
||||
sources."@jridgewell/set-array-1.1.2"
|
||||
sources."@jridgewell/sourcemap-codec-1.4.15"
|
||||
(sources."@jridgewell/trace-mapping-0.3.18" // {
|
||||
dependencies = [
|
||||
sources."@jridgewell/sourcemap-codec-1.4.14"
|
||||
];
|
||||
})
|
||||
(sources."@koa/multer-3.0.2" // {
|
||||
dependencies = [
|
||||
sources."multer-1.4.4"
|
||||
];
|
||||
})
|
||||
sources."@koa/router-12.0.0"
|
||||
(sources."@mapbox/node-pre-gyp-1.0.11" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-6.0.0"
|
||||
sources."semver-7.5.4"
|
||||
sources."yallist-4.0.0"
|
||||
];
|
||||
})
|
||||
sources."@phc/format-1.0.0"
|
||||
sources."@tootallnate/once-2.0.0"
|
||||
sources."abab-2.0.6"
|
||||
sources."abbrev-1.1.1"
|
||||
sources."accepts-1.3.8"
|
||||
sources."agent-base-6.0.2"
|
||||
sources."ansi-escapes-4.3.2"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."append-field-1.0.0"
|
||||
sources."aproba-2.0.0"
|
||||
(sources."are-we-there-yet-2.0.0" // {
|
||||
dependencies = [
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."string_decoder-1.3.0"
|
||||
];
|
||||
})
|
||||
sources."argon2-0.30.3"
|
||||
sources."asynckit-0.4.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."base64-js-1.5.1"
|
||||
sources."big-integer-1.6.51"
|
||||
(sources."bl-4.1.0" // {
|
||||
dependencies = [
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."string_decoder-1.3.0"
|
||||
];
|
||||
})
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."browser-hrtime-1.1.8"
|
||||
sources."browserslist-4.21.9"
|
||||
sources."buffer-5.7.1"
|
||||
sources."buffer-from-1.1.2"
|
||||
sources."bufferutil-4.0.7"
|
||||
sources."busboy-0.2.14"
|
||||
sources."bytes-3.1.2"
|
||||
sources."cache-content-type-1.0.1"
|
||||
sources."call-bind-1.0.2"
|
||||
sources."caniuse-lite-1.0.30001517"
|
||||
sources."canvas-2.11.2"
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."chardet-0.7.0"
|
||||
sources."chownr-2.0.0"
|
||||
sources."cli-cursor-3.1.0"
|
||||
sources."cli-spinners-2.9.0"
|
||||
sources."cli-width-3.0.0"
|
||||
sources."clone-1.0.4"
|
||||
sources."co-4.6.0"
|
||||
sources."co-body-6.1.0"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."color-support-1.1.3"
|
||||
sources."combined-stream-1.0.8"
|
||||
sources."commander-7.2.0"
|
||||
sources."concat-map-0.0.1"
|
||||
(sources."concat-stream-1.6.2" // {
|
||||
dependencies = [
|
||||
sources."isarray-1.0.0"
|
||||
sources."readable-stream-2.3.8"
|
||||
sources."string_decoder-1.1.1"
|
||||
];
|
||||
})
|
||||
sources."console-control-strings-1.1.0"
|
||||
(sources."content-disposition-0.5.4" // {
|
||||
dependencies = [
|
||||
sources."safe-buffer-5.2.1"
|
||||
];
|
||||
})
|
||||
sources."content-type-1.0.5"
|
||||
sources."convert-source-map-1.9.0"
|
||||
sources."cookies-0.8.0"
|
||||
sources."copy-to-2.0.1"
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."cssstyle-3.0.0"
|
||||
sources."data-urls-4.0.0"
|
||||
sources."debug-4.3.4"
|
||||
sources."decimal.js-10.4.3"
|
||||
sources."decompress-response-4.2.1"
|
||||
sources."deep-equal-1.0.1"
|
||||
sources."defaults-1.0.4"
|
||||
sources."define-lazy-prop-2.0.0"
|
||||
sources."delayed-stream-1.0.0"
|
||||
sources."delegates-1.0.0"
|
||||
sources."depd-2.0.0"
|
||||
sources."destroy-1.2.0"
|
||||
sources."detect-libc-2.0.2"
|
||||
sources."dicer-0.2.5"
|
||||
sources."domexception-4.0.0"
|
||||
sources."ee-first-1.1.1"
|
||||
sources."electron-to-chromium-1.4.466"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."encodeurl-1.0.2"
|
||||
(sources."encoding-0.1.13" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."entities-4.5.0"
|
||||
sources."escalade-3.1.1"
|
||||
sources."escape-html-1.0.3"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
sources."external-editor-3.1.0"
|
||||
sources."figures-3.2.0"
|
||||
sources."fix-esm-1.0.1"
|
||||
sources."form-data-4.0.0"
|
||||
sources."fresh-0.5.2"
|
||||
(sources."fs-minipass-2.1.0" // {
|
||||
dependencies = [
|
||||
sources."minipass-3.3.6"
|
||||
sources."yallist-4.0.0"
|
||||
];
|
||||
})
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
sources."gauge-3.0.2"
|
||||
sources."gensync-1.0.0-beta.2"
|
||||
sources."get-intrinsic-1.2.1"
|
||||
sources."glob-7.2.3"
|
||||
sources."globals-11.12.0"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."has-1.0.3"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."has-proto-1.0.1"
|
||||
sources."has-symbols-1.0.3"
|
||||
sources."has-tostringtag-1.0.0"
|
||||
sources."has-unicode-2.0.1"
|
||||
sources."html-encoding-sniffer-3.0.0"
|
||||
(sources."http-assert-1.5.0" // {
|
||||
dependencies = [
|
||||
sources."depd-1.1.2"
|
||||
sources."http-errors-1.8.1"
|
||||
sources."statuses-1.5.0"
|
||||
];
|
||||
})
|
||||
sources."http-errors-2.0.0"
|
||||
sources."http-proxy-agent-5.0.0"
|
||||
sources."https-proxy-agent-5.0.1"
|
||||
sources."iconv-lite-0.4.24"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."immediate-3.0.6"
|
||||
sources."inflation-2.0.0"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."inquirer-8.2.5"
|
||||
sources."is-docker-2.2.1"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."is-generator-function-1.0.10"
|
||||
sources."is-interactive-1.0.0"
|
||||
sources."is-potential-custom-element-name-1.0.1"
|
||||
sources."is-promise-2.2.2"
|
||||
sources."is-unicode-supported-0.1.0"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."isarray-0.0.1"
|
||||
sources."js-tokens-4.0.0"
|
||||
sources."jsdom-22.1.0"
|
||||
sources."jsesc-2.5.2"
|
||||
sources."json-stringify-safe-5.0.1"
|
||||
sources."json5-2.2.3"
|
||||
(sources."jszip-3.10.1" // {
|
||||
dependencies = [
|
||||
sources."isarray-1.0.0"
|
||||
sources."readable-stream-2.3.8"
|
||||
sources."string_decoder-1.1.1"
|
||||
];
|
||||
})
|
||||
sources."keygrip-1.1.0"
|
||||
(sources."koa-2.14.2" // {
|
||||
dependencies = [
|
||||
(sources."http-errors-1.8.1" // {
|
||||
dependencies = [
|
||||
sources."depd-1.1.2"
|
||||
];
|
||||
})
|
||||
sources."statuses-1.5.0"
|
||||
];
|
||||
})
|
||||
sources."koa-bodyparser-4.4.0"
|
||||
sources."koa-compose-4.2.0"
|
||||
sources."koa-convert-2.0.0"
|
||||
sources."koa-is-json-1.0.0"
|
||||
sources."koa-json-2.0.2"
|
||||
sources."lie-3.3.0"
|
||||
sources."lodash-4.17.21"
|
||||
sources."log-symbols-4.1.0"
|
||||
sources."lowdb-1.0.0"
|
||||
sources."lru-cache-5.1.1"
|
||||
sources."lunr-2.3.9"
|
||||
sources."make-dir-3.1.0"
|
||||
sources."media-typer-0.3.0"
|
||||
sources."methods-1.1.2"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."mimic-fn-2.1.0"
|
||||
sources."mimic-response-2.1.0"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.8"
|
||||
sources."minipass-5.0.0"
|
||||
(sources."minizlib-2.1.2" // {
|
||||
dependencies = [
|
||||
sources."minipass-3.3.6"
|
||||
sources."yallist-4.0.0"
|
||||
];
|
||||
})
|
||||
sources."mkdirp-0.5.6"
|
||||
sources."ms-2.1.2"
|
||||
(sources."multer-1.4.5-lts.1" // {
|
||||
dependencies = [
|
||||
sources."busboy-1.6.0"
|
||||
sources."streamsearch-1.1.0"
|
||||
];
|
||||
})
|
||||
sources."mute-stream-0.0.8"
|
||||
sources."nan-2.17.0"
|
||||
sources."negotiator-0.6.3"
|
||||
sources."node-addon-api-5.1.0"
|
||||
(sources."node-fetch-2.6.11" // {
|
||||
dependencies = [
|
||||
sources."tr46-0.0.3"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
];
|
||||
})
|
||||
sources."node-forge-1.3.1"
|
||||
sources."node-gyp-build-4.6.0"
|
||||
sources."node-releases-2.0.13"
|
||||
sources."nopt-5.0.0"
|
||||
sources."npmlog-5.0.1"
|
||||
sources."nwsapi-2.2.7"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."object-inspect-1.12.3"
|
||||
sources."on-finished-2.4.1"
|
||||
sources."once-1.4.0"
|
||||
sources."onetime-5.1.2"
|
||||
sources."only-0.0.2"
|
||||
sources."open-8.4.2"
|
||||
sources."ora-5.4.1"
|
||||
sources."os-tmpdir-1.0.2"
|
||||
sources."pako-1.0.11"
|
||||
sources."papaparse-5.4.1"
|
||||
sources."parse5-7.1.2"
|
||||
sources."parseurl-1.3.3"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."path-to-regexp-6.2.1"
|
||||
sources."picocolors-1.0.0"
|
||||
sources."pify-3.0.0"
|
||||
sources."process-nextick-args-2.0.1"
|
||||
sources."proper-lockfile-4.1.2"
|
||||
sources."psl-1.9.0"
|
||||
sources."punycode-2.3.0"
|
||||
sources."qs-6.11.2"
|
||||
sources."querystringify-2.2.0"
|
||||
sources."raw-body-2.5.2"
|
||||
sources."readable-stream-1.1.14"
|
||||
sources."requires-port-1.0.0"
|
||||
sources."restore-cursor-3.1.0"
|
||||
sources."retry-0.12.0"
|
||||
sources."rimraf-3.0.2"
|
||||
sources."rrweb-cssom-0.6.0"
|
||||
sources."run-async-2.4.1"
|
||||
sources."rxjs-7.8.1"
|
||||
sources."safe-buffer-5.1.2"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."saxes-6.0.0"
|
||||
sources."semver-6.3.1"
|
||||
sources."set-blocking-2.0.0"
|
||||
sources."setimmediate-1.0.5"
|
||||
sources."setprototypeof-1.2.0"
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-concat-1.0.1"
|
||||
sources."simple-get-3.1.1"
|
||||
sources."statuses-2.0.1"
|
||||
sources."steno-0.4.4"
|
||||
(sources."streaming-json-stringify-3.1.0" // {
|
||||
dependencies = [
|
||||
sources."isarray-1.0.0"
|
||||
sources."readable-stream-2.3.8"
|
||||
sources."string_decoder-1.1.1"
|
||||
];
|
||||
})
|
||||
sources."streamsearch-0.1.2"
|
||||
sources."string-width-4.2.3"
|
||||
sources."string_decoder-0.10.31"
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."supports-color-5.5.0"
|
||||
sources."symbol-tree-3.2.4"
|
||||
(sources."tar-6.1.15" // {
|
||||
dependencies = [
|
||||
sources."mkdirp-1.0.4"
|
||||
sources."yallist-4.0.0"
|
||||
];
|
||||
})
|
||||
sources."through-2.3.8"
|
||||
sources."tldts-6.0.5"
|
||||
sources."tldts-core-6.0.11"
|
||||
sources."tmp-0.0.33"
|
||||
sources."to-fast-properties-2.0.0"
|
||||
sources."toidentifier-1.0.1"
|
||||
sources."tough-cookie-4.1.3"
|
||||
sources."tr46-4.1.1"
|
||||
sources."tslib-2.6.0"
|
||||
sources."tsscmp-1.0.6"
|
||||
sources."type-fest-0.21.3"
|
||||
sources."type-is-1.6.18"
|
||||
sources."typedarray-0.0.6"
|
||||
sources."universalify-0.2.0"
|
||||
sources."unpipe-1.0.0"
|
||||
sources."update-browserslist-db-1.0.11"
|
||||
sources."url-parse-1.5.10"
|
||||
sources."utf-8-validate-6.0.3"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."vary-1.1.2"
|
||||
sources."w3c-xmlserializer-4.0.0"
|
||||
sources."wcwidth-1.0.1"
|
||||
sources."webidl-conversions-7.0.0"
|
||||
(sources."whatwg-encoding-2.0.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."whatwg-mimetype-3.0.0"
|
||||
sources."whatwg-url-12.0.1"
|
||||
sources."wide-align-1.1.5"
|
||||
(sources."wrap-ansi-7.0.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
];
|
||||
})
|
||||
sources."wrappy-1.0.2"
|
||||
sources."ws-8.13.0"
|
||||
sources."xml-name-validator-4.0.0"
|
||||
sources."xmlchars-2.2.0"
|
||||
sources."xtend-4.0.2"
|
||||
sources."yallist-3.1.1"
|
||||
sources."ylru-1.3.2"
|
||||
sources."zxcvbn-4.4.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "A secure and free password manager for all of your devices.";
|
||||
homepage = "https://bitwarden.com";
|
||||
license = "GPL-3.0-only";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"@commitlint/cli" = nodeEnv.buildNodePackage {
|
||||
name = "_at_commitlint_slash_cli";
|
||||
packageName = "@commitlint/cli";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p
|
||||
#!nix-shell -i python3 -p python3
|
||||
|
||||
import collections.abc
|
||||
import fileinput
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, foma
|
||||
, icu
|
||||
, swig
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hfst";
|
||||
inherit (pkgs.hfst) version src;
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
postPatch = ''
|
||||
# omorfi-python looks for 'hfst' Python package
|
||||
sed -i 's/libhfst_swig/hfst/' setup.py;
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
pkgs.hfst
|
||||
];
|
||||
|
||||
setupPyBuildFlags = [
|
||||
"--inplace"
|
||||
];
|
||||
|
||||
# Find foma in Darwin tests
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH="${foma}/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for HFST";
|
||||
homepage = "https://github.com/hfst/hfst";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
{ buildPythonPackage
|
||||
, pkgs
|
||||
, lib
|
||||
, stdenv
|
||||
, hfst
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "omorfi";
|
||||
inherit (pkgs.omorfi) src version;
|
||||
|
||||
sourceRoot = "${src.name}/src/python";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hfst
|
||||
];
|
||||
|
||||
# Fixes some improper import paths
|
||||
patches = [ ./importfix.patch ];
|
||||
|
||||
# Apply patch relative to source/src
|
||||
patchFlags = [ "-p3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for Omorfi";
|
||||
homepage = "https://github.com/flammie/omorfi";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ lurkki ];
|
||||
# Ofborg build error (hfst not found?)
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
diff --git a/src/python/omorfi/entryguessing/gradation.py b/src/python/omorfi/entryguessing/gradation.py
|
||||
index 7d3ed8cb..825d7ead 100755
|
||||
--- a/src/python/omorfi/entryguessing/gradation.py
|
||||
+++ b/src/python/omorfi/entryguessing/gradation.py
|
||||
@@ -17,8 +17,8 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
-from .omorfi.error_logging import fail_guess_because
|
||||
-from .omorfi.string_mangling import replace_rightmost, replace_rightmosts
|
||||
+from omorfi.error_logging import fail_guess_because
|
||||
+from omorfi.string_manglers import replace_rightmost, replace_rightmosts
|
||||
|
||||
|
||||
def gradation_make_morphophonemes(wordmap):
|
||||
diff --git a/src/python/omorfi/entryguessing/guess_new_class.py b/src/python/omorfi/entryguessing/guess_new_class.py
|
||||
index 1884716b..3a781bfc 100755
|
||||
--- a/src/python/omorfi/entryguessing/guess_new_class.py
|
||||
+++ b/src/python/omorfi/entryguessing/guess_new_class.py
|
||||
@@ -17,8 +17,8 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
-from .error_logging import fail_guess_because
|
||||
-from .string_manglers import three_syllable
|
||||
+from omorfi.error_logging import fail_guess_because
|
||||
+from omorfi.string_manglers import three_syllable
|
||||
|
||||
|
||||
def guess_new_class(wordmap):
|
||||
diff --git a/src/python/omorfi/entryguessing/plurale_tantum.py b/src/python/omorfi/entryguessing/plurale_tantum.py
|
||||
index a8af81fb..95fc4b7b 100755
|
||||
--- a/src/python/omorfi/entryguessing/plurale_tantum.py
|
||||
+++ b/src/python/omorfi/entryguessing/plurale_tantum.py
|
||||
@@ -17,8 +17,8 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
-from .error_logging import fail_guess_because
|
||||
-from .omorfi.string_manglers import replace_rightmost, replace_rightmosts
|
||||
+from omorfi.error_logging import fail_guess_because
|
||||
+from omorfi.string_manglers import replace_rightmost, replace_rightmosts
|
||||
|
||||
|
||||
def plurale_tantum_get_singular_stem(wordmap):
|
||||
diff --git a/src/python/omorfi/formats/experimental_xml_formatter.py b/src/python/omorfi/formats/experimental_xml_formatter.py
|
||||
index abccbff5..11b0f518 100755
|
||||
--- a/src/python/omorfi/formats/experimental_xml_formatter.py
|
||||
+++ b/src/python/omorfi/formats/experimental_xml_formatter.py
|
||||
@@ -19,9 +19,9 @@
|
||||
|
||||
from xml.sax.saxutils import escape as xml_escape
|
||||
|
||||
-from ftb3_formatter import Ftb3Formatter
|
||||
+from .ftb3_formatter import Ftb3Formatter
|
||||
|
||||
-from .settings import version_id_easter_egg
|
||||
+from omorfi.settings import version_id_easter_egg
|
||||
|
||||
|
||||
def make_xmlid(s):
|
||||
diff --git a/src/python/omorfi/formats/lexc_formatter.py b/src/python/omorfi/formats/lexc_formatter.py
|
||||
index 4ec616b7..b146129f 100755
|
||||
--- a/src/python/omorfi/formats/lexc_formatter.py
|
||||
+++ b/src/python/omorfi/formats/lexc_formatter.py
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
# functions for formatting the database data to lexc
|
||||
|
||||
-from .settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary
|
||||
-from .string_manglers import lexc_escape
|
||||
+from omorfi.settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary
|
||||
+from omorfi.string_manglers import lexc_escape
|
||||
|
||||
|
||||
def format_copyright_lexc():
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
let
|
||||
pname = "trainer";
|
||||
version = "0.0.27";
|
||||
version = "0.0.29";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage {
|
||||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2uITlcaGcRujhSZPK746d13X8ZrgaGbfMZruLmTpQIs=";
|
||||
hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-protobuf";
|
||||
version = "4.23.0.1";
|
||||
version = "4.23.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-e9XqEioFexGoK3hdneRkkyoekXX+l3pBKK3vEdfzVUc=";
|
||||
hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqlboiler-crbd";
|
||||
version = "unstable-2022-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glerchundi";
|
||||
repo = "sqlboiler-crdb";
|
||||
rev = "7b35c4d19c05fdc53d1efdcc074f20ee6b56f340";
|
||||
hash = "sha256-RlppCRYP7TlM1z1PiXtEVifNVxQHwLuoBXxgYIpUirE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N16GH8ZDyeWWBsaaG4RkJwzAbuQ7E8YjZAgVsfeECo4";
|
||||
|
||||
doCheck = false; # requires a running testdb
|
||||
|
||||
meta = with lib; {
|
||||
description = "CockroachDB generator for usage with SQLBoiler";
|
||||
homepage = "https://github.com/glerchundi/sqlboiler-crdb/";
|
||||
maintainers = with maintainers; [ dgollings ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "7s0gh+H/g8QjyLs42mQFuMhTE8kAE96meVijjryBEFs=";
|
||||
sha256 = "NtOOzI2t+Atuji/PBZwf7+0IrWLJ/n2onZYNhRasaMA=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "yyAcxmM6KF0BUU7glfUoP6ixFX92WDAwu/iGY5ZHUeg=";
|
||||
sha256 = "lTrVVBa5J/ObixstwzzMW996IRF+7cggRxZSFNHinCo=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "SJDjxykt793ZBVbAN0SO4nA7KXbo4ZB4TJarFXkaYxI=";
|
||||
sha256 = "S9n2pH2ALU9SaeS7y+ZOI82Z0ypIForpXaATqOlmOkw=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "pQFseYi2idjCTm+qfyLCTR/sYCIwZIVwYUPnNAtPH78=";
|
||||
sha256 = "CN50UOYaucIpAsN9qNU6KjmLluixxIl5opKaPCXIvQo=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "7qq1+P+6nfo3gvWSHU/YnAsEPEPcyJHFANxVcXiz5yA=";
|
||||
sha256 = "OyWX6IbWOQDhkFRmh7aon7F6GYLqUTMGgkm1/59bnZc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
|
||||
index b656f8e1..a830d3c3 100644
|
||||
--- a/src/plugins/cpptools/headerpathfilter.cpp
|
||||
+++ b/src/plugins/cpptools/headerpathfilter.cpp
|
||||
@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths)
|
||||
{
|
||||
// include/c++, include/g++, libc++\include and libc++abi\include
|
||||
static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))"
|
||||
- R"(|(.*libc\+\+/include))"
|
||||
- R"(|(.*libc\+\+abi/include))"
|
||||
+ R"(|(.*libc\+\+.*\/include))"
|
||||
+ R"(|(.*libc\+\+abi.*\/include))";
|
||||
R"(|(/usr/local/include))";
|
||||
static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
|
||||
index a830d3c3..80e2f933 100644
|
||||
--- a/src/plugins/cpptools/headerpathfilter.cpp
|
||||
+++ b/src/plugins/cpptools/headerpathfilter.cpp
|
||||
@@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths)
|
||||
|
||||
void HeaderPathFilter::tweakHeaderPaths()
|
||||
{
|
||||
- removeClangSystemHeaderPaths(builtInHeaderPaths);
|
||||
removeGccInternalIncludePaths();
|
||||
|
||||
auto split = resourceIterator(builtInHeaderPaths);
|
||||
@@ -1,96 +1,104 @@
|
||||
{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
|
||||
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf
|
||||
, withDocumentation ? false, withClangPlugins ? true
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, python3
|
||||
, qtbase
|
||||
, qt5compat
|
||||
, qtdeclarative
|
||||
, qtdoc
|
||||
, qtquick3d
|
||||
, qtquicktimeline
|
||||
, qtserialport
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtwayland
|
||||
, qtshadertools
|
||||
, wrapQtAppsHook
|
||||
, yaml-cpp
|
||||
, litehtml
|
||||
, gumbo
|
||||
, llvmPackages
|
||||
, rustc-demangle
|
||||
, elfutils
|
||||
, perf
|
||||
}:
|
||||
|
||||
let
|
||||
# Fetch clang from qt vendor, this contains submodules like this:
|
||||
# clang<-clang-tools-extra<-clazy.
|
||||
clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: {
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
|
||||
src = fetchgit {
|
||||
url = "https://code.qt.io/clang/clang.git";
|
||||
rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
|
||||
sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0";
|
||||
};
|
||||
unpackPhase = "";
|
||||
});
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtcreator";
|
||||
version = "5.0.3";
|
||||
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz";
|
||||
url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++
|
||||
lib.optionals withClangPlugins [ llvmPackages_8.libclang
|
||||
clang_qt_vendor
|
||||
llvmPackages_8.llvm ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
(qttools.override { withClang = true; })
|
||||
wrapQtAppsHook
|
||||
python3
|
||||
ninja
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdoc
|
||||
qtsvg
|
||||
qtquick3d
|
||||
qtwebengine
|
||||
qtwayland
|
||||
qtserialport
|
||||
qtshadertools
|
||||
qt5compat
|
||||
qtdeclarative
|
||||
qtquicktimeline
|
||||
yaml-cpp
|
||||
litehtml
|
||||
gumbo
|
||||
llvmPackages.libclang
|
||||
llvmPackages.llvm
|
||||
rustc-demangle
|
||||
elfutils
|
||||
];
|
||||
|
||||
# 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
|
||||
# find clang libc++ library include paths. By default it's not covering paths
|
||||
# like libc++-version, which is default name for libc++ folder in nixos.
|
||||
# ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
|
||||
# remove system clang include paths.
|
||||
patches = [ ./0001-Fix-clang-libcpp-regexp.patch
|
||||
./0002-Dont-remove-clang-header-paths.patch ];
|
||||
cmakeFlags = [
|
||||
# workaround for missing CMAKE_INSTALL_DATAROOTDIR
|
||||
# in pkgs/development/tools/build-managers/cmake/setup-hook.sh
|
||||
"-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
|
||||
# qtdeclarative in nixpkgs does not provide qmlsc
|
||||
# fix can't find Qt6QmlCompilerPlusPrivate
|
||||
"-DQT_NO_FIND_QMLSC=TRUE"
|
||||
"-DWITH_DOCS=ON"
|
||||
"-DBUILD_DEVELOPER_DOCS=ON"
|
||||
"-DBUILD_QBS=OFF"
|
||||
"-DQTC_CLANG_BUILDMODE_MATCH=ON"
|
||||
"-DCLANGTOOLING_LINK_CLANG_DYLIB=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildFlags = lib.optional withDocumentation "docs";
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs";
|
||||
|
||||
qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/plugins/plugins.pro \
|
||||
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
|
||||
substituteInPlace src/libs/libs.pro \
|
||||
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
|
||||
'' + lib.optionalString withClangPlugins ''
|
||||
# Fix paths for llvm/clang includes directories.
|
||||
substituteInPlace src/shared/clang/clang_defines.pri \
|
||||
--replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
|
||||
--replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
|
||||
|
||||
# Fix paths to libclang library.
|
||||
substituteInPlace src/shared/clang/clang_installation.pri \
|
||||
--replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang.lib}/lib' \
|
||||
--replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' \
|
||||
--replace 'LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}' 'LIBTOOLING_LIBS = -L${clang_qt_vendor}/lib' \
|
||||
--replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}'
|
||||
'';
|
||||
|
||||
preBuild = lib.optionalString withDocumentation ''
|
||||
ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
|
||||
'';
|
||||
qtWrapperArgs = [
|
||||
"--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp share/applications/org.qt-project.qtcreator.desktop $out/share/applications
|
||||
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
|
||||
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Cross-platform IDE tailored to the needs of Qt developers";
|
||||
longDescription = ''
|
||||
Qt Creator is a cross-platform IDE (integrated development environment)
|
||||
tailored to the needs of Qt developers. It includes features such as an
|
||||
advanced code editor, a visual debugger and a GUI designer.
|
||||
'';
|
||||
homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
|
||||
license = "LGPL";
|
||||
maintainers = [ lib.maintainers.akaWolf ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
|
||||
homepage = "https://wiki.qt.io/Qt_Creator";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.rewine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, python3
|
||||
, qtbase
|
||||
, qt5compat
|
||||
, qtdeclarative
|
||||
, qtdoc
|
||||
, qtquick3d
|
||||
, qtquicktimeline
|
||||
, qtserialport
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtwayland
|
||||
, qtshadertools
|
||||
, wrapQtAppsHook
|
||||
, yaml-cpp
|
||||
, litehtml
|
||||
, gumbo
|
||||
, llvmPackages
|
||||
, rustc-demangle
|
||||
, elfutils
|
||||
, perf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtcreator";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
(qttools.override { withClang = true; })
|
||||
wrapQtAppsHook
|
||||
python3
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdoc
|
||||
qtsvg
|
||||
qtquick3d
|
||||
qtwebengine
|
||||
qtwayland
|
||||
qtserialport
|
||||
qtshadertools
|
||||
qt5compat
|
||||
qtdeclarative
|
||||
qtquicktimeline
|
||||
yaml-cpp
|
||||
litehtml
|
||||
gumbo
|
||||
llvmPackages.libclang
|
||||
llvmPackages.llvm
|
||||
rustc-demangle
|
||||
elfutils
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# workaround for missing CMAKE_INSTALL_DATAROOTDIR
|
||||
# in pkgs/development/tools/build-managers/cmake/setup-hook.sh
|
||||
"-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
|
||||
# qtdeclarative in nixpkgs does not provide qmlsc
|
||||
# fix can't find Qt6QmlCompilerPlusPrivate
|
||||
"-DQT_NO_FIND_QMLSC=TRUE"
|
||||
"-DWITH_DOCS=ON"
|
||||
"-DBUILD_DEVELOPER_DOCS=ON"
|
||||
"-DBUILD_QBS=OFF"
|
||||
"-DQTC_CLANG_BUILDMODE_MATCH=ON"
|
||||
"-DCLANGTOOLING_LINK_CLANG_DYLIB=ON"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
|
||||
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform IDE tailored to the needs of Qt developers";
|
||||
longDescription = ''
|
||||
Qt Creator is a cross-platform IDE (integrated development environment)
|
||||
tailored to the needs of Qt developers. It includes features such as an
|
||||
advanced code editor, a visual debugger and a GUI designer.
|
||||
'';
|
||||
homepage = "https://wiki.qt.io/Qt_Creator";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.rewine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
+993
@@ -0,0 +1,993 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "adler"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
|
||||
dependencies = [
|
||||
"const-random",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "analyzeme"
|
||||
version = "9.2.0"
|
||||
source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"measureme 9.2.0",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "analyzeme"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 9.2.0",
|
||||
"decodeme",
|
||||
"flate2",
|
||||
"measureme 10.1.1",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi 0.1.19",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
"strsim",
|
||||
"textwrap",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "const-random"
|
||||
version = "0.1.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
|
||||
dependencies = [
|
||||
"const-random-macro",
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "const-random-macro"
|
||||
version = "0.1.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"once_cell",
|
||||
"proc-macro-hack",
|
||||
"tiny-keccak",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crox"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 10.1.1",
|
||||
"measureme 10.1.1",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crunchy"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
version = "1.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
|
||||
dependencies = [
|
||||
"csv-core",
|
||||
"itoa 1.0.6",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv-core"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "decodeme"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"measureme 10.1.1",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encode_unicode"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flamegraph"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 10.1.1",
|
||||
"inferno",
|
||||
"measureme 10.1.1",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
|
||||
dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
|
||||
[[package]]
|
||||
name = "inferno"
|
||||
version = "0.9.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b2a71c56e4c218f2a1d36bc5177cbfdedf89697ac68610ac3c8452cde152231"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"itoa 0.4.8",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"num-format",
|
||||
"quick-xml",
|
||||
"rgb",
|
||||
"str_stack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.146"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
|
||||
|
||||
[[package]]
|
||||
name = "measureme"
|
||||
version = "9.2.0"
|
||||
source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41"
|
||||
dependencies = [
|
||||
"log",
|
||||
"memmap2",
|
||||
"parking_lot",
|
||||
"perf-event-open-sys 1.0.1",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "measureme"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"log",
|
||||
"memmap2",
|
||||
"parking_lot",
|
||||
"perf-event-open-sys 3.0.0",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mmedit"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"decodeme",
|
||||
"measureme 10.1.1",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mmview"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 10.1.1",
|
||||
"measureme 10.1.1",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-format"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"itoa 1.0.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
|
||||
dependencies = [
|
||||
"instant",
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.8.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"instant",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "perf-event-open-sys"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "perf-event-open-sys"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettytable-rs"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
|
||||
dependencies = [
|
||||
"csv",
|
||||
"encode_unicode",
|
||||
"is-terminal",
|
||||
"lazy_static",
|
||||
"term",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error-attr"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-hack"
|
||||
version = "0.5.20+deprecated"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
|
||||
|
||||
[[package]]
|
||||
name = "rgb"
|
||||
version = "0.8.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.164"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.164"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.97"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
|
||||
dependencies = [
|
||||
"itoa 1.0.6",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
|
||||
[[package]]
|
||||
name = "stack_collapse"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 10.1.1",
|
||||
"measureme 10.1.1",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "str_stack"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"lazy_static",
|
||||
"structopt-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "structopt-derive"
|
||||
version = "0.4.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "summarize"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"analyzeme 10.1.1",
|
||||
"measureme 10.1.1",
|
||||
"prettytable-rs",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
|
||||
dependencies = [
|
||||
"dirs-next",
|
||||
"rustversion",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-keccak"
|
||||
version = "2.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
|
||||
dependencies = [
|
||||
"crunchy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "version_checker"
|
||||
version = "10.1.1"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"regex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "measureme";
|
||||
version = "10.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "measureme";
|
||||
rev = version;
|
||||
hash = "sha256-RCh6fTa4d+/Fj5ID5Su3pCZj/O+FhITzfKixXu9G550=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18=";
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Support crate for rustc's self-profiling feature";
|
||||
homepage = "https://github.com/rust-lang/measureme";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.t4ccer ];
|
||||
};
|
||||
}
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sof-firmware";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz";
|
||||
sha256 = "sha256-V39FCHW9gzr5uLcW42jYc6rJE6Nd2ZbHqg9Srd3vku4=";
|
||||
sha256 = "sha256-kyLCp2NtAoRcOyaYTVirj3jWP/THZtCEwxlqWF4ACQU=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-iscsi";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "open-iscsi";
|
||||
rev = version;
|
||||
hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78=";
|
||||
hash = "sha256-y0NIb/KsKpCd8byr/SXI7nwTKXP2/bSSoW8QgeL5xdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
"-Ddbroot=/etc/iscsi"
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; };
|
||||
passthru.tests = { inherit (nixosTests) iscsi-root; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-DM/EhbKp2sM5OnvFrb2GcjhgMN+9kuVW33wHVSxcoLo=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-t+nFutMp1DwK7S9rQXcGQJjG/8plmlu5rJ1v5t8zJzE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-rzGFcWou9+rDJuxqY6utnT54jAVLG2oj3Og8Fr8pibU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-irL+9P+ZmGsAqbCOEtaC0u+YJykRgjG7dJx1qvP197w=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-JkDQ9kmXuwcFXcfyDYwgI/NHqJYZj/PbhZfqlL0jvnw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-6XEtCqlYIFh4Aw/Y+PxvLJmk5os5T0JPMnE2yTdT4Tw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-YBE4yL63Ee1UmkE7pIbLKOLLhiY5DpN1t8i/ovQOKXo=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-o2EmkJ9jJAhQS25JCN15GBb+gGFOiKS/87PW2ge0YNg=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-Lj4eCcMgpy2AlGHKA/xRxZc2HV3llykWwVeTUlHXvyI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-YjecZiVwaK3/1In5uKSE5pF21YQJNpxEpPK0abNf3iQ=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-vAP/xc3IYMCtDbog2qB3kK5ftbsrk8meLD0IGx9tNa8=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-Or650AgvB/452wFiBLw1DezLIzYMSg0dQG66HeKypYg=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-XiWExZZbtCdl/1Koi1dTKsiLl5xSwpI8LiGxjX2yT+A=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-i/jKr05o7UeXdEPusTQP0FeQoATl36ydDgtg5w/pMO4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.32";
|
||||
version = "0.107.34";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
schema_version = 20;
|
||||
schema_version = 24;
|
||||
tests.adguardhome = nixosTests.adguardhome;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "komga";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
|
||||
sha256 = "sha256-uGzJgy+jfV11bZXvCMZAUdjuZasKCcv5rQBBUEidWQU=";
|
||||
sha256 = "sha256-+4At5of/jaol4c1eElpw/D9hDnWSkc8x4gCmqqg88as=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libsodium
|
||||
, Security
|
||||
, sqlite
|
||||
, nix-update-script
|
||||
, testers
|
||||
@@ -36,6 +38,8 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
libsodium
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
passthru = {
|
||||
@@ -53,6 +57,6 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}";
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
maintainers = with maintainers; [ gaelreyrol tjni ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lego";
|
||||
version = "4.12.3";
|
||||
version = "4.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-H6JGeLE/fzbfo8/mn5hTKcr7XfvmjOojeXLxUKGzt4w=";
|
||||
sha256 = "sha256-nFRDA0EHV1i9mcl1i5WpfhTNseU9E9jmlPd1xFbkCaM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w=";
|
||||
vendorHash = "sha256-mjCxe4hCCIcjVDWVizqqqo6/kn8iS8s32urMtDD5yq4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.15.6";
|
||||
version = "0.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZEmj0D+q2/UpDTEZDPb13BKiNRUcZsJmJRWOCq+8CUk=";
|
||||
hash = "sha256-2JZyINyzy4X1DTp4ZsMLY/rCsH4JdQ8bF/3hoqtvNTU=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libtickit
|
||||
, libvterm-neovim
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "a4term";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpmohn";
|
||||
repo = "a4";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hsAEiPOZBqjvmSZEmZwfDqHZV/8ym62RZPxl3DG4ntQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libtickit
|
||||
libvterm-neovim
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "A dynamic terminal window manager";
|
||||
homepage = "https://www.a4term.com/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onemoresuza ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "a4";
|
||||
};
|
||||
}
|
||||
@@ -78,11 +78,11 @@
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "243";
|
||||
version = "245";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo=";
|
||||
hash = "sha256-VeA8+gdKDDyNI9ica3YjGFw2Nl7Lb/L6/I7XNa9FMek=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.42.1";
|
||||
version = "2.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ScHlF5fvqBDvmI8p+o1LcQXZHXxKL5OS4AigE74AYVY=";
|
||||
hash = "sha256-Ad3kcx5F6U6ucamhhD0c5st86nrJxCPX9e62u7yjPYI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TTQ9cjtkcg606imz55k9bLSya7xFs2gKIqETcrPLKIQ=";
|
||||
vendorHash = "sha256-iLjm8k0XbYcA05J52K8mGWleiMhSRjzzkTOrQ28UdVw=";
|
||||
|
||||
postInstall = ''
|
||||
# Name the output the same way as the original build script does
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "twspace-crawler";
|
||||
version = "1.12.4";
|
||||
version = "1.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HitomaruKonpaku";
|
||||
repo = "twspace-crawler";
|
||||
rev = "339972a785a4074880a66be4ca4063e6b47ddfaa"; # version not tagged
|
||||
hash = "sha256-YJXvBKvZ/Z1mRf6MW3JFqlK77+N+JM3OZZNSJyaaic4=";
|
||||
rev = "fc415f4b889f93bdbf357e14f1a6bf3fc146aac9"; # version not tagged
|
||||
hash = "sha256-25/VFbf6UJJKnDDCXuIfWSEgVD24SB3feLV0zF8DlBs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-eVh+1pBAxB+tgS6b8Bd3gtxUK887djbZVVC4wM/5zZk=";
|
||||
npmDepsHash = "sha256-4ZNFuOCdCh+H8tH8qKr2569wDFPOxaLfqmA6N3FNP84=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Script to monitor & download Twitter Spaces 24/7";
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, python3, fetchFromGitHub, fetchPypi, nix-update-script }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, nix-update-script
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
# override resolvelib due to
|
||||
@@ -24,13 +30,13 @@ in
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "pdm";
|
||||
version = "2.7.4";
|
||||
version = "2.8.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-x3+N8cy31wHwBeOkMNpLihlqKCTiPmnS1avrr69uUM4=";
|
||||
hash = "sha256-BgsWKP2kZfLEHgZNISyp66Yww0ajMF4RWuI6TCzwJNo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,7 +45,6 @@ buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
blinker
|
||||
cacheyou
|
||||
certifi
|
||||
cachecontrol
|
||||
findpython
|
||||
@@ -70,7 +75,7 @@ buildPythonApplication rec {
|
||||
pytest-rerunfailures
|
||||
pytest-xdist
|
||||
pytest-httpserver
|
||||
];
|
||||
] ++ lib.optional stdenv.isLinux first;
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-m 'not network'"
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pkg";
|
||||
version = "1.19.1";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freebsd";
|
||||
repo = "pkg";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "WHR2evPn4Y0wzGwVUEuYPrDDnuPSsYHr4xIofAHeTJk=";
|
||||
sha256 = "sha256-GW29jbFt68ITJfmuxkwl8c39mA+ObYiV6NeT/OXPlyM=";
|
||||
};
|
||||
|
||||
setOutputFlags = false;
|
||||
|
||||
@@ -1452,6 +1452,7 @@ mapAliases ({
|
||||
qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22
|
||||
qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26
|
||||
qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
|
||||
qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25
|
||||
qflipper = qFlipper; # Added 2022-02-11
|
||||
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
|
||||
qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17
|
||||
|
||||
@@ -5740,6 +5740,8 @@ with pkgs;
|
||||
|
||||
maxcso = callPackage ../tools/archivers/maxcso { };
|
||||
|
||||
measureme = callPackage ../development/tools/rust/measureme { };
|
||||
|
||||
medusa = callPackage ../tools/security/medusa { };
|
||||
|
||||
megasync = libsForQt5.callPackage ../applications/misc/megasync {
|
||||
@@ -7389,6 +7391,8 @@ with pkgs;
|
||||
|
||||
dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
|
||||
|
||||
a4term = callPackage ../tools/misc/a4term { };
|
||||
|
||||
ecmtools = callPackage ../tools/cd-dvd/ecm-tools { };
|
||||
|
||||
erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
|
||||
@@ -12523,7 +12527,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
rustdesk-server = callPackage ../servers/rustdesk-server { };
|
||||
rustdesk-server = callPackage ../servers/rustdesk-server {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
rustypaste = callPackage ../servers/rustypaste { };
|
||||
|
||||
@@ -15568,7 +15574,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.8" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.8");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_14 else null;
|
||||
cloog = if !stdenv.isDarwin then cloog else null;
|
||||
@@ -15582,7 +15588,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.9" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.9");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_11 else null;
|
||||
|
||||
@@ -15599,7 +15605,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "6" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "6");
|
||||
|
||||
# gcc 10 is too strict to cross compile gcc <= 8
|
||||
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
|
||||
@@ -15618,7 +15624,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "7" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "7");
|
||||
|
||||
# gcc 10 is too strict to cross compile gcc <= 8
|
||||
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
|
||||
@@ -15633,7 +15639,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "8" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "8");
|
||||
|
||||
# gcc 10 is too strict to cross compile gcc <= 8
|
||||
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
|
||||
@@ -15648,7 +15654,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "9" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "9");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_20 else null;
|
||||
}));
|
||||
@@ -15660,7 +15666,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "10" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "10");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_20 else null;
|
||||
}));
|
||||
@@ -15672,7 +15678,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "11" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "11");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_20 else null;
|
||||
}));
|
||||
@@ -15684,7 +15690,7 @@ with pkgs;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "12" else { };
|
||||
threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "12");
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_20 else null;
|
||||
}));
|
||||
@@ -19686,11 +19692,7 @@ with pkgs;
|
||||
|
||||
qc = callPackage ../development/tools/qc { };
|
||||
|
||||
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {
|
||||
inherit (linuxPackages) perf;
|
||||
};
|
||||
|
||||
qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix {
|
||||
qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
|
||||
inherit (linuxPackages) perf;
|
||||
stdenv = llvmPackages_14.stdenv;
|
||||
llvmPackages = llvmPackages_14;
|
||||
@@ -19940,6 +19942,8 @@ with pkgs;
|
||||
|
||||
spruce = callPackage ../development/tools/misc/spruce { };
|
||||
|
||||
sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { };
|
||||
|
||||
sqlc = callPackage ../development/tools/database/sqlc { };
|
||||
|
||||
sqlcheck = callPackage ../development/tools/database/sqlcheck { };
|
||||
@@ -21373,8 +21377,7 @@ with pkgs;
|
||||
|
||||
threadsCross = threadsCrossFor null;
|
||||
threadsCrossFor = cc_version:
|
||||
if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)
|
||||
then {
|
||||
lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) {
|
||||
# other possible values: win32 or posix
|
||||
model = "mcf";
|
||||
# For win32 or posix set this to null
|
||||
@@ -21382,7 +21385,7 @@ with pkgs;
|
||||
if cc_version == null || lib.versionAtLeast cc_version "13"
|
||||
then targetPackages.windows.mcfgthreads or windows.mcfgthreads
|
||||
else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13;
|
||||
} else { };
|
||||
};
|
||||
|
||||
wasilibc = callPackage ../development/libraries/wasilibc {
|
||||
stdenv = crossLibcStdenv;
|
||||
@@ -41576,6 +41579,14 @@ with pkgs;
|
||||
|
||||
charasay = callPackage ../tools/misc/charasay { };
|
||||
|
||||
libvoikko = callPackage ../development/libraries/libvoikko { };
|
||||
|
||||
hfst = callPackage ../development/libraries/hfst { };
|
||||
|
||||
omorfi = callPackage ../development/libraries/omorfi { };
|
||||
|
||||
hfst-ospell = callPackage ../development/libraries/hfst-ospell { };
|
||||
|
||||
waylyrics = callPackage ../applications/audio/waylyrics { };
|
||||
|
||||
gitrs = callPackage ../tools/misc/gitrs { };
|
||||
|
||||
@@ -4718,6 +4718,8 @@ self: super: with self; {
|
||||
|
||||
hexdump = callPackage ../development/python-modules/hexdump { };
|
||||
|
||||
hfst = callPackage ../development/python-modules/hfst { };
|
||||
|
||||
hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { };
|
||||
|
||||
hg-evolve = callPackage ../development/python-modules/hg-evolve { };
|
||||
@@ -7282,6 +7284,8 @@ self: super: with self; {
|
||||
|
||||
omnilogic = callPackage ../development/python-modules/omnilogic { };
|
||||
|
||||
omorfi = callPackage ../development/python-modules/omorfi { };
|
||||
|
||||
omrdatasettools = callPackage ../development/python-modules/omrdatasettools { };
|
||||
|
||||
ondilo = callPackage ../development/python-modules/ondilo { };
|
||||
|
||||
Reference in New Issue
Block a user