Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3f0438cea5
|
|
@ -243,10 +243,14 @@ rec {
|
|||
vncSupport = false;
|
||||
gtkSupport = false;
|
||||
sdlSupport = false;
|
||||
alsaSupport = false;
|
||||
pulseSupport = false;
|
||||
pipewireSupport = false;
|
||||
jackSupport = false;
|
||||
smbdSupport = false;
|
||||
seccompSupport = false;
|
||||
tpmSupport = false;
|
||||
capstoneSupport = false;
|
||||
enableDocs = false;
|
||||
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18544,6 +18544,12 @@
|
|||
githubId = 6362238;
|
||||
name = "Christoph Honal";
|
||||
};
|
||||
starsep = {
|
||||
email = "nix@starsep.com";
|
||||
github = "starsep";
|
||||
githubId = 2798728;
|
||||
name = "Filip Czaplicki";
|
||||
};
|
||||
star-szr = {
|
||||
email = "nixpkgs@szr.fastmail.com";
|
||||
github = "star-szr";
|
||||
|
|
|
|||
|
|
@ -37,22 +37,13 @@ in
|
|||
enable = mkEnableOption (mdDoc "Wyoming faster-whisper server");
|
||||
|
||||
model = mkOption {
|
||||
# Intersection between available and referenced models here:
|
||||
# https://github.com/rhasspy/models/releases/tag/v1.0
|
||||
# https://github.com/rhasspy/rhasspy3/blob/wyoming-v1/programs/asr/faster-whisper/server/wyoming_faster_whisper/download.py#L17-L27
|
||||
type = enum [
|
||||
"tiny"
|
||||
"tiny-int8"
|
||||
"base"
|
||||
"base-int8"
|
||||
"small"
|
||||
"small-int8"
|
||||
"medium-int8"
|
||||
];
|
||||
type = str;
|
||||
default = "tiny-int8";
|
||||
example = "medium-int8";
|
||||
example = "Systran/faster-distil-whisper-small.en";
|
||||
description = mdDoc ''
|
||||
Name of the voice model to use.
|
||||
|
||||
Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ in
|
|||
systemd.services."autovt@${tty}".enable = false;
|
||||
|
||||
systemd.services.greetd = {
|
||||
aliases = [ "display-manager.service" ];
|
||||
|
||||
unitConfig = {
|
||||
Wants = [
|
||||
"systemd-user-sessions.service"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "redlib";
|
||||
meta.maintainers = with lib.maintainers; [ soispha ];
|
||||
|
||||
nodes.machine = {
|
||||
services.libreddit = {
|
||||
package = pkgs.redlib;
|
||||
enable = true;
|
||||
# Test CAP_NET_BIND_SERVICE
|
||||
port = 80;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("libreddit.service")
|
||||
machine.wait_for_open_port(80)
|
||||
# Query a page that does not require Internet access
|
||||
machine.succeed("curl --fail http://localhost:80/settings")
|
||||
'';
|
||||
})
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "castopod";
|
||||
version = "1.6.4";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz";
|
||||
sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v";
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/66de724407be8f940af5eb1d633fbbc3/castopod-1.10.5.tar.gz";
|
||||
sha256 = "0ssdgqxqldg2f6ni54k5vlndnjjy9lah47q1crpz5nnkkjgvc96y";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "24.2.4";
|
||||
version = "24.3.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
|
|
@ -19,8 +19,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA==";
|
||||
x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA==";
|
||||
aarch64-linux = "sha512-oj/UrUFTH0QZD2eTHdR/Lu6Tz6AIhbIBgPJD3jH1YJKgOZIzX21H0KSddMgu+iKPw2WmoKf0UP+qqf+yFs/mVQ==";
|
||||
x86_64-linux = "sha512-RakNuSDKR0neO0IZwTVaARX9tWNDfJwOBFL3teUsNlcrur862I1c6NaaA/RxriujolDRI+wgG0twaUGEXXar5g==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -955,6 +955,10 @@
|
|||
dependencies = with self; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
neotest-gtest = super.neotest-gtest.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim nui-nvim ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dmenu";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";
|
||||
sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=";
|
||||
sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama zlib libXft ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.26.8";
|
||||
version = "1.26.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
sha256 = "sha256-tfNmKgWKr2TGQNgvC/qo2+Dvij4LUL0Zy77mfTcci2k=";
|
||||
sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ=";
|
||||
hash = "sha256-FGSMXiVygkA3thHtWaA6s5Kz96PYZgMzQQwIjOr6a0c=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "107.0.5045.36";
|
||||
version = "108.0.5067.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-NSJmPwDZbmZUv7HoTiZJbvJTAS6HENFWX+JjKVC0oPc=";
|
||||
hash = "sha256-lPazFtTWb/AbK/5H5MQK+dn0imJqUHiL6/KRq1CNxfo=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.6.3271.48";
|
||||
version = "6.6.3271.53";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
|
|
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-NeYyPgIioURSDomwZq7Cc08+A/XnQEk6yEiag7YxQO0=";
|
||||
x86_64-linux = "sha256-/zBvH0IQZJr8PKWkIznPRxNLMxQoxVOnDrAw+0BWOEM=";
|
||||
aarch64-linux = "sha256-iB8BPA7A2S9fsg5n6QDt6iKFnS1lQ6Xp2yO9VBGndq8=";
|
||||
x86_64-linux = "sha256-2HS8SxaKu0NF++J8PhGJWEbA9FU1a+g/t9+HIKjvt58=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NeLMHecfDyMhXmq1HO3qRIWeYpkoj9Od5wWStZEkHYU=";
|
||||
hash = "sha256-hul348zF81oXTcvcfRpNYiiqfocS3HPwcPdXp7Ij91Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EIvwzgpC9Ls43RJEhxNYDlF4luKthFgJleaXcYzOYow=";
|
||||
vendorHash = "sha256-CKOZxmUVZWFb7cc+amPwyMv5ScujWeipEqm95m63SYk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pythonPackages, fetchurl, lib, nixosTests }:
|
||||
{ lib
|
||||
, pythonPackages
|
||||
, fetchPypi
|
||||
, fetchpatch2
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with pythonPackages;
|
||||
|
||||
|
|
@ -9,11 +14,19 @@ buildPythonApplication rec {
|
|||
propagatedBuildInputs = [ feedparser html2text ];
|
||||
nativeCheckInputs = [ beautifulsoup4 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "html2text-2024.2.25-compat.patch";
|
||||
url = "https://github.com/rss2email/rss2email/commit/b5c0e78006c2db6929b5ff50e8529de58a00412a.patch";
|
||||
hash = "sha256-edmsi3I0acx5iF9xoAS9deSexqW2UtWZR/L7CgeZs/M=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.60";
|
||||
"version" = "1.11.61";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-r4Kcf8iBACHSiUceHq5T2BswGqgVkMBm/5ANq0smA20=";
|
||||
"desktopSrcHash" = "sha256-1Pq26e2ngcji7wieHNOQAWPFBKGLoeTRAKQ3Aqnn1jw=";
|
||||
"desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1";
|
||||
"webSrcHash" = "sha256-k+jtTUuLaux2HSDsLT2ktcShQTNNnDe0e3Icoa31WdE=";
|
||||
"webYarnHash" = "0rgdfdkri7mxs7rvp3rwbnijbcs5chc02smw1kbb00j6qzf6k3dj";
|
||||
"webSrcHash" = "sha256-RJhZgwTMDLMt+ha0lxPwqiP5sipXIcGZfdPVgCxePH4=";
|
||||
"webYarnHash" = "1vj3f2bml8jyjz6djzvw1hbrv7148wk8y9hwp323zf8n6y4rnk28";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-PmTiXQp+AkTwCKisH1tR6B1+cHPx25P8FAAlLvKEb3w=";
|
||||
hash = "sha256-fSj/AX1uCUAC3Vg5+rtGF3IDPFTHRAgJ8CPVL8BYc+E=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
|
|
@ -39,5 +39,6 @@ appimageTools.wrapType2 {
|
|||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ nazarewk ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.3.0-beta.1";
|
||||
version = "7.4.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-sXZC6JgeMlX3lNPSMdB64SyiOAMPkjDAjYZrEwnIMpM=";
|
||||
hash = "sha256-Pjz55iVBww7d7WIAonTeX+cdEobitltoAyOU79RY40c=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webex";
|
||||
version = "43.11.0.27795";
|
||||
version = "43.11.0.28947";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z";
|
||||
sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466";
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240311173044/Webex_ubuntu.7z";
|
||||
sha256 = "f84669a2cd974435c6c0f8a6dc5a62c4ef01a3848e36ffcc8077f718be4a3b86";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "R";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
src = let
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo=";
|
||||
sha256 = "sha256-gIUSMTk7hb84d+6eObKC51Dthkxexgy9aObhOfBSAzA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tex" ];
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.33.0";
|
||||
version = "0.33.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0bdDolaFbVI3CqcOtKFrvRqrKXIiSIfH5rxJgK5XssI=";
|
||||
hash = "sha256-E6gFGgySXs2oCS4Ipevbr9aPWzF4tb4Arl4w+4lQ+wg=";
|
||||
};
|
||||
|
||||
goModules = (buildGo122Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-7301wHGCXUdfPFOhgLEJILmYxNohNm6H2zXGd9W11Wk=";
|
||||
vendorHash = "sha256-ypSZHJpk9wTXLH9sbmaSQB28iOIpv2nDPlgweM0Ldhs=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -234,7 +234,7 @@ buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
tests = lib.mkIf stdenv.isLinux {
|
||||
tests = lib.optionalAttrs stdenv.isLinux {
|
||||
default = nixosTests.terminal-emulators.kitty;
|
||||
};
|
||||
updateScript = nix-update-script {};
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/fzwoch/obs-gstreamer";
|
||||
maintainers = with maintainers; [ ahuzik pedrohlc ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ=";
|
||||
hash = "sha256-mesFwYgDCZ44/EJ31mzx9yLeMyV2bXpxaNSx6L3BQG0=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.25.0";
|
||||
version = "2.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QfzFo6VqNK+4GvF2sSVLeDTcoBOG8Jtqs6K5o5bwddA=";
|
||||
hash = "sha256-hOBWtvls4rRYPMTvkTRkEAftzQB6SG1bv9vasK54d/4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-zAIf5ljy9trJE27RpsK0atPoqNIDUdTn6ywRo0yk/18=";
|
||||
vendorHash = "sha256-uyGGzfsfjk0mUoJ/0Sm89Mus2fQS3HZGBAQ48xMecwU=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ rec {
|
|||
runCommand "${baseNameOf name}.tar${compress.ext}"
|
||||
{
|
||||
inherit (stream) imageName;
|
||||
passthru = { inherit (stream) imageTag; };
|
||||
passthru = { inherit (stream) imageTag; inherit stream; };
|
||||
nativeBuildInputs = compress.nativeInputs;
|
||||
} "${stream} | ${compress.compress} > $out"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, cbtemulator
|
||||
, google-cloud-bigtable-tool
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cbtemulator";
|
||||
version = "1.22.0";
|
||||
|
||||
# There's a go.{mod,sum} in the root and in the "bigtable" subdir.
|
||||
# We only ever use things in that subdir.
|
||||
src = (fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-cloud-go";
|
||||
rev = "bigtable/v${version}";
|
||||
hash = "sha256-eOi4QFthnmZb5ry/5L7wzr4Fy1pF/H07BzxOnXtmSu4=";
|
||||
}) + "/bigtable";
|
||||
|
||||
vendorHash = "sha256-7M7YZfl0usjN9hLGozqJV2bGh+M1ec4PZRGYUhEckpY=";
|
||||
subPackages = [ "cmd/emulator" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/emulator $out/bin/cbtemulator
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# Sets up a table and family, then inserts, and ensures it gets back the value.
|
||||
tests.smoketest = runCommand "cbtemulator-smoketest"
|
||||
{
|
||||
nativeBuildInputs = [ google-cloud-bigtable-tool ];
|
||||
} ''
|
||||
# Start the emulator
|
||||
${lib.getExe cbtemulator} &
|
||||
EMULATOR_PID=$!
|
||||
|
||||
cleanup() {
|
||||
kill $EMULATOR_PID
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
export BIGTABLE_EMULATOR_HOST=localhost:9000
|
||||
|
||||
cbt -instance instance-1 -project project-1 createtable table-1
|
||||
cbt -instance instance-1 -project project-1 createfamily table-1 cf1
|
||||
cbt -instance instance-1 -project project-1 ls table-1
|
||||
cbt -instance instance-1 -project project-1 set table-1 key1 cf1:c1=value1
|
||||
|
||||
cbt -instance instance-1 -project project-1 read table-1 | grep -q value1
|
||||
|
||||
touch $out;
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "In-memory Google Cloud Bigtable server";
|
||||
homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v1.22.0/bigtable/cmd/emulator/cbtemulator.go";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.flokli ];
|
||||
mainProgram = "cbtemulator";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -26,10 +26,17 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# solve error[E0310]: the parameter type `T` may not live long enough
|
||||
# in rust-serialize crate
|
||||
./rustc_serialize_update.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-M3UMeGkLf57/I/9BIkyiMpOvjbKQJrOk+axf05vRoW0=";
|
||||
patches = [ ./rustc_serialize_update.patch ];
|
||||
hash = "sha256-1Zb0J2tO/gIifDymmoXxZf6RNV8foE9QiQqZcrHrWzE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ab2add4..7740629 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1031,9 +1031,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-serialize"
|
||||
-version = "0.3.24"
|
||||
+version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
|
||||
+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
|
|
@ -0,0 +1,128 @@
|
|||
{ alsa-lib
|
||||
, at-spi2-atk
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, expat
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, gvfs
|
||||
, hicolor-icon-theme
|
||||
, lib
|
||||
, libdrm
|
||||
, libglvnd
|
||||
, libnotify
|
||||
, libsForQt5
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, openssl
|
||||
, pango
|
||||
, rpmextract
|
||||
, stdenv
|
||||
, systemd
|
||||
, trash-cli
|
||||
, vulkan-loader
|
||||
, wrapGAppsHook
|
||||
, xdg-utils
|
||||
, xorg
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plasticity";
|
||||
version = "1.4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
|
||||
hash = "sha256-wiUpDsfGVkhyjoXVpxaw3fqpo1aAfi0AkkvlkAZxTYI=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook rpmextract mesa ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
desktop-file-utils
|
||||
expat
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
gvfs
|
||||
hicolor-icon-theme
|
||||
libdrm
|
||||
libnotify
|
||||
libsForQt5.kde-cli-tools
|
||||
libxkbcommon
|
||||
nspr
|
||||
nss
|
||||
openssl
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
trash-cli
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
systemd
|
||||
libglvnd
|
||||
vulkan-loader #may help with nvidia users
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# can't find anything on the internet about these files, no clue what they do
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"ACCAMERA.tx"
|
||||
"AcMPolygonObj15.tx"
|
||||
"ATEXT.tx"
|
||||
"ISM.tx"
|
||||
"RText.tx"
|
||||
"SCENEOE.tx"
|
||||
"TD_DbEntities.tx"
|
||||
"TD_DbIO.tx"
|
||||
"WipeOut.tx"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cd $out
|
||||
rpmextract $src
|
||||
mv $out/usr/* $out
|
||||
rm -r $out/usr
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
#--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates
|
||||
postInstall = ''
|
||||
substituteInPlace share/applications/Plasticity.desktop \
|
||||
--replace-fail 'Exec=Plasticity %U' "Exec=Plasticity --use-gl=egl %U"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CAD for artists";
|
||||
homepage = "https://www.plasticity.xyz";
|
||||
license = licenses.unfree;
|
||||
mainProgram = "Plasticity";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ imadnyc ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
#shellcheck shell=bash
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
|
||||
old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r)
|
||||
|
||||
if [[ $version == "$old_version" ]]; then
|
||||
echo "New version same as old version, nothing to do." >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version plasticity "$version"
|
||||
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cacert
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d3Jjs/a2EgdqRBTjXKwDDRnU6orb7RQGl1CVz9b9SdI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2MugS0/MO85lQvDbiFwnsX4LYdk7TACDFR8OOLEFGUQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# All these test try to connect to Reddit.
|
||||
"--skip=test_fetching_subreddit_quarantined"
|
||||
"--skip=test_fetching_nsfw_subreddit"
|
||||
"--skip=test_fetching_ws"
|
||||
|
||||
"--skip=test_obfuscated_share_link"
|
||||
"--skip=test_share_link_strip_json"
|
||||
|
||||
"--skip=test_localization_popular"
|
||||
"--skip=test_fetching_subreddit"
|
||||
"--skip=test_fetching_user"
|
||||
|
||||
# These try to connect to the oauth client
|
||||
"--skip=test_oauth_client"
|
||||
"--skip=test_oauth_client_refresh"
|
||||
"--skip=test_oauth_token_exists"
|
||||
];
|
||||
|
||||
env = {
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) redlib;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/redlib-org/redlib/releases/tag/v${version}";
|
||||
description = "Private front-end for Reddit (Continued fork of Libreddit)";
|
||||
homepage = "https://github.com/redlib-org/redlib";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "redlib";
|
||||
maintainers = with lib.maintainers; [ soispha ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simde";
|
||||
version = "0.7.6";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY=";
|
||||
hash = "sha256-hQtSxO8Uld6LT6V1ZhR6tbshTK1QTGgyQ99o3jOIbQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SpFFT";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-cscs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-70fPbIYbW50CoMdRS93hZKSbMEIQvZGFNE+eiRvuw0o=";
|
||||
hash = "sha256-hZdB/QcjL8rjvR1YZS+CHe5U5zxedpfDq6msMih4Elc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeBinaryWrapper
|
||||
, makeWrapper
|
||||
, undmg
|
||||
, wrapGAppsHook
|
||||
|
|
@ -51,13 +52,13 @@ let
|
|||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
nativeBuildInputs = [ undmg makeBinaryWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r spotube.app $out/Applications
|
||||
ln -s $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
makeBinaryWrapper $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg";
|
||||
version = "2024.02.14";
|
||||
version = "2024.03.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qYRNf2NMvYkxq7CRbJIqC7HAhznTNK7zW6JCsP4+v6M=";
|
||||
hash = "sha256-861r4XsXCyxUVDlSrekZ+g17td+idUN8qJmmTZNDzow=";
|
||||
};
|
||||
|
||||
installPhase = let
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"name": "vim-language-server",
|
||||
"version": "2.3.1",
|
||||
"description": "vim language server",
|
||||
"keywords": [
|
||||
"viml",
|
||||
"vim",
|
||||
"lsp",
|
||||
"language",
|
||||
"server",
|
||||
"autocomplete"
|
||||
],
|
||||
"main": "./out/index.js",
|
||||
"repository": "https://github.com/iamcco/vim-language-server",
|
||||
"author": "iamcco <ooiss@qq.com>",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"build-docs": "rm ./src/docs/builtin-docs.json && ./bin/build-docs.js",
|
||||
"build": "rm -rf ./out && webpack",
|
||||
"watch": "webpack -w",
|
||||
"test": "mocha test/src/**/*.ts --require ts-node/register",
|
||||
"lint": "tslint -c tslint.json --format verbose {.,test}/src/**/*.ts src/index.ts",
|
||||
"fix": "tslint -c tslint.json --fix {.,test}/src/**/*.ts src/index.ts"
|
||||
},
|
||||
"bin": {
|
||||
"vim-language-server": "./bin/index.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/node": "^11.13.6",
|
||||
"chai": "^4.2.0",
|
||||
"chai-as-promised": "^7.1.1",
|
||||
"fast-glob": "^3.2.4",
|
||||
"findup": "^0.1.5",
|
||||
"mocha": "^7.1.2",
|
||||
"rxjs": "^6.6.7",
|
||||
"rxjs-operators": "^1.1.3",
|
||||
"shvl": "^2.0.0",
|
||||
"ts-loader": "^8.1.0",
|
||||
"ts-node": "^9.1.1",
|
||||
"tslint": "^6.1.3",
|
||||
"typescript": "^4.2.3",
|
||||
"vscode-languageserver": "^7.0.0",
|
||||
"vscode-languageserver-textdocument": "^1.0.1",
|
||||
"vscode-uri": "^3.0.2",
|
||||
"webpack": "^5.30.0",
|
||||
"webpack-cli": "^4.6.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, mkYarnPackage
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "vim-language-server";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamcco";
|
||||
repo = "vim-language-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NfBKNCTvCMIJrSiTlCG+LtVoMBMdCc3rzpDb9Vp2CGM=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-mo8urQaWIHu33+r0Y7mL9mJ/aSe/5CihuIetTeDHEUQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
# https://stackoverflow.com/a/69699772/4935114
|
||||
env NODE_OPTIONS=--openssl-legacy-provider yarn --offline build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "VImScript language server, LSP for vim script";
|
||||
homepage = "https://github.com/iamcco/vim-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
mainProgram = "vim-language-server";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "websecprobe";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "WebSecProbe";
|
||||
inherit version;
|
||||
hash = "sha256-OKbKz3HSTtwyx/JNUtLJBTaHQcxkUWroMg9/msVWgk4=";
|
||||
hash = "sha256-RX4tc6JaUVaNx8nidn8eMcbsmbcSY+VZbup6c6P7oOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
requests
|
||||
tabulate
|
||||
];
|
||||
|
|
@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Web Security Assessment Tool";
|
||||
homepage = "https://github.com/spyboy-productions/WebSecProbe/";
|
||||
changelog = "https://github.com/spyboy-productions/WebSecProbe/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "websecprobe";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
let version = "3.3.1"; in
|
||||
let version = "3.3.2"; in
|
||||
{ fetchurl }: {
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
sha256 = "1jihiryf8lm4mc5wrnhjwlyazpmhk3n40f8z7r25xnz7glafwvg5";
|
||||
sha256 = "0ii494ffj5vkxnpq3aykxmn54cw4jlf45slwlg9g1crm6j3lcwak";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
sha256 = "1d6404r9vhp8q5r4nf3hlcgyvxlyxv63jzd4zlmdxghvm68kkv01";
|
||||
sha256 = "0ffqwbmwx737hrq04rbpyxqfm86mqhfayq2i1ssjkjgqyzzrpmy7";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = "08amw2mw2zfpd7savydxsv8ncy8yk76ak1aixgb1csyh8pn4pagc";
|
||||
sha256 = "079jq4sp8sw8y4khw8j8l2q38149bjmn8j5yibmnzyxpwyc4ysx2";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "0mnplv2vzzfvg7a7xj8vrc75lvsj9xksbwzd3cc7s0xjxvyic40v";
|
||||
sha256 = "07ixd7qj78y6m27cv9mjlkr2kdnmld6cxc23x4dip3a02drs8990";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
||||
sha256 = "1ndj3nlw6qd94w3h4kw7jyihm71jlp3y0kc0ybgwh2r22dd2r2yd";
|
||||
sha256 = "1jwjiyxcr2ii4f7rlb4hsjq9hlmdhv9f41wa5camhy74x56z5fhn";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ assert backend == "mcode" || backend == "llvm";
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghdl-${backend}";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghdl";
|
||||
repo = "ghdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-94RNtHbOpbC2q/Z+PsQplrLxXmpS3LXOCXyTBB+n9c4=";
|
||||
hash = "sha256-KQwesrj2g8cDCyiEb5j4bkM5O3fGPuXzGUOEEGw6zRI=";
|
||||
};
|
||||
|
||||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./common.nix {
|
||||
version = "115.2.0";
|
||||
hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";
|
||||
version = "115.9.1";
|
||||
hash = "sha512-nMrt4vzaE6B/mKIRC7j5nHMkYB1mv/MR8wcKZpV2oVmP4dfeLQBdcl0fRNvjk0qcD9C3lQ9gaGBH1M6NnYEjEA==";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = with lib; {
|
||||
description = "An OpenType text shaping engine";
|
||||
homepage = "https://harfbuzz.github.io/";
|
||||
changelog = "https://github.com/harfbuzz/harfbuzz/raw/${version}/NEWS";
|
||||
changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS";
|
||||
maintainers = [ maintainers.eelco ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
pname = "commons-compress";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-AXdkqMrzTtURpPXKOmXxo0RnfFtflcDf6mmVmqVFz5k=";
|
||||
sha256 = "sha256-PVZ4hltIprOeT3UEH3+xJ+TcZLekHV7cuw16rMmx/Rk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiooss2";
|
||||
version = "0.2.9";
|
||||
format = "pyproject";
|
||||
version = "0.2.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "karajan1001";
|
||||
repo = "aiooss2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LdH04pRioxpHY1amRO90l9l5540IsDxmQcrEUVSq8dk=";
|
||||
hash = "sha256-xlbOLqillSpN6DHYn7bqTL7qMlicYCXGxO30Z/tiKJY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -32,13 +32,13 @@ buildPythonPackage rec {
|
|||
"oss2"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
oss2
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf-transform-schemas";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,14 +17,14 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "asdf_transform_schemas";
|
||||
inherit version;
|
||||
hash = "sha256-3n/cP+41+5V/wylXh3oOnX3U0uhRvWMaclnxHCvSlMo=";
|
||||
hash = "sha256-gs9MeCV1c0qJUyfyX/WDzpSZ1+K4Nv6IgLLXlhxrRis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asdf-standard
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
, pytz
|
||||
, websockets
|
||||
|
|
@ -13,26 +12,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluecurrent-api";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vr6mehGRXHW+fP2luLpD14igCdIgJI5NXzaa+bEife0=";
|
||||
hash = "sha256-mWRTSMS68+J1Z4PYOFF/UvofSqV1wv0gjiTACEWDfNg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"asyncio"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pytz
|
||||
websockets
|
||||
];
|
||||
|
|
|
|||
|
|
@ -365,14 +365,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.68";
|
||||
version = "1.34.69";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-acmbKrPt9CTYiOLM1mqmrifqGc3ub36mDx057pwrdCY=";
|
||||
hash = "sha256-k/tPhkDNAacOnTyUOVxn+2GX9eZiPS858YNXtbmtvfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.68";
|
||||
version = "1.34.69";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-9jHFtkpyC7WG+VugVwTBC7L5KClogrZEz6KU+zW1DdY=";
|
||||
hash = "sha256-RjJI/R1ue2igxXvddY0Exr0MXCw7+oGv351k8JMLWbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-migrate";
|
||||
version = "4.0.5";
|
||||
version = "4.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "miguelgrinberg";
|
||||
repo = "Flask-Migrate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fdnoX7ypTpH2mQ+7Xuhzdh706Of7PIVhHQGVbe0jv1s=";
|
||||
hash = "sha256-TnihrZ+JQ1XCBlFp6k8lrNpZr4P2/Z6AmFwWZbabz+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,29 +3,36 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "html2text";
|
||||
version = "2024.2.26";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.5";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alir3z4";
|
||||
repo = pname;
|
||||
repo = "html2text";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "html2text" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst";
|
||||
description = "Turn HTML into equivalent Markdown-structured text";
|
||||
mainProgram = "html2text";
|
||||
homepage = "https://github.com/Alir3z4/html2text/";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "html2text";
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Alternative parser for bitbake recipes";
|
||||
homepage = "https://github.com/priv-kweihmann/oelint-parser";
|
||||
changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/v${version}";
|
||||
changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,23 +5,28 @@
|
|||
, pythonOlder
|
||||
, requests
|
||||
, requests-oauthlib
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ondilo";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JeromeHXP";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM=";
|
||||
repo = "ondilo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BieWdPakQts0QxzQzJYlP6a7ieZ40rAyYqhy8zEvU38=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
oauthlib
|
||||
requests
|
||||
requests-oauthlib
|
||||
|
|
@ -37,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python package to access Ondilo ICO APIs";
|
||||
homepage = "https://github.com/JeromeHXP/ondilo";
|
||||
changelog = "https://github.com/JeromeHXP/ondilo/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
# build-system
|
||||
, setuptools
|
||||
|
||||
# dependencies
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "paypalrestsdk";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o=";
|
||||
hash = "sha256-2sI2SSqawSYKdgAUouVqs4sJ2BQylbXollRTWbYf7dY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -30,15 +30,21 @@ buildPythonPackage rec {
|
|||
six
|
||||
];
|
||||
|
||||
doCheck = false; # no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"paypalrestsdk"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://developer.paypal.com/";
|
||||
meta = with lib; {
|
||||
description = "Python APIs to create, process and manage payment";
|
||||
license = "PayPal SDK License";
|
||||
homepage = "https://github.com/paypal/PayPal-Python-SDK";
|
||||
changelog = "https://github.com/paypal/PayPal-Python-SDK/blob/master/CHANGELOG.md";
|
||||
license = {
|
||||
fullName = "PayPal SDK License";
|
||||
url = "https://github.com/paypal/PayPal-Python-SDK/blob/master/LICENSE";
|
||||
};
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "prisma";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,14 +26,14 @@ buildPythonPackage rec {
|
|||
owner = "RobertCraigie";
|
||||
repo = "prisma-client-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vmcYBUPDhFbxgWyrF+AjoXwAAH2R/tJYttFD+41bPbA=";
|
||||
hash = "sha256-j9HJZTt4VTq29Q+nynYmRWKx02GVdyA+iZzxZwspXn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
click
|
||||
httpx
|
||||
jinja2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, gssapi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-gssapi";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IHhFCJgUAfcVPJM+7QlTOJM6QIGNplolnb8tgNzLFQ4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
gssapi
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportCheck = [
|
||||
"requests_gssapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GSSAPI authentication handler for python-requests";
|
||||
homepage = "https://github.com/pythongssapi/requests-gssapi";
|
||||
changelog = "https://github.com/pythongssapi/requests-gssapi/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ javimerino ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +1,24 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-dateutil";
|
||||
version = "2.8.19.20240311";
|
||||
format = "setuptools";
|
||||
version = "2.9.0.20240316";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types-python-dateutil";
|
||||
inherit version;
|
||||
hash = "sha256-UReCJ7vUy+w13Jrf+/Wdgy8g4JhC19y4xzsWm4eAt8s=";
|
||||
hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dateutil-stubs"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmake";
|
||||
version = "2.8.8";
|
||||
version = "2.8.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
|
||||
hash = "sha256-UJFlQJleO59K1xr3Gy0Zh751SkaNGzGZxE5CWyMv0KM=";
|
||||
hash = "sha256-X3k8OTNG74Dkfwg63k08L9/ESGWKeRf9o1zNe9K5Ebg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3KZWXVwvzy3mZkh6pGZpeQQp2aU4V9TyBcJXU4Au4Rs=";
|
||||
hash = "sha256-iKWOGp5Clk+YFXHv/5k+7DZMA9TQzyIQoTlQs4IMbu4=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-8G1JX4vdpDAicx6A9Butl8XTjszlHMbh34pJVQyzEs4=";
|
||||
vendorHash = "sha256-QnmU8+J+5IIajfVQ5XPrtuo2ELB7AD56KsHsT8wLDws=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kafkactl";
|
||||
version = "4.0.0";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deviceinsight";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GtveC2W9y/mBuiZjpxCXjCE6WO0ub4wX85Is6MUTvlw=";
|
||||
hash = "sha256-pAi60t0mtRlAL+z6s5moWwxw0hC6CeiljjjFyzyN+nI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-B7kP1ksH7t/1PQrI8mSgIEGdH02RhgN4A1z4S0UJG/g=";
|
||||
vendorHash = "sha256-7ibev9Po8is+PXH0BC8ZLiTMJsPMR6VUwjNA/c1y/g0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lazygit";
|
||||
version = "0.40.2";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xj5WKAduaJWA3NhWuMsF5EXF91+NTGAXkbdhpeFqLxE=";
|
||||
hash = "sha256-Ok6QnXw3oDeSzBekft8cDXM/YsADgF1NZznfNoGNvck=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -25,7 +25,7 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/jesseduffield/lazygit";
|
||||
changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne equirosa paveloom ];
|
||||
maintainers = with maintainers; [ Br1ght0ne equirosa paveloom starsep ];
|
||||
mainProgram = "lazygit";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "linuxkit";
|
||||
version = "1.0.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxkit";
|
||||
repo = "linuxkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8x9oJaYb/mN2TUaVrGOYi5/6TETD78jif0SwCSc0kyo=";
|
||||
sha256 = "sha256-PrHGIP74mDt+mJDRaCsroiJ4QEW4/tzgsZI2JlZ8TEA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re-flex";
|
||||
version = "4.1.0";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "RE-flex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pjYiCRKaskJg1IuCxNBUQ9FY2abGi4HEZxsfZ5ctjNY=";
|
||||
hash = "sha256-w1aH04VGe9nPvwGdbTEsAcIPb7oC739LZjTI/1Ck7bU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "bin" "dev" ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "refurb";
|
||||
version = "1.28.0";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dosisod";
|
||||
repo = "refurb";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b7Id2Oyjw3NZno56IMDIq7fn5u9+jn42nuae8ix90fM=";
|
||||
hash = "sha256-6MchaqRKJPmvwiDyhCK4kFyIYl2B+2dGL8H8X2ES+VQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bind";
|
||||
version = "9.18.24";
|
||||
version = "9.18.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-cJ1zAjyRFd2tO6tltsjHmlkBltDRFPXQyiUz29Ut32Y=";
|
||||
hash = "sha256-WkpwQyoz0Anw5unbsyiq56XidQfpjii/PAxrJQzLKrM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||
|
|
|
|||
|
|
@ -141,6 +141,10 @@ let
|
|||
inherit version;
|
||||
hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o=";
|
||||
};
|
||||
build-system = oldAttrs.build-system ++ (with self; [
|
||||
pythonRelaxDepsHook
|
||||
]);
|
||||
pythonRemoveDeps = [ "asyncio" ];
|
||||
});
|
||||
|
||||
debugpy = super.debugpy.overridePythonAttrs (oldAttrs: {
|
||||
|
|
|
|||
|
|
@ -1,33 +1,53 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }:
|
||||
{
|
||||
apacheHttpd,
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
openldap,
|
||||
openssl,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_ca";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s";
|
||||
hash = "sha256-HGnhypOO0WOgRw9i9oqO4da131zAwBXOdrc9dypFjyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ apacheHttpd openssl openldap apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apacheHttpd
|
||||
apr
|
||||
aprutil
|
||||
openldap
|
||||
openssl
|
||||
];
|
||||
|
||||
# Note that configureFlags and installFlags are inherited by
|
||||
# the various submodules.
|
||||
#
|
||||
configureFlags = [
|
||||
"--with-apxs=${apacheHttpd.dev}/bin/apxs"
|
||||
];
|
||||
configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" ];
|
||||
|
||||
installFlags = [
|
||||
"INCLUDEDIR=${placeholder "out"}/include"
|
||||
"LIBEXECDIR=${placeholder "out"}/modules"
|
||||
];
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_ca/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_crl";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d";
|
||||
hash = "sha256-w8YIhed9J1uo5uwhfOVe5LhNLUvFZCgUO4FrHm344Rg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax module for Certificate Revocation Lists";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_crl/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_csr";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x";
|
||||
hash = "sha256-JVd5N5UnAxDwq6AavEHA0HsY2TRa+9RmLLJeRZbj+4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module to handle Certificate Signing Requests";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://0pointer.de/lennart/projects/mod_dnssd";
|
||||
homepage = "https://0pointer.de/lennart/projects/mod_dnssd";
|
||||
description = "Provide Zeroconf support via DNS-SD using Avahi";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_ocsp";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn";
|
||||
hash = "sha256-G+m/KdJCCTlSMeJzUnCRJkBEQ8cOQ+rJhA3NPrwh1Us=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules of OCSP Online Certificate Validation";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,33 @@
|
|||
{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }:
|
||||
{
|
||||
apacheHttpd,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
nixosTests,
|
||||
perl,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_perl";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/perl/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";
|
||||
sha256 = "sha256-reO+McRHuESIaf7N/KziWNbVh7jGx3PF8ic19w2C1to=";
|
||||
};
|
||||
|
||||
buildInputs = [ apacheHttpd perl ];
|
||||
buildInputs = [
|
||||
apacheHttpd
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
perl Makefile.PL \
|
||||
MP_APXS=${apacheHttpd.dev}/bin/apxs
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
make install DESTDIR=$out
|
||||
|
|
@ -24,6 +37,22 @@ stdenv.mkDerivation rec {
|
|||
rm $out/nix -rf
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.mod_perl;
|
||||
meta.mainProgram = "mp2bug";
|
||||
passthru = {
|
||||
updateScript = directoryListingUpdater {
|
||||
url = "https://archive.apache.org/dist/perl/";
|
||||
};
|
||||
tests = nixosTests.mod_perl;
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Integration of perl with the Apache2 web server";
|
||||
homepage = "https://perl.apache.org/download/index.html";
|
||||
changelog = "https://github.com/apache/mod_perl/blob/trunk/Changes";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "mp2bug";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_pkcs12";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73";
|
||||
hash = "sha256-k7BZ5d0WigyTmoUyFds7UCJ/tFBiUxd5pS4cVxmAI1g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules for PKCS#12 format files";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_pkcs12/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, libintl }:
|
||||
{
|
||||
apacheHttpd,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libintl,
|
||||
nix-update-script,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_python";
|
||||
version = "unstable-2022-10-18";
|
||||
version = "3.5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grisha";
|
||||
repo = pname;
|
||||
rev = "d066b07564d2194839eceb535485eb1ba0c292d8";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4=";
|
||||
};
|
||||
|
||||
|
|
@ -18,13 +26,21 @@ stdenv.mkDerivation rec {
|
|||
"BINDIR=$(out)/bin"
|
||||
];
|
||||
|
||||
passthru = { inherit apacheHttpd; };
|
||||
buildInputs = [
|
||||
apacheHttpd
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libintl
|
||||
];
|
||||
|
||||
buildInputs = [ apacheHttpd python3 ]
|
||||
++ lib.optional stdenv.isDarwin libintl;
|
||||
passthru = {
|
||||
inherit apacheHttpd;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://modpython.org/";
|
||||
changelog = "https://github.com/grisha/mod_python/blob/${version}/NEWS";
|
||||
description = "An Apache module that embeds the Python interpreter within the server";
|
||||
mainProgram = "mod_python";
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_scep";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc";
|
||||
hash = "sha256-HFPQ1A3ULtT2MduIQZS1drdQvCdZqJqKpOsJLEw67sI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_scep/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_spkac";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h";
|
||||
hash = "sha256-J1pGz+/AD0IPwRPBA+wt9PgV9qnZEHX66VCBGqhf0b8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module for handling the Netscape keygen requests. ";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_spkac/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -15,17 +15,18 @@
|
|||
, iniparser
|
||||
, libmemcached
|
||||
, mapnik
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_tile";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = "mod_tile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jDuOcmKzZGU6L0aOfPKRGpDLbX0O9ueTufBy7Bd6KMU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/openstreetmap/mod_tile";
|
||||
description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,46 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
|
||||
{
|
||||
apr,
|
||||
aprutil,
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
mod_ca,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_timestamp";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
|
||||
sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg";
|
||||
hash = "sha256-X49gJ1wQtwQT3GOZkluxdMIY2ZRpM9Y7DZln6Ag9DvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ mod_ca apr aprutil ];
|
||||
|
||||
buildInputs = [
|
||||
apr
|
||||
aprutil
|
||||
mod_ca
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=int-conversion"
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
]);
|
||||
|
||||
inherit (mod_ca) configureFlags installFlags;
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://redwax.eu/dist/rs/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedWax CA service module for issuing signed timestamps";
|
||||
|
||||
homepage = "https://redwax.eu";
|
||||
changelog = "https://source.redwax.eu/projects/RS/repos/mod_timestamp/browse/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dirkx ];
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "imgproxy";
|
||||
version = "3.20.0";
|
||||
version = "3.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
hash = "sha256-qTOMoeTk9fGBSmioTRBUa3xRXOIW6OJj8aH0b/vP7dw=";
|
||||
hash = "sha256-nsXIy/JpI7nDu40dUGPosMAOtFt/OzfSWyxD6JuKA+s=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SaxoFCEDniphr1ZZ5prE996CeHegB+a8dpGaMpjsrtQ=";
|
||||
vendorHash = "sha256-KtqXhi8VwH1aZt/vLHuug5MJLchs0t4tqA7PIZUVPHQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection ];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "postfix";
|
||||
version = "3.8.6";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
|
||||
hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q=";
|
||||
hash = "sha256-VvXkIOfCVFWk6WwZtnL4D5oKNftb7MkkfJ49XcxhfzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper m4 ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-scrip
|
|||
-# If this is a secondary instance, don't touch shared files.
|
||||
-
|
||||
-instances=`test ! -f $def_config_directory/main.cf ||
|
||||
- $command_directory/postconf -c $def_config_directory \
|
||||
- $command_directory/postconf -qc $def_config_directory \
|
||||
- -h multi_instance_directories | sed 's/,/ /'` || {
|
||||
- $FATAL cannot execute $command_directory/postconf!
|
||||
- exit 1
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.48.7";
|
||||
version = "0.49.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-W0FP9c6vMLCfK93eaXPeF1mkBAI2KMjQ9EpGx7hbRg8=";
|
||||
hash = "sha256-oyh25h59udfwuLqZJ4ngGYL+tup9GEWgegcTNb0PeHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages
|
||||
, python3, ruby, jre, nettools, bc
|
||||
, python3, ruby, jre8, nettools, bc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
perlPackages.DBDPg
|
||||
python3
|
||||
ruby
|
||||
jre
|
||||
jre8
|
||||
# tests
|
||||
perlPackages.TestLongString
|
||||
perlPackages.TestDifferences
|
||||
|
|
@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
|
|||
"PERL=${perlPackages.perl.outPath}/bin/perl"
|
||||
"PYTHON=${python3.interpreter}"
|
||||
"RUBY=${ruby.outPath}/bin/ruby"
|
||||
"JAVARUN=${jre.outPath}/bin/java"
|
||||
"JAVARUN=${jre8.outPath}/bin/java"
|
||||
"PLUGINUSER=munin"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sickgear";
|
||||
version = "3.30.13";
|
||||
version = "3.30.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SickGear";
|
||||
repo = "SickGear";
|
||||
rev = "release_${version}";
|
||||
hash = "sha256-Ka2WYU2hU9aemEiTNwFZLraerfisfL8vK2ujx0wDcPo=";
|
||||
hash = "sha256-/6D4jehI94KwE5BFZiMWddcinwmU8Rb/83NifTEvudA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.35.2";
|
||||
version = "2.35.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-aEM1In7BmtiPy0xOgUV6sIvMnX6fac4mSErr7dB2gRU=";
|
||||
sha256 = "sha256-l75s2ntZM/eqoFqw8bMkmxwPBvOFwf2Y8TpSsyzu3cU=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, groff
|
||||
, less
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
, testers
|
||||
|
|
@ -18,6 +19,23 @@ let
|
|||
"test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1
|
||||
];
|
||||
});
|
||||
python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: {
|
||||
version = "2.8.2";
|
||||
pyproject = null;
|
||||
src = prev.src.override {
|
||||
version = "2.8.2";
|
||||
hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY=";
|
||||
};
|
||||
patches = [
|
||||
# https://github.com/dateutil/dateutil/pull/1285
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch";
|
||||
relative = "src";
|
||||
hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o=";
|
||||
})
|
||||
];
|
||||
postPatch = null;
|
||||
});
|
||||
ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: {
|
||||
src = prev.src.override {
|
||||
version = "0.17.21";
|
||||
|
|
@ -41,27 +59,26 @@ let
|
|||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.15.15"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.15.31"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hJuJkCiKgSxfPVgS5II7BwpyQhjaRE2Ct3ZJQq6xWgg=";
|
||||
hash = "sha256-7qeB3NCYQi7Mke/ZCGe8QUS5qy26btpGjhY/FMNhdkE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
|
||||
--replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \
|
||||
--replace 'awscrt>=0.19.18,<=0.19.19' 'awscrt>=0.19.18' \
|
||||
--replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \
|
||||
--replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'
|
||||
--replace-fail 'awscrt>=0.19.18,<=0.19.19' 'awscrt>=0.19.18' \
|
||||
--replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
|
||||
--replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
|
||||
--replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \
|
||||
--replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'
|
||||
|
||||
substituteInPlace requirements-base.txt \
|
||||
--replace "wheel==0.38.4" "wheel>=0.38.4" \
|
||||
--replace "flit_core==3.8.0" "flit_core>=3.8.0"
|
||||
--replace-fail "wheel==0.38.4" "wheel>=0.38.4"
|
||||
|
||||
# Upstream needs pip to build and install dependencies and validates this
|
||||
# with a configure script, but we don't as we provide all of the packages
|
||||
|
|
@ -69,12 +86,12 @@ with py.pkgs; buildPythonApplication rec {
|
|||
sed -i '/pip>=/d' requirements/bootstrap.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
installShellFiles
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
awscrt
|
||||
bcdoc
|
||||
botocore
|
||||
|
|
@ -116,6 +133,9 @@ with py.pkgs; buildPythonApplication rec {
|
|||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/dependencies"
|
||||
"tests/unit/botocore"
|
||||
|
||||
# Integration tests require networking
|
||||
"tests/integration"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,21 @@
|
|||
{ lib
|
||||
, python3
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wyoming-faster-whisper";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "wyoming-faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RD6J/Q7kvd+sgTpR6ERyV+D8gpm0fF38L3U/Jp7gOgk=";
|
||||
hash = "sha256-CeFSxL2Mn9lgboKghbteCl6VMTqruJgrI0io+TdaV5k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fix setup.py
|
||||
url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/cdd1536997a091dcf9054da9ff424a2603067755.patch";
|
||||
hash = "sha256-LGYo21FhKGXcAN9DjXzwIRqkOzTz3suXiQdgGrJSDBw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
|
@ -33,9 +24,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"wyoming"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ctranslate2
|
||||
tokenizers
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
faster-whisper
|
||||
wyoming
|
||||
];
|
||||
|
||||
|
|
@ -47,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v${version}";
|
||||
description = "Wyoming Server for Faster Whisper";
|
||||
homepage = "https://github.com/rhasspy/wyoming-faster-whisper";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "awsbck";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "awsbck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-asYXmBPNsIac+c/UXSijol+DFI7qZVpg/SKxaadlBOI=";
|
||||
hash = "sha256-dUBuuFl6PVTsPnrH9OU3N/GwgTC2/QtH6yKtv3QgBsA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vFIBl/ZvSZn/9yLYMtzFvlPM+OYkZndkT6qPCIWVlOM=";
|
||||
cargoHash = "sha256-X5lYplBej+ZBLnNoHQTGu63pwouGfbVtSH4bgdoxqUo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, gnu-efi, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gnu-efi
|
||||
, nixosTests
|
||||
, efibootmgr
|
||||
, openssl
|
||||
, sbsigntool
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
archids = {
|
||||
|
|
@ -17,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
version = "0.14.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz";
|
||||
url = "mirror://sourceforge/project/refind/${version}/refind-src-${version}.tar.gz";
|
||||
hash = "sha256-JqDFXf01ZUmeH4LY/ldGTb7xnKiGzm0BqBUii478iw8=";
|
||||
};
|
||||
|
||||
|
|
@ -26,6 +35,7 @@ stdenv.mkDerivation rec {
|
|||
./0001-toolchain.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ gnu-efi ];
|
||||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
|
@ -95,18 +105,18 @@ stdenv.mkDerivation rec {
|
|||
install -D -m0644 keys/* $out/share/refind/keys/
|
||||
|
||||
# Fix variable definition of 'RefindDir' which is used to locate ressource files.
|
||||
sed -i "s,\bRefindDir=.*,RefindDir=$out/share/refind,g" $out/bin/refind-install
|
||||
|
||||
# Patch uses of `which`. We could patch in calls to efibootmgr,
|
||||
# openssl, convert, and openssl, but that would greatly enlarge
|
||||
# refind's closure (from ca 28MB to over 400MB).
|
||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
|
||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
|
||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
|
||||
sed -i "s,\bRefindDir=\"\$This.*,RefindDir=$out/share/refind,g" $out/bin/refind-install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/refind-install \
|
||||
--prefix PATH : ${lib.makeBinPath [ efibootmgr openssl sbsigntool ]}
|
||||
wrapProgram $out/bin/refind-mvrefind \
|
||||
--prefix PATH : ${lib.makeBinPath [ efibootmgr ]}
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
uefiCdrom = nixosTests.boot.uefiCdrom;
|
||||
};
|
||||
|
|
@ -129,7 +139,7 @@ stdenv.mkDerivation rec {
|
|||
Linux kernels that provide EFI stub support.
|
||||
'';
|
||||
homepage = "http://refind.sourceforge.net/";
|
||||
maintainers = with maintainers; [ AndersonTorres samueldr ];
|
||||
maintainers = with maintainers; [ AndersonTorres samueldr chewblacka ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -79,11 +79,11 @@
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "260";
|
||||
version = "261";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-jZXBX6aIArm3eFmJpr60HxlcSlVNCK/wSL1yeIl/MjQ=";
|
||||
hash = "sha256-BbxY5w2Up5IaDJyZgwnUDm683G8VIGaVnhUvaMRZHqU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fedifetcher";
|
||||
version = "7.0.3";
|
||||
version = "7.0.4";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanos";
|
||||
repo = "FediFetcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ADf6ZVqO9v6GQbNWi3NDX5bNmFDX5LMJfM6ePEWwbrQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-19ZpOpvDj2/qMufH2qPPAj8hRPlViSuC64WqJp6+xSk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lsd";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lsd-rs";
|
||||
repo = "lsd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-syT+1LNdigUWkfJ/wkbY/kny2uW6qfpl7KmW1FjZKR8=";
|
||||
hash = "sha256-pPCcKEmB1/BS6Q2j1fytwpZa/5KXIJu0ip0Zq97m6uw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-viLr76Bq9OkPMp+BoprQusMDgx59nbevVi4uxjZ+eZg=";
|
||||
cargoHash = "sha256-E0ui9cmuSqUMTkKvNNuEPOVd/gs4O2oW0aPxlyI9qoA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pandoc ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "10.2.0";
|
||||
version = "10.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bz4a4+mgssrRBthkN87aYxlZV6as2uocFvBKrKLmy8A=";
|
||||
hash = "sha256-YzoUl7dfmJpTAdJq2o8DrgRKvRoLcyIWiLUD7e7UOMk=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-vq6R2FgvoET8SLTpktGLoFzZHqnmizDp0fWU7kqlLgU=";
|
||||
vendorHash = "sha256-FWPhKDndu+QNxERYc3aQCKAYiSR0BTrZOd3ZW8aG4HU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "cloud-native, graph-based asset inventory";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.6.2";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/V0zn4Aic6tBJw23YJWkyeCZXf/ehIZlKWd9TZXe40Y=";
|
||||
hash = "sha256-JlTD8el4hXVYI76+cxGNemkUu0n2QxCqisr6R9aPqdI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wIXc0YYTdcnUBNbypVwZJ/RNTmaeMteEujmgs5WJ1g0=";
|
||||
vendorHash = "sha256-J5qLs4EirBOfjnLv8eQBSd9w9nzpxBW5GS28CgQMsN8=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxmark3";
|
||||
version = "4.18218";
|
||||
version = "4.18341";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LltTTmYEF1JsqkVaj7Z19qGR+dEUj6Hwr6T5Z1eDzZc=";
|
||||
hash = "sha256-YeBrrzCiDgl4WdhWYatm9sOAtBAECIv/f+OzB/RTdeg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "a2ps";
|
||||
version = "4.15.5";
|
||||
version = "4.15.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
|
||||
hash = "sha256-gbsbQQTnwmOXYkUe3JeG2vPf6ziErfx9xqydII8w2n8=";
|
||||
hash = "sha256-h/+dgByxGWkYHVuM+LZeZeWyS7DHahuCXoCY8pBvvfQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -308,11 +308,11 @@ chktex = stdenv.mkDerivation {
|
|||
# for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live
|
||||
context = stdenv.mkDerivation rec {
|
||||
pname = "luametatex";
|
||||
version = "2.11.02";
|
||||
version = "2.10.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?revision=70616&view=co";
|
||||
hash = "sha256-o7esoBBTTYEstkd7l34BWxew3fIRdVcFiGxrT1/KP1o=";
|
||||
url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?revision=67034&view=co";
|
||||
hash = "sha256-3JeOUQ63jJOZWTxFCoyWjfcrspmdmC/yqgS1JaLfTWk=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -828,7 +828,7 @@ conditext-55387={run="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc";doc=
|
|||
confproc-29349={run="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i";doc="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994";source="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c";};
|
||||
constants-15878={run="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk";doc="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp";source="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr";};
|
||||
conteq-37868={run="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df";doc="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy";source="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8";};
|
||||
context-69665={run="1z6knaa8mffb4ds36k1h15qymh7f2aw9fwq38jw5cqzna6s8zzs0";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
|
||||
context-69665={run="1r8gkrrrq1ps1cp058m1jv8922zsx3hw6c5vsmxpbwckrp5sirwh";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
|
||||
context-calendar-examples-66947={run="0asc49mn24ql4fk73089viy3s6wff865xk8af7h67ffsb5qjnld8";doc="0wza057wz18yf2zl1j77hddzimwnraw5wg1579ncksywvhnmx3rp";};
|
||||
context-collating-marks-68696={run="12vqvbp7ns9r5nc7p7nrlsll3jp3hc4xi9wjyjq8lrmd8ly3v26w";doc="0nawd3x4rl73s4mhpq2wd1sqa8i6k2n0a39sqcaf21zx99mpiqp0";};
|
||||
context-cyrillicnumbers-47085={run="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2";doc="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73";};
|
||||
|
|
|
|||
|
|
@ -1,106 +0,0 @@
|
|||
--- a/scripts/context/lua/mtxrun.lua 1970-01-01 01:00:01
|
||||
+++ b/cont-lmt/scripts/context/lua/mtxrun.lua 2024-03-11 08:34:49
|
||||
@@ -2435,19 +2433,22 @@
|
||||
tables[t]=tcopy
|
||||
end
|
||||
for i,v in next,t do
|
||||
+ local k
|
||||
if type(i)=="table" then
|
||||
if tables[i] then
|
||||
- i=tables[i]
|
||||
+ k=tables[i]
|
||||
else
|
||||
- i=copy(i,tables)
|
||||
+ k=copy(i,tables)
|
||||
end
|
||||
+ else
|
||||
+ k=i
|
||||
end
|
||||
if type(v)~="table" then
|
||||
- tcopy[i]=v
|
||||
+ tcopy[k]=v
|
||||
elseif tables[v] then
|
||||
- tcopy[i]=tables[v]
|
||||
+ tcopy[k]=tables[v]
|
||||
else
|
||||
- tcopy[i]=copy(v,tables)
|
||||
+ tcopy[k]=copy(v,tables)
|
||||
end
|
||||
end
|
||||
local mt=getmetatable(t)
|
||||
@@ -12982,10 +13037,10 @@
|
||||
else
|
||||
value=is_boolean(value,value,true)
|
||||
end
|
||||
- w=topattern(w,true,true)
|
||||
+ local p=topattern(w,true,true)
|
||||
for name,functions in sortedhash(data) do
|
||||
if done[name] then
|
||||
- elseif find(name,w) then
|
||||
+ elseif find(name,p) then
|
||||
done[name]=true
|
||||
for i=1,#functions do
|
||||
functions[i](value)
|
||||
@@ -13554,9 +13610,9 @@
|
||||
if v then
|
||||
v.state=value
|
||||
else
|
||||
- c=topattern(c,true,true)
|
||||
+ local p=topattern(c,true,true)
|
||||
for k,v in next,data do
|
||||
- if find(k,c) then
|
||||
+ if find(k,p) then
|
||||
v.state=value
|
||||
end
|
||||
end
|
||||
@@ -14499,10 +14556,7 @@
|
||||
realtime=realtime+real
|
||||
end
|
||||
totaltime=totaltime+total
|
||||
- if line<0 then
|
||||
- line=0
|
||||
- end
|
||||
- dataset[#dataset+1]={ real,total,count,name,source,line }
|
||||
+ dataset[#dataset+1]={ real,total,count,name,source,line<0 and 0 or line }
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -21135,10 +21251,10 @@
|
||||
str=lpegmatch(stripper_1,str)
|
||||
if validate then
|
||||
for s in gmatch(str,"[^,]+") do
|
||||
- s=validate(s)
|
||||
- if s then
|
||||
+ local v=validate(s)
|
||||
+ if v then
|
||||
n=n+1
|
||||
- t[n]=s
|
||||
+ t[n]=v
|
||||
end
|
||||
end
|
||||
else
|
||||
@@ -23552,7 +23690,8 @@
|
||||
local result={}
|
||||
local status={}
|
||||
local done={}
|
||||
- for k,r in next,results do
|
||||
+ for k=1,#results do
|
||||
+ local r=results[k]
|
||||
local method,list=r[1],r[2]
|
||||
if method and list then
|
||||
for i=1,#list do
|
||||
--- a/scripts/context/lua/mtx-context.lua 1970-01-01 01:00:01
|
||||
+++ b/scripts/context/lua/mtx-context.lua 2024-03-11 08:34:49
|
||||
@@ -613,8 +615,11 @@
|
||||
-- context flags get prepended by c: ... this will move to the sbx module
|
||||
local t = { }
|
||||
for k, v in table.sortedhash(flags) do
|
||||
+ local p
|
||||
if prefix then
|
||||
- k = format("c:%s",k)
|
||||
+ p = format("c:%s",k)
|
||||
+ else
|
||||
+ p = k
|
||||
end
|
||||
if not v or v == "" or v == '""' then
|
||||
-- no need to flag false
|
||||
|
|
@ -356,14 +356,6 @@ in lib.recursiveUpdate orig rec {
|
|||
# tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README
|
||||
arabi-add.license = [ "lppl13c" ];
|
||||
|
||||
# mtxrun.lua and mtx-context.lua write to const loop variables which is forbidden in recent LuaTeX
|
||||
# patch manually generated by diffing against a recent cont-lmt.zip
|
||||
context.postUnpack = ''
|
||||
if [[ -f "$out"/scripts/context/lua/mtxrun.lua ]] ; then
|
||||
patch -p1 -d "$out" < ${./mtx-local-vars.patch}
|
||||
fi
|
||||
'';
|
||||
|
||||
texdoc = {
|
||||
extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
|
||||
extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
|
||||
|
|
|
|||
|
|
@ -12907,6 +12907,8 @@ self: super: with self; {
|
|||
|
||||
requests-credssp = callPackage ../development/python-modules/requests-credssp { };
|
||||
|
||||
requests-gssapi = callPackage ../development/python-modules/requests-gssapi { };
|
||||
|
||||
requests-hawk = callPackage ../development/python-modules/requests-hawk { };
|
||||
|
||||
requests = callPackage ../development/python-modules/requests { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue