Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
80be812da1
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spatialite-tools";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-${version}.tar.gz";
|
||||
hash = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw=";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz";
|
||||
hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ buildGoModule rec {
|
|||
owner = "trashhalo";
|
||||
repo = "imgcat";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x7a1izsbrbfph7wa9ny9r4a8lp6z15qpb6jf8wsxshiwnkjyrig";
|
||||
hash = "sha256-L2Yvp+UR6q45ctKsi0v45lKkSE7eJsUPvG7lpX8M6nQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "191gi4c5jk8p9xvbm1cdhk5yi8q2cp2jvjq1sgxqw1ad0lppwhg2";
|
||||
vendorHash = "sha256-4kF+LwVNBY770wHLLcVlAqPoy4SNhbp2TxdNWRiJL6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to output images as RGB ANSI graphics on the terminal";
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "1.28.1.15219";
|
||||
version = "2.0.0.16559";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
|
||||
sha256 = "sha256-4P73MC5Go8wLACBtjh1y3Ao0czE/3hsSI4728mNjKxA=";
|
||||
sha256 = "sha256-z+udyilfVwcVnaFhp6GYHCXqh1d7T5fj/TbbjMoen2I=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kbt";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloznelis";
|
||||
repo = "kbt";
|
||||
rev = version;
|
||||
hash = "sha256-IVKGpifLcpqPD4ZYP+1mY0EokNoQW6qSbxt66w6b81w=";
|
||||
hash = "sha256-v0xbW1xlOhaLf19a6gFpd16RjYfXIK6FDBSWVWPlK3c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iPsBYccLQdPvzaV7pRa3ZLFFwJ1lIJoFMWChLkQpyyk=";
|
||||
cargoHash = "sha256-rBThJqaemtPAHqiWDILJZ7j+NL5+6+4tsXrFPcEiFL0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@
|
|||
"vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=",
|
||||
"hash": "sha256-hE93VV29Whh2POUz15Hcx8aq/78cw7NXDn+xUhrEA+E=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.208.1",
|
||||
"rev": "v1.209.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -583,13 +583,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"ibm": {
|
||||
"hash": "sha256-XSB0bwkFiNdeVje/pCnNDDjbiroJBckSNqEFlDuctdM=",
|
||||
"hash": "sha256-FxMBZQYYSOq1Y5jm+HPIsVA1RMv8jhPWIKHd9HV/f3g=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.55.0",
|
||||
"rev": "v1.56.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-+HYfQoJWyZizoe/g5cycmSjaStRwbRuYfXRYVOgRqCM="
|
||||
"vendorHash": "sha256-djpo+9BxWUptKRephw0by4xtPABEjsnCqwcbZoRNIug="
|
||||
},
|
||||
"icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
|
@ -1088,11 +1088,11 @@
|
|||
"vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s="
|
||||
},
|
||||
"sumologic": {
|
||||
"hash": "sha256-v4CnT51YUN7p0PdfiUJf7YAlI2pz/zkzTiNFsIWhwUU=",
|
||||
"hash": "sha256-R2t754J438nDkifE0zEtYO5q6g6N4CVQdZn9DoBiuVQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
|
||||
"owner": "SumoLogic",
|
||||
"repo": "terraform-provider-sumologic",
|
||||
"rev": "v2.24.0",
|
||||
"rev": "v2.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI="
|
||||
},
|
||||
|
|
@ -1188,13 +1188,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"utils": {
|
||||
"hash": "sha256-3eEC0UN/VVockLstHhSNY9EH0bRv/LK3SkpSfMrMwSI=",
|
||||
"hash": "sha256-UqAWByIArvTz2ArR/dgIDw98grqj9BEyRJzNODteKao=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
|
||||
"owner": "cloudposse",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "1.9.0",
|
||||
"rev": "1.10.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-ZOJ4J+t8YIWAFZe9dnVHezdXdjz5y2ho53wmyS4dJEo="
|
||||
"vendorHash": "sha256-n70qtdz4x8bdzCmVYyVTvvndx0w0AV/Yv8thGvitT6U="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=",
|
||||
|
|
@ -1261,11 +1261,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"wavefront": {
|
||||
"hash": "sha256-ag4mu9CyG78X47QGMTQTK7+VsdCv0TBOCovVnM4OMsw=",
|
||||
"hash": "sha256-bBJZT5h/2ZFTKhFXMWj/xf+DAMGdUZw8E07PuIsMVpU=",
|
||||
"homepage": "https://registry.terraform.io/providers/vmware/wavefront",
|
||||
"owner": "vmware",
|
||||
"repo": "terraform-provider-wavefront",
|
||||
"rev": "v5.0.0",
|
||||
"rev": "v5.0.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.8.0";
|
||||
version = "3.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sAA01/Hs8yGFJM+ttwhonrBqTpGsEoWrYDU8w/YmE6A=";
|
||||
hash = "sha256-IdjNk1GyJcNwHqm/ZYdHRh6a/XAD5p41Vu8JdPuCglE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in
|
|||
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "darker" "rimless" "normal" "float" "colorful" ] tweaks
|
||||
lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.49.0";
|
||||
version = "1.50.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-pHMysxnczKilfjJafobU18/gaWnfrHMpPUd6RQ+CXSg=";
|
||||
sha256 = "sha256-fZlJw+2kj8ZTt2Yb15yKD9koZPUfnalDchG29PgJTVs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep,
|
||||
src, version, git-version, stampYmd ? 0, stampHms ? 0,
|
||||
gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }:
|
||||
{ gccStdenv, lib, pkgs,
|
||||
git, openssl, autoconf, gcc, coreutils, gnused, gnugrep,
|
||||
makeStaticLibraries,
|
||||
src, version, git-version,
|
||||
stampYmd ? 0, stampHms ? 0,
|
||||
gambit-support,
|
||||
optimizationSetting ? "-O1",
|
||||
gambit-params ? pkgs.gambit-support.stable-params }:
|
||||
|
||||
# Note that according to a benchmark run by Marc Feeley on May 2018,
|
||||
# clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling
|
||||
|
|
@ -45,6 +50,7 @@ gccStdenv.mkDerivation rec {
|
|||
"--enable-shared"
|
||||
"--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
|
||||
"--enable-openssl"
|
||||
"--enable-dynamic-clib"
|
||||
#"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend
|
||||
"--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"
|
||||
# "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime
|
||||
|
|
@ -62,6 +68,7 @@ gccStdenv.mkDerivation rec {
|
|||
# "--enable-coverage"
|
||||
# "--enable-inline-jumps"
|
||||
# "--enable-char-size=1" # default is 4
|
||||
# "--enable-march=native" # Nope, makes it not work on machines older than the builder
|
||||
] ++ gambit-params.extraOptions
|
||||
# Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498
|
||||
++ lib.optional (!gccStdenv.isDarwin) "--enable-poll";
|
||||
|
|
|
|||
|
|
@ -16,12 +16,13 @@ rec {
|
|||
--replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;";
|
||||
'';
|
||||
modules = true;
|
||||
extraOptions = [];
|
||||
#extraOptions = [];
|
||||
extraOptions = ["--enable-trust-c-tco" "CFLAGS=-foptimize-sibling-calls"];
|
||||
};
|
||||
|
||||
unstable-params = stable-params // {
|
||||
stable = false;
|
||||
extraOptions = ["--enable-trust-c-tco"];
|
||||
extraOptions = ["--enable-trust-c-tco"]; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable
|
||||
};
|
||||
|
||||
export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ callPackage, fetchFromGitHub, gambit-support }:
|
||||
|
||||
callPackage ./build.nix {
|
||||
version = "unstable-2023-07-30";
|
||||
git-version = "4.9.5-3-ge059fffd";
|
||||
stampYmd = 20230730;
|
||||
stampHms = 151945;
|
||||
version = "unstable-2023-08-06";
|
||||
git-version = "4.9.5-5-gf1fbe9aa";
|
||||
stampYmd = 20230806;
|
||||
stampHms = 195822;
|
||||
src = fetchFromGitHub {
|
||||
owner = "gambit";
|
||||
repo = "gambit";
|
||||
rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212";
|
||||
sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs";
|
||||
rev = "f1fbe9aa0f461e89f2a91bc050c1373ee6d66482";
|
||||
sha256 = "0b0gd6cwj8zxwcqglpsnmanysiq4mvma2mrgdfr6qy99avhbhzxm";
|
||||
};
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
|
||||
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ;
|
||||
done ;
|
||||
'';
|
||||
'';
|
||||
|
||||
## TODO: make static compilation work.
|
||||
## For that, get all the packages below to somehow expose static libraries,
|
||||
|
|
@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Gerbil Scheme";
|
||||
homepage = "https://github.com/vyzo/gerbil";
|
||||
license = lib.licenses.lgpl21; # also asl20, like Gambit
|
||||
# NB regarding platforms: regularly tested on Linux, only occasionally on macOS.
|
||||
license = lib.licenses.lgpl21Only; # dual, also asl20, like Gambit
|
||||
# NB regarding platforms: regularly tested on Linux and on macOS.
|
||||
# Please report success and/or failure to fare.
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ callPackage, fetchFromGitHub }:
|
||||
|
||||
callPackage ./build.nix rec {
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
git-version = version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "vyzo";
|
||||
repo = "gerbil";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f";
|
||||
sha256 = "0xzi9mhrmzcajhlz5qcnz4yjlljvbkbm9426iifgjn47ac0965zw";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
27
pkgs/development/compilers/gerbil/ftw.nix
Normal file
27
pkgs/development/compilers/gerbil/ftw.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, fetchFromGitHub, gerbilPackages, ... }:
|
||||
|
||||
{
|
||||
pname = "ftw";
|
||||
version = "unstable-2022-01-14";
|
||||
git-version = "8ba16b3";
|
||||
softwareName = "FTW: For The Web!";
|
||||
gerbil-package = "drewc/ftw";
|
||||
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils ];
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "drewc";
|
||||
repo = "ftw";
|
||||
rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9";
|
||||
sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple web handlers for Gerbil Scheme";
|
||||
homepage = "https://github.com/drewc/ftw";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +1,29 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ pkgs, lib, fetchFromGitHub, gerbilPackages, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
{
|
||||
pname = "gerbil-crypto";
|
||||
version = "unstable-2020-08-01";
|
||||
git-version = "0.0-6-ga228862";
|
||||
version = "unstable-2023-03-27";
|
||||
git-version = "0.0-18-ge57f887";
|
||||
gerbil-package = "clan/crypto";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils];
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ];
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = [pkgs.secp256k1 ];
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
buildInputs = [ pkgs.secp256k1 ];
|
||||
version-path = "version";
|
||||
softwareName = "Gerbil-crypto";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "fare";
|
||||
repo = "gerbil-crypto";
|
||||
rev = "a22886260849ec92c3a34bfeedc1574e41e49e33";
|
||||
sha256 = "0qbanw2vnw2ymmr4pr1jap29cyc3icbhyq0apibpfnj2znns7w47";
|
||||
rev = "e57f88742d9b41640b4a7d9bd3e86c688d4a83f9";
|
||||
sha256 = "08hrk3s82hbigvza75vgx9kc7qf64yhhn3xm5calc859sy6ai4ka";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil Crypto: Extra Cryptographic Primitives for Gerbil";
|
||||
homepage = "https://github.com/fare/gerbil-crypto";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,49 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ lib, fetchFromGitHub, gerbilPackages, gerbil-support, gerbil, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
rec {
|
||||
pname = "gerbil-ethereum";
|
||||
version = "unstable-2020-10-18";
|
||||
git-version = "0.0-26-gf27ada8";
|
||||
gerbil-package = "mukn/ethereum";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = with gerbil-support.gerbilPackages-unstable;
|
||||
[gerbil-utils gerbil-crypto gerbil-poo gerbil-persist];
|
||||
buildInputs = [];
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = "version";
|
||||
version = "unstable-2023-05-30";
|
||||
git-version = "0.0-375-g989a5ca";
|
||||
softwareName = "Gerbil-ethereum";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "mukn/ethereum";
|
||||
version-path = "version";
|
||||
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist ];
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "fare";
|
||||
repo = "gerbil-ethereum";
|
||||
rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7";
|
||||
sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd";
|
||||
rev = "989a5ca78958e42c4a1ec242786ade89f1887e48";
|
||||
sha256 = "0bs2knhx3hy3k72yidgaplwjd48y86arqscdik8hgxwmhm9z8kwp";
|
||||
};
|
||||
meta = {
|
||||
|
||||
postInstall = ''
|
||||
cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/mukn/ethereum/scripts/
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/run-ethereum-test-net <<EOF
|
||||
#!/bin/sh
|
||||
#|
|
||||
ORIG_GERBIL_LOADPATH="\$GERBIL_LOADPATH"
|
||||
ORIG_GERBIL_PATH="\$GERBIL_PATH"
|
||||
ORIG_GERBIL_HOME="\$GERBIL_HOME"
|
||||
unset GERBIL_HOME
|
||||
GERBIL_LOADPATH="${gerbil-support.gerbilLoadPath (["$out"] ++ gerbilInputs)}"
|
||||
GERBIL_PATH="\$HOME/.cache/gerbil-ethereum/gerbil"
|
||||
export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH
|
||||
exec ${gerbil}/bin/gxi "\$0" "\$@"
|
||||
|#
|
||||
(import :mukn/ethereum/scripts/run-ethereum-test-net :clan/multicall)
|
||||
(apply call-entry-point (cdr (command-line)))
|
||||
EOF
|
||||
chmod a+x $out/bin/run-ethereum-test-net
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil Ethereum: a Scheme alternative to web3.js";
|
||||
homepage = "https://github.com/fare/gerbil-ethereum";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ lib, fetchFromGitHub, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
{
|
||||
pname = "gerbil-libp2p";
|
||||
version = "unstable-2018-12-27";
|
||||
git-version = "2376b3f";
|
||||
gerbil-package = "vyzo";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = [];
|
||||
buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = "version";
|
||||
version = "unstable-2022-02-03";
|
||||
git-version = "15b3246";
|
||||
softwareName = "Gerbil-libp2p";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "vyzo";
|
||||
|
||||
buildInputs = []; # Note: at *runtime*, this depends on go-libp2p-daemon running
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "vyzo";
|
||||
repo = "gerbil-libp2p";
|
||||
rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88";
|
||||
sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw";
|
||||
rev = "15b32462e683d89ffce0ff15ad373d293ea0ee5d";
|
||||
sha256 = "059lydp7d6pjgrd4pdnqq2zffzlba62ch102f01rgzf9aps3c8lz";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil libp2p: use libp2p from Gerbil";
|
||||
homepage = "https://github.com/vyzo/gerbil-libp2p";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
{ lib, fetchFromGitHub, gerbilPackages, ... }:
|
||||
{
|
||||
pname = "gerbil-persist";
|
||||
version = "unstable-2020-08-31";
|
||||
git-version = "0.0-8-gd211390";
|
||||
gerbil-package = "clan/persist";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo];
|
||||
buildInputs = [];
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = "version";
|
||||
version = "unstable-2023-03-02";
|
||||
git-version = "0.1.0-24-ge2305f5";
|
||||
softwareName = "Gerbil-persist";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "clan/persist";
|
||||
version-path = "version";
|
||||
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo ];
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "fare";
|
||||
repo = "gerbil-persist";
|
||||
rev = "d211390c8a199cf2b8c7400cd98977524e960015";
|
||||
sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7";
|
||||
rev = "e2305f53571e55292179286ca2d88e046ec6638b";
|
||||
sha256 = "1vsi4rfzpqg4hhn53d2r26iw715vzwz0hiai9r34z4diwzqixfgn";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil Persist: Persistent data and activities";
|
||||
homepage = "https://github.com/fare/gerbil-persist";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,28 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ lib, fetchFromGitHub, gerbilPackages, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
pname = "gerbil-ethereum";
|
||||
version = "unstable-2020-10-17";
|
||||
git-version = "0.0-35-g44d490d";
|
||||
gerbil-package = "clan/poo";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto];
|
||||
buildInputs = [];
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = "version";
|
||||
{
|
||||
pname = "gerbil-poo";
|
||||
version = "unstable-2023-04-28";
|
||||
git-version = "0.0-106-g418b582";
|
||||
softwareName = "Gerbil-POO";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "clan/poo";
|
||||
version-path = "version";
|
||||
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils ];
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "fare";
|
||||
repo = "gerbil-poo";
|
||||
rev = "44d490d95b9d1b5d54eaedf2602419af8e086837";
|
||||
sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k";
|
||||
rev = "418b582ae72e1494cf3a5f334d31d4f6503578f5";
|
||||
sha256 = "0qdzs7l6hp45dji5bc3879k4c8k9x6cj4qxz68cskjhn8wrc5lr8";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme";
|
||||
homepage = "https://github.com/fare/gerbil-poo";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,54 +1,112 @@
|
|||
{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }:
|
||||
# See ../gambit/build.nix regarding gccStdenv
|
||||
{ pkgs, lib, callPackage, ... }:
|
||||
|
||||
rec {
|
||||
# Gerbil libraries
|
||||
gerbilPackages-unstable = {
|
||||
gerbil-libp2p = callPackage ./gerbil-libp2p.nix { };
|
||||
gerbil-utils = callPackage ./gerbil-utils.nix { };
|
||||
gerbil-crypto = callPackage ./gerbil-crypto.nix { };
|
||||
gerbil-poo = callPackage ./gerbil-poo.nix { };
|
||||
gerbil-persist = callPackage ./gerbil-persist.nix { };
|
||||
gerbil-ethereum = callPackage ./gerbil-ethereum.nix { };
|
||||
smug-gerbil = callPackage ./smug-gerbil.nix { };
|
||||
with pkgs.gerbil-support; {
|
||||
|
||||
prePackages-unstable =
|
||||
let pks = [ ./gerbil-libp2p.nix ./smug-gerbil.nix ./ftw.nix
|
||||
./gerbil-utils.nix ./gerbil-crypto.nix ./gerbil-poo.nix
|
||||
./gerbil-persist.nix ./gerbil-ethereum.nix ./glow-lang.nix ];
|
||||
call = pkg: callPackage pkg prePackage-defaults;
|
||||
pkgName = pkg: lib.removeSuffix ".nix" (baseNameOf pkg);
|
||||
f = pkg: { name = pkgName pkg; value = call pkg; }; in
|
||||
builtins.listToAttrs (map f pks);
|
||||
|
||||
prePackage-defaults = {
|
||||
gerbil = pkgs.gerbil-unstable;
|
||||
gambit-params = pkgs.gambit-support.unstable-params;
|
||||
gerbilPackages = gerbilPackages-unstable;
|
||||
git-version = "";
|
||||
version-path = "";
|
||||
gerbilInputs = [];
|
||||
nativeBuildInputs = [];
|
||||
buildInputs = [];
|
||||
buildScript = "./build.ss";
|
||||
postInstall = "";
|
||||
softwareName = "";
|
||||
};
|
||||
|
||||
gerbilPackages-unstable =
|
||||
builtins.mapAttrs (_: gerbilPackage) prePackages-unstable;
|
||||
|
||||
resolve-pre-src = pre-src: pre-src.fun (removeAttrs pre-src ["fun"]);
|
||||
|
||||
gerbilVersionFromGit = pkg:
|
||||
let version-path = "${pkg.passthru.pre-pkg.version-path}.ss"; in
|
||||
if builtins.pathExists version-path then
|
||||
let m =
|
||||
builtins.match "\\(import :clan/versioning.*\\)\n\\(register-software \"([-_.A-Za-z0-9]+)\" \"([-_.A-Za-z0-9]+)\"\\) ;; ([-0-9]+)\n"
|
||||
(builtins.readFile version-path); in
|
||||
{ version = builtins.elemAt m 2; git-version = builtins.elemAt m 1; }
|
||||
else { version = "0.0";
|
||||
git-version = let gitpath = "${toString pkg.src}/.git"; in
|
||||
if builtins.pathExists gitpath then lib.commitIdFromGitRepo gitpath else "0"; };
|
||||
|
||||
gerbilSkippableFiles = [".git" ".build" ".build_outputs" "run" "result" "dep" "BLAH"
|
||||
"version.ss" "tmp.nix"];
|
||||
|
||||
gerbilSourceFilter = path: type:
|
||||
let baseName = baseNameOf path; in
|
||||
! (builtins.elem baseName gerbilSkippableFiles || lib.hasSuffix "~" baseName);
|
||||
|
||||
gerbilFilterSource = builtins.filterSource gerbilSourceFilter;
|
||||
|
||||
# Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH.
|
||||
gerbilLoadPath =
|
||||
gerbilInputs : builtins.concatStringsSep ":" (map (x : x + "/gerbil/lib") gerbilInputs);
|
||||
gerbilInputs: builtins.concatStringsSep ":" (map (x: x + "/gerbil/lib") gerbilInputs);
|
||||
|
||||
path-src = path: { fun = _: path; };
|
||||
|
||||
view = lib.debug.traceSeqN 4;
|
||||
|
||||
sha256-of-pre-src = pre-src: if pre-src ? sha256 then pre-src.sha256 else "none";
|
||||
|
||||
overrideSrcIfShaDiff = name: new-pre-src: super:
|
||||
let old-sha256 = sha256-of-pre-src super.${name}.pre-src;
|
||||
new-sha256 = sha256-of-pre-src new-pre-src; in
|
||||
if old-sha256 == new-sha256 then {} else
|
||||
view "Overriding ${name} old-sha256: ${old-sha256} new-sha256: ${new-sha256}"
|
||||
{ ${name} = super.${name} // {
|
||||
pre-src = new-pre-src;
|
||||
version = "override";
|
||||
git-version = if new-pre-src ? rev then lib.substring 0 7 new-pre-src.rev else "unknown";};};
|
||||
|
||||
pkgsOverrideGerbilPackageSrc = name: pre-src: pkgs: super: {
|
||||
gerbil-support = (super-support:
|
||||
{ prePackages-unstable =
|
||||
(super-ppu: super-ppu // (overrideSrcIfShaDiff name pre-src super-ppu))
|
||||
super-support.prePackages-unstable;}) super.gerbil-support;};
|
||||
|
||||
# Use this function to create a Gerbil library. See gerbil-utils as an example.
|
||||
gerbilPackage = {
|
||||
pname, version, src, meta, gerbil-package,
|
||||
git-version ? "", version-path ? "",
|
||||
gerbil ? pkgs.gerbil-unstable,
|
||||
gambit-params ? pkgs.gambit-support.stable-params,
|
||||
gerbilInputs ? [],
|
||||
nativeBuildInputs ? [],
|
||||
buildInputs ? [],
|
||||
buildScript ? "./build.ss",
|
||||
softwareName ? ""} :
|
||||
let buildInputs_ = buildInputs; in
|
||||
gccStdenv.mkDerivation rec {
|
||||
inherit src meta pname version nativeBuildInputs;
|
||||
passthru = { inherit gerbil-package version-path ;};
|
||||
gerbilPackage = prePackage:
|
||||
let pre-pkg = prePackage-defaults // prePackage;
|
||||
inherit (pre-pkg) pname version pre-src git-version meta
|
||||
softwareName gerbil-package version-path gerbil gambit-params
|
||||
gerbilInputs nativeBuildInputs buildInputs buildScript postInstall;
|
||||
buildInputs_ = buildInputs; in
|
||||
pkgs.gccStdenv.mkDerivation rec { # See ../gambit/build.nix regarding why we use gccStdenv
|
||||
inherit meta pname version nativeBuildInputs postInstall;
|
||||
passthru = {
|
||||
inherit pre-pkg;
|
||||
};
|
||||
src = resolve-pre-src pre-src;
|
||||
buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_;
|
||||
|
||||
postPatch = ''
|
||||
set -e ;
|
||||
if [ -n "${version-path}.ss" ] ; then
|
||||
echo -e '(import :clan/versioning${builtins.concatStringsSep ""
|
||||
(map (x : lib.optionalString (x.passthru.version-path != "")
|
||||
" :${x.passthru.gerbil-package}/${x.passthru.version-path}")
|
||||
${lib.optionalString (version-path != "")
|
||||
''echo -e '(import :clan/versioning${builtins.concatStringsSep ""
|
||||
(map (x: let px = x.passthru.pre-pkg; in
|
||||
lib.optionalString (px.version-path != "")
|
||||
" :${px.gerbil-package}/${px.version-path}")
|
||||
gerbilInputs)
|
||||
})\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss"
|
||||
fi
|
||||
})\n(register-software "${softwareName}" "v${git-version}")\n' > "${version-path}.ss"''}
|
||||
patchShebangs . ;
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
export GERBIL_BUILD_CORES=$NIX_BUILD_CORES
|
||||
export GERBIL_PATH=$PWD/.build
|
||||
export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs}
|
||||
export GERBIL_LOADPATH=${gerbilLoadPath (["$out"] ++ gerbilInputs)}
|
||||
${pkgs.gambit-support.export-gambopt gambit-params}
|
||||
'';
|
||||
|
||||
|
|
@ -60,18 +118,36 @@ rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/gerbil/lib
|
||||
cp -fa .build/lib $out/gerbil/
|
||||
bins=(.build/bin/*)
|
||||
if [ 0 -lt ''${#bins} ] ; then
|
||||
cp -fa .build/bin $out/gerbil/
|
||||
mkdir $out/bin
|
||||
cd $out/bin
|
||||
ln -s ../gerbil/bin/* .
|
||||
mkdir -p $out/gerbil
|
||||
cp -fa .build/* $out/gerbil/
|
||||
if [[ -d $out/gerbil/bin ]] ; then
|
||||
( cd $out/gerbil
|
||||
bins=$(find ../gerbil/bin -type f)
|
||||
if [[ -n $bins ]] ; then
|
||||
( mkdir -p ../bin
|
||||
cd ..
|
||||
ln -s $bins bin
|
||||
)
|
||||
fi
|
||||
)
|
||||
fi
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
if [[ -f unit-tests.ss ]] ; then
|
||||
export GERBIL_APPLICATION_HOME=$PWD
|
||||
./unit-tests.ss version
|
||||
./unit-tests.ss
|
||||
else
|
||||
echo "No gerbil-utils style unit-tests.ss detected for ${pname} ${version}.";
|
||||
fi
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,26 @@
|
|||
{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ lib, fetchFromGitHub, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
{
|
||||
pname = "gerbil-utils";
|
||||
version = "unstable-2020-10-18";
|
||||
git-version = "0.2-36-g8b481b7";
|
||||
gerbil-package = "clan";
|
||||
gerbil = gerbil-unstable;
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = "version";
|
||||
version = "unstable-2023-07-22";
|
||||
git-version = "0.2-198-g2fb01ce";
|
||||
softwareName = "Gerbil-utils";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "clan";
|
||||
version-path = "version";
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "fare";
|
||||
repo = "gerbil-utils";
|
||||
rev = "8b481b787e13e07e14d0718d670aab016131a090";
|
||||
sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m";
|
||||
rev = "2fb01ce0b302f232f5c4daf4987457b6357d609d";
|
||||
sha256 = "127q98gk1x6y1nlkkpnbnkz989ybpszy7aiy43hzai2q6xn4nv72";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gerbil Clan: Community curated Collection of Common Utilities";
|
||||
homepage = "https://github.com/fare/gerbil-utils";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
55
pkgs/development/compilers/gerbil/glow-lang.nix
Normal file
55
pkgs/development/compilers/gerbil/glow-lang.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib, fetchFromGitHub, gerbil-support, gerbilPackages, gerbil, ... }:
|
||||
|
||||
rec {
|
||||
pname = "glow-lang";
|
||||
version = "unstable-2023-04-26";
|
||||
git-version = "0.3.2-222-gb19cd980";
|
||||
softwareName = "Glow";
|
||||
gerbil-package = "mukn/glow";
|
||||
version-path = "version";
|
||||
|
||||
gerbilInputs = with gerbilPackages;
|
||||
[ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist gerbil-ethereum
|
||||
gerbil-libp2p smug-gerbil ftw ];
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "Glow-Lang";
|
||||
repo = "glow";
|
||||
rev = "b19cd98082dfc5156d1b4fc83cde161572d6a211";
|
||||
sha256 = "0k3qy5826pxqr9ylnnpq4iikxf4j50987vhpa5qiv99j0p643xr3";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "runtime/glow-path.ss" --replace \
|
||||
'(def glow-install-path (source-path "dapps"))' \
|
||||
'(def glow-install-path "$out")'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin $out/gerbil/lib/mukn/glow $out/share/glow/dapps
|
||||
cp main.ss $out/gerbil/lib/mukn/glow/
|
||||
cp dapps/{buy_sig,coin_flip,rps_simple}.glow $out/share/glow/dapps/
|
||||
cat > $out/bin/glow <<EOF
|
||||
#!/bin/sh
|
||||
ORIG_GERBIL_LOADPATH="\$GERBIL_LOADPATH"
|
||||
ORIG_GERBIL_PATH="\$GERBIL_PATH"
|
||||
ORIG_GERBIL_HOME="\$GERBIL_HOME"
|
||||
unset GERBIL_HOME
|
||||
GERBIL_LOADPATH="${gerbil-support.gerbilLoadPath (["$out"] ++ gerbilInputs)}"
|
||||
GLOW_SOURCE="\''${GLOW_SOURCE:-$out/share/glow}"
|
||||
GERBIL_PATH="\$HOME/.cache/glow/gerbil"
|
||||
export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH ORIG_GERBIL_HOME
|
||||
exec ${gerbil}/bin/gxi $out/gerbil/lib/mukn/glow/main.ss "\$@"
|
||||
EOF
|
||||
chmod a+x $out/bin/glow
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Glow: language for safe Decentralized Applications (DApps)";
|
||||
homepage = "https://glow-lang.org";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,25 @@
|
|||
{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
|
||||
{ lib, fetchFromGitHub, ... }:
|
||||
|
||||
gerbil-support.gerbilPackage {
|
||||
{
|
||||
pname = "smug-gerbil";
|
||||
version = "unstable-2019-12-24";
|
||||
git-version = "95d60d4";
|
||||
gerbil-package = "drewc/smug";
|
||||
gerbil = gerbil-unstable;
|
||||
gerbilInputs = [];
|
||||
buildInputs = [];
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
version-path = ""; #"version";
|
||||
version = "unstable-2020-12-12";
|
||||
git-version = "0.4.20";
|
||||
softwareName = "Smug-Gerbil";
|
||||
src = fetchFromGitHub {
|
||||
gerbil-package = "drewc/smug";
|
||||
|
||||
pre-src = {
|
||||
fun = fetchFromGitHub;
|
||||
owner = "drewc";
|
||||
repo = "smug-gerbil";
|
||||
rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5";
|
||||
sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j";
|
||||
rev = "cf23a47d0891aa9e697719309d04dd25dd1d840b";
|
||||
sha256 = "13fdijd71m3fzp9fw9xp6ddgr38q1ly6wnr53salp725w6i4wqid";
|
||||
};
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme";
|
||||
homepage = "https://github.com/drewc/smug-gerbil";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fare ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fare ];
|
||||
};
|
||||
buildScript = ''
|
||||
for i in primitive simple tokens smug ; do gxc -O $i.ss ; done
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }:
|
||||
|
||||
callPackage ./build.nix rec {
|
||||
version = "unstable-2020-11-05";
|
||||
git-version = "0.16-152-g808929ae";
|
||||
version = "unstable-2023-08-07";
|
||||
git-version = "0.17.0-187-gba545b77";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vyzo";
|
||||
repo = "gerbil";
|
||||
rev = "808929aeb8823959191f35df53bc0c0150911b4b";
|
||||
sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw";
|
||||
rev = "ba545b77e8e85118089232e3cd263856e414b24b";
|
||||
sha256 = "1f4v1qawx2i8333kshj4pbj5r21z0868pwrr3r710n6ng3pd9gqn";
|
||||
};
|
||||
inherit gambit-support;
|
||||
gambit = gambit-unstable;
|
||||
|
|
|
|||
|
|
@ -184,6 +184,8 @@ let
|
|||
if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb"
|
||||
else if isx86_32 then "i386"
|
||||
else parsed.cpu.name;
|
||||
# Python doesn't distinguish musl and glibc and always prefixes with "gnu"
|
||||
gnuAbiName = replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name;
|
||||
pythonAbiName =
|
||||
# python's build doesn't support every gnu<extension>, and doesn't
|
||||
# differentiate between musl and glibc, so we list those supported in
|
||||
|
|
@ -191,7 +193,7 @@ let
|
|||
# https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724
|
||||
# Note: this is an approximation, as it doesn't take into account the CPU
|
||||
# family, or the nixpkgs abi naming conventions.
|
||||
if elem parsed.abi.name [
|
||||
if elem gnuAbiName [
|
||||
"gnux32"
|
||||
"gnueabihf"
|
||||
"gnueabi"
|
||||
|
|
@ -199,7 +201,7 @@ let
|
|||
"gnuabi64"
|
||||
"gnuspe"
|
||||
]
|
||||
then parsed.abi.name
|
||||
then gnuAbiName
|
||||
else "gnu";
|
||||
multiarch =
|
||||
if isDarwin then "darwin"
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "risor";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "risor-io";
|
||||
repo = "risor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YBiBadyI8TRa7CpiTkMOL0biuVMAk23sqEOzJ0ipfA8=";
|
||||
hash = "sha256-4Tw8QJj14MYfuQ4mNkSO1z4F8/3/6HjORKgARljlfs8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4=";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,29 @@
|
|||
{ lib, stdenv, fetchurl, validatePkgConfig, libiconv }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, validatePkgConfig
|
||||
, expat
|
||||
, minizip
|
||||
, zlib
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freexl";
|
||||
version = "1.0.6";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz";
|
||||
hash = "sha256-Pei1ej0TDLKIHqUtOqnOH+7bG1e32qTrN/dRQE+Q/CI=";
|
||||
hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
buildInputs = [
|
||||
expat
|
||||
minizip
|
||||
zlib
|
||||
] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspatialite";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-${version}.tar.gz";
|
||||
hash = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg=";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz";
|
||||
hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JJFHRoG/w5PLSrn99i4EUjRtbNUYDF19/xlsYOwwFZA=";
|
||||
sha256 = "sha256-+BCXkOaWYZSFWGZmeZ2ZJwVxFwmHgRbb7GSj/lRxmfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "empty-files";
|
||||
version = "0.0.4";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "approvals";
|
||||
repo = "EmptyFiles.Python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sXatMH2QEGxzDGszAoFXUoPzB00rYaQIasz93vsfyz8=";
|
||||
hash = "sha256-P/woyAN9cYdxryX1iM36C53c9dL6lo4eoTzBWT2cd3A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, colour
|
||||
, email-validator
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, flask
|
||||
, flask-babelex
|
||||
|
|
@ -39,6 +40,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-JMrir4MramEaAdfcNfQtJmwdbHWkJrhp2MskG3gjM2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/flask-admin/flask-admin/pull/2374
|
||||
(fetchpatch {
|
||||
name = "pillow-10-compatibility.patch";
|
||||
url = "https://github.com/flask-admin/flask-admin/commit/96b92deef8b087e86a9dc3e84381d254ea5c0342.patch";
|
||||
hash = "sha256-iR5kxyeZaEyved5InZuPmcglTD77zW18/eSHGwOuW40=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
wtforms
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonAtLeast
|
||||
, fetchpatch
|
||||
, jsonschema
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -13,9 +14,6 @@ buildPythonPackage rec {
|
|||
version = "0.0.16";
|
||||
format = "pyproject";
|
||||
|
||||
# ValueError: mutable default <class 'tests.conftest.Point'> for field a is not allowed: use default_factory
|
||||
disabled = pythonAtLeast "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbt-labs";
|
||||
repo = pname;
|
||||
|
|
@ -23,8 +21,18 @@ buildPythonPackage rec {
|
|||
hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/dbt-labs/hologram/pull/58
|
||||
(fetchpatch {
|
||||
name = "python3.11-test-compatibility.patch";
|
||||
url = "https://github.com/dbt-labs/hologram/commit/84bbe862ef6a2fcc8b8ce85b5c9a006cc7dc1f66.patch";
|
||||
hash = "sha256-t096jJDoKUPED4QHSfVjUMLtUJjWcqjblCtGR8moEJc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
37
pkgs/development/python-modules/ipycanvas/default.nix
Normal file
37
pkgs/development/python-modules/ipycanvas/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, jupyter-packaging
|
||||
, ipywidgets
|
||||
, numpy
|
||||
, pillow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipycanvas";
|
||||
version = "0.13.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jupyter-packaging ];
|
||||
|
||||
propagatedBuildInputs = [ ipywidgets numpy pillow ];
|
||||
|
||||
doCheck = false; # tests are in Typescript and require `npx` and `chromium`
|
||||
pythonImportsCheck = [ "ipycanvas" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Expose the browser's Canvas API to IPython";
|
||||
homepage = "https://ipycanvas.readthedocs.io";
|
||||
changelog = "https://github.com/jupyter-widgets-contrib/ipycanvas/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.1.13";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PUZedfKA+t8VdyvuJEuob6Dl7u4NagDRoLSHmsJ+1IE=";
|
||||
hash = "sha256-6oxKaMFXZTrz7gZpSAtXI5Jit7z5NWQgUkd1yB3EtA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,19 +3,17 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
let
|
||||
pname = "Polygon3";
|
||||
version = "3.0.9";
|
||||
in
|
||||
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
pname = "polygon3";
|
||||
version = "3.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jraedler";
|
||||
repo = pname;
|
||||
repo = "Polygon3";
|
||||
rev = "7b2091f77741fa1d94251979bc4a4f2676b4d2d1";
|
||||
hash = "sha256-jXtjEzjWwMoVgrHWsK8brSN6TQRxIPRjUaRiLBXYLcI=";
|
||||
};
|
||||
|
|
@ -8,11 +8,14 @@
|
|||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-ansible";
|
||||
version = "3.1.5";
|
||||
version = "3.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "ansible";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-stsgVJseZ02C7nG0Hm0wfAnhoLpM3qRZ2Lkr1N5hODw=";
|
||||
hash = "sha256-fSerRbd7QeEdTfyy2lVLq7FKHWWT0MlutonunHhM5M4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -29,6 +32,14 @@ buildPythonPackage rec {
|
|||
--replace '/usr/bin/env' '${coreutils}/bin/env'
|
||||
'';
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
|
@ -78,6 +89,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/jlaska/pytest-ansible";
|
||||
changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ tjni ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "universal-pathlib";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "universal_pathlib";
|
||||
inherit version;
|
||||
hash = "sha256-LqzljIZUZh8zHvcyBqFHBbunpJVYFpk6mfuesVGyojg=";
|
||||
hash = "sha256-UhTIbyEP6rm+W8wALwQtZeruw8CTP9ZlpDNstw6GxZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vertica-python";
|
||||
version = "1.3.2";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NmTwYQwWzV1ga4u+XApQNZsel52Tg8B5Z7vUnUmQoC8=";
|
||||
hash = "sha256-2TyJs0GdYTZWJR66IV6XuBR4b3aRi9KhFy/4ji1c6NU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ buildPythonPackage rec {
|
|||
anyio
|
||||
];
|
||||
|
||||
# Tests need these permissions in order to use the FSEvents API on macOS.
|
||||
sandboxProfile = ''
|
||||
(allow mach-lookup (global-name "com.apple.FSEvents"))
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
dirty-equals
|
||||
pytest-mock
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.20";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
|
||||
hash = "sha256-DSuBON5EXQlAEqiCitAtDxOcdGNu0ubisIbuWmAfElw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, fetchurl, makeDesktopItem, appimageTools }:
|
||||
let
|
||||
name = "saleae-logic-2";
|
||||
version = "2.4.7";
|
||||
version = "2.4.9";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
|
||||
hash = "sha256-dMt8XWLatLNothU9oTJqYrBGNZZs0L5dXRMKP9ZeM6E=";
|
||||
url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";
|
||||
hash = "sha256-zM5XztFv+A7cNMqNPGAO5i0B45w6AMyRL4OR+tG03JY=";
|
||||
};
|
||||
desktopItem = makeDesktopItem {
|
||||
inherit name;
|
||||
|
|
@ -25,7 +25,7 @@ appimageTools.wrapType2 {
|
|||
in
|
||||
''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/
|
||||
cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s ${desktopItem}/share/applications $out/share/
|
||||
cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
|
||||
|
|
|
|||
6
pkgs/development/tools/ruff/Cargo.lock
generated
6
pkgs/development/tools/ruff/Cargo.lock
generated
|
|
@ -800,7 +800,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
|||
|
||||
[[package]]
|
||||
name = "flake8-to-ruff"
|
||||
version = "0.0.282"
|
||||
version = "0.0.283"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
|
|
@ -2042,7 +2042,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.0.282"
|
||||
version = "0.0.283"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
|
|
@ -2141,7 +2141,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ruff_cli"
|
||||
version = "0.0.282"
|
||||
version = "0.0.283"
|
||||
dependencies = [
|
||||
"annotate-snippets 0.9.1",
|
||||
"anyhow",
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.282";
|
||||
version = "0.0.283";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CQsgRTpZTBj07/9SYkrQXtb5FOguCtf5LCli65v20YA=";
|
||||
hash = "sha256-WqvTn/NGyZq9cJ417KPOVEEshDITxs6XdhwZbCXPk2o=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2023-07-17";
|
||||
cargoSha256 = "sha256-Xi2SG+mMwFvgO0tRdC5RPYhAxN7+Aw9woRVqDA+S4Ts=";
|
||||
version = "2023-08-07";
|
||||
cargoSha256 = "sha256-lvKfGy6tdrQRSaTLux7ynQMfCuiwHjJzJQ5EfppqaF4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-TcSjq91OCaJ7L3paN9XYsgOw990ZtDveI3fT/YW9nD8=";
|
||||
sha256 = "sha256-npJ8zOZ/CQoZu+0kN5NU9iC5JbmbsucyK1DayPmHWPs=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.4.39";
|
||||
version = "1.4.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eawsTvPJwWKDSZd/2XBneitoydSRxEAU5RAPZgE6NSo=";
|
||||
hash = "sha256-GD7SgxGZRivVbgrzAe7U0EgkTmrXFvSGzzZUOE7CwbY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uHTYp8PBXdQ2w+kjxLVvUOzOvDfXF53lcBriK8sif7A=";
|
||||
vendorHash = "sha256-1w+/tmF73hN5y5vj++JCX+T5RQ/PF747wmAbN9i7Bgs=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftune";
|
||||
version = "unstable-2023-07-14";
|
||||
version = "unstable-2023-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle-samples";
|
||||
repo = "bpftune";
|
||||
rev = "66620152bf8c37ab592e9273fe87e567126801c2";
|
||||
hash = "sha256-U0O+F1DBF1xiaUKklwpZORBwF1T9wHM0SPQKUNaxKZk=";
|
||||
rev = "f7e051a011d581a3c667b7f7b769862407d85f04";
|
||||
hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace include/bpftune/libbpftune.h \
|
||||
--replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \
|
||||
--replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/"
|
||||
|
||||
substituteInPlace src/Makefile sample_tuner/Makefile \
|
||||
--replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,7 +53,6 @@ stdenv.mkDerivation rec {
|
|||
"prefix=${placeholder "out"}"
|
||||
"confprefix=${placeholder "out"}/etc"
|
||||
"BPFTUNE_VERSION=${version}"
|
||||
"BPF_INCLUDE=${lib.getDev libbpf}/include"
|
||||
"NL_INCLUDE=${lib.getDev libnl}/include/libnl3"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, openssl
|
||||
, keyutils
|
||||
, asciidoc
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ima-evm-utils";
|
||||
|
|
@ -10,16 +20,27 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-WPBG7v29JHZ+ZGeLgA2gtLzZmaG0Xdvpq+BZ6NriY+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ openssl attr keyutils asciidoc libxslt ];
|
||||
strictDeps = true;
|
||||
|
||||
MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
asciidoc
|
||||
libxslt
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
keyutils
|
||||
];
|
||||
|
||||
env.MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
|
||||
|
||||
meta = {
|
||||
description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
|
||||
homepage = "https://sourceforge.net/projects/linux-ima/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "xcaddy";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
subPackages = [ "cmd/xcaddy" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "caddyserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CJzh1/rX9JjIiSyBReCt/lxUBQnXxY8NjRnSSqna9p4=";
|
||||
hash = "sha256-XxklyOaKFPyWFabodNCcV1NnaPWS0AQ2Sj89ZZ5hJbk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pgcat";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postgresml";
|
||||
repo = "pgcat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ESHBOh9JSzu6Zxh0z/+nebumi/zyFVdTK0DIwR/46Xo=";
|
||||
hash = "sha256-BERxdGgPk8POnhLsyy4lKV4LCoHsJTmv2OhAOz6CKKc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2wZADXEi8bfNgSQuL7yAmDYd/a0LOssdPFa/kvSSLFU=";
|
||||
cargoHash = "sha256-GwcqR8pEvz42NEmcuXpcoPdChzRBYsDEnllX62T8ulQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec {
|
|||
license = with licenses; [mit];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [cathalmullan];
|
||||
mainProgram = "pgcat";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tempo";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-gnQAldqfxJk8kbXAyX1VQXddCnSBWnvc3wesYoYI7wI=";
|
||||
hash = "sha256-+qBfscfAtVr8SEqAkpjkJfWfGfEImvO7BQfKvpVvf/0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [
|
||||
"cmd/tempo-cli"
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.14.0";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/mSefgkRNhKahToUOZQ73TYERq2mV23u+M8DSJL8E4Y=";
|
||||
sha256 = "sha256-BxtEMIWJaZaCtd5auGRq+F3VkRTZXGBa6GdLWgvC+ZE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SGm5jJ8savjUqgeK5wQ9dxz9BgROkKrnrSwNcojC9gE=";
|
||||
vendorHash = "sha256-tPWdzPJyjxcjDM5UgIeQek60Df/7dSaKedZF04tfu6Q=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "zbctl";
|
||||
version = "8.0.6";
|
||||
version = "8.2.11";
|
||||
|
||||
src = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then fetchurl {
|
||||
url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin";
|
||||
sha256 = "17hfjrcr6lmw91jq24nbw5yz61x6larmx39lyfj6pwlz0710y13p";
|
||||
sha256 = "0390n6wmlmfwqf6fvw6wqg6hbrs7bm9x2cdaajlw87377lklypkf";
|
||||
} else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then fetchurl {
|
||||
url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl";
|
||||
sha256 = "1xng11x7wcjvc0vipdrqyn97aa4jlgcp7g9aw4d36fw0xp9p47kp";
|
||||
sha256 = "081hc0nynwg014lhsxxyin4rc2i9z6wh8q9i98cjjd8kgr41h096";
|
||||
} else throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
1641
pkgs/tools/misc/codemov/Cargo.lock
generated
1641
pkgs/tools/misc/codemov/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -10,22 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "codemov";
|
||||
version = "unstable-2023-05-28";
|
||||
version = "unstable-2023-08-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloganking";
|
||||
repo = "codemov";
|
||||
rev = "ab4b287c5cdb64f8a1f378c54070fde5a1f3be5b";
|
||||
hash = "sha256-miW/s3Ox2Z5qyFZqAp/FqHhc5jC6s+4DzxlHQhzCc2w=";
|
||||
rev = "8a4d6e50c21010866ca06f845f30c2aa54c09854";
|
||||
hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
cargoHash = "sha256-cyzoMD97ofrbm3BDAtl8pSezcM4B2TVbW9V5J6xRVLc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxi-tools";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxi-tools";
|
||||
repo = "lxi-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F9svLaQnQyVyC5KzDnaGwB8J/nBZ3zzOVwYNxWBPifU=";
|
||||
sha256 = "sha256-THtMSiGlBes9OujFEZL88Twx+etYiQRJSk9DFYeGFhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "katana";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MhvagLlJ3WuZ3eEA0KI0sJ1ioFyqCcC9lejvewIFg5M=";
|
||||
hash = "sha256-0OXpA+sa97YjbHhIq3Uj65OWg53PH9y2cY8bjCqC3tQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1XT8VOBztC/V5Yguzq91ZoOWlkdT6fJrvcxp7KvtNqw=";
|
||||
vendorHash = "sha256-rb0fNAOP4y2yvJb7FIlAIfXF0uw0eLKgup75f9cwT6U=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uTU8HKDNvoLGan5OtZxujtEJvAzEhi0L/Z2AgdrDAfU=";
|
||||
hash = "sha256-qbAus0RgocbkC9eOmoiAOoyZw58LPDZlJgoRA/SzhQI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM=";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "repgrep";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acheronfail";
|
||||
repo = "repgrep";
|
||||
rev = version;
|
||||
hash = "sha256-sclBzv3F3M3oARRm0cNg/ABomzfgbDp0cFOXkRYjGEY=";
|
||||
hash = "sha256-33b0dZJY/lnVJGMfAg/faD6PPJIFZsvMZOmKAqCZw8k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o6pF32sNiDuCjsBaa5beZyFCv1PoqALZOhAb0GF0XyQ=";
|
||||
cargoHash = "sha256-UMMTdWJ0/M8lN4abTJEVUGtoNp/g49DyW+OASg3TKfg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "riffdiff";
|
||||
version = "2.23.3";
|
||||
version = "2.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "riff";
|
||||
rev = version;
|
||||
hash = "sha256-5C2Q9moFo39zeLK0PkY6S74I/MI8TVpD3tRAaX4TMT4=";
|
||||
hash = "sha256-NyVtGj4ZE/DdGWKt+v4LXAhf7ZK+JHjmLnViPypgmA4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xHdlU9YXvEvfspDntLLgWr/knAfjMmiWK9JCV9wtIIE=";
|
||||
cargoHash = "sha256-qsUFt+w9CEZdqzjf0EiB/Kkx2evHwOycrE8MYdrCHuo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A diff filter highlighting which line parts have changed";
|
||||
|
|
|
|||
|
|
@ -15557,7 +15557,8 @@ with pkgs;
|
|||
gerbil = callPackage ../development/compilers/gerbil { };
|
||||
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { };
|
||||
gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { };
|
||||
gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
|
||||
gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
|
||||
glow-lang = pkgs.gerbilPackages-unstable.glow-lang;
|
||||
|
||||
gbforth = callPackage ../development/compilers/gbforth { };
|
||||
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ mapAliases ({
|
|||
pep257 = pydocstyle; # added 2022-04-12
|
||||
poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09
|
||||
poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02
|
||||
Polygon3 = polygon3; # Added 2023-08-08
|
||||
poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
|
||||
postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
|
||||
powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
|
||||
|
|
|
|||
|
|
@ -5194,6 +5194,8 @@ self: super: with self; {
|
|||
|
||||
ipy = callPackage ../development/python-modules/IPy { };
|
||||
|
||||
ipycanvas = callPackage ../development/python-modules/ipycanvas { };
|
||||
|
||||
ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { };
|
||||
|
||||
ipynbname = callPackage ../development/python-modules/ipynbname { };
|
||||
|
|
@ -8313,7 +8315,7 @@ self: super: with self; {
|
|||
|
||||
polyline = callPackage ../development/python-modules/polyline { };
|
||||
|
||||
Polygon3 = callPackage ../development/python-modules/Polygon3 { };
|
||||
polygon3 = callPackage ../development/python-modules/polygon3 { };
|
||||
|
||||
pomegranate = callPackage ../development/python-modules/pomegranate { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue