Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a85f7e6120
|
|
@ -10,13 +10,13 @@
|
|||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anhoder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nhUsudytVSY/wbaP8ZuXurU2rxQPPblgPGdEyGjVpG4=";
|
||||
hash = "sha256-eOcQWw5wXU59/EzDLk028mV/Ro6Ii0DYcp4wdDedhrA=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-cli";
|
||||
version = "0.18.2.0";
|
||||
version = "0.18.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "n2e5U3p0eG2atPYV86H2UAURwsIkeSOBm8iwYsDVAoc=";
|
||||
sha256 = "6VI5D3vP6NKdrEE5qOpKnv1wr6AWriixdOxkAa8HaCQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.18.2.0";
|
||||
version = "0.18.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "Bm6OpK1jjdWVqdp6HpirqP6+3GcMSZfZ/e70wcu+rQc=";
|
||||
sha256 = "c5+bgu+hF3mOwF3ZxksPMiYUFyDRMFLA3f5FWeLsSBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "3.150.7",
|
||||
"version": "3.150.45",
|
||||
"appimage": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-x86_64.AppImage",
|
||||
"hash": "sha512-uJJloClRiyBneNrRjsRnq0AiSlJyZFrS97bdkDU89Oz0GCaVjQMnAz87gPu9H45qqjQyIogtOnd6Wpkw2/5WJA=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-x86_64.AppImage",
|
||||
"hash": "sha512-a1g+nOJJ1MSiCvguFAlAPhwyogAS6cwDD8Ou+P0lufLLG2HyLPdOEwVl8Nhqq4iaFFQoyY3FtKm+Sdpd3WJ72Q=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-arm64.AppImage",
|
||||
"hash": "sha512-rzMu2VsrQJmaQFSJjyMLcL2/jXvMAQgzrOw179fGOPBKP+LA6hQ7XYBXL/abb9ZwAz5NO/uV6QUS8HDciKtIZw=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-arm64.AppImage",
|
||||
"hash": "sha512-ivnyuMhdBweRs+9Qkt4srm2JlMMxLFDbT0DBaeNCHVuyWM/13LRczIyto2tbPp9xC6DCJmGktjY3ZYsB3odftA=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1441
pkgs/applications/misc/faircamp/Cargo.lock
generated
1441
pkgs/applications/misc/faircamp/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "faircamp";
|
||||
version = "unstable-2022-12-28";
|
||||
version = "unstable-2023-04-10";
|
||||
|
||||
# TODO when switching to a stable release, use fetchFromGitea and add a
|
||||
# version test. Meanwhile, fetchgit is used to make unstableGitUpdater work.
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/simonrepp/faircamp.git";
|
||||
rev = "c77fd779cea6daecbac9a9beea65c1dc1ac56bc4";
|
||||
sha256 = "sha256-Tl3T/IoBIhYCNDEYT6cV1UyksDkoEDydBjYM9yzT4VQ=";
|
||||
rev = "21f775dc35a88c54015694f9757e81c97fa860ea";
|
||||
hash = "sha256-aMSMMIGfoiqtg8Dj8QiCbUE40OKQXMXt4hvlvbXQLls=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
|
|||
website for you automatically, otherwise you can use FTP or whichever
|
||||
means you prefer to do that manually.
|
||||
'';
|
||||
homepage = "https://codeberg.org/simonrepp/faircamp";
|
||||
homepage = "https://simonrepp.com/faircamp/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "timewarrior";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "timewarrior";
|
||||
rev = "v${version}";
|
||||
sha256 = "00ydikzmxym5jhv6w1ii12a6zw5ighddbzxsw03xg8yabzzfnvzw";
|
||||
sha256 = "sha256-qD49NExR0OZ6hgt5ejGiltxF9xkmseJjhJNzEGofnhw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asn";
|
||||
version = "0.73.1";
|
||||
version = "0.73.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitefood";
|
||||
repo = "asn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W8Q6DOvLdp3iRi7OvTsvIdb8XnUatK/vt7bhtwtep/8=";
|
||||
sha256 = "sha256-aswssP2l7NdjUEwXO2v0nEiZCk6kArnZA3Jch59W+yA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "111.0.1-1",
|
||||
"packageVersion": "112.0-1",
|
||||
"source": {
|
||||
"rev": "111.0.1-1",
|
||||
"sha256": "045nisl000ll0pzir9zhrkbbkl87bsd38mygx7gz9kv6p0pppl7i"
|
||||
"rev": "112.0-1",
|
||||
"sha256": "1qjckchx20bf20z05g8m7hqm68v4hpn20fbs52l19z87irglmmfk"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "111.0.1",
|
||||
"sha512": "b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f"
|
||||
"version": "112.0",
|
||||
"sha512": "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,13 @@
|
|||
, libpulseaudio
|
||||
, makeDesktopItem
|
||||
, wrapGAppsHook
|
||||
, testers
|
||||
, palemoon-bin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon-bin";
|
||||
version = "32.0.1";
|
||||
version = "32.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
|
|
@ -25,9 +27,9 @@ stdenv.mkDerivation rec {
|
|||
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
];
|
||||
hash = if withGTK3 then
|
||||
"sha256-CSAsZTMIeInuvN7mddiMDtzzNKuYST2zp1XczKAP1mQ="
|
||||
"sha256-2oKLkQi+NQHhEI1zsWCN8JiSsrVFefSdGcmS7v9gZoI="
|
||||
else
|
||||
"sha256-bvdy4tqnuoUxVVz/8zp7VwfS3wH51eKCzXDqgDWMb3A=";
|
||||
"sha256-rSQuCCCvTKHcGDHS0VEyMwroZ/zD7RvaW3/K5sXefw4=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
|
@ -152,6 +154,10 @@ stdenv.mkDerivation rec {
|
|||
wrapGApp $out/lib/palemoon/palemoon
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = palemoon-bin;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.palemoon.org/";
|
||||
description = "An Open Source, Goanna-based web browser focusing on efficiency and customization";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-MQBDX4gCpEERdgimAAhKvnN76L1ckpsfWIHZqIsSJOE=";
|
||||
sha256 = "sha256-FeW11prM9wTYA6cELF/qcITbTqJ+B+VVvzcw2W6i/CY=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -1,28 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPackages
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "unstable-2023-03-05";
|
||||
version = "unstable-2023-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "633d5b0b2f2b87b6377bc4f715604f79b17aab66";
|
||||
hash = "sha256-5LOSyfeGavWesAR7jqd37Z845iyNstr/cJdQiWHlIPg=";
|
||||
rev = "dd6a01da6e7f52a15af5bd584e93edf1a77bc04b";
|
||||
hash = "sha256-GZkC/Tvep7fL5nJyz0ZN7z0lUhGX4EJlXVswwAyegUE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# treewide: use $(CC) instead of hardcoding gcc
|
||||
# https://github.com/georgeweigt/eigenmath/pull/18
|
||||
(fetchpatch {
|
||||
url = "https://github.com/georgeweigt/eigenmath/commit/70551b3624ea25911f6de608c9ee9833885ab0b8.patch";
|
||||
hash = "sha256-g2crXOlC5SM1vAq87Vg/2zWMvx9DPFWEPaTrrPbcDZ0=";
|
||||
})
|
||||
];
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
runHook preCheck
|
||||
|
||||
for testcase in selftest1 selftest2; do
|
||||
${emulator} ./eigenmath "test/$testcase"
|
||||
done
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -30,6 +32,12 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib;{
|
||||
description = "Computer algebra system written in C";
|
||||
homepage = "https://georgeweigt.github.io";
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-desktop";
|
||||
version = "3.1.1";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
|
||||
hash = "sha256-R8t0y7b2upMOsWebIBr9+qT2GqQ/ahzWLcFIWwK4JTs=";
|
||||
hash = "sha256-OdvebRvOTyadgNjzrv6CGDPkljfpo4RVvVAc+X9hjSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
|
|||
])
|
||||
++ (lib.optionals nvidiaPatches [
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/nvidia.patch?h=hyprland-nvidia-git&id=757614af7729352fda534abe9eb1a88fe77dfe04";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git&id=2830d3017d7cdd240379b4cc7e5dd6a49cf3399a";
|
||||
sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
|
||||
})
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "alcotest";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
|
||||
sha256 = "sha256-/QD5ZoOVh0/zsdfvVm0U78Avp900Ej6yXVk1W+lLIyk=";
|
||||
hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml-syntax-shims ];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ buildDunePackage {
|
|||
|
||||
inherit (alcotest) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ alcotest logs lwt fmt ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
buildDunePackage rec {
|
||||
pname = "angstrom-async";
|
||||
|
||||
inherit (angstrom) version useDune2 src;
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.04.1";
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.04.1";
|
||||
|
||||
propagatedBuildInputs = [ angstrom async ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage, angstrom, lwt }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "angstrom-lwt-unix";
|
||||
|
||||
inherit (angstrom) version useDune2 src;
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ angstrom ocaml_lwt ];
|
||||
propagatedBuildInputs = [ angstrom lwt ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
buildDunePackage rec {
|
||||
pname = "angstrom-unix";
|
||||
|
||||
inherit (angstrom) version useDune2 src;
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ angstrom ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
buildDunePackage rec {
|
||||
pname = "angstrom";
|
||||
version = "0.15.0";
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@ buildDunePackage rec {
|
|||
version = "0.9.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
|
||||
hash = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildDunePackage rec {
|
|||
pname = "dispatch";
|
||||
version = "0.5.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
duneVersion = "3";
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, ocaml
|
||||
, fmt
|
||||
, alcotest
|
||||
, hxd
|
||||
|
|
@ -13,6 +12,9 @@ buildDunePackage rec {
|
|||
pname = "duff";
|
||||
version = "0.5";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-${version}.tbz";
|
||||
sha256 = "sha256-0eqpfPWNOHYjkcjXRnZUTUFF0/L9E+TNoOqKCETN5hI=";
|
||||
|
|
@ -20,7 +22,7 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ fmt ];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
crowbar
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchurl
|
||||
, ocaml
|
||||
, fmt
|
||||
, bigstringaf
|
||||
, angstrom
|
||||
|
|
@ -12,14 +11,14 @@ buildDunePackage rec {
|
|||
pname = "encore";
|
||||
version = "0.8";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
|
||||
sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ angstrom fmt bigstringaf ];
|
||||
checkInputs = [ alcotest ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ buildDunePackage rec {
|
|||
inherit (faraday) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ faraday core_unix async ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ buildDunePackage rec {
|
|||
version = "0.8.2";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "faraday-lwt-unix";
|
||||
inherit (faraday) version src;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ lwt faraday-lwt ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ buildDunePackage rec {
|
|||
inherit (faraday) version src;
|
||||
|
||||
propagatedBuildInputs = [ faraday lwt ];
|
||||
duneVersion = "3";
|
||||
|
||||
meta = faraday.meta // {
|
||||
description = "Lwt support for Faraday";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "ff";
|
||||
inherit (ff-sig) version src;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ff-sig
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ buildDunePackage {
|
|||
inherit (ff-sig) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ buildDunePackage rec {
|
|||
sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zarith
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ buildDunePackage rec {
|
|||
pname = "gmap";
|
||||
version = "0.3.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
|
||||
sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
checkInputs = [ alcotest fmt ];
|
||||
|
||||
|
|
|
|||
|
|
@ -871,6 +871,7 @@ with self;
|
|||
|
||||
vcaml = janePackage {
|
||||
pname = "vcaml";
|
||||
duneVersion = "3";
|
||||
hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs";
|
||||
meta.description = "OCaml bindings for the Neovim API";
|
||||
propagatedBuildInputs = [ angstrom-async async_extra faraday ];
|
||||
|
|
|
|||
|
|
@ -451,6 +451,7 @@ with self;
|
|||
|
||||
jsonaf = janePackage {
|
||||
pname = "jsonaf";
|
||||
duneVersion = "3";
|
||||
hash = "1j9rn8vsvfpgmdpmdqb5qhvss5171j8n3ii1bcgnavqinchbvqa6";
|
||||
meta.description = "A library for parsing, manipulating, and serializing data structured as JSON";
|
||||
propagatedBuildInputs = [ base ppx_jane angstrom faraday ];
|
||||
|
|
@ -690,6 +691,7 @@ with self;
|
|||
|
||||
ppx_jsonaf_conv = janePackage {
|
||||
pname = "ppx_jsonaf_conv";
|
||||
duneVersion = "3";
|
||||
version = "0.15.1";
|
||||
hash = "0wprs7qmscklyskj4famhaqqisi6jypy414aqba14qdyi43w0cv3";
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
|
@ -898,6 +900,7 @@ with self;
|
|||
|
||||
sexp = janePackage {
|
||||
pname = "sexp";
|
||||
duneVersion = "3";
|
||||
hash = "00xlsymm1mpgs8cqkb6c36vh5hfw0saghvwiqh7jry65qc5nvv9z";
|
||||
propagatedBuildInputs = [
|
||||
async
|
||||
|
|
@ -1062,6 +1065,7 @@ with self;
|
|||
};
|
||||
|
||||
vcaml = janePackage {
|
||||
duneVersion = "3";
|
||||
pname = "vcaml";
|
||||
hash = "12fd29x9dgf4f14xrx7z4y1bm1wbfynrs3jismjbiqnckfpbqrib";
|
||||
meta.description = "OCaml bindings for the Neovim API";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
buildDunePackage ({
|
||||
pname = "junit_alcotest";
|
||||
|
||||
inherit (junit) src version meta useDune2;
|
||||
inherit (junit) src version meta;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
junit
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildDunePackage (rec {
|
|||
tyxml
|
||||
];
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
buildDunePackage ({
|
||||
pname = "junit_ounit";
|
||||
|
||||
inherit (junit) src version meta useDune2;
|
||||
inherit (junit) src version meta;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
junit
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
meta = {
|
||||
description = "Fast implementation of queue in OCaml";
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ buildDunePackage rec {
|
|||
pname = "pecu";
|
||||
version = "0.6";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildDunePackage rec {
|
|||
pname = "ppx_blob";
|
||||
version = "0.7.2";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ buildDunePackage rec {
|
|||
version = "0.6.1";
|
||||
|
||||
minimalOCamlVersion = "4.11";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hammerlab";
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ buildDunePackage rec {
|
|||
version = "0.2.1";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz";
|
||||
sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
|
||||
hash = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ stdlib-shims uutf uucp ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ buildDunePackage rec {
|
|||
sha256 = "0mjm4v7kk75iwwsfnpmxc3bsl8aisz53y7z21sykdp60f4rxnah7";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ buildDunePackage rec {
|
|||
version = "0.3.0";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncua";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,13 +25,19 @@ buildPythonPackage rec {
|
|||
owner = "FreeOpcUa";
|
||||
repo = "opcua-asyncio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs=";
|
||||
hash = "sha256-DnBxR4nD3dBBhiElDuRgljHaoBPiakdjY/VFn3VsKEQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/FreeOpcUa/opcua-asyncio/issues/1263
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'asynctest'" ""
|
||||
|
||||
# Workaround hardcoded paths in test
|
||||
# "test_cli_tools_which_require_sigint"
|
||||
substituteInPlace tests/test_tools.py \
|
||||
--replace "tools/" "$out/bin/"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -54,11 +60,6 @@ buildPythonPackage rec {
|
|||
"asyncua"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Hard coded path only works from root of src
|
||||
"test_cli_tools_which_require_sigint"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OPC UA / IEC 62541 Client and Server for Python";
|
||||
homepage = "https://github.com/FreeOpcUa/opcua-asyncio";
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "concurrent-log-handler";
|
||||
version = "0.9.20";
|
||||
version = "0.9.22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-n6KtYUdKE3tWQnAr0z8hgVWYqsuh51E5s3zrLO3aj58=";
|
||||
hash = "sha256-+PnlhCkrnzpLR3VwGP3xr8i/lynxiKW2dQrNih5+P8k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-configurations";
|
||||
version = "2.4";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IrmWTmtlfa/Ho1QQoRXSDxRRFJqCc3rcbDMew2WIgZY=";
|
||||
hash = "sha256-psJcFDg05nsg00dRUS0IsykGhPJQmO4hKx7jaASlkIU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nextcord";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "nextcord";
|
||||
repo = "nextcord";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9Zgdaw5JXr0xUhxuhBWyPwKN64NY76Z72KJ571Hko2w=";
|
||||
hash = "sha256-n73F5y922rsu0YFjAwQlUVpSa6Scs/xyfZHREmqKiHU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, requests
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pythonegardia";
|
||||
version = "1.0.51";
|
||||
version = "1.0.52";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,23 +15,14 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "jeroenterheerdt";
|
||||
repo = "python-egardia";
|
||||
rev = "v${version}";
|
||||
sha256 = "7HindS++jcV3GRn/SKoTMpVOchOnLojy/TY0HZjtyD8=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-lQ/7tH74MllwFe2kF5OcYSb4rQd+yJU1W6ztG4Z6Y0U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Adjust search path, https://github.com/jeroenterheerdt/python-egardia/pull/33
|
||||
(fetchpatch {
|
||||
name = "search-path.patch";
|
||||
url = "https://github.com/jeroenterheerdt/python-egardia/commit/6b7bf5b7b2211e3557e0f438586b9d03b9bae440.patch";
|
||||
sha256 = "wUSfmF0SrKCITQJJsHgkGgPZFouaB/zbVqupK6fARHY=";
|
||||
})
|
||||
];
|
||||
|
||||
# Project has no tests, only two test file for manual interaction
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -43,6 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python interface with Egardia/Woonveilig alarms";
|
||||
homepage = "https://github.com/jeroenterheerdt/python-egardia";
|
||||
changelog = "https://github.com/jeroenterheerdt/python-egardia/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-mixins";
|
||||
version = "1.5.3";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "absent1706";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M=";
|
||||
hash = "sha256-Ftpw3oDVu7Vdcwj7+a1G9cPeVUAEPggtozlvWioENIA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python mixins for SQLAlchemy ORM";
|
||||
homepage = "https://github.com/absent1706/sqlalchemy-mixins";
|
||||
changelog = "https://github.com/absent1706/sqlalchemy-mixins/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
let
|
||||
pname = "trainer";
|
||||
version = "0.0.24";
|
||||
version = "0.0.25";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage {
|
|||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+Wr8kmHo3rWxknSN/jJVzXow95hNgth/j4OSj96gScE=";
|
||||
hash = "sha256-XhE3CbcbCZjuUI6dx1gNNpQrxycqCgmOgjkaQ8MtL9E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "webssh";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g3RRQUWbjHRaZRVekmETcrHYeVIIpeteCCh7o28jBLY=";
|
||||
hash = "sha256-mRestRJukaf7ti3vIs/MM/R+zpGmK551j5HAM2chBsE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,19 +2,23 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dapr-cli";
|
||||
version = "1.8.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dapr";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NzHg/pn0Gek3JhcdOBFilmmw0xaKtjTote11LLr4oj8=";
|
||||
sha256 = "sha256-LBsJjAtsKlecRhes9q+HYCwlhZn0jUhhEzu62nATGz8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZsuDaFcBPZuyt5rmjeBkzkrphCCcraLZCrMiQ2FtAUc=";
|
||||
vendorSha256 = "sha256-t2uew44kLLDM6cuWUV5Joa+h88BhRv3GnnckDshB5Tw=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize-sops";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viaduct-ai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-piCsae2B+FC+wi/vCCtPY76O4eMXJeNufFo31QkHCAU=";
|
||||
sha256 = "sha256-jwOyOGSnUgk9+cD+cGj1/ZzQ84HAdAn0HMy3CLPs1U0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vTP2wM7MqiSfP+3Gd0Ab5t0al5xL8rw3kl7bOT19zU4=";
|
||||
vendorHash = "sha256-tNYPgXFDJuNRlrVE0ywg77goNzfoWHFVzOG9mHqK3q8=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.23.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5T2bw07bkhEmlJa8Qw+USreY3MtGRHIUVrHLJOMk824=";
|
||||
sha256 = "sha256-eJD+7J5R+Oomj4QbOj5QHB30F0jpWmnkbl6bhVOEgDU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s8U0ERAb/qLwen8ABfeZ21HLTgHWvHaYHazztSeP87c=";
|
||||
vendorHash = "sha256-UMRAyUcGxPsW4Q7o5KtXMmdcuY+DEGhbm4jPBVLOLGQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-09";
|
||||
version = "2023-04-11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4eUDdtKUAHN18IoaODHGaxgcB44o3VoUvIYYka+V1qo=";
|
||||
hash = "sha256-LGC8AK6e0zhl7jOTSirwv7ZSfVveqNRhM/+afcMmnHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,15 +16,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tracee";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-55+eyulFbzR2ZzKbTN5sHIickpwXY8eJDDzf6Gzwhsk=";
|
||||
hash = "sha256-YO5u/hE5enoqh8niV4Zi+NFUsU+UXCCxdqvxolZImGk=";
|
||||
};
|
||||
vendorHash = "sha256-qEubjzYGdiBntPOJw8dR/THcvK2Bml97SXHImIWbDm0=";
|
||||
vendorHash = "sha256-swMvJe+Dz/kwPIStPlQ7d6U/UwXSMcJ3eONxjzebXCc=";
|
||||
|
||||
patches = [
|
||||
./use-our-libbpf.patch
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erdtree";
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solidiquis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dSIq6PNkFkdYvAzNQ1qBEZWEdiYYZCb/7rNICuUJAsE=";
|
||||
hash = "sha256-RKIQM5RJygVL15Q3B30DXnqTSbVPJZdb8YNitanzOEA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Dpg4AbDClqh6yzI/s5LQDP6QkyTMLP/IJIp2l2d+Ouw=";
|
||||
cargoHash = "sha256-5bK+gJRBX0Xij5TUGD6BVWDDUJzUzHNPWoLwSXLF9iY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "File-tree visualizer and disk usage analyzer";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hck";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wsuXEHwnTP+vl8Gn1mfH+cKoasDdZ+ILiAaJ7510lsI=";
|
||||
sha256 = "sha256-KPpvai7+El2JA97EXDCstZ66FeyVCe7w+ERDDNRZ/h8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qWat0QIMLmMrbK/QCr3dSyWP27wFFQ+IDQAzLngThQE=";
|
||||
cargoSha256 = "sha256-TpwUO0BL8kambnxAUE9+l6YYkNL1WzmkTYn1YxjufdY=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nerdfix";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loichyan";
|
||||
repo = "nerdfix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HNd2wx1nUzPPs+wQBU4FOgDBq4mcyigEPtGpT44VPzo=";
|
||||
hash = "sha256-bohN3RXGZObDSDsggKmqKdLx37o8llTwIcpDQIbxEUo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rTDMg9TKHNqLjQztT/AhDYWNZjrRUk+/LM34ofYr/Ws=";
|
||||
cargoHash = "sha256-T5t+PvzCKfwiKQR/WWKxcoulSRhTNdiLDfoLnKO2qJ0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "peco";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
|
||||
subPackages = [ "cmd/peco" ];
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "peco";
|
||||
repo = "peco";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Iu2MclUbUYX1FuMnE65Qdk0S+5+K3HW86WIdQrNUyY8=";
|
||||
sha256 = "sha256-OVUfeNpnmuJsgD//JTn6n9n4oOBxep69LhIpHX+ru2w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90=";
|
||||
vendorHash = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplistic interactive filtering tool";
|
||||
|
|
|
|||
110
pkgs/tools/typesetting/typst/Cargo.lock
generated
110
pkgs/tools/typesetting/typst/Cargo.lock
generated
|
|
@ -170,6 +170,31 @@ version = "1.0.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chinese-number"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "365a2e504d6cb41e85fba5d01a6baf7f13cad4424102859193c4674e7fdff933"
|
||||
dependencies = [
|
||||
"chinese-numerals",
|
||||
"chinese-variant",
|
||||
"enum-ordinalize",
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "chinese-numerals"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76a5a40575256b55eebe3e39fa41e53bdaea5d67ac5a7092fa8756020c798d1e"
|
||||
|
||||
[[package]]
|
||||
name = "chinese-variant"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.24"
|
||||
|
|
@ -206,6 +231,15 @@ dependencies = [
|
|||
"strsim",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_complete"
|
||||
version = "4.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd"
|
||||
dependencies = [
|
||||
"clap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.2.0"
|
||||
|
|
@ -224,6 +258,16 @@ version = "0.4.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
|
||||
|
||||
[[package]]
|
||||
name = "clap_mangen"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4237e29de9c6949982ba87d51709204504fb8ed2fd38232fcb1e5bf7d4ba48c8"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"roff",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "codespan-reporting"
|
||||
version = "0.11.1"
|
||||
|
|
@ -430,6 +474,20 @@ dependencies = [
|
|||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enum-ordinalize"
|
||||
version = "3.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc_version",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.0"
|
||||
|
|
@ -673,9 +731,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.2"
|
||||
version = "1.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
|
||||
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"hashbrown",
|
||||
|
|
@ -910,6 +968,17 @@ dependencies = [
|
|||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
|
|
@ -1165,6 +1234,12 @@ dependencies = [
|
|||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "roff"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
|
||||
|
||||
[[package]]
|
||||
name = "roxmltree"
|
||||
version = "0.14.1"
|
||||
|
|
@ -1174,6 +1249,15 @@ dependencies = [
|
|||
"xmlparser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
|
||||
dependencies = [
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.5"
|
||||
|
|
@ -1240,6 +1324,12 @@ version = "1.0.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.158"
|
||||
|
|
@ -1507,7 +1597,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
|
|||
|
||||
[[package]]
|
||||
name = "typst"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bytemuck",
|
||||
|
|
@ -1516,6 +1606,7 @@ dependencies = [
|
|||
"flate2",
|
||||
"if_chain",
|
||||
"image",
|
||||
"indexmap",
|
||||
"log",
|
||||
"miniz_oxide 0.5.4",
|
||||
"once_cell",
|
||||
|
|
@ -1543,10 +1634,12 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "typst-cli"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
"clap_complete",
|
||||
"clap_mangen",
|
||||
"codespan-reporting",
|
||||
"comemo",
|
||||
"dirs",
|
||||
|
|
@ -1564,7 +1657,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "typst-docs"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"heck",
|
||||
|
|
@ -1582,8 +1675,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "typst-library"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"chinese-number",
|
||||
"comemo",
|
||||
"csv",
|
||||
"ecow",
|
||||
|
|
@ -1611,7 +1705,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "typst-macros"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
|
|
@ -1622,7 +1716,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "typst-tests"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"comemo",
|
||||
"elsa",
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typst";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typst";
|
||||
repo = "typst";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fPcQlgmpViDsvd9OmnP1wZoMTOtyL5pfH6plktNG0JQ=";
|
||||
hash = "sha256-3vNJmLmbskAzXVXjiSVDLhRcX1j3ksOgPd53W31YZ0c=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
@ -23,10 +24,25 @@ rustPlatform.buildRustPackage rec {
|
|||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
];
|
||||
|
||||
env = {
|
||||
GEN_ARTIFACTS = "artifacts";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installManPage cli/artifacts/*.1
|
||||
installShellCompletion \
|
||||
cli/artifacts/typst.{bash,fish} \
|
||||
--zsh cli/artifacts/_typst
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A new markup-based typesetting system that is powerful and easy to learn";
|
||||
homepage = "https://typst.app";
|
||||
|
|
|
|||
Loading…
Reference in a new issue