Merge master into haskell-updates

This commit is contained in:
github-actions[bot]
2021-10-21 00:07:20 +00:00
committed by GitHub
288 changed files with 5179 additions and 41160 deletions
+12
View File
@@ -7001,6 +7001,12 @@
githubId = 458783;
name = "Martin Gammelsæter";
};
martfont = {
name = "Martino Fontana";
email = "tinozzo123@tutanota.com";
github = "SuperSamus";
githubId = 40663462;
};
marzipankaiser = {
email = "nixos@gaisseml.de";
github = "marzipankaiser";
@@ -12394,6 +12400,12 @@
githubId = 452;
name = "Yurii Rashkovskii";
};
yrd = {
name = "Yannik Rödel";
email = "nix@yannik.info";
github = "yrd";
githubId = 1820447;
};
ysndr = {
email = "me@ysndr.de";
github = "ysndr";
+10
View File
@@ -164,6 +164,16 @@ with lib.maintainers; {
scope = "Maintain Kodi and related packages.";
};
linux-kernel = {
members = [
TredwellGit
ma27
nequissimus
qyliss
];
scope = "Maintain the Linux kernel.";
};
mate = {
members = [
j03
@@ -83,7 +83,8 @@
which introduced some breaking changes to the experimental OCI
manifest format. See
<link xlink:href="https://github.com/helm/community/blob/main/hips/hip-0006.md">HIP
6</link> for more details.
6</link> for more details. <literal>helmfile</literal> also
defaults to 0.141.0, which is the minimum compatible version.
</para>
</listitem>
<listitem>
@@ -29,6 +29,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- Pantheon desktop has been updated to version 6. Due to changes of screen locker, if locking doesn't work for you, please try `gsettings set org.gnome.desktop.lockdown disable-lock-screen false`.
- `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details.
`helmfile` also defaults to 0.141.0, which is the minimum compatible version.
- GNOME has been upgraded to 41. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/41.0/) for details.
+1 -1
View File
@@ -7,7 +7,7 @@ let
fpm = config.services.phpfpm.pools.roundcube;
localDB = cfg.database.host == "localhost";
user = cfg.database.username;
phpWithPspell = pkgs.php74.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
phpWithPspell = pkgs.php80.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
in
{
options.services.roundcube = {
@@ -35,10 +35,15 @@ in
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
'';
# The systemd collector needs AF_UNIX
RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX";
RestrictAddressFamilies = optionals (any (collector: (collector == "logind" || collector == "systemd")) cfg.enabledCollectors) [
# needs access to dbus via unix sockets (logind/systemd)
"AF_UNIX"
] ++ optionals (any (collector: (collector == "network_route" || collector == "wifi")) cfg.enabledCollectors) [
# needs netlink sockets for wireless collector
"AF_NETLINK"
];
# The timex collector needs to access clock APIs
ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors;
ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors;
};
};
}
+1
View File
@@ -332,6 +332,7 @@ let
if [ $? == 0 ]; then
echo -ne "$new_salt\n$new_iterations" > /crypt-storage${dev.yubikey.storage.path}
sync /crypt-storage${dev.yubikey.storage.path}
else
echo "Warning: Could not update LUKS key, current challenge persists!"
fi
+3 -3
View File
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "1rs1jy7zzfgqzr64ld8whn0wlw8n7rk1svxx0xfxm3ynmgc7sd68";
sha256 = "07qqs5q64zaxl3b2091vjihqb35fm0136cm4zibrgpx21akmbvr2";
};
cargoSha256 = "10g7gdi1iz751wa60vr4fs0cvfsgs3pfcp8pnywicl0vsdp25fmc";
cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
+32 -39
View File
@@ -1,65 +1,58 @@
{ stdenv
, dpkg
, lib
, autoPatchelfHook
{ lib
, stdenv
, fetchurl
, gtk3
, glib
, desktop-file-utils
, autoPatchelfHook
, dpkg
, alsa-lib
, libjack2
, harfbuzz
, fribidi
, pango
, freetype
, libglvnd
, curl
, libXcursor
, libXinerama
, libXrandr
, libXrender
, libjack2
}:
stdenv.mkDerivation rec {
pname = "tonelib-gfx";
version = "4.6.6";
version = "4.7.0";
src = fetchurl {
url = "https://www.tonelib.net/download/0509/ToneLib-GFX-amd64.deb";
sha256 = "sha256-wdX3SQSr0IZHsTUl+1Y0iETme3gTyryexhZ/9XHkGeo=";
url = "https://www.tonelib.net/download/0930/ToneLib-GFX-amd64.deb";
hash = "sha256-BcbX0dz94B4mj6QeQsnuZmwXAaXH+yJjnrUPgEYVqkU=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];
buildInputs = [
dpkg
gtk3
glib
desktop-file-utils
stdenv.cc.cc.lib
alsa-lib
libjack2
harfbuzz
fribidi
pango
freetype
libglvnd
] ++ runtimeDependencies;
runtimeDependencies = map lib.getLib [
curl
libXcursor
libXinerama
libXrandr
libXrender
libjack2
];
nativeBuildInputs = [
autoPatchelfHook
];
unpackPhase = ''
mkdir -p $TMP/ $out/
dpkg -x $src $TMP
'';
unpackCmd = "dpkg -x $curSrc source";
installPhase = ''
cp -R $TMP/usr/* $out/
mv $out/bin/ToneLib-GFX $out/bin/tonelib-gfx
'';
runtimeDependencies = [
(lib.getLib curl)
];
mv usr $out
substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/
'';
meta = with lib; {
description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass.";
homepage = "https://tonelib.net/";
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
maintainers = with maintainers; [ dan4ik605743 orivej ];
platforms = [ "x86_64-linux" ];
};
}
+6 -6
View File
@@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "069jdwqs9z2z95mjs9nx58rp1516dyyqn5bc0vgr7xvlbis97lq0";
x86_64-darwin = "1bd32dkpyfgknxqn76jcwpa47rac9q14glbf5sb1rh9rfav0m1m8";
aarch64-linux = "1axxnys3pd2qrvj6mqpa5cih44b4dbpgi8mvn616d8d45jgdnc1r";
aarch64-darwin = "0bdp0k20lfwpsl1a3dz6c97s0b5bp3rhb66jwgbyyc16zrz79r1z";
armv7l-linux = "077w5hvc4brb56zs0w37nr4a8vlcij5z3yrv3rz16p58nnkj56hs";
x86_64-linux = "1yfaf9qdaf6njvj8kilmivyl0nnhdvd9hbzpf8hv3kw5rfpdvy89";
x86_64-darwin = "10rx5aif61xipf5lcjzkidz9dhbm5gc2wf87c2j456nixaxbx0b4";
aarch64-linux = "13h4ffdm9y9p3jnqcjvapykbm73bkjy5jaqwhsi293f9r7jfp9rf";
aarch64-darwin = "07nmrxc25rfp5ibarhg3c14ksk2ymqmsnc55hicvvhw93g2qczby";
armv7l-linux = "1gz1mmw2vp986l9sm7rd6hypxs70sz63sbmzyxwfqpvj973dl23q";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.61.1";
version = "1.61.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0ic7h5aq1lyplk01bydqwrvz40h59sf0n0q4gxj844k4qidy14md";
x86_64-darwin = "15s3vj7740ksb82gdjqpxw6cyd45ymdpacamkqk800929cv715qs";
aarch64-linux = "0n3bxggfzlr1cqarq861yfqka3qfgpwvk8j22l7dv4vki06f8jzy";
armv7l-linux = "0jksfdals8xf3vh5hqrd40pj5qn8byjrakjnrv926qznxjj152bn";
x86_64-linux = "1q260kjhyx8djl82275ii63z1mzypsz7rkz3pj1n2wjkwsnw276x";
x86_64-darwin = "1scx155rm8j6dwn0i31b6ajsdxcn1n24p3k6dx248w0zyiwd5wm1";
aarch64-linux = "1j788a0p767i65ying9pfg6rss8l7g76n2323dnmj12bhxs6cqd1";
armv7l-linux = "1yfwmfxpilfv2h3pp698pg4wr6dnyzwg0r266xiwsw7z38jh54fk";
}.${system};
sourceRoot = {
@@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.61.1";
version = "1.61.2";
pname = "vscodium";
executableName = "codium";
@@ -0,0 +1,33 @@
{ lib
, rustPlatform
, fetchFromGitHub
, glib
, pkg-config
, wrapGAppsHook
, gtk3
}:
rustPlatform.buildRustPackage rec {
pname = "image-roll";
version = "1.3.1";
src = fetchFromGitHub {
owner = "weclaw1";
repo = pname;
rev = version;
sha256 = "007jzmrn4cnqbi6fy5lxanbwa4pc72fbcv9irk3pfd0wspp05s8j";
};
cargoSha256 = "sha256-dRRBfdGTXtoNbp7OWqOdNECXHCpj0ipkCOvcdekW+G4=";
nativeBuildInputs = [ glib pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 ];
meta = with lib; {
description = "Simple and fast GTK image viewer with basic image manipulation tools";
homepage = "https://github.com/weclaw1/image-roll";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
+28 -6
View File
@@ -1,7 +1,9 @@
{ lib
, mkDerivation
, makeDesktopItem
, fetchurl
, pkg-config
, copyDesktopItems
, cairo
, freetype
, ghostscript
@@ -26,7 +28,7 @@ mkDerivation rec {
sourceRoot = "${pname}-${version}/src";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config copyDesktopItems ];
buildInputs = [
cairo
@@ -42,19 +44,39 @@ mkDerivation rec {
zlib
];
IPEPREFIX=placeholder "out";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
IPEPREFIX = placeholder "out";
URWFONTDIR = "${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua";
qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ];
qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];
enableParallelBuilding = true;
# TODO: make .desktop entry
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "Ipe";
genericName = "Drawing editor";
comment = "A drawing editor for creating figures in PDF format";
exec = "ipe";
icon = "ipe";
mimeType = "text/xml;application/pdf";
categories = "Graphics;Qt;";
extraDesktopEntries = {
StartupWMClass = "ipe";
StartupNotify = "true";
};
})
];
postInstall = ''
mkdir -p $out/share/icons/hicolor/128x128/apps
ln -s $out/share/ipe/${version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png
'';
meta = with lib; {
description = "An editor for drawing figures";
homepage = "http://ipe.otfried.org"; # https not available
homepage = "http://ipe.otfried.org"; # https not available
license = licenses.gpl3Plus;
longDescription = ''
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
+3 -3
View File
@@ -11,8 +11,8 @@ in
stdenv.mkDerivation rec {
pname = "authy";
version = "1.8.4";
rev = "6";
version = "1.9.0";
rev = "7";
buildInputs = [
alsa-lib
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "07h4mgp229nlvw9ifiiyzph26aa61w4x4f1xya8vw580blrk1ph9";
sha256 = "10az47cc3lgsdi0ixmmna08nqf9xm7gsl1ph00wfwrxzsi05ygx3";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
+9 -14
View File
@@ -13,29 +13,24 @@
, tllist
, fcft
, enableCairo ? true
, enablePNG ? true
, enableSVG ? true
, withPNGBackend ? "libpng"
, withSVGBackend ? "librsvg"
# Optional dependencies
, cairo
, librsvg
, libpng
}:
let
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
in
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.6.1";
version = "1.6.4";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fuzzel";
rev = version;
sha256 = "sha256-JW5sAlTprSRIdFbmSaUreGtNccERgQMGEW+WCSscYQk=";
sha256 = "sha256-wl3dO6EwLXWf0XtAIml1NlNRIvpIQJuq1pxLmo/pAUE=";
};
nativeBuildInputs = [
@@ -54,15 +49,15 @@ stdenv.mkDerivation rec {
tllist
fcft
] ++ lib.optional enableCairo cairo
++ lib.optional enablePNG libpng
++ lib.optional enableSVG librsvg;
++ lib.optional (withPNGBackend == "libpng") libpng
++ lib.optional (withSVGBackend == "librsvg") librsvg;
mesonBuildType = "release";
mesonFlags = [
(mesonFeatureFlag "enable-cairo" enableCairo)
(mesonFeatureFlag "enable-png" enablePNG)
(mesonFeatureFlag "enable-svg" enableSVG)
"-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
"-Dpng-backend=${withPNGBackend}"
"-Dsvg-backend=${withSVGBackend}"
];
meta = with lib; {
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://github.com/alexays/waybar";
homepage = "https://hg.sr.ht/~scoopta/rootbar";
description = "A bar for Wayland WMs";
longDescription = ''
Root Bar is a bar for wlroots based wayland compositors such as sway and
@@ -24,7 +24,7 @@ setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The
cd ../../../../../
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f3)
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
cd - > /dev/null
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
version = "0.140.1";
version = "0.141.0";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-QnGu/EGzgWva/EA6gKrDzWgjX6OrfZKzWIhRqKbexjU=";
sha256 = "sha256-UwjV3xgnZa0Emzw4FP/+gHh1ES6MTihrrlGKUBH6O9Q=";
};
vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4=";
@@ -243,6 +243,9 @@ stdenv.mkDerivation rec {
pname = "k3s";
version = k3sVersion;
# `src` here is a workaround for the updateScript bot. It couldn't be empty.
src = builtins.filterSource (path: type: false) ./.;
# Important utilities used by the kubelet, see
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s.
@@ -12,7 +12,7 @@ LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE}
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -r | head -n1)
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -V -r | head -n1)
K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
@@ -15,6 +15,8 @@ buildGoPackage {
goPackagePath = "github.com/bitnami/kubecfg";
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
meta = {
description = "A tool for managing Kubernetes resources as code";
homepage = "https://github.com/bitnami/kubecfg";
@@ -5,13 +5,11 @@ set -x -eu -o pipefail
cd $(dirname "$0")
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
--silent https://api.github.com/repos/linkerd/linkerd2/releases | \
jq 'map(.tag_name)' | grep edge | sed 's/["|,| ]//g' | sort -r | head -n1)
jq 'map(.tag_name)' | grep edge | sed 's/["|,| ]//g' | sed 's/edge-//' | sort -V -r | head -n1)
VERSION=$(echo ${TAG} | sed 's/^edge-//')
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/edge-${VERSION}.tar.gz)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./edge.nix
@@ -19,11 +17,11 @@ setKV () {
setKV version ${VERSION}
setKV sha256 ${SHA256}
setKV vendorSha256 "" # Necessary to force clean build.
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build.
cd ../../../../../
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
cd - > /dev/null
@@ -5,13 +5,11 @@ set -x -eu -o pipefail
cd $(dirname "$0")
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
--silent https://api.github.com/repos/linkerd/linkerd2/releases/latest | \
jq -r '.tag_name')
VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
--silent https://api.github.com/repos/linkerd/linkerd2/releases | \
jq 'map(.tag_name)' | grep stable | sed 's/["|,| ]//g' | sed 's/stable-//' | sort -V -r | head -n1)
VERSION=$(echo ${TAG} | sed 's/^stable-//')
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/stable-${VERSION}.tar.gz)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
@@ -19,11 +17,11 @@ setKV () {
setKV version ${VERSION}
setKV sha256 ${SHA256}
setKV vendorSha256 "" # Necessary to force clean build.
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build.
cd ../../../../../
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
cd - > /dev/null
@@ -4,6 +4,7 @@
, makeWrapper
, makeDesktopItem
, mkYarnPackage
, fetchYarnDeps
, electron
, element-web
, callPackage
@@ -13,27 +14,28 @@
, useWayland ? false
}:
# Notes for maintainers:
# * versions of `element-web` and `element-desktop` should be kept in sync.
# * the Yarn dependency expression must be updated with `./update-element-desktop.sh <git release tag>`
let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json));
executableName = "element-desktop";
version = "1.9.2";
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in
mkYarnPackage rec {
pname = "element-desktop";
inherit (pinData) version;
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=";
sha256 = pinData.desktopSrcHash;
};
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in
mkYarnPackage rec {
name = "element-desktop-${version}";
inherit version src;
packageJSON = ./element-desktop-package.json;
yarnNix = ./element-desktop-yarndeps.nix;
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = pinData.desktopYarnHash;
};
nativeBuildInputs = [ makeWrapper ];
@@ -102,6 +104,8 @@ mkYarnPackage rec {
'';
};
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "A feature-rich client for Matrix.org";
homepage = "https://element.io/";
@@ -1,9 +1,7 @@
{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
# Note for maintainers:
# Versions of `element-web` and `element-desktop` should be kept in sync.
let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json));
noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org
piwik = false; # disable analytics
@@ -12,11 +10,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.9.2";
inherit (pinData) version;
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-Qkn0vyZGvBAeOfTzxydWzjFQJwY39INAhwZNX4xsM7U=";
sha256 = pinData.webHash;
};
installPhase = ''
@@ -1,15 +1,18 @@
{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage
, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit }:
, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }:
stdenv.mkDerivation rec {
let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json));
in stdenv.mkDerivation rec {
pname = "keytar";
version = "7.7.0";
inherit (pinData) version;
src = fetchFromGitHub {
owner = "atom";
repo = "node-keytar";
rev = "v${version}";
sha256 = "0ajvr4kjbyw2shb1y14c0dsghdlnq30f19hk2sbzj6n9y3xa3pmi";
sha256 = pinData.srcHash;
};
nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ]
@@ -19,7 +22,10 @@ stdenv.mkDerivation rec {
npm_config_nodedir = nodejs-14_x;
yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache;
yarnOfflineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
sha256 = pinData.yarnHash;
};
buildPhase = ''
cp ${./yarn.lock} ./yarn.lock
@@ -0,0 +1,5 @@
{
"version": "7.7.0",
"srcHash": "sd6h+vDJGvmXFhOm4MDAljb4dAOMBB8W1IL7JSfJWyo=",
"yarnHash": "1m75hvl06mcj260hicbmv75p94h73gw5d24zpm5wxwc0q8v8wzfl"
}
@@ -1,19 +1,38 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix yarn
#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the Yarn dependency lock files."
echo "Usage: $0 <git release tag>"
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the seshat package."
echo "Usage: $0 [git release tag]"
exit 1
fi
SRC="https://raw.githubusercontent.com/atom/node-keytar/$1"
version="$1"
set -euo pipefail
if [ -z "$version" ]; then
version="$(wget -O- "https://api.github.com/repos/atom/node-keytar/releases?per_page=1" | jq -r '.[0].tag_name')"
fi
# strip leading "v"
version="${version#v}"
SRC="https://raw.githubusercontent.com/atom/node-keytar/v$version"
wget "$SRC/package-lock.json"
wget "$SRC/package.json"
rm -f yarn.lock
yarn import
yarn2nix > yarn.nix
rm -rf node_modules package.json package-lock.json
yarn_hash=$(prefetch-yarn-deps yarn.lock)
src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256)
cat > pin.json << EOF
{
"version": "$version",
"srcHash": "$src_hash",
"yarnHash": "$yarn_hash"
}
EOF
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,6 @@
{
"version": "1.9.2",
"desktopSrcHash": "F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=",
"desktopYarnHash": "0iwbszhaxaxggymixljzjb2gqrsij67fwakxhd3yj9g1zds49ghh",
"webHash": "1d9kdj65yk86hx087x1p0qkm0cffaqkwgwzl74g11g264szz8ja2"
}
@@ -1,14 +1,17 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }:
rustPlatform.buildRustPackage rec {
let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json));
in rustPlatform.buildRustPackage rec {
pname = "seshat-node";
version = "2.3.0";
inherit (pinData) version;
src = fetchFromGitHub {
owner = "matrix-org";
repo = "seshat";
rev = version;
sha256 = "0zigrz59mhih9asmbbh38z2fg0sii2342q6q0500qil2a0rssai7";
sha256 = pinData.srcHash;
};
sourceRoot = "source/seshat-node/native";
@@ -18,7 +21,10 @@ rustPlatform.buildRustPackage rec {
npm_config_nodedir = nodejs-14_x;
yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache;
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/seshat-node/yarn.lock";
sha256 = pinData.yarnHash;
};
buildPhase = ''
cd ..
@@ -42,5 +48,5 @@ rustPlatform.buildRustPackage rec {
cp -r . $out
'';
cargoSha256 = "0habjf85mzqxwf8k15msm4cavd7ldq4zpxddkwd4inl2lkvlffqj";
cargoSha256 = pinData.cargoHash;
}
@@ -0,0 +1,6 @@
{
"version": "2.3.0",
"srcHash": "JyqtM1CCRgxAAdhgQYaIUYPnxEcDrlW1SjDCmsrPL34=",
"yarnHash": "0bym6i1f0i3bs4fncbiwzwmbxp7j14rz1v4kyvsl02qs97qw1jac",
"cargoHash": "sha256-EjtH96SC2kgan631+wlu9LStGKm6ljCR4x3/WpCTS0E="
}
@@ -1,16 +1,49 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix
#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the Yarn dependency lock files."
echo "Usage: $0 <git release tag>"
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the seshat package."
echo "Usage: $0 [git release tag]"
exit 1
fi
SRC="https://raw.githubusercontent.com/matrix-org/seshat/$1"
version="$1"
set -euo pipefail
if [ -z "$version" ]; then
version="$(wget -O- "https://api.github.com/repos/matrix-org/seshat/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)"
fi
SRC="https://raw.githubusercontent.com/matrix-org/seshat/$version"
tmpdir=$(mktemp -d)
trap 'rm -rf "$tmpdir"' EXIT
pushd $tmpdir
wget "$SRC/seshat-node/yarn.lock"
yarn2nix > yarn.nix
rm yarn.lock
yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .sha256)
cat > pin.json << EOF
{
"version": "$version",
"srcHash": "$src_hash",
"yarnHash": "$yarn_hash",
"cargoHash": "0000000000000000000000000000000000000000000000000000"
}
EOF
cargo_hash=$(nix-prefetch "{ sha256 }: (import ../../../../../.. {}).element-desktop.seshat.cargoDeps")
cat > pin.json << EOF
{
"version": "$version",
"srcHash": "$src_hash",
"yarnHash": "$yarn_hash",
"cargoHash": "$cargo_hash"
}
EOF
File diff suppressed because it is too large Load Diff
@@ -1,17 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix nix-prefetch-git
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the Yarn dependency lock files for the element-desktop package."
echo "Usage: $0 <git release tag>"
exit 1
fi
RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1"
wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json
wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock
yarn2nix --no-patch --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix
rm element-desktop-yarndeps.lock
@@ -0,0 +1,43 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."
echo "Usage: $0 [git release tag]"
exit 1
fi
version="$1"
set -euo pipefail
if [ -z "$version" ]; then
version="$(wget -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
fi
# strip leading "v"
version="${version#v}"
desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version"
desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256)
web_hash=$(nix-prefetch-url "https://github.com/vector-im/element-web/releases/download/v$version/element-v$version.tar.gz")
wget "$desktop_src/package.json" -O element-desktop-package.json
tmpdir=$(mktemp -d)
trap 'rm -rf "$tmpdir"' EXIT
pushd $tmpdir
wget "$desktop_src/yarn.lock"
desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
cat > pin.json << EOF
{
"version": "$version",
"desktopSrcHash": "$desktop_src_hash",
"desktopYarnHash": "$desktop_yarn_hash",
"webHash": "$web_hash"
}
EOF
@@ -17,11 +17,11 @@
let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin";
majorVersion = "2";
version = "${majorVersion}.14.6";
version = "${majorVersion}.14.8";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2";
sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336";
sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z";
};
nativeBuildInputs = [ makeWrapper ];
@@ -33,6 +33,7 @@
, nspr
, nss
, pango
, pipewire
, systemd
, xdg-utils
, xorg
@@ -119,6 +120,7 @@ let
nspr
nss
pango
pipewire
stdenv.cc.cc
systemd
xorg.libX11
@@ -56,6 +56,12 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
description = "Terminal emulator with support for tiling and tabs";
longDescription = ''
@@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "3.10.1";
version = "3.11.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "120hds7v29v70qxz20ppxf2glmgbah16v7jyy9i6hb6cfqp68vr8";
sha256 = "1s58wlpnndypx1q0m9fx8jmcd6hzqvrwdaxxrk7gn5nf423wq4xv";
};
buildInputs = [ git gettext ];
@@ -1,6 +1,7 @@
{
"version": "14.3.3",
"repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk",
"yarn_hash": "0b6brkxg93gv4gjp1f7qlx7v7q7mb8z9vikcz98igdnhm46nl4dn",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.3.3-ee",
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file, cacert
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps
}:
let
@@ -45,7 +45,10 @@ let
ignoreCollisions = true;
};
yarnOfflineCache = (callPackage ./yarnPkgs.nix {}).offline_cache;
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = data.yarn_hash;
};
assets = stdenv.mkDerivation {
pname = "gitlab-assets";
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix
#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log prefetch-yarn-deps
import click
import click_log
@@ -9,6 +9,7 @@ import logging
import subprocess
import json
import pathlib
import tempfile
from distutils.version import LooseVersion
from typing import Iterable
@@ -42,6 +43,12 @@ class GitLabRepo:
def get_git_hash(self, rev: str):
return subprocess.check_output(['nix-universal-prefetch', 'fetchFromGitLab', '--owner', self.owner, '--repo', self.repo, '--rev', rev]).decode('utf-8').strip()
def get_yarn_hash(self, rev: str):
with tempfile.TemporaryDirectory() as tmp_dir:
with open(tmp_dir + '/yarn.lock', 'w') as f:
f.write(self.get_file('yarn.lock', rev))
return subprocess.check_output(['prefetch-yarn-deps', tmp_dir + '/yarn.lock']).decode('utf-8').strip()
@staticmethod
def rev2version(tag: str) -> str:
"""
@@ -74,6 +81,7 @@ class GitLabRepo:
return dict(version=self.rev2version(rev),
repo_hash=self.get_git_hash(rev),
yarn_hash=self.get_yarn_hash(rev),
owner=self.owner,
repo=self.repo,
rev=rev,
@@ -142,26 +150,6 @@ def update_rubyenv():
subprocess.check_output(['bundix'], cwd=rubyenv_dir)
@cli.command('update-yarnpkgs')
def update_yarnpkgs():
"""Update yarnPkgs"""
repo = GitLabRepo()
yarnpkgs_dir = pathlib.Path(__file__).parent
# load rev from data.json
data = _get_data_json()
rev = data['rev']
with open(yarnpkgs_dir / 'yarn.lock', 'w') as f:
f.write(repo.get_file('yarn.lock', rev))
with open(yarnpkgs_dir / 'yarnPkgs.nix', 'w') as f:
subprocess.run(['yarn2nix'], cwd=yarnpkgs_dir, check=True, stdout=f)
os.unlink(yarnpkgs_dir / 'yarn.lock')
@cli.command('update-gitaly')
def update_gitaly():
"""Update gitaly"""
@@ -203,7 +191,6 @@ def update_all(ctx, rev: str):
"""Update all gitlab components to the latest stable release"""
ctx.invoke(update_data, rev=rev)
ctx.invoke(update_rubyenv)
ctx.invoke(update_yarnpkgs)
ctx.invoke(update_gitaly)
ctx.invoke(update_gitlab_shell)
ctx.invoke(update_gitlab_workhorse)
File diff suppressed because it is too large Load Diff
@@ -74,7 +74,8 @@ stdenv.mkDerivation rec {
'';
postFixup = lib.optionalString withXwayland ''
wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin"
wrapProgram $out/bin/cagebreak \
--prefix PATH : "${lib.makeBinPath [ xwayland ]}"
'';
meta = with lib; {
@@ -6,6 +6,8 @@
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
, enableXWayland ? true
}:
stdenv.mkDerivation rec {
@@ -40,13 +42,16 @@ stdenv.mkDerivation rec {
buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg
wlroots wayland-protocols libdrm
wayland-protocols libdrm
(wlroots.override { inherit enableXWayland; })
];
mesonFlags = [
"-Ddefault-wallpaper=false"
"-Dsd-bus-provider=libsystemd"
];
]
++ lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
passthru.tests.basic = nixosTests.sway;
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, swaylock
, imagemagick, getopt, fontconfig, makeWrapper
{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock
, imagemagick, getopt, fontconfig, wmctrl, makeWrapper
}:
let
@@ -7,20 +7,22 @@ let
coreutils
grim
gawk
jq
swaylock
imagemagick
getopt
fontconfig
wmctrl
];
in stdenv.mkDerivation rec {
pname = "swaylock-fancy-unstable";
version = "2020-02-22";
version = "2021-10-11";
src = fetchFromGitHub {
owner = "Big-B";
repo = "swaylock-fancy";
rev = "5cf977b12f372740aa7b7e5a607d583f93f1e028";
sha256 = "0laqwzi6069sgz91i69438ns0g2nq4zkqickavrf80h4g3gcs8vm";
rev = "265fbfb438392339bf676b0a9dbe294abe2a699e";
sha256 = "NjxeJyWYXBb1P8sXKgb2EWjF+cNodTE83r1YwRYoBjM=";
};
postPatch = ''
@@ -6,6 +6,8 @@
, extraOptions ? [] # E.g.: [ "--verbose" ]
# Used by the NixOS module:
, isNixOS ? false
, enableXWayland ? true
}:
assert extraSessionCommands != "" -> withBaseWrapper;
@@ -13,7 +15,7 @@ assert extraSessionCommands != "" -> withBaseWrapper;
with lib;
let
sway = sway-unwrapped.override { inherit isNixOS; };
sway = sway-unwrapped.override { inherit isNixOS enableXWayland; };
baseWrapper = writeShellScriptBin "sway" ''
set -o errexit
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
@@ -0,0 +1,74 @@
{ stdenv, lib, makeWrapper, coreutils, nix-prefetch-git, fetchurl, nodejs-slim, prefetch-yarn-deps, cacert, callPackage }:
let
yarnpkg-lockfile-tar = fetchurl {
url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz";
sha512 = "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==";
};
in {
prefetch-yarn-deps = stdenv.mkDerivation {
name = "prefetch-yarn-deps";
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ coreutils nix-prefetch-git nodejs-slim ];
buildPhase = ''
runHook preBuild
mkdir libexec
tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js
mv index.js libexec/yarnpkg-lockfile.js
cp ${./index.js} libexec/index.js
patchShebangs libexec/index.js
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r libexec $out
makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \
--prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git ]}
runHook postInstall
'';
};
fetchYarnDeps = let
f = {
name ? "offline",
yarnLock,
hash ? "",
sha256 ? "",
}: let
hash_ =
if hash != "" then { outputHashAlgo = null; outputHash = hash; }
else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
else throw "fetchYarnDeps requires a hash";
in stdenv.mkDerivation {
inherit name;
dontUnpack = true;
dontInstall = true;
nativeBuildInputs = [ prefetch-yarn-deps ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
buildPhase = ''
mkdir -p $out
(cd $out; prefetch-yarn-deps --verbose --builder ${yarnLock})
'';
outputHashMode = "recursive";
inherit (hash_) outputHashAlgo outputHash;
};
in lib.setFunctionArgs f (lib.functionArgs f) // {
tests = callPackage ./tests {};
};
}
+169
View File
@@ -0,0 +1,169 @@
#!/usr/bin/env node
'use strict'
const fs = require('fs')
const crypto = require('crypto')
const process = require('process')
const https = require('https')
const child_process = require('child_process')
const path = require('path')
const lockfile = require('./yarnpkg-lockfile.js')
const { promisify } = require('util')
const execFile = promisify(child_process.execFile)
const exec = async (...args) => {
const res = await execFile(...args)
if (res.error) throw new Error(res.stderr)
return res
}
const downloadFileHttps = (fileName, url, expectedHash) => {
return new Promise((resolve, reject) => {
https.get(url, (res) => {
const file = fs.createWriteStream(fileName)
const hash = crypto.createHash('sha1')
res.pipe(file)
res.pipe(hash).setEncoding('hex')
res.on('end', () => {
file.close()
const h = hash.read()
if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h}`))
resolve()
})
res.on('error', e => reject(e))
})
})
}
const downloadGit = async (fileName, url, rev) => {
await exec('nix-prefetch-git', [
'--out', fileName + '.tmp',
'--url', url,
'--rev', rev,
'--builder'
])
await exec('tar', [
// hopefully make it reproducible across runs and systems
'--owner=0', '--group=0', '--numeric-owner', '--format=gnu', '--sort=name', '--mtime=@1',
// Set u+w because tar-fs can't unpack archives with read-only dirs: https://github.com/mafintosh/tar-fs/issues/79
'--mode', 'u+w',
'-C', fileName + '.tmp',
'-cf', fileName, '.'
])
await exec('rm', [ '-rf', fileName + '.tmp', ])
}
const downloadPkg = (pkg, verbose) => {
const [ url, hash ] = pkg.resolved.split('#')
if (verbose) console.log('downloading ' + url)
if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) {
const fileName = path.basename(url)
const s = url.split('/')
downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[6])
} else if (url.startsWith('https://')) {
const fileName = url
.replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names
.replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore
return downloadFileHttps(fileName, url, hash)
} else if (url.startsWith('git+')) {
const fileName = path.basename(url)
return downloadGit(fileName, url.replace(/^git\+/, ''), hash)
} else {
throw new Error('don\'t know how to download "' + url + '"')
}
}
const performParallel = tasks => {
const worker = async () => {
while (tasks.length > 0) await tasks.shift()()
}
const workers = []
for (let i = 0; i < 4; i++) {
workers.push(worker())
}
return Promise.all(workers)
}
const prefetchYarnDeps = async (lockContents, verbose) => {
const lockData = lockfile.parse(lockContents)
const tasks = Object.values(
Object.entries(lockData.object)
.map(([key, value]) => {
return { key, ...value }
})
.reduce((out, pkg) => {
out[pkg.resolved] = pkg
return out
}, {})
)
.map(pkg => () => downloadPkg(pkg, verbose))
await performParallel(tasks)
await fs.promises.writeFile('yarn.lock', lockContents)
if (verbose) console.log('Done')
}
const showUsage = async () => {
process.stderr.write(`
syntax: prefetch-yarn-deps [path to yarn.lock] [options]
Options:
-h --help Show this help
-v --verbose Verbose output
--builder Only perform the download to current directory, then exit
`)
process.exit(1)
}
const main = async () => {
const args = process.argv.slice(2)
let next, lockFile, verbose, isBuilder
while (next = args.shift()) {
if (next == '--builder') {
isBuilder = true
} else if (next == '--verbose' || next == '-v') {
verbose = true
} else if (next == '--help' || next == '-h') {
showUsage()
} else if (!lockFile) {
lockFile = next
} else {
showUsage()
}
}
let lockContents
try {
lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8')
} catch {
showUsage()
}
if (isBuilder) {
await prefetchYarnDeps(lockContents, verbose)
} else {
const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
try {
process.chdir(tmpDir.trim())
await prefetchYarnDeps(lockContents, verbose)
const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
console.log(hash)
} finally {
await exec('rm', [ '-rf', tmpDir.trim() ])
}
}
}
main()
.catch(e => {
console.error(e)
process.exit(1)
})
@@ -0,0 +1,16 @@
{ invalidateFetcherByDrvHash, fetchYarnDeps, ... }:
{
simple = invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./simple.lock;
sha256 = "sha256-Erdkw2E8wWT09jFNLXGkrdwKl0HuSZWnUDJUrV95vSE=";
};
gitDep = invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./git.lock;
sha256 = "sha256-lAqN4LpoE+jgsQO1nDtuORwcVEO7ogEV53jCu2jFJUI=";
};
githubDep = invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./github.lock;
sha256 = "sha256-Tsfgyjxz8x6gNmfN0xR7G/NQNoEs4svxRN/N+26vfJU=";
};
}
@@ -0,0 +1,7 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
"async@git+https://github.com/caolan/async":
version "3.2.1"
resolved "git+https://github.com/caolan/async#fc9ba651341af5ab974aade6b1640e345912be83"
@@ -0,0 +1,7 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
"async@github:caolan/async":
version "3.2.1"
resolved "https://codeload.github.com/caolan/async/tar.gz/fc9ba651341af5ab974aade6b1640e345912be83"
@@ -0,0 +1,8 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
lit-html@1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0"
integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA==
+14 -20
View File
@@ -1,17 +1,15 @@
{ stdenv
, lib
, buildPackages
{ lib
, importCargoLock
, fetchCargoTarball
, rust
, stdenv
, callPackage
, cacert
, git
, cargoBuildHook
, cargoCheckHook
, cargoInstallHook
, cargoSetupHook
, fetchCargoTarball
, importCargoLock
, rustPlatform
, callPackage
, git
, rust
, rustc
, libiconv
, windows
@@ -19,12 +17,6 @@
{ name ? "${args.pname}-${args.version}"
# SRI hash
, cargoHash ? ""
# Legacy hash
, cargoSha256 ? ""
# Name for the vendored dependencies tarball
, cargoDepsName ? name
@@ -56,7 +48,7 @@
, buildAndTestSubdir ? null
, ... } @ args:
assert cargoVendorDir == null && cargoLock == null -> cargoSha256 == "" && cargoHash == ""
assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256) && !(args ? cargoHash)
-> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set";
assert buildType == "release" || buildType == "debug";
@@ -68,15 +60,17 @@ let
else fetchCargoTarball ({
inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
name = cargoDepsName;
hash = cargoHash;
patches = cargoPatches;
sha256 = cargoSha256;
} // lib.optionalAttrs (args ? cargoHash) {
hash = args.cargoHash;
} // lib.optionalAttrs (args ? cargoSha256) {
sha256 = args.cargoSha256;
} // depsExtraArgs)
else null;
# If we have a cargoSha256 fixed-output derivation, validate it at build time
# against the src fixed-output derivation to check consistency.
validateCargoDeps = !(cargoHash == "" && cargoSha256 == "");
validateCargoDeps = args ? cargoHash || args ? cargoSha256;
target = rust.toRustTargetSpec stdenv.hostPlatform;
targetIsJSON = lib.hasSuffix ".json" target;
@@ -88,7 +82,7 @@ let
(lib.removeSuffix ".json" (builtins.baseNameOf "${target}"))
else target;
sysroot = (callPackage ./sysroot {}) {
sysroot = callPackage ./sysroot { } {
inherit target shortTarget;
RUSTFLAGS = args.RUSTFLAGS or "";
originalCargoToml = src + /Cargo.toml; # profile info is later extracted
@@ -22,15 +22,13 @@ in
, srcs ? []
, patches ? []
, sourceRoot ? ""
, hash ? ""
, sha256 ? ""
, cargoUpdateHook ? ""
, ...
} @ args:
let hash_ =
if hash != "" then { outputHashAlgo = null; outputHash = hash; }
else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
if args ? hash then { outputHashAlgo = null; outputHash = args.hash; }
else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; }
else throw "fetchCargoTarball requires a hash for ${name}";
in stdenv.mkDerivation ({
name = "${name}-vendor.tar.gz";
@@ -1,21 +1,18 @@
{ callPackage, Foundation }:
{ lib, callPackage, Foundation }:
let
mkGraal = opts: callPackage (import ./repository.nix opts) {
mkGraal = opts: callPackage (import ./mkGraal.nix opts) {
inherit Foundation;
};
in {
in
{
inherit mkGraal;
graalvm8-ce = mkGraal rec {
version = "21.2.0";
javaVersion = "8";
platforms = ["x86_64-linux"];
graalvm11-ce = mkGraal rec {
version = lib.fileContents ./version;
javaVersion = "11";
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
};
graalvm11-ce = mkGraal rec {
version = "21.2.0";
javaVersion = "11";
platforms = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
};
# TODO: added graalvm17-ce
}
@@ -0,0 +1,43 @@
# Generated by ./update.sh script
{ javaVersionPlatform, ... }:
[
{
sha256 = {
"11-linux-aarch64" = "0hsjxp6ly7jsn9k94fddcl7afc5gda66jyppcnfvslishbizqd0i";
"11-linux-amd64" = "1ylk5l933z813k0k1xlayiv8fa0f1gmpr66bma51532iy3mch6rs";
"11-darwin-amd64" = "0qpqnnmqxvxzj3mwz05acpg4n8ffqsz0sji8lbl03fgswpvgfavc";
}.${javaVersionPlatform} or null;
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java${javaVersionPlatform}-21.3.0.tar.gz";
}
{
sha256 = {
"11-linux-aarch64" = "0qlmg5fwvqsb5ab3irj2hrcd5jc94mibnlz1gvzpnq85rw1zcb6h";
"11-linux-amd64" = "0kvnjr55rizy53vn0ff9w27z1qh9d1vp3s7r1kdl0wyhrbhd8n49";
"11-darwin-amd64" = "1mg8c8hh8wmbwsisgarmp35jd0dall1fwdv49mggp74hicbc32h3";
}.${javaVersionPlatform} or null;
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/native-image-installable-svm-java${javaVersionPlatform}-21.3.0.jar";
}
{
sha256 = {
"11-linux-aarch64" = "02rvwl1nng8d3qn226rjx5yq2blxs4yz009ab928qanhmb4vhv8b";
"11-linux-amd64" = "0zz62zr7imjaw9a3j5m66xs7c72cqb1i74ab3rnlh0dgs1mdpljg";
"11-darwin-amd64" = "1wiv0299b2xrc229alczmjfj1bsn90p0wdm64rr39xnyyhbqrr80";
}.${javaVersionPlatform} or null;
url = "https://github.com/oracle/truffleruby/releases/download/vm-21.3.0/ruby-installable-svm-java${javaVersionPlatform}-21.3.0.jar";
}
{
sha256 = {
"11-linux-aarch64" = "1ck4c1z98h1zn4i6xhh1hb6w2jab6n17ddykb72xxw4vig9nhlc7";
"11-linux-amd64" = "0gy8jj9d9msmj0i44sysiwq3j2k2w2g47fhq6y1aq47n3kmwj9kv";
"11-darwin-amd64" = "0agw6k3jn2jh8wyc9h8rvzlgs96qh4nlj0y8nyzsmidvwq2ahl00";
}.${javaVersionPlatform} or null;
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/wasm-installable-svm-java${javaVersionPlatform}-21.3.0.jar";
}
{
sha256 = {
"11-linux-amd64" = "1l5av2v459q88zfl83877h7b3426z3d86kp6wqjvz2441brvidi0";
"11-darwin-amd64" = "06694n74dzsfwlli1sjdsrfbj9ngw7bhrcayvy4sgy2va5qpdjs0";
}.${javaVersionPlatform} or null;
url = "https://github.com/graalvm/graalpython/releases/download/vm-21.3.0/python-installable-svm-java${javaVersionPlatform}-21.3.0.jar";
}
]
@@ -24,55 +24,20 @@ let
javaVersionPlatform = "${javaVersion}-${platform}";
graalvmXXX-ce = stdenv.mkDerivation rec {
inherit version;
name = "graalvm${javaVersion}-ce";
srcs = [
(fetchurl {
sha256 = {
"8-linux-amd64" = "01gyxjmfp7wpcyn7x8b184fn0lp3xryfw619bqch120pzvr6z88f";
"11-linux-aarch64" = "sha256-u9841eaHH347JHCrm5u3YGZ9RSTuKiDq368TY2otAYw=";
"11-linux-amd64" = "0w7lhvxm4nggqdcl4xrhdd3y6dqw9jhyca9adjkp508n4lqf1lxv";
"11-darwin-amd64" = "0dnahicdl0vhrbiml9z9nbb7k75hbsjj8rs246i1lwril12dqb7n";
}.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz";
})
(fetchurl {
sha256 = {
"8-linux-amd64" = "1jlvrxdlbsmlk3ia43h9m29kmmdn83h6zdlnf8qb7bm38c84nhsc";
"11-linux-aarch64" = "sha256-7W5gkhj2kON2ocrGpyH/OL/phOyHkjNDId2CtyUAEWY=";
"11-linux-amd64" = "1ybd7a6ii6582skr0nkxx7bccsa7gkg0yriql2h1lcz0rfzcdi3g";
"11-darwin-amd64" = "1jdy845vanmz05zx5b9227gb1msh9wdrz2kf3fx9z54ssd9qgdhm";
}.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar";
})
(fetchurl {
sha256 = {
"8-linux-amd64" = "18ip0ay06q1pryqs8ja988mvk9vw475c0nfjcznnsd1zp296p6jc";
"11-linux-aarch64" = "sha256-i9ysgqbI52PiXofZQ5AnPSzs2TeR8An5CIYzcwhx28o=";
"11-linux-amd64" = "1jszz97mkqavxzyhx5jxhi43kqjxk9c36j5l5hy3kn8sdfmbplm4";
"11-darwin-amd64" = "1767ryhv2cn5anlys63ysax1p8ag79bykac1xfrjfan8yv6d8ybl";
}.${javaVersionPlatform};
url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar";
})
(fetchurl {
sha256 = {
"8-linux-amd64" = "08s36rjy5irg25b7lqx0m4v2wpywin3cqyhdrywhvq14f7zshsd5";
"11-linux-aarch64" = "sha256-Lkc/mq1w18+PQ5McvLGyQBSOz/TMSUgwioRZ0Dtyhm4=";
"11-linux-amd64" = "1ybjaknmbsdg8qzb986x39fq0h7fyiymdcigc7y86swk8dd916hv";
"11-darwin-amd64" = "02dwlb62kqr4rjjmvkhn2xk9l1p47ahg9xyyfkw7im1jwlqmqnzf";
}.${javaVersionPlatform};
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar";
})
] ++ lib.optionals (platform == "amd64") [
# graalpython is not available on aarch64 platforms yet
(fetchurl {
sha256 = {
"8-linux-amd64" = "0il15438qnikqsxdsl7fcdg0c8zs3cbm4ry7pys7fxxr1ckd8szq";
"11-linux-amd64" = "07759sr8nijvqm8aqn69x9vq7lyppns7a6l6xribv43jvfmwpfkl";
"11-darwin-amd64" = "01l3as8dihc7xqy5sdkrpxmpzrqbcvvg84m2s6j1j8y2db1khf2s";
}.${javaVersionPlatform};
url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar";
})
];
srcs =
let
# Some platforms doesn't have all GraalVM features
# e.g.: GraalPython on aarch64-linux
# When the platform doesn't have a feature, sha256 is null on hashes.nix
# To update hashes.nix file, run `./update.sh <graalvm-ce-version>`
maybeFetchUrl = url: if url.sha256 != null then (fetchurl url) else null;
in
(lib.remove null
(map
maybeFetchUrl
(import ./hashes.nix { inherit javaVersionPlatform; })));
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so
@@ -168,16 +133,6 @@ let
done
'';
in {
"8-linux-amd64" = ''
${nativePRNGWorkaround "$out/jre/lib/security/java.security"}
${copyClibrariesToOut "$out/jre/lib/svm/clibraries"}
${copyClibrariesToLib}
# allow using external truffle-api.jar and languages not included in the distrubution
rm $out/jre/lib/jvmci/parentClassLoader.classpath
'';
"11-linux-amd64" = ''
${nativePRNGWorkaround "$out/conf/security/java.security"}
@@ -265,37 +220,47 @@ let
''
}
${
lib.optionalString (platform == "amd64") ''
echo "Testing interpreted languages"
$out/bin/graalpython -c 'print(1 + 1)'
$out/bin/ruby -e 'puts(1 + 1)'
${# TODO: Doesn't work on MacOS, we have this error:
# "Launching JShell execution engine threw: Operation not permitted (Bind failed)"
lib.optionalString (stdenv.isLinux) ''
echo "Testing Jshell"
echo '1 + 1' | $out/bin/jshell
''
}
${
lib.optionalString (platform != "linux-aarch64") ''
echo "Testing GraalPython"
$out/bin/graalpython -c 'print(1 + 1)'
echo '1 + 1' | $out/bin/graalpython
''
}
echo "Testing TruffleRuby"
$out/bin/ruby -e 'puts(1 + 1)'
${# TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL
# headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even
# though `openssl` is in `propagatedBuildInputs`. For more details see:
# https://github.com/NixOS/nixpkgs/pull/105815
# TODO: "truffleruby: an internal exception escaped out of the interpreter"
# error on linux-aarch64
lib.optionalString (platform == "linux-amd64") ''
# TODO: "core/kernel.rb:234:in `gem_original_require':
# /nix/store/wlc5xalzj2ip1l83siqw8ac5fjd52ngm-graalvm11-ce/languages/llvm/native/lib:
# cannot read file data: Is a directory (RuntimeError)" error on linux-amd64
lib.optionalString false ''
echo '1 + 1' | $out/bin/irb
''
}
'';
${# TODO: Doesn't work on MacOS, we have this error:
# "Launching JShell execution engine threw: Operation not permitted (Bind failed)"
lib.optionalString (javaVersion == "11" && stdenv.isLinux) ''
echo '1 + 1' | $out/bin/jshell
''
}'';
passthru.home = graalvmXXX-ce;
passthru = {
home = graalvmXXX-ce;
updateScript = ./update.sh;
};
meta = with lib; {
inherit platforms;
homepage = "https://www.graalvm.org/";
description = "High-Performance Polyglot VM";
license = with licenses; [ upl gpl2Classpath bsd3 ];
@@ -308,7 +273,6 @@ let
ericdallo
thiagokokada
];
platforms = platforms;
};
};
in graalvmXXX-ce
@@ -0,0 +1,72 @@
#!/usr/bin/env nix-shell
#!nix-shell -p curl -i bash coreutils nix common-updater-scripts curl jq
set -eou pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
info() { echo "[INFO] $*"; }
echo_file() { echo "$@" >> hashes.nix; }
verlte() {
[ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ]
}
readonly old_version="$(cat version)"
if [[ -z "${1:-}" ]]; then
readonly gh_version="$(curl -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | jq --raw-output .tag_name)"
readonly new_version="${gh_version//vm-/}"
else
readonly new_version="$1"
fi
if verlte "$new_version" "$old_version"; then
info "graalvm-ce $old_version is up-to-date. Exiting..."
exit 0
else
info "graalvm-ce $old_version is out-of-date. Updating..."
fi
readonly urls=(
"https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz"
"https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar"
"https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar"
"https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar"
"https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar"
)
readonly platforms=(
"11-linux-aarch64"
"11-linux-amd64"
"11-darwin-amd64"
)
info "Deleting old hashes.nix file..."
rm -f hashes.nix
info "Generating hashes.nix file for 'graalvm-ce' $new_version. This will take a while..."
echo_file "# Generated by $0 script"
echo_file "{ javaVersionPlatform, ... }:"
echo_file "["
for url in "${urls[@]}"; do
echo_file " {"
echo_file " sha256 = {"
for platform in "${platforms[@]}"; do
if hash="$(nix-prefetch-url "${url//@platform@/$platform}")"; then
echo_file " \"$platform\" = \"$hash\";"
fi
done
echo_file ' }.${javaVersionPlatform} or null;'
echo_file " url = \"${url//@platform@/\$\{javaVersionPlatform\}}\";"
echo_file " }"
done
echo_file "]"
info "Updating 'version' file..."
echo "$new_version" > version
info "Done!"
@@ -0,0 +1 @@
21.3.0
@@ -13,6 +13,7 @@
, mpg123
, opusfile
, smpeg2
, timidity
}:
stdenv.mkDerivation rec {
@@ -42,8 +43,16 @@ stdenv.mkDerivation rec {
mpg123
opusfile
smpeg2
# MIDI patterns
timidity
];
# fix default path to timidity.cfg so MIDI files could be played
postPatch = ''
substituteInPlace timidity/options.h \
--replace "/usr/share/timidity" "${timidity}/share/timidity"
'';
configureFlags = [
"--disable-music-ogg-shared"
"--disable-music-flac-shared"
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake curl ];
buildInputs = [
aws-crt-cpp
curl openssl zlib
] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) ||
@@ -50,14 +49,7 @@ stdenv.mkDerivation rec {
[ CoreAudio AudioToolbox ];
# propagation is needed for Security.framework to be available when linking
propagatedBuildInputs = [
aws-c-cal
aws-c-event-stream
aws-c-io
aws-c-common
aws-checksums
s2n-tls
];
propagatedBuildInputs = [ aws-crt-cpp ];
cmakeFlags = [
"-DBUILD_DEPS=OFF"
@@ -2,21 +2,19 @@
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
, zimg, libass, python3, libiconv
, ApplicationServices
, ocrSupport ? false, tesseract
, imwriSupport ? true, imagemagick
}:
with lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R55";
version = "R57";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE=";
sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk=";
};
patches = [
@@ -27,14 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract
++ optional imwriSupport imagemagick;
configureFlags = [
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ];
enableParallelBuilding = true;
@@ -54,6 +45,10 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/vspipe \
--prefix PYTHONPATH : $out/${python3.sitePackages}
# VapourSynth does not include any plugins by default
# and emits a warning when the system plugin directory does not exist.
mkdir $out/lib/vapoursynth
'';
meta = with lib; {
@@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand
{ lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:
@@ -6,13 +6,13 @@
let
unwrapped = mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19";
version = "R19-mod-4";
src = fetchFromBitbucket {
owner = "mystery_keeper";
src = fetchFromGitHub {
owner = "YomikoR";
repo = pname;
rev = lib.toLower version;
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
};
nativeBuildInputs = [ qmake ];
@@ -35,7 +35,7 @@ let
meta = with lib; {
description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
platforms = platforms.all;
+11 -3
View File
@@ -1,7 +1,9 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg, xcbutilrenderutil, xwayland, seatd
, libpng, ffmpeg, xcbutilrenderutil, seatd
, enableXWayland ? true, xwayland ? null
}:
stdenv.mkDerivation rec {
@@ -25,8 +27,14 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg xcbutilrenderutil xwayland seatd
];
libpng ffmpeg xcbutilrenderutil seatd
]
++ lib.optional enableXWayland xwayland
;
mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
postFixup = ''
# Install ALL example programs to $examples:
+1
View File
@@ -7,6 +7,7 @@ Want to add a package? There are 3 simple steps!
specify the native dependencies correctly the first time.
(Might be nice to ensure the cache directories exist)
3. Add native libraries and whatever else is needed to quicklisp-to-nix-overrides.nix.
If libraries are needed during package analysis then add them to shell.nix, too.
4. Sometimes there are problems with loading implementation-provided systems.
In this case you might need to add more systems in the implementation's (so
SBCL's) entry into *implementation-systems* in quicklisp-to-nix/system-info.lisp
@@ -29,7 +29,9 @@ let
echo "source '$path_config_script'" >> "$config_script"
echo "fi" >> "$config_script"
echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG:-}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script"
echo "export NIX_LISP_ASDF_PATHS=\"$( ( echo "\''${NIX_LISP_ASDF_PATHS:-}"; echo "$NIX_LISP_ASDF_PATHS"; echo "$out/lib/common-lisp/${args.baseName}" ) | grep . | sort | uniq)\"" >> "$path_config_script"
echo "NIX_LISP_ASDF_PATHS=\"$( echo "\''${NIX_LISP_ASDF_PATHS:-}"; echo "$NIX_LISP_ASDF_PATHS"; echo "$out/lib/common-lisp/${args.baseName}" )\"" >> "$path_config_script"
echo "export NIX_LISP_ASDF_PATHS=\$((tr ' ' '\n' | sort | uniq | tr '\n' ' ') <<< \$NIX_LISP_ASDF_PATHS)" >> $path_config_script
test -n "$LD_LIBRARY_PATH" &&
echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script"
test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
@@ -107,6 +109,8 @@ basePackage = {
ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}";
noAuditTmpDir = true;
meta = {
inherit description version;
} // meta;
@@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
url = "https://beta.quicklisp.org/dist/quicklisp/2021-04-11/distinfo.txt";
sha256 = "sha256:1z7a7m9cm7iv4m9ajvyqphsw30s3qwb0l8g8ayfmkvmvhlj79g86";
url = "http://beta.quicklisp.org/dist/quicklisp/2021-08-07/distinfo.txt";
sha256 = "sha256:05hby6rbsxk3pisjzr9gqjw0cdk2rq8hc4j544hqf11y6451k37v";
};
buildPhase = "true; ";
postInstall = ''
@@ -205,5 +205,48 @@ let lispPackages = rec {
pkgs.sbcl
];
};
mgl = buildLispPackage rec {
baseName = "mgl";
version = "2021-10-07";
description = "MGL is a machine learning library for backpropagation neural networks, boltzmann machines, gaussian processes and more";
deps = with pkgs.lispPackages; [
alexandria closer-mop array-operations lla cl-reexport mgl-mat mgl-pax
named-readtables pythonic-string-reader
];
src = pkgs.fetchFromGitHub {
owner = "melisgl";
repo = "mgl";
rev = "e697791a9bcad3b6e7b3845246a2aa55238cfef7";
sha256 = "sha256:09sf7nq7nmf9q7bh3a5ygl2i2n0nhrx5fk2kv5ili0ckv7g9x72s";
# date = 2021-10-18T14:15+02:00
};
buildSystems = [ "mgl" "mgl/test" ];
packageName = "mgl";
parasites = [ "mgl/test" ];
asdFilesToKeep = [ "mgl.asd" "mgl-example.asd" "gnuplot/mgl-gnuplot.asd" "visuals/mgl-visuals.asd" ];
};
mgl-mat = buildLispPackage rec {
baseName = "mgl-mat";
version = "2021-10-11";
description = "Multi-dimensional arrays with FFI/CUDA support";
deps = with pkgs.lispPackages; [
alexandria bordeaux-threads cffi cffi-grovel cl-cuda flexi-streams ieee-floats
lla mgl-pax static-vectors trivial-garbage
];
src = pkgs.fetchFromGitHub {
owner = "melisgl";
repo = "mgl-mat";
rev = "3710858bc876b1b86e50f1db2abe719e92d810e7";
sha256 = "sha256:1aa2382mi55rp8pd31dz4d94yhfzh30vkggcvmvdfrr4ngffj0dx";
# date = 2021-10-18T14:15+02:00
};
packageName = "mgl-mat";
buildSystems = [ "mgl-mat" "mgl-mat/test" ];
parasites = [ "mgl-mat/test" ];
asdFilesToKeep = [ "mgl-mat.asd" ];
};
};
in lispPackages
@@ -0,0 +1,25 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "_1am";
version = "20141106-git";
description = "A minimal testing framework.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz";
sha256 = "0vnnqd4fiq9z34i1k9gqczg3j6xllwba1f6nx0b82sgsdccmsly6";
};
packageName = "1am";
asdFilesToKeep = ["1am.asd"];
overrides = x: x;
}
/* (SYSTEM 1am DESCRIPTION A minimal testing framework. SHA256
0vnnqd4fiq9z34i1k9gqczg3j6xllwba1f6nx0b82sgsdccmsly6 URL
http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz MD5
c5e83c329157518e3ebfeef63e4ac269 NAME 1am FILENAME _1am DEPS NIL
DEPENDENCIES NIL VERSION 20141106-git SIBLINGS NIL PARASITES NIL) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "agutil";
version = "20200325-git";
version = "20210531-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" ];
deps = [ args."alexandria" args."closer-mop" args."optima" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz";
sha256 = "0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k";
url = "http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz";
sha256 = "01shs4qbr0bzmx9134cm84zbh8whbi2s5xngapd2fl8ag1rda9q1";
};
packageName = "agutil";
@@ -20,23 +20,10 @@ rec {
}
/* (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
SHA256 01shs4qbr0bzmx9134cm84zbh8whbi2s5xngapd2fl8ag1rda9q1 URL
http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz
MD5 99de7cd320ae2696c1707ca5b55cf40a 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) */
(NAME closer-mop FILENAME closer-mop) (NAME optima FILENAME optima))
DEPENDENCIES (alexandria closer-mop optima) VERSION 20210531-git SIBLINGS
NIL PARASITES NIL) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "alexandria";
version = "20210411-git";
version = "20210807-git";
description = "Alexandria is a collection of portable public domain utilities.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz";
sha256 = "0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh";
url = "http://beta.quicklisp.org/archive/alexandria/2021-08-07/alexandria-20210807-git.tgz";
sha256 = "0y2x3xapx06v8083ls4pz12s63gv33d6ix05r61m62h4qqm8qk3j";
};
packageName = "alexandria";
@@ -20,8 +20,8 @@ rec {
}
/* (SYSTEM alexandria DESCRIPTION
Alexandria is a collection of portable public domain utilities. SHA256
0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh URL
http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz
MD5 415c43451862b490577b20ee4fb8e8d7 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (alexandria-tests)
0y2x3xapx06v8083ls4pz12s63gv33d6ix05r61m62h4qqm8qk3j URL
http://beta.quicklisp.org/archive/alexandria/2021-08-07/alexandria-20210807-git.tgz
MD5 0193fd1a1d702b4a0fafa19361b1e644 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20210807-git SIBLINGS (alexandria-tests)
PARASITES NIL) */
@@ -0,0 +1,32 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "array-operations";
version = "20210411-git";
parasites = [ "array-operations/tests" ];
description = "Simple array operations library for Common Lisp.";
deps = [ args."alexandria" args."anaphora" args."clunit2" args."let-plus" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/array-operations/2021-04-11/array-operations-20210411-git.tgz";
sha256 = "0l6wxd3a1xdcmcsc93prq8ymainfsy15imiwnaik1i9g94fcbjz8";
};
packageName = "array-operations";
asdFilesToKeep = ["array-operations.asd"];
overrides = x: x;
}
/* (SYSTEM array-operations DESCRIPTION
Simple array operations library for Common Lisp. SHA256
0l6wxd3a1xdcmcsc93prq8ymainfsy15imiwnaik1i9g94fcbjz8 URL
http://beta.quicklisp.org/archive/array-operations/2021-04-11/array-operations-20210411-git.tgz
MD5 902c6034c006bc6ca88ef59e7ff2b1aa NAME array-operations FILENAME
array-operations DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME clunit2 FILENAME clunit2) (NAME let-plus FILENAME let-plus))
DEPENDENCIES (alexandria anaphora clunit2 let-plus) VERSION 20210411-git
SIBLINGS NIL PARASITES (array-operations/tests)) */
@@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "binomial-heap";
version = "20130420-git";
description = "A compact binomial heap implementation.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz";
sha256 = "0fl062psd0jn94raip46lq342xmsq0xgrql6v5f9j9w0ps0dg2ap";
};
packageName = "binomial-heap";
asdFilesToKeep = ["binomial-heap.asd"];
overrides = x: x;
}
/* (SYSTEM binomial-heap DESCRIPTION A compact binomial heap implementation.
SHA256 0fl062psd0jn94raip46lq342xmsq0xgrql6v5f9j9w0ps0dg2ap URL
http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz
MD5 ca40cb01b88a3fe902cc4cc25fb2d242 NAME binomial-heap FILENAME
binomial-heap DEPS NIL DEPENDENCIES NIL VERSION 20130420-git SIBLINGS NIL
PARASITES NIL) */
@@ -0,0 +1,28 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "binpack";
version = "20201220-git";
parasites = [ "binpack/2" ];
description = "Rectangle packer for sprite/texture atlases";
deps = [ args."alexandria" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/binpack/2020-12-20/binpack-20201220-git.tgz";
sha256 = "1kyl19kjsii2nrbf229c5fb3bjw7r25736f991g2j8vig991imwm";
};
packageName = "binpack";
asdFilesToKeep = ["binpack.asd"];
overrides = x: x;
}
/* (SYSTEM binpack DESCRIPTION Rectangle packer for sprite/texture atlases
SHA256 1kyl19kjsii2nrbf229c5fb3bjw7r25736f991g2j8vig991imwm URL
http://beta.quicklisp.org/archive/binpack/2020-12-20/binpack-20201220-git.tgz
MD5 1ac4eaa76586091edb77111ea033f316 NAME binpack FILENAME binpack DEPS
((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
20201220-git SIBLINGS (binpack-test) PARASITES (binpack/2)) */
@@ -1,87 +0,0 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "caveman";
version = "20200325-git";
description = "Web Application Framework for Common Lisp";
deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz";
sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py";
};
packageName = "caveman";
asdFilesToKeep = ["caveman.asd"];
overrides = x: x;
}
/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py URL
http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz
MD5 32a7cbce26c77f885a497117c8e94a13 NAME caveman FILENAME caveman DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
(NAME chunga FILENAME chunga)
(NAME circular-streams FILENAME circular-streams)
(NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot)
(NAME cl-ansi-text FILENAME cl-ansi-text)
(NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
(NAME cl-colors2 FILENAME cl-colors2) (NAME cl-cookie FILENAME cl-cookie)
(NAME cl-emb FILENAME cl-emb) (NAME cl-fad FILENAME cl-fad)
(NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project)
(NAME cl-reexport FILENAME cl-reexport)
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
(NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
(NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test)
(NAME clack-v1-compat FILENAME clack-v1-compat)
(NAME dexador FILENAME dexador) (NAME dissect FILENAME dissect)
(NAME do-urlencode FILENAME do-urlencode)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
(NAME http-body FILENAME http-body)
(NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
(NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
(NAME myway FILENAME myway)
(NAME named-readtables FILENAME named-readtables)
(NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove)
(NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388)
(NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME trivial-mimes FILENAME trivial-mimes)
(NAME trivial-types FILENAME trivial-types)
(NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
DEPENDENCIES
(alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
cl-colors cl-colors2 cl-cookie cl-emb cl-fad cl-ppcre cl-project
cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
dissect do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
let-plus local-time map-set marshal md5 myway named-readtables proc-parse
prove quri rfc2388 rove smart-buffer split-sequence static-vectors
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
trivial-mimes trivial-types usocket xsubseq)
VERSION 20200325-git SIBLINGS
(caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
caveman2)
PARASITES NIL) */
@@ -6,7 +6,7 @@ rec {
description = "The CFFI toolchain";
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
deps = [ args."alexandria" args."asdf" args."babel" args."cffi" args."trivial-features" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
@@ -23,10 +23,10 @@ rec {
http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5
c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-toolchain FILENAME
cffi-toolchain DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi)
((NAME alexandria FILENAME alexandria) (NAME asdf FILENAME asdf)
(NAME babel FILENAME babel) (NAME cffi FILENAME cffi)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1
SIBLINGS
DEPENDENCIES (alexandria asdf babel cffi trivial-features) VERSION
cffi_0.24.1 SIBLINGS
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
PARASITES NIL) */
@@ -0,0 +1,32 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "check-it";
version = "20150709-git";
parasites = [ "check-it-test" ];
description = "A randomized property-based testing tool for Common Lisp.";
deps = [ args."alexandria" args."closer-mop" args."optima" args."stefil" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz";
sha256 = "1bx3ndkkl3w7clkqplhy6c2sz46pcp5w76j610gynzv7scz72iw2";
};
packageName = "check-it";
asdFilesToKeep = ["check-it.asd"];
overrides = x: x;
}
/* (SYSTEM check-it DESCRIPTION
A randomized property-based testing tool for Common Lisp. SHA256
1bx3ndkkl3w7clkqplhy6c2sz46pcp5w76j610gynzv7scz72iw2 URL
http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz
MD5 0baae55e5a9c8c884202cbc51e634c42 NAME check-it FILENAME check-it DEPS
((NAME alexandria FILENAME alexandria)
(NAME closer-mop FILENAME closer-mop) (NAME optima FILENAME optima)
(NAME stefil FILENAME stefil))
DEPENDENCIES (alexandria closer-mop optima stefil) VERSION 20150709-git
SIBLINGS NIL PARASITES (check-it-test)) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "chipz";
version = "20190202-git";
version = "20210807-git";
description = "A library for decompressing deflate, zlib, and gzip data";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz";
sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a";
url = "http://beta.quicklisp.org/archive/chipz/2021-08-07/chipz-20210807-git.tgz";
sha256 = "0g7xhh4yq9azjq7gnszaq2kbxima2q30apb3rrglc1ign973hr8x";
};
packageName = "chipz";
@@ -20,7 +20,7 @@ rec {
}
/* (SYSTEM chipz DESCRIPTION
A library for decompressing deflate, zlib, and gzip data SHA256
1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a URL
http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz
MD5 e3533408ca6899fe996eede390e820c7 NAME chipz FILENAME chipz DEPS NIL
DEPENDENCIES NIL VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */
0g7xhh4yq9azjq7gnszaq2kbxima2q30apb3rrglc1ign973hr8x URL
http://beta.quicklisp.org/archive/chipz/2021-08-07/chipz-20210807-git.tgz
MD5 11438e3bc60c39294c337cb232ae8040 NAME chipz FILENAME chipz DEPS NIL
DEPENDENCIES NIL VERSION 20210807-git SIBLINGS NIL PARASITES NIL) */
@@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-ascii-table";
version = "20200610-git";
description = "Common Lisp library to present tabular data in ascii-art table.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz";
sha256 = "00395cbmjwlywyks3zd4mqp0w7yyms61ywp06knv1gbf847vy7yi";
};
packageName = "cl-ascii-table";
asdFilesToKeep = ["cl-ascii-table.asd"];
overrides = x: x;
}
/* (SYSTEM cl-ascii-table DESCRIPTION
Common Lisp library to present tabular data in ascii-art table. SHA256
00395cbmjwlywyks3zd4mqp0w7yyms61ywp06knv1gbf847vy7yi URL
http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz
MD5 6f2eaaae3fb03ba719d77ed3ffaeaf4f NAME cl-ascii-table FILENAME
cl-ascii-table DEPS NIL DEPENDENCIES NIL VERSION 20200610-git SIBLINGS NIL
PARASITES NIL) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async-repl";
version = "cl-async-20210228-git";
version = "cl-async-20210531-git";
description = "REPL integration for CL-ASYNC.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz";
sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4";
url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
};
packageName = "cl-async-repl";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
MD5 0954743eb96f941aa27ff09bceff91dc NAME cl-async-repl FILENAME
0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
VERSION cl-async-20210228-git SIBLINGS
VERSION cl-async-20210531-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async-ssl";
version = "cl-async-20210228-git";
version = "cl-async-20210531-git";
description = "SSL Wrapper around cl-async socket implementation.";
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz";
sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4";
url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
};
packageName = "cl-async-ssl";
@@ -20,9 +20,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
MD5 0954743eb96f941aa27ff09bceff91dc NAME cl-async-ssl FILENAME
0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async-ssl FILENAME
cl-async-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -41,5 +41,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
VERSION cl-async-20210228-git SIBLINGS
VERSION cl-async-20210531-git SIBLINGS
(cl-async-repl cl-async-test cl-async) PARASITES NIL) */
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-async";
version = "20210228-git";
version = "20210531-git";
parasites = [ "cl-async-base" "cl-async-util" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz";
sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4";
url = "http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz";
sha256 = "0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw";
};
packageName = "cl-async";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
MD5 0954743eb96f941aa27ff09bceff91dc NAME cl-async FILENAME cl-async DEPS
0hvgxkdvz1hz9ysyajlsnckcypfqka6h5payy3chxbnbvis4kkqw URL
http://beta.quicklisp.org/archive/cl-async/2021-05-31/cl-async-20210531-git.tgz
MD5 bf2b1337e09df5ecca329c3e92622376 NAME cl-async FILENAME cl-async DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -38,5 +38,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
vom)
VERSION 20210228-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
VERSION 20210531-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
PARASITES (cl-async-base cl-async-util)) */
@@ -2,17 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-colors2";
version = "20210411-git";
parasites = [ "cl-colors2/tests" ];
version = "20210630-git";
description = "Simple color library for Common Lisp";
deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ];
deps = [ args."alexandria" args."cl-ppcre" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz";
sha256 = "14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk";
url = "http://beta.quicklisp.org/archive/cl-colors2/2021-06-30/cl-colors2-20210630-git.tgz";
sha256 = "00mb239p4r30fm7b0qwfg1vfyp83h2h87igk3hqqgvadp6infi7g";
};
packageName = "cl-colors2";
@@ -21,11 +19,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256
14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk URL
http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz
MD5 e6b54e76e7d1cfcff45955dbd4752f1d NAME cl-colors2 FILENAME cl-colors2
00mb239p4r30fm7b0qwfg1vfyp83h2h87igk3hqqgvadp6infi7g URL
http://beta.quicklisp.org/archive/cl-colors2/2021-06-30/cl-colors2-20210630-git.tgz
MD5 50a5885e2b55239d5904b0a0134e0be3 NAME cl-colors2 FILENAME cl-colors2
DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME clunit2 FILENAME clunit2))
DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20210411-git SIBLINGS
NIL PARASITES (cl-colors2/tests)) */
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre))
DEPENDENCIES (alexandria cl-ppcre) VERSION 20210630-git SIBLINGS NIL
PARASITES NIL) */
@@ -0,0 +1,45 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-cuda";
version = "20210807-git";
description = "Cl-cuda is a library to use NVIDIA CUDA in Common Lisp programs.";
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-pattern" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."external-program" args."named-readtables" args."osicat" args."split-sequence" args."trivial-features" args."trivial-types" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
sha256 = "0q974qrjxdn7c53frpac0hz9wnxhnf3lf8xngrc8zkphp1windc0";
};
packageName = "cl-cuda";
asdFilesToKeep = ["cl-cuda.asd"];
overrides = x: x;
}
/* (SYSTEM cl-cuda DESCRIPTION
Cl-cuda is a library to use NVIDIA CUDA in Common Lisp programs. SHA256
0q974qrjxdn7c53frpac0hz9wnxhnf3lf8xngrc8zkphp1windc0 URL
http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz
MD5 0502aed4f738192adee742b7757ee8d7 NAME cl-cuda FILENAME cl-cuda DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain)
(NAME cl-annot FILENAME cl-annot) (NAME cl-pattern FILENAME cl-pattern)
(NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME external-program FILENAME external-program)
(NAME named-readtables FILENAME named-readtables)
(NAME osicat FILENAME osicat)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-types FILENAME trivial-types))
DEPENDENCIES
(alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-pattern
cl-ppcre cl-reexport cl-syntax cl-syntax-annot external-program
named-readtables osicat split-sequence trivial-features trivial-types)
VERSION 20210807-git SIBLINGS
(cl-cuda-examples cl-cuda-interop-examples cl-cuda-interop cl-cuda-misc)
PARASITES NIL) */
@@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-digraph";
version = "20210411-hg";
description = "Simple directed graphs for Common Lisp.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-digraph/2021-04-11/cl-digraph-20210411-hg.tgz";
sha256 = "1g9l3dzw4ykvprl3id7xv4brpzz86jk70z4wfw5lkq8vpxv397fi";
};
packageName = "cl-digraph";
asdFilesToKeep = ["cl-digraph.asd"];
overrides = x: x;
}
/* (SYSTEM cl-digraph DESCRIPTION Simple directed graphs for Common Lisp.
SHA256 1g9l3dzw4ykvprl3id7xv4brpzz86jk70z4wfw5lkq8vpxv397fi URL
http://beta.quicklisp.org/archive/cl-digraph/2021-04-11/cl-digraph-20210411-hg.tgz
MD5 c7c947fb7471213b24505bff1e9287de NAME cl-digraph FILENAME cl-digraph
DEPS NIL DEPENDENCIES NIL VERSION 20210411-hg SIBLINGS
(cl-digraph.dot cl-digraph.test) PARASITES NIL) */
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-environments";
version = "20210411-git";
version = "20210807-git";
parasites = [ "cl-environments/test" ];
@@ -10,11 +10,11 @@ rec {
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" ];
deps = [ args."alexandria" args."anaphora" args."closer-mop" args."collectors" args."fiveam" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz";
sha256 = "1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk";
url = "http://beta.quicklisp.org/archive/cl-environments/2021-08-07/cl-environments-20210807-git.tgz";
sha256 = "1i544zz9v49b0mdv96sr17ivnz4s84lgw4vypq9v9w6cmhz5v8am";
};
packageName = "cl-environments";
@@ -26,19 +26,17 @@ rec {
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
SHA256 1i544zz9v49b0mdv96sr17ivnz4s84lgw4vypq9v9w6cmhz5v8am URL
http://beta.quicklisp.org/archive/cl-environments/2021-08-07/cl-environments-20210807-git.tgz
MD5 6884f21f315c5082fd6db7233497497d 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 collectors FILENAME collectors) (NAME fiveam FILENAME fiveam)
(NAME iterate FILENAME iterate) (NAME optima FILENAME optima)
(NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0)
(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)) */
(alexandria anaphora closer-mop collectors fiveam iterate optima
parse-declarations-1.0 symbol-munger)
VERSION 20210807-git SIBLINGS NIL PARASITES (cl-environments/test)) */
@@ -0,0 +1,42 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-form-types";
version = "20210807-git";
parasites = [ "cl-form-types/test" ];
description = "Library for determining types of Common Lisp forms.";
deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."closer-mop" args."collectors" args."fiveam" args."introspect-environment" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-form-types/2021-08-07/cl-form-types-20210807-git.tgz";
sha256 = "1hv78ygnzf67f8ww22bmc2nx2gmw3lg7qc3navmd541jivx6v0lp";
};
packageName = "cl-form-types";
asdFilesToKeep = ["cl-form-types.asd"];
overrides = x: x;
}
/* (SYSTEM cl-form-types DESCRIPTION
Library for determining types of Common Lisp forms. SHA256
1hv78ygnzf67f8ww22bmc2nx2gmw3lg7qc3navmd541jivx6v0lp URL
http://beta.quicklisp.org/archive/cl-form-types/2021-08-07/cl-form-types-20210807-git.tgz
MD5 1b1415794a4e9cd6716ee3b5eb0f658a NAME cl-form-types FILENAME
cl-form-types DEPS
((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria)
(NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows)
(NAME cl-environments FILENAME cl-environments)
(NAME closer-mop FILENAME closer-mop)
(NAME collectors FILENAME collectors) (NAME fiveam FILENAME fiveam)
(NAME introspect-environment FILENAME introspect-environment)
(NAME iterate FILENAME iterate) (NAME optima FILENAME optima)
(NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0)
(NAME symbol-munger FILENAME symbol-munger))
DEPENDENCIES
(agutil alexandria anaphora arrows cl-environments closer-mop collectors
fiveam introspect-environment iterate optima parse-declarations-1.0
symbol-munger)
VERSION 20210807-git SIBLINGS NIL PARASITES (cl-form-types/test)) */
@@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-fuzz";
version = "20181018-git";
description = "A Fuzz Testing Framework";
deps = [ args."alexandria" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz";
sha256 = "1kxh73lbnhzzpflab1vpxsmg4qia9n42sij0459iksi29kmjxjpz";
};
packageName = "cl-fuzz";
asdFilesToKeep = ["cl-fuzz.asd"];
overrides = x: x;
}
/* (SYSTEM cl-fuzz DESCRIPTION A Fuzz Testing Framework SHA256
1kxh73lbnhzzpflab1vpxsmg4qia9n42sij0459iksi29kmjxjpz URL
http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz
MD5 22e715b370ea886bbff1e09db20c4e32 NAME cl-fuzz FILENAME cl-fuzz DEPS
((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
20181018-git SIBLINGS NIL PARASITES NIL) */
@@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-geometry";
version = "20160531-git";
description = "Library for two dimensional geometry.";
deps = [ args."iterate" args."trees" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz";
sha256 = "0v451w2dx9llvd2kgp3m5jn2n8n0xwynxf8zl436cngh63ag6s7p";
};
packageName = "cl-geometry";
asdFilesToKeep = ["cl-geometry.asd"];
overrides = x: x;
}
/* (SYSTEM cl-geometry DESCRIPTION Library for two dimensional geometry. SHA256
0v451w2dx9llvd2kgp3m5jn2n8n0xwynxf8zl436cngh63ag6s7p URL
http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz
MD5 c0aaccbb4e2df6c504e6c1cd15155353 NAME cl-geometry FILENAME cl-geometry
DEPS ((NAME iterate FILENAME iterate) (NAME trees FILENAME trees))
DEPENDENCIES (iterate trees) VERSION 20160531-git SIBLINGS
(cl-geometry-tests) PARASITES NIL) */
@@ -0,0 +1,26 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-heap";
version = "0.1.6";
description = "An implementation of heap and priority queue data structures.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz";
sha256 = "163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i";
};
packageName = "cl-heap";
asdFilesToKeep = ["cl-heap.asd"];
overrides = x: x;
}
/* (SYSTEM cl-heap DESCRIPTION
An implementation of heap and priority queue data structures. SHA256
163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i URL
http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz MD5
a12d71f7bbe22d6acdcc7cf36fb907b0 NAME cl-heap FILENAME cl-heap DEPS NIL
DEPENDENCIES NIL VERSION 0.1.6 SIBLINGS (cl-heap-tests) PARASITES NIL) */
@@ -0,0 +1,34 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-num-utils";
version = "20210531-git";
parasites = [ "cl-num-utils-tests" ];
description = "Numerical utilities for Common Lisp";
deps = [ args."alexandria" args."anaphora" args."array-operations" args."cl-slice" args."clunit" args."let-plus" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz";
sha256 = "1snhwhnrkmavkhwd0dx7a958xdiwcc0a84fj0k5xqj99ksd9hp8x";
};
packageName = "cl-num-utils";
asdFilesToKeep = ["cl-num-utils.asd"];
overrides = x: x;
}
/* (SYSTEM cl-num-utils DESCRIPTION Numerical utilities for Common Lisp SHA256
1snhwhnrkmavkhwd0dx7a958xdiwcc0a84fj0k5xqj99ksd9hp8x URL
http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz
MD5 1977251bf552ba82005de0dc2f37d130 NAME cl-num-utils FILENAME
cl-num-utils DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME array-operations FILENAME array-operations)
(NAME cl-slice FILENAME cl-slice) (NAME clunit FILENAME clunit)
(NAME let-plus FILENAME let-plus))
DEPENDENCIES
(alexandria anaphora array-operations cl-slice clunit let-plus) VERSION
20210531-git SIBLINGS NIL PARASITES (cl-num-utils-tests)) */
@@ -0,0 +1,34 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-pattern";
version = "20140713-git";
description = "System lacks description";
deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."named-readtables" args."trivial-types" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz";
sha256 = "08z7jccjcq41i3i5zdsgixqnijgyrb4q7hm7gq8l5xb1sr3kj72v";
};
packageName = "cl-pattern";
asdFilesToKeep = ["cl-pattern.asd"];
overrides = x: x;
}
/* (SYSTEM cl-pattern DESCRIPTION System lacks description SHA256
08z7jccjcq41i3i5zdsgixqnijgyrb4q7hm7gq8l5xb1sr3kj72v URL
http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz
MD5 cf8e74def535c66a358df1ada9d89785 NAME cl-pattern FILENAME cl-pattern
DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-annot FILENAME cl-annot)
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME named-readtables FILENAME named-readtables)
(NAME trivial-types FILENAME trivial-types))
DEPENDENCIES
(alexandria cl-annot cl-syntax cl-syntax-annot named-readtables
trivial-types)
VERSION 20140713-git SIBLINGS (cl-pattern-benchmark) PARASITES NIL) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-pdf";
version = "20210228-git";
version = "20210531-git";
description = "Common Lisp PDF Generation Library";
deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz";
sha256 = "1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y";
url = "http://beta.quicklisp.org/archive/cl-pdf/2021-05-31/cl-pdf-20210531-git.tgz";
sha256 = "0f5flqci615ck0ncq4f7x67x31m9715750r0wg3gx6qrdpi0k1cx";
};
packageName = "cl-pdf";
@@ -19,10 +19,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y URL
http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz
MD5 a0eae40821642fc5287b67bf462b54d9 NAME cl-pdf FILENAME cl-pdf DEPS
0f5flqci615ck0ncq4f7x67x31m9715750r0wg3gx6qrdpi0k1cx URL
http://beta.quicklisp.org/archive/cl-pdf/2021-05-31/cl-pdf-20210531-git.tgz
MD5 675d3498976f4cb118dc72fa71829f5c NAME cl-pdf FILENAME cl-pdf DEPS
((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
(NAME zpb-ttf FILENAME zpb-ttf))
DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20210228-git SIBLINGS
DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20210531-git SIBLINGS
(cl-pdf-parser) PARASITES NIL) */
@@ -2,17 +2,17 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-postgres";
version = "postmodern-20210411-git";
version = "postmodern-20210807-git";
parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
description = "Low-level client library for PostgreSQL";
deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz";
sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw";
url = "http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz";
sha256 = "01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp";
};
packageName = "cl-postgres";
@@ -21,9 +21,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
SHA256 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL
http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz
MD5 8a75a05ba9e371f672f2620d40724cb2 NAME cl-postgres FILENAME cl-postgres
SHA256 01l0zk5f3z1cxb6rspvagjl1fy8v3jwm62p2975cgl45aspp18fp URL
http://beta.quicklisp.org/archive/postmodern/2021-08-07/postmodern-20210807-git.tgz
MD5 aa951f2ad4ce59fce588a62afa34f3ec NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,9 +32,10 @@ rec {
(NAME md5 FILENAME md5) (NAME simple-date FILENAME simple-date)
(NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
(NAME split-sequence FILENAME split-sequence)
(NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
(NAME uax-15 FILENAME uax-15) (NAME uiop FILENAME uiop)
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5
simple-date simple-date/postgres-glue split-sequence uax-15 usocket)
VERSION postmodern-20210411-git SIBLINGS (postmodern s-sql simple-date)
simple-date simple-date/postgres-glue split-sequence uax-15 uiop usocket)
VERSION postmodern-20210807-git SIBLINGS (postmodern s-sql simple-date)
PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
@@ -2,15 +2,15 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-prevalence";
version = "20210228-git";
version = "20210531-git";
description = "Common Lisp Prevalence Package";
deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz";
sha256 = "0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl";
url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz";
sha256 = "1608xbfyr0id1nwf9845yfaqz5jbi60vz6c36h70bnzkm4b55s1w";
};
packageName = "cl-prevalence";
@@ -19,9 +19,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256
0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl URL
http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz
MD5 d67c661693637b837ef7f6b1d4d47f9f NAME cl-prevalence FILENAME
1608xbfyr0id1nwf9845yfaqz5jbi60vz6c36h70bnzkm4b55s1w URL
http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz
MD5 4d2ced14365fb45ef97621298fd24501 NAME cl-prevalence FILENAME
cl-prevalence DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads s-sysdeps s-xml split-sequence usocket
usocket-server)
VERSION 20210228-git SIBLINGS (cl-prevalence-test) PARASITES NIL) */
VERSION 20210531-git SIBLINGS (cl-prevalence-test) PARASITES NIL) */
@@ -6,7 +6,7 @@ rec {
description = "Protobufs for Common Lisp";
deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ];
deps = [ args."alexandria" args."asdf" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz";
@@ -23,9 +23,10 @@ rec {
http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz
MD5 9fb9af8bd53796b3cf8f358762095899 NAME cl-protobufs FILENAME
cl-protobufs DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME closer-mop FILENAME closer-mop)
((NAME alexandria FILENAME alexandria) (NAME asdf FILENAME asdf)
(NAME babel FILENAME babel) (NAME closer-mop FILENAME closer-mop)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-garbage FILENAME trivial-garbage))
DEPENDENCIES (alexandria babel closer-mop trivial-features trivial-garbage)
VERSION 20200325-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */
DEPENDENCIES
(alexandria asdf babel closer-mop trivial-features trivial-garbage) VERSION
20200325-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */
@@ -0,0 +1,31 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "cl-semver";
version = "20201220-git";
description = "Semantic Version implementation";
deps = [ args."alexandria" args."esrap" args."named-readtables" args."trivial-with-current-source-form" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-semver/2020-12-20/cl-semver-20201220-git.tgz";
sha256 = "02m23kwsz49dh7jq2rgcd1c4asgjj1g7dy321hyr07k5hqmhk92y";
};
packageName = "cl-semver";
asdFilesToKeep = ["cl-semver.asd"];
overrides = x: x;
}
/* (SYSTEM cl-semver DESCRIPTION Semantic Version implementation SHA256
02m23kwsz49dh7jq2rgcd1c4asgjj1g7dy321hyr07k5hqmhk92y URL
http://beta.quicklisp.org/archive/cl-semver/2020-12-20/cl-semver-20201220-git.tgz
MD5 7fcc6938d4618687bf1e18ba40d6ac6e NAME cl-semver FILENAME cl-semver DEPS
((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap)
(NAME named-readtables FILENAME named-readtables)
(NAME trivial-with-current-source-form FILENAME
trivial-with-current-source-form))
DEPENDENCIES
(alexandria esrap named-readtables trivial-with-current-source-form)
VERSION 20201220-git SIBLINGS (cl-semver-test) PARASITES NIL) */
@@ -2,7 +2,7 @@
args @ { fetchurl, ... }:
rec {
baseName = "cl-slice";
version = "20171130-git";
version = "20210531-git";
parasites = [ "cl-slice-tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz";
sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn";
url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz";
sha256 = "1jkm8yrnc0x2nx4bwwk56xda1r5h2aw0q4yfbv8lywaiwj92v7hk";
};
packageName = "cl-slice";
@@ -21,10 +21,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-slice DESCRIPTION DSL for array slices in Common Lisp. SHA256
0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn URL
http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz
MD5 b83a7a9aa503dc01cba43cf1e494e67d NAME cl-slice FILENAME cl-slice DEPS
1jkm8yrnc0x2nx4bwwk56xda1r5h2aw0q4yfbv8lywaiwj92v7hk URL
http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz
MD5 d7be90ed28b5c316b1f31b4f567bd725 NAME cl-slice FILENAME cl-slice DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME clunit FILENAME clunit) (NAME let-plus FILENAME let-plus))
DEPENDENCIES (alexandria anaphora clunit let-plus) VERSION 20171130-git
DEPENDENCIES (alexandria anaphora clunit let-plus) VERSION 20210531-git
SIBLINGS NIL PARASITES (cl-slice-tests)) */

Some files were not shown because too many files have changed in this diff Show More