Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-10-06 00:03:02 +00:00 committed by GitHub
commit c2b2bb3e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 667 additions and 1755 deletions

View File

@ -30,6 +30,14 @@ in mkLicense lset) ({
fullName = "Abstyles License";
};
acsl14 = {
fullName = "Anti-Capitalist Software License v1.4";
url = "https://anticapitalist.software/";
/* restrictions on corporations apply for both use and redistribution */
free = false;
redistributable = false;
};
afl20 = {
spdxId = "AFL-2.0";
fullName = "Academic Free License v2.0";

View File

@ -5997,6 +5997,15 @@
githubId = 134872;
name = "Sergei Lukianov";
};
fryuni = {
name = "Luiz Ferraz";
email = "luiz@lferraz.com";
github = "Fryuni";
githubId = 11063910;
keys = [{
fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC";
}];
};
fsagbuya = {
email = "fa@m-labs.ph";
github = "fsagbuya";
@ -11548,6 +11557,15 @@
githubId = 1776903;
name = "Andrew Abbott";
};
mirrorwitch = {
email = "mirrorwitch@transmom.love";
github = "mirrorwitch";
githubId = 146672255;
name = "mirrorwitch";
keys = [{
fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC";
}];
};
Misaka13514 = {
name = "Misaka13514";
email = "Misaka13514@gmail.com";
@ -15353,6 +15371,12 @@
githubId = 107703;
name = "Samuel Rivas";
};
samueltardieu = {
email = "nixpkgs@sam.rfc1149.net";
github = "samueltardieu";
githubId = 44656;
name = "Samuel Tardieu";
};
samw = {
email = "sam@wlcx.cc";
github = "wlcx";

View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.199.0";
version = "1.200.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-07IXz2xhnAJFq4YbxjY6EjWiS5MCgylDphYUDk7ILfM=";
hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0=";
};
postPatch = ''

View File

@ -11,13 +11,13 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2023.09.07",
"hash": "sha256-/ebjEOnmMH9pj8EZfyGP98fzBvSJepLTJGqK6xWoQWc="
"rev": "2023.10.02",
"hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q="
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2023.09.18",
"hash": "sha256-JwZ9abeodtPqzZZ8NlAEZQLgb81DB2NPBcbBphwhpb0="
"rev": "2023.10.03",
"hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
@ -31,13 +31,13 @@
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
"rev": "2023.08.12",
"hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ="
"rev": "2023.10.02",
"hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ="
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
"rev": "2023.05.15",
"hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo="
"rev": "2023.06.29",
"hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
},
"Emmet-Pascal": {
"owner": "Alexey-T",

View File

@ -9,7 +9,7 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.16" else "8.10.16-43.BETA";
version = if channel == "stable" then "8.10.16" else "8.10.18-19.BETA";
sources = {
stable = {
@ -33,19 +33,19 @@ let
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-7udgyaj84rnh5yn2RuvZzjDC6QsVdHh7vkJrStlW93I=";
hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-2c5pL5C3BgimI8D4+Be/FkKKDBflo5Oc24nzaI4Oa4Y=";
hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-f7Wme98qrmdzfipBoEEEa9PSOMiTqAica8gwKfZJLCE=";
hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-6hK+qEG5gUo8XBOnxYIC+x5L9ah8m6c6YS/WpIGjENo=";
hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4=";
};
};
};

View File

@ -4,39 +4,63 @@
, pkg-config
, xorg
, cairo
, wayland
, wayland-protocols
, wayland-scanner
, libconfig
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "activate-linux";
version = "unstable-2022-05-22";
version = "1.1.0";
src = fetchFromGitHub {
owner = "MrGlockenspiel";
repo = pname;
rev = "18a6dc9771c568c557569ef680386d5d67f25e96";
sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE=";
repo = "activate-linux";
rev = "v${finalAttrs.version}";
hash = "sha256-6XnoAoZwAs2hKToWlDqkaGqucmV1VMkEc4QO0G0xmrg=";
};
makeFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [
pkg-config
wayland-scanner
];
buildInputs = [
cairo
xorg.libX11
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXinerama
cairo
xorg.libXrandr
xorg.libXt
xorg.xorgproto
wayland
wayland-protocols
libconfig
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/man/man1
cp activate-linux $out/bin
cp activate-linux.1 $out/share/man/man1
runHook postInstall
'';
meta = with lib; {
description = "The \"Activate Windows\" watermark ported to Linux";
homepage = "https://github.com/MrGlockenspiel/activate-linux";
license = licenses.gpl3;
maintainers = with maintainers; [ alexnortung ];
maintainers = with maintainers; [ alexnortung donovanglover ];
platforms = platforms.linux;
mainProgram = "activate-linux";
};
}
})

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nchat";
version = "3.60";
version = "3.67";
src = fetchFromGitHub {
owner = "d99kris";
repo = "nchat";
rev = "v${version}";
hash = "sha256-Fe+Cdh8NlrCkzSO/Juw96eXtGfXajhFIsKeTC3qXIlU=";
hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI=";
};
postPatch = ''

View File

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "pyrosimple";
version = "2.11.1";
version = "2.11.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "kannibalox";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-J3eRuQK53Tsh1vhIgEUYBv08c6v3fSMzgK2PIhA13Qw=";
hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A=";
};
pythonRelaxDeps = [

View File

@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
xorg.libX11.dev
];
configureFlags = [ "LDFLAGS=-lGL" ];
enableParallelBuilding = true;
meta = with lib; {

View File

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "6.2.0";
version = "6.2.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-rq4beEhEb5CZjGIyTnEHyPQfjAgmbbxBm4HhzBs1VZo=";
hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI=";
};
nativeCheckInputs = with python3Packages; [

View File

@ -1,18 +1,53 @@
From 5c41e49b79ef85e7e23748fbeeaf65df8b769263 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 10 Jun 2023 14:17:16 +0200
Subject: [PATCH] Make arch detection optional and fix targets
---
Makefile | 6 +++---
configure.sh | 22 +++++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index d21c53bf..fe982b24 100644
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,8 @@ stuff/%.o: stuff/%.c ctx.h stuff/*.h stuff/*.inc Makefile build.conf
diff -Naur --no-dereference ctx-source-old/configure.sh ctx-source-new/configure.sh
--- ctx-source-old/configure.sh 1969-12-31 21:00:01.000000000 -0300
+++ ctx-source-new/configure.sh 2023-09-27 19:26:05.403569888 -0300
@@ -42,15 +42,18 @@
ENABLE_SWITCH_DISPATCH=1
pkg-config sdl2 && HAVE_SDL=1
-pkg-config babl && HAVE_BABL=1
+
+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
+if [ $HAVE_BABL != 1 ]; then
+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
+fi
+
pkg-config libcurl && HAVE_LIBCURL=1
pkg-config alsa && HAVE_ALSA=1
pkg-config libdrm && HAVE_KMS=1
#pkg-config harfbuzz && HAVE_HARFBUZZ=1
-
-
-ARCH=`uname -m`
+: "${ARCH:="$(uname -m)"}"
case "$ARCH" in
"x86_64") HAVE_SIMD=1 ;;
@@ -224,8 +227,8 @@
if [ $HAVE_BABL = 1 ];then
echo "#define CTX_BABL 1 " >> local.conf
echo "#define CTX_ENABLE_CM 1 " >> local.conf
- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
+ echo "CTX_CFLAGS+= `pkg-config "${BABL_NAME}" --cflags`" >> build.conf
+ echo "CTX_LIBS+= `pkg-config "${BABL_NAME}" --libs` " >> build.conf
else
echo "#define CTX_BABL 0 " >> local.conf
echo "#define CTX_ENABLE_CM 0 " >> local.conf
@@ -335,7 +338,7 @@
#echo "Generating build.deps"
#make build.deps 2>/dev/null
-echo -n "configuration summary, architecture $(arch)"
+echo -n "configuration summary, architecture $ARCH"
[ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
echo ""
echo "Backends:"
diff -Naur --no-dereference ctx-source-old/Makefile ctx-source-new/Makefile
--- ctx-source-old/Makefile 1969-12-31 21:00:01.000000000 -0300
+++ ctx-source-new/Makefile 2023-09-27 19:37:23.779830320 -0300
@@ -206,8 +206,8 @@
libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile
$(AR) rcs $@ $(CTX_OBJS) deps.o itk.o
libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile
@ -23,64 +58,10 @@ index d21c53bf..fe982b24 100644
ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a
$(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS)
@@ -276,5 +276,5 @@ itk/w3c-constants.h: itk/css.h Makefile squoze/squoze
@@ -277,5 +277,5 @@
for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \
>> $@
echo '#endif' >> $@
-static.inc: static/* static/*/* tools/gen_fs.sh
+static.inc: static/* tools/gen_fs.sh
./tools/gen_fs.sh static > $@
diff --git a/configure.sh b/configure.sh
index ad388a5d..fd9d3b96 100755
--- a/configure.sh
+++ b/configure.sh
@@ -43,16 +43,20 @@ ENABLE_FAST_FILL_RECT=1
ENABLE_SWITCH_DISPATCH=1
pkg-config sdl2 && HAVE_SDL=1
-pkg-config babl && HAVE_BABL=1
-pkg-config cairo && HAVE_CAIRO=1
-pkg-config libcurl && HAVE_LIBCURL=1
-pkg-config alsa && HAVE_ALSA=1
-pkg-config libdrm && HAVE_KMS=1
+# https://github.com/GNOME/gimp/blob/828a8a7fe7ecd1825387f37a42922bc50fa32be9/meson.build#L349
+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
+if [ $HAVE_BABL != 1 ];then
+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
+fi
+pkg-config cairo && HAVE_CAIRO=1
+pkg-config libcurl && HAVE_LIBCURL=1
+pkg-config alsa && HAVE_ALSA=1
+pkg-config libdrm && HAVE_KMS=1
#pkg-config harfbuzz && HAVE_HARFBUZZ=1
-ARCH=`uname -m`
+: "${ARCH:="$(uname -m)"}"
case "$ARCH" in
"x86_64") HAVE_SIMD=1 ;;
@@ -229,8 +233,8 @@ echo >> build.conf
if [ $HAVE_BABL = 1 ];then
echo "#define CTX_BABL 1 " >> local.conf
echo "#define CTX_ENABLE_CM 1 " >> local.conf
- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
+ echo "CTX_CFLAGS+= `pkg-config "$BABL_NAME" --cflags`" >> build.conf
+ echo "CTX_LIBS+= `pkg-config "$BABL_NAME" --libs` " >> build.conf
else
echo "#define CTX_BABL 0 " >> local.conf
echo "#define CTX_ENABLE_CM 0 " >> local.conf
@@ -348,7 +352,7 @@ echo "LIBS=$LIBS" >> build.conf
#echo "Generating build.deps"
#make build.deps 2>/dev/null
-echo -n "configuration summary, architecture $(arch)"
+echo -n "configuration summary, architecture $ARCH"
[ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
echo ""
echo "Backends:"
--
2.40.1

View File

@ -1,42 +1,42 @@
{ lib
, stdenv
, fetchgit
, pkg-config
, xxd
, SDL2
, alsa-lib
, babl
, bash
, cairo
, curl
, libdrm # Not documented
, pkg-config
, xxd
, enableFb ? false
, nixosTests
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "ctx";
version = "unstable-2023-06-05";
version = "unstable-2023-09-03";
src = fetchgit {
name = "ctx-source"; # because of a dash starting the directory
url = "https://ctx.graphics/.git/";
rev = "2eb3886919d0a0b8c305e4f9e18428dad5e73ca0";
sha256 = "sha256-PLUyGArxLU742IKIgpzxdBdc94mWWSkHNFoXGW8L/Zo=";
rev = "1bac18c152eace3ca995b3c2b829a452085d46fb";
hash = "sha256-fOcQJ2XCeomdtAUmy0A+vU7Vt325OSwrb1+ccW+gZ38=";
};
patches = [
./0001-Make-arch-detection-optional-and-fix-targets.patch
# Many problematic things fixed - it should be upstreamed somehow:
# - babl changed its name in pkg-config files
# - arch detection made optional
# - LD changed to CCC
# - remove inexistent reference to static/*/*
./0001-fix-detections.diff
];
postPatch = ''
patchShebangs ./tools/gen_fs.sh
'';
strictDeps = true;
env.ARCH = stdenv.hostPlatform.parsed.cpu.arch;
nativeBuildInputs = [
pkg-config
xxd
@ -47,11 +47,14 @@ stdenv.mkDerivation {
alsa-lib
babl
bash # for ctx-audioplayer
cairo
curl
libdrm
];
strictDeps = true;
env.ARCH = stdenv.hostPlatform.parsed.cpu.arch;
configureScript = "./configure.sh";
configureFlags = lib.optional enableFb "--enable-fb";
configurePlatforms = [];
@ -64,16 +67,16 @@ stdenv.mkDerivation {
passthru.tests.test = nixosTests.terminal-emulators.ctx;
meta = with lib; {
meta = {
homepage = "https://ctx.graphics/";
description = "Vector graphics terminal";
longDescription= ''
longDescription = ''
ctx is an interactive 2D vector graphics, audio, text- canvas and
terminal, with escape sequences that enable a 2D vector drawing API using
a vector graphics protocol.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres];
platforms = platforms.unix;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
}
})

View File

@ -17,13 +17,13 @@
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.28.1";
version = "2.28.12";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-Wy4FPvBQY2CvpR9QiFbI1wI2ztUAc1XvaOGaGH7SkKs=";
hash = "sha256-uWCpCjYFtK2pNeHHZWhWI6YZ+cllQpkKz//nHracl5s=";
};
postPatch = ''

View File

@ -1,29 +1,27 @@
{ lib
, buildPythonApplication
, python3
, fetchFromGitHub
, lxml
, setuptools
, six
}:
buildPythonApplication rec {
pname = "xmldiff";
version = "2.4";
let
version = "2.6.3";
src = fetchFromGitHub {
owner = "Shoobx";
repo = pname;
repo = "xmldiff";
rev = version;
hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE=";
hash = "sha256-qn8gGultTSNKPUro6Ap4xJGcbpxV+lKgZFpKvyPdhtc=";
};
in
python3.pkgs.buildPythonApplication {
pname = "xmldiff";
inherit version src;
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
lxml
setuptools
six
];
meta = with lib; {
meta = {
homepage = "https://xmldiff.readthedocs.io/en/stable/";
description = "A library and command line utility for diffing xml";
longDescription = ''
@ -37,7 +35,7 @@ buildPythonApplication rec {
would not be be readable by a human. xmldiff provides tools to make human
readable diffs in those situations.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres anpryl ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres anpryl ];
};
}

View File

@ -0,0 +1,82 @@
# Lambda Lisp has several backends, here we are using
# the blc one. Ideally, this should be made into several
# packages such as lambda-lisp-blc, lambda-lisp-lazyk,
# lambda-lisp-clamb, etc.
{ lib
, gccStdenv
, fetchFromGitHub
, fetchurl
, runtimeShell
}:
let
stdenv = gccStdenv;
s = import ./sources.nix { inherit fetchurl fetchFromGitHub; };
in
stdenv.mkDerivation rec {
pname = "lambda-lisp-blc";
version = s.lambdaLispVersion;
src = s.src;
flatSrc = s.flatSrc;
blcSrc = s.blcSrc;
installPhase = ''
runHook preInstall
mkdir -p ./build
cp $blcSrc ./build/Blc.S
cp $flatSrc ./build/flat.lds
cd build;
cat Blc.S | sed -e 's/#define.*TERMS.*//' > Blc.ext.S;
$CC -c -DTERMS=50000000 -o Blc.o Blc.ext.S
ld.bfd -o Blc Blc.o -T flat.lds
cd ..;
mv build/Blc ./bin
install -D -t $out/bin bin/Blc
install -D -t $out/lib bin/lambdalisp.blc
cd build;
$CC ../tools/asc2bin.c -O2 -o asc2bin;
cd ..;
mv build/asc2bin ./bin;
chmod 755 ./bin/asc2bin;
install -D -t $out/bin bin/asc2bin
echo -e "#!${runtimeShell}\n( cat $out/lib/lambdalisp.blc | $out/bin/asc2bin; cat ) | $out/bin/Blc" > lambda-lisp-blc
chmod +x lambda-lisp-blc
install -D -t $out/bin lambda-lisp-blc
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
a=$(echo "(* (+ 1 2 3 4 5 6 7 8 9 10) 12020569 (- 2 5))" | $out/bin/lambda-lisp-blc | tr -d "> ");
test $a == -1983393885
runHook postInstallCheck
'';
meta = with lib; {
description = "A Lisp interpreter written in untyped lambda calculus";
homepage = "https://github.com/woodrush/lambdalisp";
longDescription = ''
LambdaLisp is a Lisp interpreter written as a closed untyped lambda calculus term.
It is written as a lambda calculus term LambdaLisp = λx. ... which takes a string
x as an input and returns a string as an output. The input x is the Lisp program
and the user's standard input, and the output is the standard output. Characters
are encoded into lambda term representations of natural numbers using the Church
encoding, and strings are encoded as a list of characters with lists expressed as
lambdas in the Mogensen-Scott encoding, so the entire computation process solely
consists of the beta-reduction of lambda terms, without introducing any
non-lambda-type object.
'';
license = licenses.mit;
maintainers = with maintainers; [ cafkafk ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -0,0 +1,50 @@
let
lambdaLispVersion = "2022-08-18";
blcVersion = "2";
# Archive of "https://justine.lol/lambda/";
justineLolArchive = "https://web.archive.org/web/20230614065521if_/https://justine.lol/lambda/";
in
{ fetchFromGitHub, fetchurl }: {
inherit blcVersion;
inherit lambdaLispVersion;
src = fetchFromGitHub {
owner = "woodrush";
repo = "lambdalisp";
rev = "2119cffed1ab2005f08ab3cfca92028270f08725";
hash = "sha256-ml2xQ8s8sux+6GwTw8mID3PEOcH6hn8tyc/UI5tFaO0=";
};
uniCSrc = fetchFromGitHub {
owner = "tromp";
repo = "tromp.github.io";
rev = "b4de12e566c1fb0fa3f3babe89bac885f4c966a4";
hash = "sha256-JmbqQp2kkkkkkkkSWQmG3uBxdgyIu4r2Ch8bBGyQ4H4=";
};
# needed later
clambSrc = fetchFromGitHub {
owner = "irori";
repo = "clamb";
rev = "44c1208697f394e22857195be5ea73bfdd48ebd1";
hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY=";
};
# needed later
lazykSrc = fetchFromGitHub {
owner = "irori";
repo = "lazyk";
rev = "5edb0b834d0af5f7413c484eb3795d47ec2e3894";
hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY=";
};
blcSrc = fetchurl {
url = "${justineLolArchive}Blc.S?v=${blcVersion}";
hash = "sha256-qt7vDtn9WvDoBaLESCyyscA0u74914e8ZKhLiUAN52A=";
};
flatSrc = fetchurl {
url = "${justineLolArchive}flat.lds";
hash = "sha256-HxX+10rV86zPv+UtF+n72obtz3DosWLMIab+uskxIjA=";
};
}

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "4.2.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-7E/of0WP28VM7ceDCBsSCb6ot3FEYUZkHVk0H/LcbGk=";
hash = "sha256-GROw9TYKC53ECJUeYhCez8f2jImPla/lGgsP91tTGjQ=";
};
cargoHash = "sha256-1YlwYgnZzkYjY2yQlSZTs3JrUnIeZgpCDZBevqlj4WM=";
cargoHash = "sha256-JE7FDF4MWhqJbL7ZP+yzfV7/Z79x0NuQLYNwWwMjAao=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@ -2,14 +2,14 @@
let
pname = "phpstan";
version = "1.10.33";
version = "1.10.37";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-dFIuCVYmZr6E0181jegKs6d3mA9jPoFqoIY+lyWl7P8=";
sha256 = "sha256-i1h3N11MsKhHx/RJxAthnUbjacA5yZJF6bzmQnmEKzg=";
};
dontUnpack = true;

View File

@ -9,7 +9,7 @@
, setuptools
# runtime
, ffmpeg-headless
, ffmpeg_5-headless
# tests
, numpy
@ -38,7 +38,7 @@ buildPythonPackage rec {
];
buildInputs = [
ffmpeg-headless
ffmpeg_5-headless
];
preCheck = ''

View File

@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pydicom
, pyfakefs
, pytestCheckHook
@ -23,6 +24,14 @@ buildPythonPackage rec {
hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
};
patches = [
(fetchpatch {
name = "fix-python-3.11-test-attribute-errors";
url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch";
hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4=";
})
];
propagatedBuildInputs = [
pydicom
];

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
version = "20.5";
version = "20.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/AdGpOl87EeVDCAZLjtan7ttE2vUL0gi1qeM18ilYEQ=";
hash = "sha256-t6yHl2uNdGaTLdbQTXp3+zds2pab4T6Pe69mu31HahA=";
};
nativeBuildInputs = [

View File

@ -8,6 +8,7 @@
, pythonOlder
, pyyaml
, qcelemental
, msgpack
}:
buildPythonPackage rec {
@ -28,6 +29,7 @@ buildPythonPackage rec {
pydantic
pyyaml
qcelemental
msgpack
];
nativeCheckInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "tank-utility";
version = "1.4.1";
version = "1.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,16 +20,10 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "krismolendyke";
repo = pname;
rev = version;
hash = "sha256-2cxAaSyreIzQzCUtiolEV7JbGFKL8Mob3337J0jlMsU=";
rev = "refs/tags/${version}";
hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E=";
};
postPatch = ''
# urllib3[secure] is not picked-up
substituteInPlace setup.py \
--replace "urllib3[secure]" "urllib3"
'';
propagatedBuildInputs = [
requests
urllib3
@ -49,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for the Tank Utility API";
homepage = "https://github.com/krismolendyke/tank-utility";
changelog = "https://github.com/krismolendyke/tank-utility/blob/${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

File diff suppressed because it is too large Load Diff

View File

@ -60,21 +60,18 @@ let
in
buildPythonPackage rec {
pname = "tokenizers";
version = "0.13.3";
version = "0.14.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
hash = "sha256-QZG5jmr3vbyQs4mVBjwVDR31O66dUM+p39R0htJ1umk=";
rev = "v${version}";
hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE=";
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
@ -85,6 +82,7 @@ buildPythonPackage rec {
pkg-config
setuptools-rust
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
cargo
rustc
];

View File

@ -51,7 +51,7 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.33.2";
version = "4.34.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -60,7 +60,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-i2ruOOkuEHHwzGT2Iqy+Pt1sBBUx43eiNkwf2Iqdcfc=";
hash = "sha256-hDZU/3bQ1k4uL3kDEW3+pB4g8jhC8ospRqE55jIqrP0=";
};
propagatedBuildInputs = [

View File

@ -11,19 +11,19 @@
buildPythonPackage rec {
pname = "y-py";
version = "0.6.0";
version = "0.6.2";
format = "pyproject";
src = fetchPypi {
pname = "y_py";
inherit version;
hash = "sha256-RoNhaffcKVffhRPP5LwgCRdbOkc+Ywr0IajnXuHEj5g=";
hash = "sha256-R1eoKlBAags6MzqgEiAZozG9bxbkn+1n3KQj+Siz/U0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ=";
hash = "sha256-RXwrDSPU0wiprsUJwoDzti14H/+bSwy4hK4tYhNVfYw=";
};
nativeBuildInputs = [

View File

@ -2,6 +2,10 @@
, electron-unwrapped
, wrapGAppsHook
, makeWrapper
, gsettings-desktop-schemas
, glib
, gtk3
, gtk4
}:
stdenv.mkDerivation {
@ -9,9 +13,14 @@ stdenv.mkDerivation {
inherit (electron-unwrapped) version;
nativeBuildInputs = [ wrapGAppsHook makeWrapper ];
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk3 gtk4
];
dontWrapGApps = true;
buildCommand = ''
gappsWrapperArgsHook
mkdir -p $out/bin
makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \
"''${gappsWrapperArgs[@]}" \

View File

@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "gci";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "daixiang0";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qNkSAbVhX4P+DqCtxXSnxYjZwq/nMYsDpEif+q1oTIA=";
sha256 = "sha256-1JYmnMXm2ywGZAVhcfzvF1I1h0pBvijbeVmqKzgiz8U=";
};
vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8=";
vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ=";
meta = with lib; {
description = "Controls golang package import order and makes it always deterministic";

View File

@ -0,0 +1,33 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, pkg-config
, libusb1
, DarwinTools
, AppKit
}:
rustPlatform.buildRustPackage rec {
pname = "rtthost";
version = "0.20.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-h/D2LW8tQ2WfVrP+HOLs3Gg7HS2Rd0zXBxbnxvEeiWk=";
};
cargoHash = "sha256-cEzp33y1wuOrKHJBdAPxWUc1ANpT7Sg1MZmaCno1WKA=";
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
meta = with lib; {
description = "RTT (Real-Time Transfer) client";
homepage = "https://probe.rs/";
changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ samueltardieu ];
};
}

View File

@ -1,7 +1,9 @@
{
lib,
stdenv,
buildGo121Module,
fetchFromGitHub,
installShellFiles,
}:
buildGo121Module rec {
pname = "turso-cli";
@ -16,6 +18,8 @@ buildGo121Module rec {
vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE=";
nativeBuildInputs = [ installShellFiles ];
# Build with production code
tags = ["prod"];
# Include version for `turso --version` reporting
@ -23,14 +27,22 @@ buildGo121Module rec {
echo "v${version}" > internal/cmd/version.txt
'';
# Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error.
doCheck = false;
preCheck = ''
export HOME=$(mktemp -d)
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd turso \
--bash <($out/bin/turso completion bash) \
--fish <($out/bin/turso completion fish) \
--zsh <($out/bin/turso completion zsh)
'';
meta = with lib; {
description = "This is the command line interface (CLI) to Turso.";
homepage = "https://turso.tech";
mainProgram = "turso";
license = licenses.mit;
maintainers = with maintainers; [ zestsystem kashw2 ];
maintainers = with maintainers; [ zestsystem kashw2 fryuni ];
};
}

View File

@ -5,25 +5,32 @@
, pkg-config
, IOKit
, Foundation
, nix-update-script
}:
let
rustPlatform.buildRustPackage rec {
pname = "nushell_plugin_formats";
in
rustPlatform.buildRustPackage {
inherit pname;
version = "0.85.0";
src = nushell.src;
inherit (nushell) version src;
cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0=";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ];
cargoBuildFlags = [ "--package nu_plugin_formats" ];
doCheck = false;
checkPhase = ''
cargo test --manifest-path crates/nu_plugin_formats/Cargo.toml
'';
passthru.updateScript = nix-update-script {
# Skip the version check and only check the hash because we inherit version from nushell.
extraArgs = [ "--version=skip" ];
};
meta = with lib; {
description = "A formats plugin for Nushell";
homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_formats";
homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats";
license = licenses.mpl20;
maintainers = with maintainers; [ viraptor ];
maintainers = with maintainers; [ viraptor aidalgol ];
platforms = with platforms; all;
};
}

View File

@ -5,25 +5,32 @@
, nushell
, pkg-config
, Security
, nix-update-script
}:
let
rustPlatform.buildRustPackage rec {
pname = "nushell_plugin_gstat";
in
rustPlatform.buildRustPackage {
inherit pname;
version = "0.85.0";
src = nushell.src;
inherit (nushell) version src;
cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoBuildFlags = [ "--package nu_plugin_gstat" ];
doCheck = false; # some tests fail
checkPhase = ''
cargo test --manifest-path crates/nu_plugin_gstat/Cargo.toml
'';
passthru.updateScript = nix-update-script {
# Skip the version check and only check the hash because we inherit version from nushell.
extraArgs = [ "--version=skip" ];
};
meta = with lib; {
description = "A git status plugin for Nushell";
homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gstat";
homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat";
license = licenses.mpl20;
maintainers = with maintainers; [ mrkkrp ];
maintainers = with maintainers; [ mrkkrp aidalgol ];
platforms = with platforms; all;
};
}

View File

@ -9,28 +9,26 @@
rustPlatform.buildRustPackage {
pname = "nushell_plugin_query";
version = "0.85.0";
src = nushell.src;
inherit (nushell) version src;
cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do=";
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
cargoBuildFlags = [ "--package nu_plugin_query" ];
# compilation fails with a missing symbol
doCheck = false;
checkPhase = ''
cargo test --manifest-path crates/nu_plugin_query/Cargo.toml
'';
passthru = {
updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
# Skip the version check and only check the hash because we inherit version from nushell.
extraArgs = [ "--version=skip" ];
};
meta = with lib; {
description = "A Nushell plugin to query JSON, XML, and various web data";
homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_query";
homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query";
license = licenses.mpl20;
maintainers = with maintainers; [ happysalada ];
maintainers = with maintainers; [ happysalada aidalgol ];
platforms = with platforms; all;
};
}

View File

@ -1,16 +1,23 @@
{ lib, stdenv, fetchurl, python3, runtimeShell }:
{ lib
, stdenv
, fetchurl
, python3
, runtimeShell
}:
stdenv.mkDerivation rec {
pname = "mozlz4a";
version = "2018-08-23";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
version = "2022-03-19";
src = fetchurl {
url = "https://gist.githubusercontent.com/kaefer3000/73febe1eec898cd50ce4de1af79a332a/raw/a266410033455d6b4af515d7a9d34f5afd35beec/mozlz4a.py";
sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6";
url = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5/raw/c12fce199a97ecb214eb913cc5d762eac2e92c57/mozlz4a.py";
hash = "sha256-Igj9u6TmV+nIuSg8gI8zD4hTb/Iiog/3aB3DDk0Lqkg=";
};
dontUnpack = true;
buildInputs = [ python3 python3.pkgs.lz4 ];
installPhase = ''
mkdir -p "$out/bin" "$out/${python3.sitePackages}/"
cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py"
@ -21,13 +28,11 @@ stdenv.mkDerivation rec {
chmod a+x "$out/bin/mozlz4a"
'';
buildInputs = [ python3 python3.pkgs.lz4 ];
meta = {
description = "A script to handle Mozilla's mozlz4 files";
license = lib.licenses.bsd2;
maintainers = [lib.maintainers.raskin lib.maintainers.pshirshov lib.maintainers.kira-bruneau];
platforms = lib.platforms.unix;
homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5";
meta = with lib; {
description = "MozLz4a compression/decompression utility";
license = licenses.bsd2;
maintainers = with maintainers; [ kira-bruneau pshirshov raskin ];
platforms = python3.meta.platforms;
homepage = "https://gist.github.com/Tblue/62ff47bef7f894e92ed5";
};
}

View File

@ -0,0 +1,20 @@
{ lib, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "moon-phases";
version = "0.3.3";
src = fetchCrate {
inherit pname version;
hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY=";
};
cargoSha256 = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM=";
meta = with lib; {
description = "Command-line/WM bar tool to display the moon phase at a certain date";
homepage = "https://github.com/mirrorwitch/moon-phases";
license = licenses.acsl14;
maintainers = with maintainers; [ mirrorwitch ];
};
}

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.83.0";
version = "0.86.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
hash = "sha256-e2wcRawTEyK/NwSwd2WUgOnQnAj8Z7DQrrx32ksfHeU=";
hash = "sha256-Ucp00OjyPtHA6so/NOzTLtPSuhXwz6A2708w2WIZb/E=";
};
# there is a nested go.mod
sourceRoot = "${src.name}/cmd/otelcorecol";
vendorHash = "sha256-HZ7aKLVjDMdMuq8IQ/6EgqCXWeYHmrJtf1fJyrLbPuU=";
vendorHash = "sha256-DfbG2qrhwVMXYjg2yJ6XlhrL27oPplvWIoP3C/JBKuA=";
# upstream strongly recommends disabling CGO
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nmap-formatter";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "vdjagilev";
repo = pname;
rev = "v${version}";
hash = "sha256-i2g+l5XJkBjXMbJwpSirEKCDxO2Ric4CwF3jzue/4+o=";
hash = "sha256-Y7BAMJlcu5j8css2F75Bgq90nUGGo/H/kNc5aVwFJew=";
};
vendorHash = "sha256-YAsWXbIyeC4uhzRFXX/bZs3cOvEa3k4/ZCoDisUN1Yw=";
vendorHash = "sha256-c2n8GlaD6q21gWUqr31UOioZRxO0s0tSpVRKl/YHXZU=";
meta = with lib; {
description = "Tool that allows you to convert nmap output";

View File

@ -732,6 +732,11 @@ with pkgs;
inherit (darwin) DarwinTools;
};
rtthost = callPackage ../development/tools/rust/rtthost {
inherit (darwin.apple_sdk.frameworks) AppKit;
inherit (darwin) DarwinTools;
};
mix2nix = callPackage ../development/tools/mix2nix { };
n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
@ -2987,8 +2992,6 @@ with pkgs;
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
ctx = callPackage ../applications/terminal-emulators/ctx { };
darklua = callPackage ../development/tools/darklua { };
darktile = callPackage ../applications/terminal-emulators/darktile { };
@ -6036,6 +6039,8 @@ with pkgs;
moodle-dl = callPackage ../tools/networking/moodle-dl { };
moon-phases = callPackage ../tools/misc/moon-phases { };
moonraker = callPackage ../servers/moonraker { };
morsel = callPackage ../tools/text/morsel { };
@ -15029,8 +15034,6 @@ with pkgs;
xml2 = callPackage ../tools/text/xml/xml2 { };
xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { };
xmlformat = callPackage ../tools/text/xml/xmlformat { };
xmlroff = callPackage ../tools/typesetting/xmlroff { };
@ -17905,6 +17908,9 @@ with pkgs;
konf = callPackage ../development/tools/konf { };
lambda-lisp = callPackage ../development/interpreters/lambda-lisp { };
lambda-lisp-blc = lambda-lisp;
lolcode = callPackage ../development/interpreters/lolcode { };
love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };