Merge branch 'master' into staging-next
Manually fixed a merge conflict between https://github.com/NixOS/nixpkgs/pull/227900 and https://github.com/NixOS/nixpkgs/pull/246022.
This commit is contained in:
Theodore Ni
commit
80a74ec050
@ -15512,6 +15512,15 @@
|
||||
githubId = 293035;
|
||||
name = "Shawn Dellysse";
|
||||
};
|
||||
shayne = {
|
||||
email = "shaynesweeney@gmail.com";
|
||||
github = "shayne";
|
||||
githubId = 79330;
|
||||
name = "Shayne Sweeney";
|
||||
keys = [{
|
||||
fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0";
|
||||
}];
|
||||
};
|
||||
shazow = {
|
||||
email = "andrey.petrov@shazow.net";
|
||||
github = "shazow";
|
||||
|
||||
@ -113,6 +113,8 @@
|
||||
|
||||
- The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq.
|
||||
|
||||
- `odoo` now defaults to 16, updated from 15.
|
||||
|
||||
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
||||
|
||||
- `services.keyd` changed API. Now you can create multiple configuration files.
|
||||
|
||||
@ -52,6 +52,8 @@ let
|
||||
set -s escape-time ${toString cfg.escapeTime}
|
||||
set -g history-limit ${toString cfg.historyLimit}
|
||||
|
||||
${cfg.extraConfigBeforePlugins}
|
||||
|
||||
${lib.optionalString (cfg.plugins != []) ''
|
||||
# Run plugins
|
||||
${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins}
|
||||
@ -108,10 +110,18 @@ in {
|
||||
description = lib.mdDoc "Time in milliseconds for which tmux waits after an escape is input.";
|
||||
};
|
||||
|
||||
extraConfigBeforePlugins = mkOption {
|
||||
default = "";
|
||||
description = lib.mdDoc ''
|
||||
Additional contents of /etc/tmux.conf, to be run before sourcing plugins.
|
||||
'';
|
||||
type = types.lines;
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
description = lib.mdDoc ''
|
||||
Additional contents of /etc/tmux.conf
|
||||
Additional contents of /etc/tmux.conf, to be run after sourcing plugins.
|
||||
'';
|
||||
type = types.lines;
|
||||
};
|
||||
|
||||
@ -31,6 +31,12 @@ in
|
||||
description = lib.mdDoc ''
|
||||
Odoo configuration settings. For more details see <https://www.odoo.com/documentation/15.0/administration/install/deploy.html>
|
||||
'';
|
||||
example = literalExpression ''
|
||||
options = {
|
||||
db_user = "odoo";
|
||||
db_password="odoo";
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
@ -112,11 +118,11 @@ in
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
|
||||
ensureDatabases = [ "odoo" ];
|
||||
ensureUsers = [{
|
||||
name = "odoo";
|
||||
ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; };
|
||||
}];
|
||||
ensureDatabases = [ "odoo" ];
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@ -62,6 +62,16 @@ in {
|
||||
Whether to open the firewall for the default ports.
|
||||
'';
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
Extra args to pass to `vmagent`. See the docs:
|
||||
<https://docs.victoriametrics.com/vmagent.html#advanced-usage>
|
||||
or {command}`vmagent -help` for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
@ -90,7 +100,7 @@ in {
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig}";
|
||||
ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig} ${escapeShellArgs cfg.extraArgs}";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -267,6 +267,7 @@ in
|
||||
|
||||
environment.systemPackages = [ sddm ];
|
||||
services.dbus.packages = [ sddm ];
|
||||
systemd.tmpfiles.packages = [ sddm ];
|
||||
|
||||
# We're not using the upstream unit, so copy these: https://github.com/sddm/sddm/blob/develop/services/sddm.service.in
|
||||
systemd.services.display-manager.after = [
|
||||
|
||||
@ -2610,6 +2610,22 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
ms-vscode-remote.remote-containers = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "remote-containers";
|
||||
publisher = "ms-vscode-remote";
|
||||
version = "0.305.0";
|
||||
sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc=";
|
||||
};
|
||||
meta = {
|
||||
description = "Open any folder or repository inside a Docker container.";
|
||||
downloadPage = "Use a container as your development environment";
|
||||
homepage = "https://code.visualstudio.com/docs/devcontainers/containers";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.anthonyroussel ];
|
||||
};
|
||||
};
|
||||
|
||||
ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { };
|
||||
|
||||
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { };
|
||||
|
||||
@ -44,19 +44,19 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
odoo_version = "15.0";
|
||||
odoo_release = "20230317";
|
||||
odoo_version = "16.0";
|
||||
odoo_release = "20230722";
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "odoo";
|
||||
version = "${odoo_version}.${odoo_release}";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
|
||||
# latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile
|
||||
src = fetchurl {
|
||||
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo
|
||||
hash = "sha256-DV5JBY+2gq5mUfcvN9S5xkd+ufgEBjvyvBY1X7pPFPk="; # odoo
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -9,27 +9,28 @@
|
||||
, components ? lib.optionals isFull [
|
||||
"kumactl"
|
||||
"kuma-cp"
|
||||
"kuma-prometheus-sd"
|
||||
"kuma-dp"
|
||||
]
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname ;
|
||||
version = "1.8.1";
|
||||
tags = lib.optionals enableGateway ["gateway"];
|
||||
vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng=";
|
||||
inherit pname;
|
||||
version = "2.3.1";
|
||||
tags = lib.optionals enableGateway [ "gateway" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs=";
|
||||
hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA=";
|
||||
|
||||
# no test files
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns];
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals isFull [ coredns ];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
@ -59,6 +60,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Service mesh controller";
|
||||
homepage = "https://kuma.io/";
|
||||
changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zbioe ];
|
||||
};
|
||||
|
||||
@ -1,24 +1,30 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, fetchFromGitHub
|
||||
, imagemagick
|
||||
, mesa
|
||||
, libdrm
|
||||
, flutter
|
||||
, pulseaudio
|
||||
, makeDesktopItem
|
||||
, gnome
|
||||
}:
|
||||
|
||||
let
|
||||
libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ];
|
||||
in
|
||||
flutter.buildFlutterApplication rec {
|
||||
pname = "fluffychat";
|
||||
version = "1.12.1";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "famedly";
|
||||
src = fetchFromGitHub {
|
||||
owner = "krille-chan";
|
||||
repo = "fluffychat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc=";
|
||||
};
|
||||
|
||||
depsListFile = ./deps.json;
|
||||
vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE=";
|
||||
vendorHash = "sha256-Ot96+EF8PgYQmXn0hvIWzN8StuzTgQzakRO3yf7PJAU=";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Fluffychat";
|
||||
@ -30,6 +36,7 @@ flutter.buildFlutterApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
runtimeDependencies = [ pulseaudio ];
|
||||
extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin";
|
||||
postInstall = ''
|
||||
FAV=$out/app/data/flutter_assets/assets/favicon.png
|
||||
@ -45,8 +52,12 @@ flutter.buildFlutterApplication rec {
|
||||
done
|
||||
substituteInPlace $out/share/applications/*.desktop \
|
||||
--subst-var out
|
||||
|
||||
patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so
|
||||
'';
|
||||
|
||||
env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chat with your friends (matrix client)";
|
||||
homepage = "https://fluffychat.im/";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -102,9 +102,6 @@ buildPythonApplication rec {
|
||||
hardeningDisable = [
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
"fortify3"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# Causes build failure due to warning
|
||||
"strictoverflow"
|
||||
];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -22,17 +22,16 @@
|
||||
, pango
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
id = "123097753";
|
||||
id = "123219506";
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "multiviewer-for-f1";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
|
||||
sha256 = "sha256-VS1oDqib0XCEVDVt72GGz1ikwZJYnn6enAylh54PrDI=";
|
||||
sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -98,6 +97,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ babeuh ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "multiviewer-for-f1";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.27.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY=";
|
||||
sha256 = "sha256-vVw3mVliu9JiCgTpwBfubaOkEkNJD4Tb1M7HARg5VjA=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.40.3";
|
||||
version = "1.40.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slimtoolkit";
|
||||
repo = "slim";
|
||||
rev = version;
|
||||
hash = "sha256-fXB2rMW73F12ZO1sqUIiaky6LDiMasg3QcIgeWwtkOs=";
|
||||
hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyber";
|
||||
version = "unstable-2023-08-11";
|
||||
version = "unstable-2023-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fubark";
|
||||
repo = "cyber";
|
||||
rev = "242ba2573cbac2acecc8c06878a8d754dd7a8716";
|
||||
hash = "sha256-jArkFdvWnHNouNGsTn8O2lbU7eZdLbPD0xEfkrFH5Aw=";
|
||||
rev = "be76bc13590285cffa502c3c97470a80ff1f27bd";
|
||||
hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -208,7 +208,8 @@ let
|
||||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit lib;
|
||||
inherit lib stdenv;
|
||||
inherit buildPackages;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
if [[ -n "${__nix_qtbase-}" ]]; then
|
||||
if [ -z "${dontWorryAboutQtMismatch-}" ]; then
|
||||
# Throw an error if a different version of Qt was already set up.
|
||||
if [[ "$__nix_qtbase" != "@dev@" ]]; then
|
||||
echo >&2 "Error: detected mismatched Qt dependencies:"
|
||||
@ -6,6 +7,7 @@ if [[ -n "${__nix_qtbase-}" ]]; then
|
||||
echo >&2 " $__nix_qtbase"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
else # Only set up Qt once.
|
||||
__nix_qtbase="@dev@"
|
||||
|
||||
|
||||
@ -29,10 +29,15 @@
|
||||
, developerBuild ? false
|
||||
, decryptSslTraffic ? false
|
||||
, testers
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
debugSymbols = debug || developerBuild;
|
||||
qtPlatformCross = plat: with plat;
|
||||
if isLinux
|
||||
then "linux-generic-g++"
|
||||
else throw "Please add a qtPlatformCross entry for ${plat.config}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -83,6 +88,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
# `qtbase` expects to find `cc` (with no prefix) in the
|
||||
# `$PATH`, so the following is needed even if
|
||||
# `stdenv.buildPlatform.canExecute stdenv.hostPlatform`
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
|
||||
@ -162,6 +172,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
|
||||
|
||||
./bin/syncqt.pl -version $version
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
# QT's configure script will refuse to use pkg-config unless these two environment variables are set
|
||||
export PKG_CONFIG_SYSROOT_DIR=/
|
||||
export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
|
||||
echo 'QMAKE_PKG_CONFIG=''$''${CROSS_COMPILE}pkg-config' >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
@ -209,6 +224,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# To prevent these failures, we need to override PostgreSQL detection.
|
||||
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
|
||||
|
||||
# do not pass --host and --build to configureFlags as QT's configure script doesn't understand them
|
||||
configurePlatforms = [ ];
|
||||
# TODO Remove obsolete and useless flags once the build will be totally mastered
|
||||
configureFlags = [
|
||||
"-plugindir $(out)/$(qtPluginPrefix)"
|
||||
@ -235,6 +252,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-L" "${icu.out}/lib"
|
||||
"-I" "${icu.dev}/include"
|
||||
"-pch"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-device ${qtPlatformCross stdenv.hostPlatform}"
|
||||
"-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
]
|
||||
++ lib.optional debugSymbols "-debug"
|
||||
++ lib.optionals developerBuild [
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
{ lib, mkDerivation, perl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation, perl
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let inherit (lib) licenses maintainers platforms; in
|
||||
|
||||
@ -18,6 +22,7 @@ mkDerivation (args // {
|
||||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
|
||||
propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []);
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
@ -74,4 +79,7 @@ mkDerivation (args // {
|
||||
maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
|
||||
platforms = platforms.unix;
|
||||
} // (args.meta or {});
|
||||
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
|
||||
dontWorryAboutQtMismatch = true;
|
||||
})
|
||||
|
||||
27
pkgs/development/misc/gokrazy/default.nix
Normal file
27
pkgs/development/misc/gokrazy/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gokrazy";
|
||||
version = "unstable-2023-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gokrazy";
|
||||
repo = "tools";
|
||||
rev = "23cde3b0d858497a63c21e93ad30859bf197995f";
|
||||
hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/gok" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs!";
|
||||
homepage = "https://github.com/gokrazy/gokrazy";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ shayne ];
|
||||
mainProgram = "gok";
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "0.5.6-2";
|
||||
version = "0.5.6-4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "vincegio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xxKZI6yb8h1eqtfTpa8SqL/hnIWhFtuBP7RXQvI/Z/4=";
|
||||
hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fe25519";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VwCw/sS8Pzhscoa6yCRGbB9X+CtRVn8xyBEpKfGyhhY=";
|
||||
hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PogpRQWeFhBpPlesHBUq9F6QA384/u+wIYsqkjCH3Sk=";
|
||||
hash = "sha256-5Iy4UrB7rn11dmQxh/7EtvrrxkXH8k1tYQkREJJXsOs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -4,17 +4,31 @@
|
||||
, isPy3k
|
||||
, pytest
|
||||
, unicodecsv
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jellyfish";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a";
|
||||
hash = "sha256-iBquNnGZm7B85QwnaW8pyn6ELz4SOswNtlJcmZmIG9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
maturinBuildHook
|
||||
cargoSetupHook
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}-rust-dependencies";
|
||||
hash = "sha256-Grk+n4VCPjirafcRWWI51jHw/IFUYkBtbXY739j0MFI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest unicodecsv ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, deprecated
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, hatch-vcs
|
||||
@ -15,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "particle";
|
||||
version = "0.21.2";
|
||||
version = "0.23.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns=";
|
||||
hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -39,6 +40,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
deprecated
|
||||
hepunits
|
||||
];
|
||||
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.18";
|
||||
version = "8.13.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k=";
|
||||
hash = "sha256-OBgCR2lyQMzt103sS/vbwiuxCLnF+ZHycMo+QTleb5Y=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -15,18 +15,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rustworkx";
|
||||
version = "0.12.1";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw=";
|
||||
hash = "sha256-WwQuvRMDGiY9VrWPfxL0OotPCUhCsvbXoVSCNhmIF/g=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ=";
|
||||
hash = "sha256-QuzBJyM83VtB6CJ7i9/SFE8h6JbxkX/LQ9lOFSQIidU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.23.3";
|
||||
version = "3.23.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w=";
|
||||
hash = "sha256-vf1mnszEs/r/IyggCklAjNXsrZ8ZtgIsSttVS7s6JiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whirlpool-sixth-sense";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "abmantis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc=";
|
||||
hash = "sha256-0NJsZex054CWfKX2wyJRd6Cnxa89mNrZN59VqIV2MD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.214.0";
|
||||
version = "0.215.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N3eunmUl08RPu54k1QQWqgKa9RS0uzVVI2f0kCbmb2w=";
|
||||
sha256 = "sha256-n6swStUU+mKeUhs94h71eCJk02yP6QFAkpDz67DJmXg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -25,15 +25,15 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "diesel_cli";
|
||||
hash = "sha256-FdmjfywvDD3mo1d1pUQMYvebo5AUTa99gQbQuOWmZZk=";
|
||||
hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-onPzM9E53VUogZdIu3jAeB4dL3MC2FP3b6QWZ5Tr3j0=";
|
||||
cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
|
||||
@ -568,9 +568,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.82"
|
||||
version = "1.0.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
|
||||
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
@ -769,9 +769,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
|
||||
checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
@ -1163,9 +1163,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "h2"
|
||||
version = "0.3.20"
|
||||
version = "0.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
|
||||
checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"fnv",
|
||||
@ -2006,12 +2006,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
|
||||
|
||||
[[package]]
|
||||
name = "petgraph"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
|
||||
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
|
||||
dependencies = [
|
||||
"fixedbitset",
|
||||
"indexmap 1.9.3",
|
||||
"indexmap 2.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2373,9 +2373,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.11.18"
|
||||
version = "0.11.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
|
||||
checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3"
|
||||
dependencies = [
|
||||
"base64 0.21.2",
|
||||
"bytes",
|
||||
@ -2586,18 +2586,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.183"
|
||||
version = "1.0.185"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
|
||||
checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.183"
|
||||
version = "1.0.185"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
|
||||
checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -2659,9 +2659,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "3.2.0"
|
||||
version = "3.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49"
|
||||
checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
|
||||
dependencies = [
|
||||
"base64 0.21.2",
|
||||
"chrono",
|
||||
@ -2676,9 +2676,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_with_macros"
|
||||
version = "3.2.0"
|
||||
version = "3.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7"
|
||||
checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
@ -2848,9 +2848,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.7.1"
|
||||
version = "3.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
|
||||
checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand 2.0.0",
|
||||
@ -3171,9 +3171,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicase"
|
||||
version = "2.6.0"
|
||||
version = "2.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
|
||||
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
|
||||
dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
@ -3533,9 +3533,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-streams"
|
||||
version = "0.2.3"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
|
||||
checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
|
||||
dependencies = [
|
||||
"futures-util",
|
||||
"js-sys",
|
||||
@ -3723,11 +3723,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "winreg"
|
||||
version = "0.10.1"
|
||||
version = "0.50.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
|
||||
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
"cfg-if",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3766,8 +3767,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0a86fe4c862e5d3d06d65ff0e9b5da8e84217af535bca6fc3acffed9eff0f5c2"
|
||||
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
|
||||
dependencies = [
|
||||
"bitflags 2.4.0",
|
||||
"wit-bindgen-rust-macro",
|
||||
@ -3776,8 +3776,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wit-bindgen-core"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ed17e12f4277a1de3a33ef68e4934bd10a9c295053f4de803b5c0ba856b4c08"
|
||||
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"wit-component",
|
||||
@ -3787,8 +3786,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wit-bindgen-rust"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6b6a165d93a825badf9c2db8c4033d76455807a4ab5f6890ccd01936d16b20ed"
|
||||
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
@ -3801,8 +3799,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wit-bindgen-rust-lib"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88e00b553c5b5fcdabe295cb1cdb369f76f72e8c626be1930e99bb01a4e7f4dc"
|
||||
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"wit-bindgen-core",
|
||||
@ -3811,8 +3808,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wit-bindgen-rust-macro"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4d49b81b63fa30c3b13a559cd89dc3a721ccd94736a0b375cae718da5995d64"
|
||||
source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro2",
|
||||
|
||||
@ -9,19 +9,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cargo-component";
|
||||
version = "unstable-2023-08-19";
|
||||
version = "unstable-2023-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "cargo-component";
|
||||
rev = "4abbb89ed356887a5b7e822c507cc1d02cbe8935";
|
||||
hash = "sha256-MZQcyK8AN/TRplTNuPkNMFFdJIlWxHEB4W6z5PnFDxw=";
|
||||
rev = "a4ee64625a5248234397a9c7c2a7513bb025b030";
|
||||
hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc=";
|
||||
"wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corsix-th";
|
||||
version = "0.66";
|
||||
version = "0.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CorsixTH";
|
||||
repo = "CorsixTH";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GsZU2FHcFRlwN3hnFTyQmUK6kJLwnarKDtvg+DDc+mk=";
|
||||
hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE=";
|
||||
};
|
||||
|
||||
luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]);
|
||||
|
||||
@ -88,12 +88,12 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeswitch";
|
||||
version = "1.10.9";
|
||||
version = "1.10.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw=";
|
||||
sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,6 +1,31 @@
|
||||
{ lib, stdenv, buildEnv, runCommand, fetchurl, file, texlive, writeShellScript, writeText }:
|
||||
|
||||
{
|
||||
rec {
|
||||
|
||||
mkTeXTest = lib.makeOverridable (
|
||||
{ name
|
||||
, format
|
||||
, text
|
||||
, texLive ? texlive.combined.scheme-small
|
||||
, options ? "-interaction=errorstopmode"
|
||||
, preTest ? ""
|
||||
, postTest ? ""
|
||||
, ...
|
||||
}@attrs: runCommand "texlive-test-tex-${name}"
|
||||
({
|
||||
nativeBuildInputs = [ texLive ] ++ attrs.nativeBuildInputs or [ ];
|
||||
text = builtins.toFile "${name}.tex" text;
|
||||
} // builtins.removeAttrs attrs [ "nativeBuildInputs" "text" "texLive" ])
|
||||
''
|
||||
export HOME="$(mktemp -d)"
|
||||
mkdir "$out"
|
||||
cd "$out"
|
||||
cp "$text" "$name.tex"
|
||||
${preTest}
|
||||
$format $options "$name.tex"
|
||||
${postTest}
|
||||
''
|
||||
);
|
||||
|
||||
tlpdbNix = runCommand "texlive-test-tlpdb-nix" {
|
||||
nixpkgsTlpdbNix = ../../tools/typesetting/tex/texlive/tlpdb.nix;
|
||||
@ -11,34 +36,32 @@
|
||||
diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch"
|
||||
'';
|
||||
|
||||
opentype-fonts = runCommand "texlive-test-opentype" {
|
||||
nativeBuildInputs = [
|
||||
(with texlive; combine { inherit scheme-medium libertinus-fonts; })
|
||||
];
|
||||
input = builtins.toFile "opentype-testfile.tex" ''
|
||||
\documentclass{article}
|
||||
\usepackage{fontspec}
|
||||
\setmainfont{Libertinus Serif}
|
||||
\begin{document}
|
||||
\LaTeX{} is great
|
||||
\end{document}
|
||||
'';
|
||||
}
|
||||
''
|
||||
export HOME="$(mktemp -d)"
|
||||
# We use the same testfile to test two completely different
|
||||
# font discovery mechanisms, both of which were once broken:
|
||||
# - lualatex uses its own luaotfload script (#220228)
|
||||
# - xelatex uses fontconfig (#228196)
|
||||
# both of the following two commands need to succeed.
|
||||
lualatex -halt-on-error "$input"
|
||||
xelatex -halt-on-error "$input"
|
||||
echo success > $out
|
||||
'';
|
||||
# test two completely different font discovery mechanisms, both of which were once broken:
|
||||
# - lualatex uses its own luaotfload script (#220228)
|
||||
# - xelatex uses fontconfig (#228196)
|
||||
opentype-fonts = lib.recurseIntoAttrs rec {
|
||||
lualatex = mkTeXTest {
|
||||
name = "opentype-fonts-lualatex";
|
||||
format = "lualatex";
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small libertinus-fonts; };
|
||||
text = ''
|
||||
\documentclass{article}
|
||||
\usepackage{fontspec}
|
||||
\setmainfont{Libertinus Serif}
|
||||
\begin{document}
|
||||
\LaTeX{} is great
|
||||
\end{document}
|
||||
'';
|
||||
};
|
||||
xelatex = lualatex.override {
|
||||
name = "opentype-fonts-xelatex";
|
||||
format = "xelatex";
|
||||
};
|
||||
};
|
||||
|
||||
chktex = runCommand "texlive-test-chktex" {
|
||||
nativeBuildInputs = [
|
||||
(with texlive; combine { inherit scheme-infraonly chktex; })
|
||||
(texlive.combine { inherit (texlive) scheme-infraonly chktex; })
|
||||
];
|
||||
input = builtins.toFile "chktex-sample.tex" ''
|
||||
\documentclass{article}
|
||||
@ -76,7 +99,7 @@
|
||||
|
||||
# test dvipng's limited capability to render postscript specials via GS
|
||||
ghostscript = runCommand "texlive-test-ghostscript" {
|
||||
nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
|
||||
nativeBuildInputs = [ file (texlive.combine { inherit (texlive) scheme-small dvipng; }) ];
|
||||
input = builtins.toFile "postscript-sample.tex" ''
|
||||
\documentclass{minimal}
|
||||
\begin{document}
|
||||
@ -143,8 +166,8 @@
|
||||
|
||||
texdoc = runCommand "texlive-test-texdoc" {
|
||||
nativeBuildInputs = [
|
||||
(with texlive; combine {
|
||||
inherit scheme-infraonly luatex texdoc;
|
||||
(texlive.combine {
|
||||
inherit (texlive) scheme-infraonly luatex texdoc;
|
||||
pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ];
|
||||
})
|
||||
];
|
||||
@ -155,6 +178,115 @@
|
||||
grep texdoc.pdf "$out"
|
||||
'';
|
||||
|
||||
# check that the default language is US English
|
||||
defaultLanguage = lib.recurseIntoAttrs rec {
|
||||
# language.def
|
||||
etex = mkTeXTest {
|
||||
name = "default-language-etex";
|
||||
format = "etex";
|
||||
text = ''
|
||||
\catcode`\@=11
|
||||
\ifnum\language=\lang@USenglish \message{[tests.texlive] Default language is US English.}
|
||||
\else\errmessage{[tests.texlive] Error: default language is NOT US English.}\fi
|
||||
\ifnum\language=0\message{[tests.texlive] Default language has id 0.}
|
||||
\else\errmessage{[tests.texlive] Error: default language does NOT have id 0.}\fi
|
||||
\bye
|
||||
'';
|
||||
};
|
||||
# language.dat
|
||||
latex = mkTeXTest {
|
||||
name = "default-language-latex";
|
||||
format = "latex";
|
||||
text = ''
|
||||
\makeatletter
|
||||
\ifnum\language=\l@USenglish \GenericWarning{}{[tests.texlive] Default language is US English}
|
||||
\else\GenericError{}{[tests.texlive] Error: default language is NOT US English}{}{}\fi
|
||||
\ifnum\language=0\GenericWarning{}{[tests.texlive] Default language has id 0}
|
||||
\else\GenericError{}{[tests.texlive] Error: default language does NOT have id 0}{}{}\fi
|
||||
\stop
|
||||
'';
|
||||
};
|
||||
# language.dat.lua
|
||||
luatex = etex.override {
|
||||
name = "default-language-luatex";
|
||||
format = "luatex";
|
||||
};
|
||||
};
|
||||
|
||||
# check that all languages are available, including synonyms
|
||||
allLanguages = let hyphenBase = lib.head texlive.hyphen-base.pkgs; texLive = texlive.combined.scheme-full; in
|
||||
lib.recurseIntoAttrs {
|
||||
# language.def
|
||||
etex = mkTeXTest {
|
||||
name = "all-languages-etex";
|
||||
format = "etex";
|
||||
inherit hyphenBase texLive;
|
||||
text = ''
|
||||
\catcode`\@=11
|
||||
\input kvsetkeys.sty
|
||||
\def\CheckLang#1{
|
||||
\ifcsname lang@#1\endcsname\message{[tests.texlive] Found language #1}
|
||||
\else\errmessage{[tests.texlive] Error: missing language #1}\fi
|
||||
}
|
||||
\comma@parse{@texLanguages@}\CheckLang
|
||||
\bye
|
||||
'';
|
||||
preTest = ''
|
||||
texLanguages="$(sed -n -E 's/^\\addlanguage\s*\{([^}]+)\}.*$/\1/p' < "$hyphenBase"/tex/generic/config/language.def)"
|
||||
texLanguages="''${texLanguages//$'\n'/,}"
|
||||
substituteInPlace "$name.tex" --subst-var texLanguages
|
||||
'';
|
||||
};
|
||||
# language.dat
|
||||
latex = mkTeXTest {
|
||||
name = "all-languages-latex";
|
||||
format = "latex";
|
||||
inherit hyphenBase texLive;
|
||||
text = ''
|
||||
\makeatletter
|
||||
\@for\Lang:=italian,@texLanguages@\do{
|
||||
\ifcsname l@\Lang\endcsname
|
||||
\GenericWarning{}{[tests.texlive] Found language \Lang}
|
||||
\else
|
||||
\GenericError{}{[tests.texlive] Error: missing language \Lang}{}{}
|
||||
\fi
|
||||
}
|
||||
\stop
|
||||
'';
|
||||
preTest = ''
|
||||
texLanguages="$(sed -n -E 's/^([^%= \t]+).*$/\1/p' < "$hyphenBase"/tex/generic/config/language.dat)"
|
||||
texLanguages="''${texLanguages//$'\n'/,}"
|
||||
substituteInPlace "$name.tex" --subst-var texLanguages
|
||||
'';
|
||||
};
|
||||
# language.dat.lua
|
||||
luatex = mkTeXTest {
|
||||
name = "all-languages-luatex";
|
||||
format = "luatex";
|
||||
inherit hyphenBase texLive;
|
||||
text = ''
|
||||
\directlua{
|
||||
require('luatex-hyphen.lua')
|
||||
langs = '@texLanguages@,'
|
||||
texio.write('\string\n')
|
||||
for l in langs:gmatch('([^,]+),') do
|
||||
if luatexhyphen.lookupname(l) \string~= nil then
|
||||
texio.write('[tests.texlive] Found language '..l..'.\string\n')
|
||||
else
|
||||
error('[tests.texlive] Error: missing language '..l..'.', 2)
|
||||
end
|
||||
end
|
||||
}
|
||||
\bye
|
||||
'';
|
||||
preTest = ''
|
||||
texLanguages="$(sed -n -E 's/^.*\[("|'\''')(.*)("|'\''')].*$/\2/p' < "$hyphenBase"/tex/generic/config/language.dat.lua)"
|
||||
texLanguages="''${texLanguages//$'\n'/,}"
|
||||
substituteInPlace "$name.tex" --subst-var texLanguages
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# test that language files are generated as expected
|
||||
hyphen-base = runCommand "texlive-test-hyphen-base" {
|
||||
hyphenBase = lib.head texlive.hyphen-base.pkgs;
|
||||
@ -511,4 +643,25 @@
|
||||
echo "$errorText"
|
||||
false
|
||||
'');
|
||||
|
||||
# verify that all fixed hashes are present
|
||||
# this is effectively an eval-time assertion, converted into a derivation for
|
||||
# ease of testing
|
||||
fixedHashes = with lib; let
|
||||
combine = findFirst (p: (head p.pkgs).pname == "combine") { pkgs = []; } (head texlive.collection-latexextra.pkgs).tlDeps;
|
||||
all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs;
|
||||
fods = filter (p: isDerivation p && p.tlType != "bin") all;
|
||||
errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname + optionalString (p.tlType != "run") ("." + p.tlType)} does not have a fixed output hash\n") fods;
|
||||
in runCommand "texlive-test-fixed-hashes" {
|
||||
inherit errorText;
|
||||
passAsFile = [ "errorText" ];
|
||||
} ''
|
||||
if [[ -s "$errorTextPath" ]] ; then
|
||||
cat "$errorTextPath"
|
||||
echo Failed: some TeX Live packages do not have fixed output hashes. Please read UPGRADING.md for how to generate a new fixed-hashes.nix.
|
||||
exit 1
|
||||
else
|
||||
touch "$out"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,30 +1,33 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, gawk
|
||||
, bash
|
||||
, python3
|
||||
, installShellFiles
|
||||
, bash
|
||||
, gawk
|
||||
, curl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amazon-ec2-utils";
|
||||
version = "2.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
owner = "amazonlinux";
|
||||
repo = "amazon-ec2-utils";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Yr6pVwyvyVGV4xrjL7VFSkRH8d1w8VLPMTVjXfneJUM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
bash
|
||||
python3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
@ -66,9 +69,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aws/amazon-ec2-utils";
|
||||
changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}";
|
||||
description = "Contains a set of utilities and settings for Linux deployments in EC2";
|
||||
homepage = "https://github.com/amazonlinux/amazon-ec2-utils";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ketzacoatl thefloweringash ];
|
||||
maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "url-parser";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "url-parser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rOL6merwQ6CQkdsYGOpFttkJIy2EXCKMGIbAqqmYdvM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-A+uoxwPdWdy12Avl2Ci+zd9TFmQFA22pMbsxtWpNPpc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZaZlIGk44eX0ER2sdLdSvN2qdKVyEPsXjfCuJzJGspE=";
|
||||
vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -26,6 +26,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Simple command-line URL parser";
|
||||
homepage = "https://github.com/thegeeklab/url-parser";
|
||||
changelog = "https://github.com/thegeeklab/url-parser/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slirp4netns";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "slirp4netns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wVisE4YAK52yfeM2itnBqCmhRKlrKRs0NEppQzZPok8=";
|
||||
sha256 = "sha256-Lq3MMIPPEo1yJZ/xE3m9Y/V+cJl17IRkTBVjnr/avHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bottom";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9WQdudO2tIvxDHfJ87zvJeMfpuFSr4D5zGteL7Od2fQ=";
|
||||
hash = "sha256-4wfkNKtF+txsil25HQtS/a/p8n9LWpUHwZVWcQ2u3+c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aRN6V6r+JYi6yUcXei2f7l7oZ+8IkUmw1sgOwZJOtIE=";
|
||||
cargoHash = "sha256-+dXbVNfE0GKVySySiISqOdRqR6BLgwUC8U4PB1wsnvs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -73,6 +73,10 @@ perlPackages.buildPerlPackage rec {
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs bin
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
for sh in bash zsh; do
|
||||
substituteInPlace ./share/rex-tab-completion.$sh \
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sg3_utils";
|
||||
version = "1.47";
|
||||
version = "1.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz";
|
||||
sha256 = "sha256-hnPH+sqEm2s0dkMy0qqR9y2wW/9zgruDbQaIeVGZw+E=";
|
||||
sha256 = "sha256-1itsPPIDkPpzVwRDkAhBZtJfHZMqETXEULaf5cKD13M=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qbAus0RgocbkC9eOmoiAOoyZw58LPDZlJgoRA/SzhQI=";
|
||||
hash = "sha256-eU5mMUDUh5eMzd4oLc0XOHapt1hhODWXQJ+OJAy3tWc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM=";
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mmdoc";
|
||||
version = "0.15.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryantm";
|
||||
repo = "mmdoc";
|
||||
rev = version;
|
||||
hash = "sha256-xOi91BSQh+AN13V6YyAzOe7kUsyPAvUKWTJ+PUPlPJQ=";
|
||||
hash = "sha256-W48ndjWrdJphvGDDUtcLZLBzsTfeLCi3k6UrHVroBcA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja meson pkg-config xxd ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-t0M0b4q/25gEY3+LhGEgkKJAK1d6kni6uH0VW+yQco0=";
|
||||
hash = "sha256-VkONia3xhhgCcq+dh5lNYoj3C8abDYNG7JfoBXomMUw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
, hasManpages ? false
|
||||
, hasRunfiles ? false
|
||||
, hasTlpkg ? false
|
||||
, extraNativeBuildInputs ? [ ]
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
@ -119,6 +120,7 @@ let
|
||||
inherit meta;
|
||||
# shebang interpreters
|
||||
buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput);
|
||||
nativeBuildInputs = extraNativeBuildInputs;
|
||||
# absolute scripts folder
|
||||
scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname);
|
||||
# binaries info
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
*/
|
||||
{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv
|
||||
, callPackage, ghostscript_headless, harfbuzz
|
||||
, makeWrapper
|
||||
, makeWrapper, installShellFiles
|
||||
, python3, ruby, perl, tk, jdk, bash, snobol4
|
||||
, coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip
|
||||
, libfaketime, asymptote, biber-ms, makeFontsConf
|
||||
@ -376,6 +376,8 @@ let
|
||||
extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
|
||||
extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
|
||||
|
||||
extraNativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# build Data.tlpdb.lua (part of the 'tlType == "run"' package)
|
||||
postUnpack = ''
|
||||
if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then
|
||||
@ -392,6 +394,18 @@ let
|
||||
cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua
|
||||
fi
|
||||
'';
|
||||
|
||||
# install zsh completion
|
||||
postFixup = ''
|
||||
TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$scriptsFolder/../.." \
|
||||
texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc
|
||||
substituteInPlace "$TMPDIR"/_texdoc \
|
||||
--replace 'compdef __texdoc texdoc' '#compdef texdoc' \
|
||||
--replace '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \
|
||||
--replace '/^name[^.]*$/ {print $2}' '/^ \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }'
|
||||
echo '__texdoc' >> "$TMPDIR"/_texdoc
|
||||
installShellCompletion --zsh "$TMPDIR"/_texdoc
|
||||
'';
|
||||
};
|
||||
|
||||
"texlive.infra" = {
|
||||
@ -496,11 +510,7 @@ let
|
||||
|
||||
assertions = with lib;
|
||||
assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" &&
|
||||
assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate" &&
|
||||
(!useFixedHashes ||
|
||||
(let all = concatLists (catAttrs "pkgs" (attrValues tl));
|
||||
fods = filter (p: isDerivation p && p.tlType != "bin") all;
|
||||
in builtins.all (p: assertMsg (p ? outputHash) "The TeX Live package '${p.pname + lib.optionalString (p.tlType != "run") ("." + p.tlType)}' does not have a fixed output hash. Please read UPGRADING.md on how to build a new 'fixed-hashes.nix'.") fods));
|
||||
assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate";
|
||||
|
||||
in
|
||||
tl // {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "typstfmt";
|
||||
version = "unstable-2023-08-15";
|
||||
version = "unstable-2023-08-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astrale-sharp";
|
||||
repo = "typstfmt";
|
||||
rev = "0e5cf2769ef46ca8f6627c688cb8f848ee279a88";
|
||||
hash = "sha256-xdmEixbINjVjXlGwdBqDPcd4YHcT/WeswlRNEwpnfx4=";
|
||||
rev = "578d39fb304020d0c26118e4eeab272868c9d525";
|
||||
hash = "sha256-pF0i3yqGOzbN3CMELhZ7JElOUdBZCnp3cLqa9VONHhI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -855,6 +855,7 @@ mapAliases ({
|
||||
kubei = kubeclarity; # Added 2023-05-20
|
||||
kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05
|
||||
kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30
|
||||
kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02
|
||||
kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22
|
||||
|
||||
### L ###
|
||||
|
||||
@ -676,6 +676,8 @@ with pkgs;
|
||||
|
||||
goda = callPackage ../development/tools/goda { };
|
||||
|
||||
gokrazy = callPackage ../development/misc/gokrazy { };
|
||||
|
||||
gojq = callPackage ../development/tools/gojq { };
|
||||
|
||||
govulncheck = callPackage ../tools/security/govulncheck { };
|
||||
@ -33356,10 +33358,6 @@ with pkgs;
|
||||
components = ["kuma-dp"];
|
||||
pname = "kuma-dp";
|
||||
};
|
||||
kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma {
|
||||
components = ["kuma-prometheus-sd"];
|
||||
pname = "kuma-prometheus-sd";
|
||||
};
|
||||
|
||||
kile-wl = callPackage ../applications/misc/kile-wl { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user