Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-19 00:55:36 +00:00 committed by GitHub
commit 7000ae2b9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 626 additions and 171 deletions

View file

@ -48,7 +48,7 @@ in {
startAt = mkOption { startAt = mkOption {
default = "*-*-* 01:15:00"; default = "*-*-* 01:15:00";
type = types.str; type = with types; either (listOf str) str;
description = '' description = ''
This option defines (see <literal>systemd.time</literal> for format) when the This option defines (see <literal>systemd.time</literal> for format) when the
databases should be dumped. databases should be dumped.

View file

@ -4,21 +4,29 @@ with lib;
let let
cfg = config.services.prometheus.xmpp-alerts; cfg = config.services.prometheus.xmpp-alerts;
settingsFormat = pkgs.formats.yaml {};
configFile = pkgs.writeText "prometheus-xmpp-alerts.yml" (builtins.toJSON cfg.configuration); configFile = settingsFormat.generate "prometheus-xmpp-alerts.yml" cfg.settings;
in in
{ {
options.services.prometheus.xmpp-alerts = { imports = [
(mkRenamedOptionModule
[ "services" "prometheus" "xmpp-alerts" "configuration" ]
[ "services" "prometheus" "xmpp-alerts" "settings" ])
];
options.services.prometheus.xmpp-alerts = {
enable = mkEnableOption "XMPP Web hook service for Alertmanager"; enable = mkEnableOption "XMPP Web hook service for Alertmanager";
configuration = mkOption { settings = mkOption {
type = types.attrs; type = settingsFormat.type;
description = "Configuration as attribute set which will be converted to YAML"; default = {};
};
description = ''
Configuration for prometheus xmpp-alerts, see
<link xlink:href="https://github.com/jelmer/prometheus-xmpp-alerts/blob/master/xmpp-alerts.yml.example"/>
for supported values.
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {

View file

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ]; buildInputs = [ gtk2 ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with lib; { meta = with lib; {
homepage = "http://spacenav.sourceforge.net/"; homepage = "http://spacenav.sourceforge.net/";
description = "Interactive configuration GUI for space navigator input devices"; description = "Interactive configuration GUI for space navigator input devices";

View file

@ -11,6 +11,8 @@ stdenv.mkDerivation {
sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax";
}; };
makeFlags = [ "C=${stdenv.cc.targetPrefix}c++" ];
installPhase = '' installPhase = ''
install -Dm755 sunwait -t $out/bin install -Dm755 sunwait -t $out/bin
''; '';

View file

@ -1,4 +1,5 @@
{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: { mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake
, makeDesktopItem }:
# we now have libqmatrixclient so a future version of tensor that supports it # we now have libqmatrixclient so a future version of tensor that supports it
# should use that # should use that
@ -30,7 +31,15 @@ mkDerivation rec {
mimeType = "application/x-chat"; mimeType = "application/x-chat";
}; };
installPhase = '' installPhase = if stdenv.isDarwin then ''
runHook preInstall
mkdir -p $out/Applications
cp -r tensor.app $out/Applications/tensor.app
wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor
runHook postInstall
'' else ''
runHook preInstall runHook preInstall
install -Dm755 tensor $out/bin/tensor install -Dm755 tensor $out/bin/tensor

View file

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
buildInputs = [ boost165 ]; buildInputs = [ boost165 ];
makeFlags = [
"CXX=${stdenv.cc.targetPrefix}c++"
"BOOST_DIR=${boost165.dev}/include"
];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mv starspace $out/bin mv starspace $out/bin

View file

@ -39,5 +39,8 @@ stdenv.mkDerivation rec {
license = licenses.bsd2; license = licenses.bsd2;
maintainers = [ maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux; platforms = platforms.linux;
knownVulnerabilities = [
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
];
}; };
} }

View file

@ -36,5 +36,8 @@ stdenv.mkDerivation {
homepage = "https://sourceforge.net/projects/materm"; homepage = "https://sourceforge.net/projects/materm";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
knownVulnerabilities = [
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
];
}; };
} }

View file

@ -9,7 +9,7 @@
let let
pname = "rxvt-unicode"; pname = "rxvt-unicode";
version = "9.22"; version = "9.26";
description = "A clone of the well-known terminal emulator rxvt"; description = "A clone of the well-known terminal emulator rxvt";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -31,7 +31,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4";
}; };
buildInputs = buildInputs =

View file

@ -35,5 +35,8 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
knownVulnerabilities = [
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
];
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "1.9.2"; version = "1.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "0lx6sx3zkjq9855va1vxbd5g47viqkrchk5d2rb6xj7zywwm4mgb"; sha256 = "sha256-nQc10uTb7yQoH9rlMQiexttdAnnPRGaHCrzZNqkZcIc=";
}; };
vendorSha256 = "1zmyd566xcksgqm0f7mq0rkfnxk0fmf39k13fcp9jy30c1y9681v"; vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -6,13 +6,13 @@
buildKodiBinaryAddon rec { buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple"; pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple"; namespace = "pvr.iptvsimple";
version = "7.6.4"; version = "7.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kodi-pvr"; owner = "kodi-pvr";
repo = "pvr.iptvsimple"; repo = "pvr.iptvsimple";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "sha256-F2uvf3BChN4p4VV1vTMAAPwQchVI5paTdxSFEi0u9a0="; sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA=";
}; };
extraBuildInputs = [ extraBuildInputs = [

View file

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
}; };
makeFlags = [ "PREFIX=${placeholder "out"}"]; makeFlags = [
"PREFIX=${placeholder "out"}"
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = with lib; { meta = with lib; {
homepage = "https://cc65.github.io/"; homepage = "https://cc65.github.io/";

View file

@ -22,7 +22,7 @@
, enableGtk2 ? false, gtk2 , enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3 , enableGtk3 ? false, gtk3
, enableVtk ? false, vtk , enableVtk ? false, vtk
, enableFfmpeg ? false, ffmpeg_3 , enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1 , enableGStreamer ? false, gst_all_1
, enableTesseract ? false, tesseract, leptonica , enableTesseract ? false, tesseract, leptonica
, enableTbb ? false, tbb , enableTbb ? false, tbb
@ -188,7 +188,7 @@ stdenv.mkDerivation {
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff
++ lib.optional enableWebP libwebp ++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals (enableFfmpeg && stdenv.isDarwin) ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ] [ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])

View file

@ -45,7 +45,7 @@
, enableVtk ? false , enableVtk ? false
, vtk , vtk
, enableFfmpeg ? true , enableFfmpeg ? true
, ffmpeg_3 , ffmpeg
, enableGStreamer ? true , enableGStreamer ? true
, gst_all_1 , gst_all_1
, enableTesseract ? false , enableTesseract ? false
@ -252,7 +252,7 @@ stdenv.mkDerivation {
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff
++ lib.optional enableWebP libwebp ++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals (enableFfmpeg && stdenv.isDarwin) ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ] [ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])

View file

@ -6,7 +6,7 @@
, enablePNG ? true, libpng , enablePNG ? true, libpng
, enableTIFF ? true, libtiff , enableTIFF ? true, libtiff
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
, enableFfmpeg ? false, ffmpeg_3 , enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1 , enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen , enableEigen ? true, eigen
, Cocoa, QTKit , Cocoa, QTKit
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ lib.optional enablePNG libpng ++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, fuse, zlib }: { lib, stdenv, fetchurl, fuse, zlib
, withFuse ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "sqlar"; pname = "sqlar";
@ -9,12 +10,21 @@ stdenv.mkDerivation {
sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9"; sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9";
}; };
buildInputs = [ fuse zlib ]; postPatch = ''
substituteInPlace Makefile \
--replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ]; buildInputs = [ zlib ]
++ lib.optional withFuse fuse;
buildFlags = [ "CFLAGS=-Wno-error" "sqlar" ]
++ lib.optional withFuse "sqlarfs";
installPhase = '' installPhase = ''
install -D -t $out/bin sqlar sqlarfs install -D -t $out/bin sqlar
'' + lib.optionalString withFuse ''
install -D -t $out/bin sqlarfs
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,31 +0,0 @@
diff --git a/unix/Make-arch b/unix/Make-arch
index 08afb85..822c4fc 100644
--- a/unix/Make-arch
+++ b/unix/Make-arch
@@ -924,7 +924,7 @@ macosx-thr:
$(MAKE) all \
"ARCH = macosx-thr" \
"CC = cc" \
- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
+ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
@@ -946,7 +946,7 @@ macosx-x86-thr:
$(MAKE) all \
"ARCH = macosx-x86-thr" \
"CC = cc" \
- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
@@ -957,7 +957,7 @@ macosx-x86-thr-ogl:
$(MAKE) all \
"ARCH = macosx-x86-thr-ogl" \
"CC = cc" \
- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \
+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \

View file

@ -48,14 +48,18 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else
throw "Don't know what arch to select for tachyon build"; throw "Don't know what arch to select for tachyon build";
makeFlags = [ arch ]; makeFlags = [ arch ];
patches = [ patches = [
# Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild)
./no-absolute-paths.patch ./no-absolute-paths.patch
# Include new targets (like arm) # Include new targets (like arm)
./make-archs.patch ./make-archs.patch
] ++ ];
# Ensure looks for nix-provided Carbon, not system frameworks postPatch = ''
lib.optional stdenv.isDarwin ./darwin.patch; # Ensure looks for nix-provided Carbon, not system frameworks
substituteInPlace unix/Make-arch \
--replace '-F/System/Library/Frameworks' ""
'';
installPhase = '' installPhase = ''
cd ../compile/${arch} cd ../compile/${arch}

View file

@ -1,6 +1,6 @@
Want to add a package? There are 3 simple steps! Want to add a package? There are 3 simple steps!
1. Add the needed system names to quicklisp-to-nix-systems.txt. 1. Add the needed system names to quicklisp-to-nix-systems.txt.
2. cd <path to quicklisp-to-nix-systems.txt> ; nix-shell --run 'quicklisp-to-nix .' 2. cd <path to quicklisp-to-nix-systems.txt> ; nix-shell --pure --run 'quicklisp-to-nix .'
You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir
parameters to preserve some data between runs. For example, it is very parameters to preserve some data between runs. For example, it is very
useful when you add new packages with native dependencies and fail to useful when you add new packages with native dependencies and fail to

View file

@ -0,0 +1,42 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "agutil";
version = "20200325-git";
description = "A collection of utility functions not found in other utility libraries.";
deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz";
sha256 = "0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k";
};
packageName = "agutil";
asdFilesToKeep = ["agutil.asd"];
overrides = x: x;
}
/* (SYSTEM agutil DESCRIPTION
A collection of utility functions not found in other utility libraries.
SHA256 0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k URL
http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz
MD5 89e47bd15c0f9930a5025d04b9706b60 NAME agutil FILENAME agutil DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop)
(NAME introspect-environment FILENAME introspect-environment)
(NAME iterate FILENAME iterate)
(NAME lisp-namespace FILENAME lisp-namespace)
(NAME trivia FILENAME trivia)
(NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
(NAME trivia.level0 FILENAME trivia_dot_level0)
(NAME trivia.level1 FILENAME trivia_dot_level1)
(NAME trivia.level2 FILENAME trivia_dot_level2)
(NAME trivia.trivial FILENAME trivia_dot_trivial)
(NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
DEPENDENCIES
(alexandria closer-mop introspect-environment iterate lisp-namespace trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */

View file

@ -0,0 +1,31 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "arrows";
version = "20181018-git";
parasites = [ "arrows/test" ];
description = "Implements -> and ->> from Clojure, as well as several expansions on the
idea.";
deps = [ args."hu_dot_dwim_dot_stefil" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz";
sha256 = "1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r";
};
packageName = "arrows";
asdFilesToKeep = ["arrows.asd"];
overrides = x: x;
}
/* (SYSTEM arrows DESCRIPTION
Implements -> and ->> from Clojure, as well as several expansions on the
idea.
SHA256 1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r URL
http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz
MD5 c60b5d79680de19baad018a0fe87bc48 NAME arrows FILENAME arrows DEPS
((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)) DEPENDENCIES
(hu.dwim.stefil) VERSION 20181018-git SIBLINGS NIL PARASITES (arrows/test)) */

View file

@ -0,0 +1,44 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-environments";
version = "20210411-git";
parasites = [ "cl-environments/test" ];
description = "Implements the CLTL2 environment access functionality
for implementations which do not provide the
functionality to the programmer.";
deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."optima" args."prove" args."prove-asdf" args."symbol-munger" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz";
sha256 = "1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk";
};
packageName = "cl-environments";
asdFilesToKeep = ["cl-environments.asd"];
overrides = x: x;
}
/* (SYSTEM cl-environments DESCRIPTION
Implements the CLTL2 environment access functionality
for implementations which do not provide the
functionality to the programmer.
SHA256 1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk URL
http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz
MD5 87b7c0186d37d30d24df11d021ab4fba NAME cl-environments FILENAME
cl-environments DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME cl-ansi-text FILENAME cl-ansi-text)
(NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME closer-mop FILENAME closer-mop)
(NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate)
(NAME optima FILENAME optima) (NAME prove FILENAME prove)
(NAME prove-asdf FILENAME prove-asdf)
(NAME symbol-munger FILENAME symbol-munger))
DEPENDENCIES
(alexandria anaphora cl-ansi-text cl-colors cl-ppcre closer-mop collectors
iterate optima prove prove-asdf symbol-munger)
VERSION 20210411-git SIBLINGS NIL PARASITES (cl-environments/test)) */

View file

@ -0,0 +1,56 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "generic-cl";
version = "20201220-git";
parasites = [ "generic-cl/test" ];
description = "Standard Common Lisp functions implemented using generic functions.";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-custom-hash-table" args."cl-environments" args."cl-ppcre" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz";
sha256 = "02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl";
};
packageName = "generic-cl";
asdFilesToKeep = ["generic-cl.asd"];
overrides = x: x;
}
/* (SYSTEM generic-cl DESCRIPTION
Standard Common Lisp functions implemented using generic functions. SHA256
02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl URL
http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz
MD5 76aa19981d3addb9a741fd4705d5d3ff NAME generic-cl FILENAME generic-cl
DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
(NAME cl-ansi-text FILENAME cl-ansi-text)
(NAME cl-colors FILENAME cl-colors)
(NAME cl-custom-hash-table FILENAME cl-custom-hash-table)
(NAME cl-environments FILENAME cl-environments)
(NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop)
(NAME collectors FILENAME collectors)
(NAME introspect-environment FILENAME introspect-environment)
(NAME iterate FILENAME iterate)
(NAME lisp-namespace FILENAME lisp-namespace)
(NAME optima FILENAME optima) (NAME prove FILENAME prove)
(NAME prove-asdf FILENAME prove-asdf)
(NAME static-dispatch FILENAME static-dispatch)
(NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia)
(NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
(NAME trivia.level0 FILENAME trivia_dot_level0)
(NAME trivia.level1 FILENAME trivia_dot_level1)
(NAME trivia.level2 FILENAME trivia_dot_level2)
(NAME trivia.trivial FILENAME trivia_dot_trivial)
(NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
DEPENDENCIES
(agutil alexandria anaphora arrows cl-ansi-text cl-colors
cl-custom-hash-table cl-environments cl-ppcre closer-mop collectors
introspect-environment iterate lisp-namespace optima prove prove-asdf
static-dispatch symbol-munger trivia trivia.balland2006 trivia.level0
trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i)
VERSION 20201220-git SIBLINGS (generic-cl.util) PARASITES (generic-cl/test)) */

View file

@ -0,0 +1,55 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "static-dispatch";
version = "20210411-git";
parasites = [ "static-dispatch/test" ];
description = "Static generic function dispatch for Common Lisp.";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-environments" args."cl-interpol" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz";
sha256 = "0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1";
};
packageName = "static-dispatch";
asdFilesToKeep = ["static-dispatch.asd"];
overrides = x: x;
}
/* (SYSTEM static-dispatch DESCRIPTION
Static generic function dispatch for Common Lisp. SHA256
0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1 URL
http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz
MD5 7af665c6a3a1aa3315fe0a651ca559de NAME static-dispatch FILENAME
static-dispatch DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
(NAME cl-ansi-text FILENAME cl-ansi-text)
(NAME cl-colors FILENAME cl-colors)
(NAME cl-environments FILENAME cl-environments)
(NAME cl-interpol FILENAME cl-interpol)
(NAME closer-mop FILENAME closer-mop)
(NAME collectors FILENAME collectors)
(NAME introspect-environment FILENAME introspect-environment)
(NAME iterate FILENAME iterate)
(NAME lisp-namespace FILENAME lisp-namespace)
(NAME optima FILENAME optima) (NAME prove FILENAME prove)
(NAME prove-asdf FILENAME prove-asdf)
(NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia)
(NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
(NAME trivia.level0 FILENAME trivia_dot_level0)
(NAME trivia.level1 FILENAME trivia_dot_level1)
(NAME trivia.level2 FILENAME trivia_dot_level2)
(NAME trivia.trivial FILENAME trivia_dot_trivial)
(NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
DEPENDENCIES
(agutil alexandria anaphora arrows cl-ansi-text cl-colors cl-environments
cl-interpol closer-mop collectors introspect-environment iterate
lisp-namespace optima prove prove-asdf symbol-munger trivia
trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
trivia.trivial trivial-cltl2 type-i)
VERSION 20210411-git SIBLINGS NIL PARASITES (static-dispatch/test)) */

View file

@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "trivial-arguments";
version = "20200925-git";
description = "A simple library to retrieve the lambda-list of a function.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz";
sha256 = "079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295";
};
packageName = "trivial-arguments";
asdFilesToKeep = ["trivial-arguments.asd"];
overrides = x: x;
}
/* (SYSTEM trivial-arguments DESCRIPTION
A simple library to retrieve the lambda-list of a function. SHA256
079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295 URL
http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz
MD5 3d7b76a729b272019c8827e40bfb6db8 NAME trivial-arguments FILENAME
trivial-arguments DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS
NIL PARASITES NIL) */

View file

@ -277,4 +277,6 @@ $out/lib/common-lisp/query-fs"
md5 = ifLispNotIn ["sbcl" "ccl" "gcl"] md5 = ifLispNotIn ["sbcl" "ccl" "gcl"]
(extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams])); (extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams]));
cl-gobject-introspection = addNativeLibs (with pkgs; [glib gobject-introspection]); cl-gobject-introspection = addNativeLibs (with pkgs; [glib gobject-introspection]);
generic-cl = x: { parasites = []; };
static-dispatch = x: { parasites = []; };
} }

View file

@ -123,6 +123,7 @@ fiveam
flexi-streams flexi-streams
form-fiddle form-fiddle
fset fset
generic-cl
gettext gettext
http-body http-body
hu.dwim.asdf hu.dwim.asdf
@ -189,6 +190,7 @@ swank
swap-bytes swap-bytes
symbol-munger symbol-munger
trivia trivia
trivial-arguments
trivial-backtrace trivial-backtrace
trivial-clipboard trivial-clipboard
trivial-features trivial-features

View file

@ -289,6 +289,80 @@ let quicklisp-to-nix-packages = rec {
})); }));
"trivia_dot_quasiquote" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivia_dot_quasiquote" or (x: {}))
(import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
}));
"fare-quasiquote-readtable" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-readtable" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix {
inherit fetchurl;
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
"fare-quasiquote-optima" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-optima" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
}));
"fare-quasiquote-extras" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-extras" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
}));
"type-i" = buildLispPackage "type-i" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."type-i" or (x: {})) (qlOverrides."type-i" or (x: {}))
@ -329,26 +403,6 @@ let quicklisp-to-nix-packages = rec {
})); }));
"trivia_dot_quasiquote" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivia_dot_quasiquote" or (x: {}))
(import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
}));
"trivia_dot_level2" = buildLispPackage "trivia_dot_level2" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."trivia_dot_level2" or (x: {})) (qlOverrides."trivia_dot_level2" or (x: {}))
@ -401,6 +455,39 @@ let quicklisp-to-nix-packages = rec {
})); }));
"static-dispatch" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."static-dispatch" or (x: {}))
(import ./quicklisp-to-nix-output/static-dispatch.nix {
inherit fetchurl;
"agutil" = quicklisp-to-nix-packages."agutil";
"alexandria" = quicklisp-to-nix-packages."alexandria";
"anaphora" = quicklisp-to-nix-packages."anaphora";
"arrows" = quicklisp-to-nix-packages."arrows";
"cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
"cl-colors" = quicklisp-to-nix-packages."cl-colors";
"cl-environments" = quicklisp-to-nix-packages."cl-environments";
"cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"collectors" = quicklisp-to-nix-packages."collectors";
"introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"optima" = quicklisp-to-nix-packages."optima";
"prove" = quicklisp-to-nix-packages."prove";
"prove-asdf" = quicklisp-to-nix-packages."prove-asdf";
"symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
"trivia" = quicklisp-to-nix-packages."trivia";
"trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
"type-i" = quicklisp-to-nix-packages."type-i";
}));
"introspect-environment" = buildLispPackage "introspect-environment" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."introspect-environment" or (x: {})) (qlOverrides."introspect-environment" or (x: {}))
@ -409,57 +496,53 @@ let quicklisp-to-nix-packages = rec {
})); }));
"fare-quasiquote-readtable" = buildLispPackage "cl-environments" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-readtable" or (x: {})) (qlOverrides."cl-environments" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { (import ./quicklisp-to-nix-output/cl-environments.nix {
inherit fetchurl; inherit fetchurl;
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; "alexandria" = quicklisp-to-nix-packages."alexandria";
"fare-utils" = quicklisp-to-nix-packages."fare-utils"; "anaphora" = quicklisp-to-nix-packages."anaphora";
"named-readtables" = quicklisp-to-nix-packages."named-readtables"; "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
"cl-colors" = quicklisp-to-nix-packages."cl-colors";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"collectors" = quicklisp-to-nix-packages."collectors";
"iterate" = quicklisp-to-nix-packages."iterate";
"optima" = quicklisp-to-nix-packages."optima";
"prove" = quicklisp-to-nix-packages."prove";
"prove-asdf" = quicklisp-to-nix-packages."prove-asdf";
"symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
})); }));
"fare-quasiquote-optima" = buildLispPackage "arrows" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-optima" or (x: {})) (qlOverrides."arrows" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { (import ./quicklisp-to-nix-output/arrows.nix {
inherit fetchurl; inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria"; "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
})); }));
"fare-quasiquote-extras" = buildLispPackage "agutil" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."fare-quasiquote-extras" or (x: {})) (qlOverrides."agutil" or (x: {}))
(import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { (import ./quicklisp-to-nix-output/agutil.nix {
inherit fetchurl; inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria"; "alexandria" = quicklisp-to-nix-packages."alexandria";
"closer-mop" = quicklisp-to-nix-packages."closer-mop"; "closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
"fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; "iterate" = quicklisp-to-nix-packages."iterate";
"fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
"fare-utils" = quicklisp-to-nix-packages."fare-utils";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"named-readtables" = quicklisp-to-nix-packages."named-readtables"; "trivia" = quicklisp-to-nix-packages."trivia";
"trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
"type-i" = quicklisp-to-nix-packages."type-i";
})); }));
@ -1556,6 +1639,14 @@ let quicklisp-to-nix-packages = rec {
})); }));
"trivial-arguments" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivial-arguments" or (x: {}))
(import ./quicklisp-to-nix-output/trivial-arguments.nix {
inherit fetchurl;
}));
"trivia" = buildLispPackage "trivia" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."trivia" or (x: {})) (qlOverrides."trivia" or (x: {}))
@ -2414,6 +2505,41 @@ let quicklisp-to-nix-packages = rec {
})); }));
"generic-cl" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."generic-cl" or (x: {}))
(import ./quicklisp-to-nix-output/generic-cl.nix {
inherit fetchurl;
"agutil" = quicklisp-to-nix-packages."agutil";
"alexandria" = quicklisp-to-nix-packages."alexandria";
"anaphora" = quicklisp-to-nix-packages."anaphora";
"arrows" = quicklisp-to-nix-packages."arrows";
"cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
"cl-colors" = quicklisp-to-nix-packages."cl-colors";
"cl-custom-hash-table" = quicklisp-to-nix-packages."cl-custom-hash-table";
"cl-environments" = quicklisp-to-nix-packages."cl-environments";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"collectors" = quicklisp-to-nix-packages."collectors";
"introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
"optima" = quicklisp-to-nix-packages."optima";
"prove" = quicklisp-to-nix-packages."prove";
"prove-asdf" = quicklisp-to-nix-packages."prove-asdf";
"static-dispatch" = quicklisp-to-nix-packages."static-dispatch";
"symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
"trivia" = quicklisp-to-nix-packages."trivia";
"trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
"trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
"trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
"trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
"trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
"trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
"type-i" = quicklisp-to-nix-packages."type-i";
}));
"fset" = buildLispPackage "fset" = buildLispPackage
((f: x: (x // (f x))) ((f: x: (x // (f x)))
(qlOverrides."fset" or (x: {})) (qlOverrides."fset" or (x: {}))

View file

@ -6,12 +6,12 @@
buildDunePackage rec { buildDunePackage rec {
pname = "luv"; pname = "luv";
version = "0.5.7"; version = "0.5.8";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260"; sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk";
}; };
postConfigure = '' postConfigure = ''

View file

@ -2,23 +2,20 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, importlib-metadata
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "catalogue"; pname = "catalogue";
version = "2.0.1"; version = "2.0.4";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o=";
}; };
propagatedBuildInputs = [ importlib-metadata ];
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];
meta = with lib; { meta = with lib; {

View file

@ -3,20 +3,20 @@
, fetchPypi , fetchPypi
, pytestCheckHook , pytestCheckHook
, six , six
, icu , icu68
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyICU"; pname = "PyICU";
version = "2.6"; version = "2.7.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9"; sha256 = "1jv1pds94agvn3zs33a8p8f0mk7f5pjwmczmg1s05ri5p0kzk4h8";
}; };
nativeBuildInputs = [ icu ]; # for icu-config nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config
buildInputs = [ icu ]; buildInputs = [ icu68 ];
checkInputs = [ pytestCheckHook six ]; checkInputs = [ pytestCheckHook six ];
meta = with lib; { meta = with lib; {

View file

@ -12,13 +12,13 @@
, murmurhash , murmurhash
, numpy , numpy
, pathlib , pathlib
, plac
, preshed , preshed
, requests , requests
, setuptools , setuptools
, srsly , srsly
, spacy-legacy , spacy-legacy
, thinc , thinc
, typer
, wasabi , wasabi
, packaging , packaging
, pathy , pathy
@ -27,11 +27,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "spacy"; pname = "spacy";
version = "3.0.5"; version = "3.0.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; hash = "sha256-ViirifH1aAmciAsSqcN/Ts4pq4kmBmDP33KMAnEYecU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -42,7 +42,6 @@ buildPythonPackage rec {
jsonschema jsonschema
murmurhash murmurhash
numpy numpy
plac
preshed preshed
requests requests
setuptools setuptools
@ -53,6 +52,7 @@ buildPythonPackage rec {
packaging packaging
pathy pathy
pydantic pydantic
typer
] ++ lib.optional (pythonOlder "3.4") pathlib; ] ++ lib.optional (pythonOlder "3.4") pathlib;
checkInputs = [ checkInputs = [
@ -67,10 +67,6 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace setup.cfg \ substituteInPlace setup.cfg \
--replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \
--replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
--replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
--replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \
--replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \
--replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3"
''; '';

View file

@ -6,20 +6,19 @@
, catalogue , catalogue
, mock , mock
, numpy , numpy
, pathlib
, pytest , pytest
, pytz , ruamel-yaml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "srsly"; pname = "srsly";
version = "2.4.0"; version = "2.4.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; hash = "sha256-sPKuwKMp5ufnQqCmDpmnSWjKKb5x81xcTeIh4ygXaSY=";
}; };
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ];
@ -30,13 +29,9 @@ buildPythonPackage rec {
mock mock
numpy numpy
pytest pytest
pytz ruamel-yaml
]; ];
# TypeError: cannot serialize '_io.BufferedRandom' object
# Possibly because of sandbox restrictions.
doCheck = false;
pythonImportsCheck = [ "srsly" ]; pythonImportsCheck = [ "srsly" ];
meta = with lib; { meta = with lib; {

View file

@ -24,11 +24,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "thinc"; pname = "thinc";
version = "8.0.2"; version = "8.0.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; hash = "sha256-w3CnpG0BtYjY1fmdjV42s8usRRJjg1b6Qw9/Urs6iJc=";
}; };
buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "1.1.5";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "0wyx216q9q7y60bnnw4cbpv9zlbnjm2hwq0llkjw60fp3qalj9am";
};
cargoSha256 = "1pii5ajl3xgylrm20pkwbd1lk7gv0pshl1cxjfna0l63q56v7f21";
meta = with lib; {
description = "Background rust code checker";
homepage = "https://github.com/Canop/bacon";
license = licenses.agpl3Only;
maintainers = [ maintainers.FlorianFranzen ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }: { lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:
with rustPlatform; with rustPlatform;
@ -16,6 +16,8 @@ buildRustPackage rec {
cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; { meta = with lib; {
description = "Generate Rust register maps (`struct`s) from SVD files"; description = "Generate Rust register maps (`struct`s) from SVD files";
homepage = "https://github.com/rust-embedded/svd2rust"; homepage = "https://github.com/rust-embedded/svd2rust";

View file

@ -1,4 +1,5 @@
{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: { lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
, openssl, libiconv, CoreServices, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "trunk"; pname = "trunk";
@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = if stdenv.isDarwin
then [ libiconv CoreServices Security ]
else [ openssl ];
cargoSha256 = "sha256-0ehz0ETNA2gOvTJUu8uq5H+bv4VXOJMq6AA8kn65m/Q="; cargoSha256 = "sha256-0ehz0ETNA2gOvTJUu8uq5H+bv4VXOJMq6AA8kn65m/Q=";

View file

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
SDL2 SDL2
]; ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install --directory $out/bin $out/share/doc/$pname install --directory $out/bin $out/share/doc/$pname

View file

@ -25,7 +25,7 @@ let
inherit llvmPackages; inherit llvmPackages;
}; };
aliases = if (config.allowAliases or true) then final: prev: {} else (import ./aliases.nix lib); aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {};
extensible-self = lib.makeExtensible extensible-self = lib.makeExtensible
(extends aliases (extends aliases

View file

@ -1,17 +1,36 @@
{ lib, fetchFromGitHub, pythonPackages }: { lib
, fetchFromGitHub
, python3Packages
, prometheus-alertmanager
}:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "prometheus-xmpp-alerts"; pname = "prometheus-xmpp-alerts";
version = "0.4.2"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jelmer"; owner = "jelmer";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63"; sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld";
}; };
propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; propagatedBuildInputs = [
prometheus-alertmanager
] ++ (with python3Packages; [
aiohttp
slixmpp
prometheus_client
pyyaml
]);
checkInputs = with python3Packages; [
pytz
];
checkPhase = ''
${python3Packages.python.interpreter} -m unittest discover
'';
meta = { meta = {
description = "XMPP Web hook for Prometheus"; description = "XMPP Web hook for Prometheus";

View file

@ -31,7 +31,7 @@ mkDerivation {
substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
''; '';
installPhase = lib.optionalString stdenv.isDarwin '' installPhase = lib.optionalString (stdenv.isDarwin && enableGUI) ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app
wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend

View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }: { lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wagyu"; pname = "wagyu";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "10al0j8ak95x4d85lzphgq8kmdnb809l6gahfp5miyvsfd4dxmpi"; cargoSha256 = "10al0j8ak95x4d85lzphgq8kmdnb809l6gahfp5miyvsfd4dxmpi";
buildInputs = lib.optional stdenv.isDarwin Security;
meta = with lib; { meta = with lib; {
description = "Rust library for generating cryptocurrency wallets"; description = "Rust library for generating cryptocurrency wallets";
homepage = "https://github.com/ArgusHQ/wagyu"; homepage = "https://github.com/ArgusHQ/wagyu";

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: { lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, libiconv
, Security, makeWrapper, bash }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "websocat"; pname = "websocat";
@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k="; cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k=";
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
# Needed to get openssl-sys to use pkg-config. # Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR=1; OPENSSL_NO_VENDOR=1;

View file

@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -D $pname $out/bin/$pname install -D $pname $out/bin/$pname

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kea"; pname = "kea";
version = "1.9.6"; version = "1.9.7";
src = fetchurl { src = fetchurl {
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw="; sha256 = "sha256-3/A0cG9AiyiWMk0GUjeUAHm0uRw5Q9PsEA2S6WZ8clo=";
}; };
patches = [ ./dont-create-var.patch ]; patches = [ ./dont-create-var.patch ];

View file

@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
cargo cargo
rustc rustc
git git
llvmPackages_10.libclang llvmPackages_10.libclang.lib
llvmPackages_10.clang llvmPackages_10.clang
ensureNewerSourcesForZipFilesHook ensureNewerSourcesForZipFilesHook
capnproto capnproto

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, protobuf }: { lib, stdenv, fetchurl, cmake, protobuf, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jumanpp"; pname = "jumanpp";
@ -8,8 +8,10 @@ stdenv.mkDerivation rec {
url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ]
++ lib.optional stdenv.isDarwin libiconv;
meta = with lib; { meta = with lib; {
description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)";

View file

@ -3268,6 +3268,8 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
}; };
bacon = callPackage ../development/tools/bacon { };
bareos = callPackage ../tools/backup/bareos { }; bareos = callPackage ../tools/backup/bareos { };
bats = callPackage ../development/interpreters/bats { }; bats = callPackage ../development/interpreters/bats { };
@ -9093,7 +9095,9 @@ in
trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
trunk = callPackage ../development/tools/trunk { }; trunk = callPackage ../development/tools/trunk {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
tthsum = callPackage ../applications/misc/tthsum { }; tthsum = callPackage ../applications/misc/tthsum { };
@ -9698,7 +9702,9 @@ in
waf = callPackage ../development/tools/build-managers/waf { python = python3; }; waf = callPackage ../development/tools/build-managers/waf { python = python3; };
wafHook = callPackage ../development/tools/build-managers/wafHook { }; wafHook = callPackage ../development/tools/build-managers/wafHook { };
wagyu = callPackage ../tools/misc/wagyu { }; wagyu = callPackage ../tools/misc/wagyu {
inherit (darwin.apple_sdk.frameworks) Security;
};
wakelan = callPackage ../tools/networking/wakelan { }; wakelan = callPackage ../tools/networking/wakelan { };
@ -19542,9 +19548,7 @@ in
prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
pythonPackages = python3Packages;
};
prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };