mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 01:24:09 +01:00
Merge master into staging-next
This commit is contained in:
commit
9af8e8ea80
47 changed files with 296 additions and 4391 deletions
|
|
@ -1,4 +1,6 @@
|
|||
{
|
||||
stdenv,
|
||||
config,
|
||||
runCommand,
|
||||
testers,
|
||||
fetchgit,
|
||||
|
|
@ -239,8 +241,11 @@
|
|||
withGitConfig =
|
||||
let
|
||||
pkgs = import ../../.. {
|
||||
config.gitConfig = {
|
||||
url."https://github.com".insteadOf = "https://doesntexist.forsure";
|
||||
system = stdenv.hostPlatform.system;
|
||||
config = config // {
|
||||
gitConfig = {
|
||||
url."https://github.com".insteadOf = "https://doesntexist.forsure";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,9 +2,12 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
autoPatchelfHook,
|
||||
makeBinaryWrapper,
|
||||
jq,
|
||||
dotnet-runtime,
|
||||
zlib,
|
||||
runtimeShell,
|
||||
libzen,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -17,21 +20,36 @@ stdenv.mkDerivation {
|
|||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeBinaryWrapper
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
libzen
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/avdump3 $out/bin
|
||||
mv * $out/share/avdump3
|
||||
cat > $out/bin/avdump3 <<EOF
|
||||
#!${runtimeShell}
|
||||
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ zlib ]}:\$LD_LIBRARY_PATH"
|
||||
exec ${dotnet-runtime}/bin/dotnet $out/share/avdump3/AVDump3CL.dll "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/avdump3
|
||||
|
||||
# The app targets net6.0, which is EOL. Allow roll-forward to whatever
|
||||
# major version dotnet-runtime provides.
|
||||
jq '.runtimeOptions.rollForward = "major"' \
|
||||
$out/share/avdump3/AVDump3CL.runtimeconfig.json > tmp.json
|
||||
mv tmp.json $out/share/avdump3/AVDump3CL.runtimeconfig.json
|
||||
|
||||
makeBinaryWrapper ${dotnet-runtime}/bin/dotnet $out/bin/avdump3 \
|
||||
--add-flags $out/share/avdump3/AVDump3CL.dll
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = {
|
||||
mainProgram = "avdump3";
|
||||
description = "Tool for extracting audio/video metadata from media files and uploading it to AniDB";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
From 898cfcc19af66f5a9273cd04b43cf76ae9ec6da9 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Daniels <mdaniels5757@gmail.com>
|
||||
Date: Tue, 17 Feb 2026 21:17:33 -0500
|
||||
Subject: [PATCH] fix error with pytest 4.0
|
||||
|
||||
https://docs.pytest.org/en/stable/deprecations.html#pytest-plugins-in-non-top-level-conftest-files
|
||||
---
|
||||
test/conftest.py | 1 +
|
||||
test/integration/conftest.py | 3 ---
|
||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/test/conftest.py b/test/conftest.py
|
||||
index 8f0629b..53f3e32 100644
|
||||
--- a/test/conftest.py
|
||||
+++ b/test/conftest.py
|
||||
@@ -12,6 +12,7 @@ import sys
|
||||
|
||||
import pytest
|
||||
|
||||
+pytest_plugins = ['b2sdk.v3.testing']
|
||||
|
||||
@pytest.hookimpl
|
||||
def pytest_configure(config):
|
||||
diff --git a/test/integration/conftest.py b/test/integration/conftest.py
|
||||
index 1a7226d..035a2be 100755
|
||||
--- a/test/integration/conftest.py
|
||||
+++ b/test/integration/conftest.py
|
||||
@@ -47,9 +47,6 @@ ROOT_PATH = pathlib.Path(__file__).parent.parent.parent
|
||||
GENERAL_BUCKET_NAME_PREFIX = 'clitst'
|
||||
|
||||
|
||||
-pytest_plugins = ['b2sdk.v3.testing']
|
||||
-
|
||||
-
|
||||
@pytest.fixture(scope='session', autouse=True)
|
||||
def summary_notes(request, worker_id):
|
||||
capmanager = request.config.pluginmanager.getplugin('capturemanager')
|
||||
--
|
||||
2.51.2
|
||||
|
||||
|
|
@ -11,16 +11,18 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "backblaze-b2";
|
||||
version = "4.4.2";
|
||||
version = "4.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Backblaze";
|
||||
repo = "B2_Command_Line_Tool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ut1e/A36Tp4pgwZx+S8nYmjg3k/2CmRpdUfz3iOXTz0=";
|
||||
hash = "sha256-0BF4+L47Cx7GNGeNm8nJkEfTLYb6jLxSH3WE+h9B6zA=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-error-with-pytest-4.0.patch ];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
installShellFiles
|
||||
argcomplete
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.bazarr.media/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ diogotcorreia ];
|
||||
mainProgram = "bazarr";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.42.0";
|
||||
version = "0.43.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ev3Kk+jFnjc8pdozeeqktxDtYjyODvdN8lkiynMKe/o=";
|
||||
hash = "sha256-VyV57ASsn2t1zaW7L6o7sVc+H+tHf4AP1HaKgrdXrtk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u2K0CmCFFrlNVUJhof/8/OtX2ruKvVAIhyyE5Uyoj6Y=";
|
||||
vendorHash = "sha256-qFqFyPdAqh2BXeE2tkLmn88Z8qHFeSlTA2Ols8H7iaQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
glib,
|
||||
|
|
@ -16,13 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ddcutil";
|
||||
version = "2.2.5";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockowitz";
|
||||
repo = "ddcutil";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Bf4I2bt7Ykn2P834tVIbTaY+7fae18zrs2I84Byv1Y=";
|
||||
src = fetchurl {
|
||||
url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dua";
|
||||
version = "2.33.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "dua-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3Mlhz+vYeDSoVLuBFAtgJxrECwUchSWIusrLKqhxU30=";
|
||||
hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-85I+rWomp+2G1DLbwowHDSrRm6dS4b99Ia24ffY7Fnk=";
|
||||
cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip interactive tests
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "erofs-utils";
|
||||
version = "1.8.10";
|
||||
version = "1.9";
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-BetO3r4R3szm7LNOmNL4DIzSg8Lyln2Lp+/VhBhXBRQ=";
|
||||
hash = "sha256-0byEtdYLyuEhp/V+qX1BVRiQh+F4+BJ/MIRtn1N8nXM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -49,17 +49,17 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-runner";
|
||||
version = "12.6.4";
|
||||
version = "12.7.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v+b1YGUoIwzSGYUq/aUc5DceKUqWm0LA1Fd1/X/rf5w=";
|
||||
hash = "sha256-pQYlacbctW+Cbm3abDps2ZpqX/iPhgAgJnBsaXcny6w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU=";
|
||||
vendorHash = "sha256-nceLZzbSk56l3NLgusw6JKi1owniQVudNDgC7fsHxYQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"g3proxy"
|
||||
"-p"
|
||||
"g3proxy-ctl"
|
||||
"-p"
|
||||
"g3proxy-lua"
|
||||
"-p"
|
||||
"g3proxy-ftp"
|
||||
"-p"
|
||||
"g3mkcert"
|
||||
"-p"
|
||||
"g3fcgen"
|
||||
"-p"
|
||||
"g3iploc"
|
||||
"-p"
|
||||
"g3statsd"
|
||||
];
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-ethereum";
|
||||
version = "1.16.8";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "go-ethereum";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eMvLhOSWGC31ezZeqMMt8kmFHq9NU0kh5s2IBiw46NY=";
|
||||
hash = "sha256-xTx2gcpDY4xuZOuUEmtV6m5NNO6YQ01tGzLr5rh9F/g=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-KP9oD87kn8MCvEf3ply8HbP8xIBlGAEtthGob8Yh++A=";
|
||||
vendorHash = "sha256-egsqYaItRtKe97P3SDb6+7sbuvyGdNGIwCR6V2lgGOc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goresym";
|
||||
version = "3.1.2";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mandiant";
|
||||
repo = "goresym";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BgnT0qYPH8kMI837hnUK5zGhboGgRU7VeU5dKNcrj8g=";
|
||||
hash = "sha256-VYC9D27/4Up0zIO2wdstdQM8+5FwK+i+nxN8FoYpW4Q=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder";
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sl5apGLA64xgHxk7C47aK+OTVPjAVkpxi2yhN6HoJyk=";
|
||||
hash = "sha256-VceAqiWeDJEAqx96Y4WHUTsPLeb4HvkNbl4fmMi296g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "har-to-k6";
|
||||
version = "0.14.12";
|
||||
version = "0.14.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "har-to-k6";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9LOL67K1hPPioN0eWPEucMb+jy6WcAYsO4Mm34T9NB4=";
|
||||
hash = "sha256-RKg8ShzxxIaK6mmcmLjYT8Ofe2CM3U5/Lg/UEIRi30Q=";
|
||||
};
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmDepsHash = "sha256-dKt3TPZye/HO2j06EcN5G1iShaKazMpHUaWdwvEN5pk=";
|
||||
npmDepsHash = "sha256-Z5aq9apwz1wvm0uam2pxzX+T+hKkk/kmXPy7IyrUHFM=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
libevdev,
|
||||
libxkbcommon,
|
||||
meson,
|
||||
|
|
@ -12,6 +13,9 @@
|
|||
protobufc,
|
||||
systemd,
|
||||
buildPackages,
|
||||
epoll-shim,
|
||||
basu,
|
||||
evdev-proto,
|
||||
}:
|
||||
let
|
||||
munit = fetchFromGitHub {
|
||||
|
|
@ -33,12 +37,28 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-PqQpJz88tDzjwsBuwxpWcGAWz6Gp6A/oAOS87uxGOGs=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isBSD [
|
||||
# From https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/357
|
||||
(fetchpatch {
|
||||
name = "peercred-bsd.patch";
|
||||
url = "https://gitlab.freedesktop.org/libinput/libei/-/commit/4f11112be0c0a89e8f078c0b4bcc103dbc6ac875.patch";
|
||||
hash = "sha256-Z6oZphzyfHMdAQninbUvEtxr738sx/SQV8o0fkF25iI=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libevdev
|
||||
libxkbcommon
|
||||
protobuf
|
||||
protobufc
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
systemd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isFreeBSD [
|
||||
basu
|
||||
epoll-shim
|
||||
evdev-proto
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
|
|
@ -56,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
))
|
||||
];
|
||||
|
||||
mesonFlags = lib.optionals stdenv.hostPlatform.isFreeBSD [
|
||||
"-Dsd-bus-provider=basu"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s "${munit}" ./subprojects/munit
|
||||
patchShebangs ./proto/ei-scanner
|
||||
|
|
@ -67,6 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://gitlab.freedesktop.org/libinput/libei";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.pedrohlc ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
withGpu ? true,
|
||||
}:
|
||||
let
|
||||
version = "1.16.0";
|
||||
version = "1.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libkrun";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZMR6+psxA8IOidilcZxoiwiL4Npo6kBmGDt/96oTjdE=";
|
||||
hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U=";
|
||||
};
|
||||
|
||||
virglrenderer = stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-WZDLz560Un+2P+I6y9V3RB4jiHW0NLN0X8y2TAvwFp8=";
|
||||
hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtrace";
|
||||
version = "4.0.29-1";
|
||||
version = "4.0.30-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibtraceTeam";
|
||||
repo = "libtrace";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Gt7mGs1/ltVRON5mmltDI6ukZ+LquTnUSFF/QHG9ocI=";
|
||||
hash = "sha256-zUSc/ZrXo1EV+XB2KYtNPZqd8GzmunO9rCjSKppMMcw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
48
pkgs/by-name/li/libudev-devd/package.nix
Normal file
48
pkgs/by-name/li/libudev-devd/package.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
evdev-proto,
|
||||
freebsd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libudev-devd";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wulf7";
|
||||
repo = "libudev-devd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CrRPJMJRYiYyEIy5XPFk286S87/paf6OfGkEdRPv28I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freebsd.libdevinfo
|
||||
evdev-proto
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-gpl=true"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "libudev-compatible interface for devd";
|
||||
homepage = "https://github.com/wulf7/libudev-devd";
|
||||
license = with lib.licenses; [
|
||||
bsd2
|
||||
gpl2
|
||||
];
|
||||
maintainers = with lib.maintainers; [ artemist ];
|
||||
platforms = lib.platforms.freebsd;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
pkgsBuildTarget,
|
||||
pkgsBuildHost,
|
||||
minijail,
|
||||
}:
|
||||
|
||||
|
|
@ -11,24 +11,28 @@ let
|
|||
in
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
pname = "minijail-tools";
|
||||
inherit (minijail) version src;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace /bin/echo echo
|
||||
substituteInPlace Makefile --replace-fail /bin/echo echo
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace tools/compile_seccomp_policy.py \
|
||||
--replace "'constants.json'" "'$out/share/constants.json'"
|
||||
--replace-fail "'constants.json'" "'$out/share/constants.json'"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
make libconstants.gen.c libsyscalls.gen.c
|
||||
${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \
|
||||
libconstants.gen.c libsyscalls.gen.c
|
||||
${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \
|
||||
${python3.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \
|
||||
--output constants.json \
|
||||
libconstants.gen.ll libsyscalls.gen.ll
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minijail";
|
||||
version = "2025.07.02";
|
||||
|
||||
src = fetchFromGitiles {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/minijail";
|
||||
rev = "linux-v${version}";
|
||||
sha256 = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY=";
|
||||
tag = "linux-v${finalAttrs.version}";
|
||||
hash = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap ];
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
installPhase = ''
|
||||
./platform2_preinstall.sh ${version} $out/include/chromeos
|
||||
./platform2_preinstall.sh ${finalAttrs.version} $out/include/chromeos
|
||||
|
||||
mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin \
|
||||
$out/share/minijail
|
||||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/heads/main/README.md";
|
||||
description = "Sandboxing library and application using Linux namespaces and capabilities";
|
||||
changelog = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/tags/linux-v${version}";
|
||||
changelog = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/tags/linux-v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
pcarrier
|
||||
|
|
@ -61,4 +61,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = lib.platforms.linux;
|
||||
mainProgram = "minijail0";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
}:
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "msbuild-structured-log-viewer";
|
||||
version = "2.3.139";
|
||||
version = "2.3.143";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KirillOsenkov";
|
||||
repo = "MSBuildStructuredLog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5i5qEwUzk9bUn2F/wcMfIOodcfn4d9ApdADes5e1nIo=";
|
||||
hash = "sha256-Gjk6hxgFSiSLDP9B4UUsNEaadLjTn8WrPmFRbIUerAA=";
|
||||
};
|
||||
|
||||
env.AVALONIA_TELEMETRY_OPTOUT = "1";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.71.0";
|
||||
version = "2.72.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KJqHSl5ebCLl5kiAYkG1VeGEb/TZUuF/4fnslWA6KKY=";
|
||||
hash = "sha256-tQufX7LIRrPDCid2lfKKEJjZHInVDRVmoCd1oYiSCfk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -13,16 +13,17 @@
|
|||
libxcursor,
|
||||
libx11,
|
||||
libxi,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "outfly";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "outfly";
|
||||
repo = "outfly";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FRvu3FgbT3i5888ll573nhb7naYx04Oi8nrcfgEHxUo=";
|
||||
hash = "sha256-BOm5SxpWowq5LCTqRqDkbKGPnZo0pJYz8w3kB/WnH9M=";
|
||||
};
|
||||
|
||||
runtimeInputs = [
|
||||
|
|
@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--add-rpath ${lib.makeLibraryPath runtimeInputs}
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-5t6PPlfV/INqb4knz1Bv6dqw47RxUmVO0DSlQNUIQL4=";
|
||||
cargoHash = "sha256-UXqS4JfKuLxeTW1MDMnKLzw8oHf1Gpgv8SktTtf12mc=";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
@ -58,6 +59,8 @@ rustPlatform.buildRustPackage rec {
|
|||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Breathtaking 3D space game in the rings of Jupiter";
|
||||
homepage = "https://yunicode.itch.io/outfly";
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.29";
|
||||
version = "0.1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8aFBb+bkdht0aQmqSwEy266rQM3iuE2vpqgtZzbhszU=";
|
||||
hash = "sha256-oobSNeafVWwYmvYs4REV7RuqVMIob3JruMjgN/wzNFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IjVVHDHm7qe0w8HvsmZb7u830EFXZDcYmlpqpqjLzSk=";
|
||||
cargoHash = "sha256-Cm/wJtNwHuJklk8b39Fk+SzxWjGE2qGcJD/ekydcBxE=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pytr";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytr-org";
|
||||
repo = "pytr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VfNoovNGvu1tNbYYiIX8KTOfll0WrHxJsLk/Yoyhu6s=";
|
||||
hash = "sha256-2x0Kwg4upKLwFYslyIvXcssdO4W8l0Gs3qvy6kJYNnI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -10,17 +10,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rgrc";
|
||||
version = "0.6.9";
|
||||
version = "0.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazywalker";
|
||||
repo = "rgrc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sc0JmcnxW9WZ78ayJtSWTZBoVgqnFGUO2dKGi8U05S0=";
|
||||
hash = "sha256-PgfLDVO1OyHlJYbUzZCkKv7SV/nSPFjUhi5qpdxCDYw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wEE08Rqga5Ffz6IgYyQto0gB8bXCZ6Myc3r6uM5XTCs=";
|
||||
cargoHash = "sha256-ek9Cf33fW6kS0L+u8mQYqsqZmv7dfptHFd+t3odtCO4=";
|
||||
|
||||
buildFeatures = [ "embed-configs" ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkFlags = [ "--skip=test_command_exists" ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "slade";
|
||||
version = "3.2.11-unstable-2026-02-10";
|
||||
version = "3.2.11-unstable-2026-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = "b2c302bb9723a7ef12315c299244874249f4f13b";
|
||||
hash = "sha256-lUyDsJb2DXCSwRp7G9YF9aAWhJ7a2mXriTPmQ2/nhaQ=";
|
||||
rev = "3615810ce2aee36909fb0a1a1e8a605edc2caf81";
|
||||
hash = "sha256-/70LynJvcrjM4ztudaPp2pv6hPy+TQXwafwLj0n7T8E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.42.9";
|
||||
version = "2.42.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LyOydzm4w9HRwc18jfETvC9gsK2B4dQMYb/gTOZ2nZY=";
|
||||
hash = "sha256-n05g7b2XziajUxjygLz8QXgor5mPneYeqmAfoiCGhGE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec=";
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "starkiller";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bc-security";
|
||||
repo = "starkiller";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sUrbM0uq6wmGEF++K869AQtwgTlCxKe6r9XPlYMicU8=";
|
||||
hash = "sha256-tnU6Q5hVRwouII0wSHWrCDhrDySiH6qV5oxCSE+hDqk=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tbtools";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "tbtools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gVVJzStmLJQMsc6DF8vEcJxTwpoRC0Kwq5WMzyNweB4=";
|
||||
hash = "sha256-tDAaWFMZeJcU2wzrOD/4DLHerm/Iy56HTe5Qz98I23M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0zwxpvCKpR78L6d/nJk/e1S5GQHL0lCQi2Ns9J/U1/o=";
|
||||
cargoHash = "sha256-94O+ma6twGfXr/QM7nZRmNVV4s4Z2YnsYNsNELjnhiQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "uptime-kuma";
|
||||
version = "2.1.1";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1zTZCTT2UzdhZ8UBYdlnC8/nwpa/M459+X05rk1rb4U=";
|
||||
hash = "sha256-frs5Pn3Zalroto40P2c1igew3/pALeUvSgqcxFapclQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-fazB+iyOjTgp+chDFCQpPGmLgNGKIPnmoLyG7CYiiUk=";
|
||||
npmDepsHash = "sha256-SfkSCITDrigEJ4MTqs3JYGDuMKY531sPfvNyVNn5JYQ=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -21,9 +21,9 @@
|
|||
let
|
||||
# Note: use this to get the release metadata
|
||||
# https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version}
|
||||
version = "0.17.0";
|
||||
date = "2024-12-28-12:49";
|
||||
rev = "a1be5a7bece7af43ebd76910eb0020c1cf3c0798";
|
||||
version = "0.18.0";
|
||||
timestamp = "1769191511";
|
||||
rev = "1d12f35edd6cdbfc1fb921c167cdd7beeeffe248";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
|
|
@ -34,15 +34,14 @@ rustPlatform.buildRustPackage {
|
|||
owner = "veloren";
|
||||
repo = "veloren";
|
||||
inherit rev;
|
||||
hash = "sha256-AnmXn4GWzxu27FUyQIIVnANtu3sr0NIi7seN7buAtL8=";
|
||||
hash = "sha256-tngIwFq18kvOU2XwCQoeLWjiVDjrJgOf3XIYz2J2cWs=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
./fix-on-rust-stable.patch
|
||||
./fix-assets-path.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-hxDVFJxZQ2Seg4vapSE8PsT527GOs9DFWFnacKwWkiM=";
|
||||
cargoHash = "sha256-1qLE1UeP2i0xaOGLniZzdjIkBbme6rctGfcO9Kfoh5E=";
|
||||
|
||||
postPatch = ''
|
||||
# Force vek to build in unstable mode
|
||||
|
|
@ -54,6 +53,8 @@ rustPlatform.buildRustPackage {
|
|||
EOF
|
||||
# Fix assets path
|
||||
substituteAllInPlace common/assets/src/lib.rs
|
||||
# Do not use mold, it produces broken binaries
|
||||
substituteInPlace .cargo/config.toml --replace-fail mold gold
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -78,8 +79,7 @@ rustPlatform.buildRustPackage {
|
|||
RUSTC_BOOTSTRAP = true;
|
||||
|
||||
# Set version info, required by veloren-common
|
||||
NIX_GIT_TAG = "v${version}";
|
||||
NIX_GIT_HASH = "${lib.substring 0 8 rev}/${date}";
|
||||
VELOREN_GIT_VERSION = "/${lib.substring 0 8 rev}/${timestamp}";
|
||||
|
||||
# Save game data under user's home directory,
|
||||
# otherwise it defaults to $out/bin/../userdata
|
||||
|
|
@ -99,6 +99,7 @@ rustPlatform.buildRustPackage {
|
|||
libxi
|
||||
libxcursor
|
||||
libxrandr
|
||||
libxkbcommon
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vicinae";
|
||||
version = "0.19.7";
|
||||
version = "0.19.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vicinaehq";
|
||||
repo = "vicinae";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jJhGzVLu8QgMQrhZgJxRYcYwzrG+dKUdo9qWX8KBwnk=";
|
||||
hash = "sha256-y4Z5QknWJ18jU8BiZlYvmhhSB0h3A2ZL7hMjQdgGdgk=";
|
||||
};
|
||||
|
||||
apiDeps = fetchNpmDeps {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vimb";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fanglingsu";
|
||||
repo = "vimb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NW9B/hybSOaojKIubaxiQ+Nd5f/D4XKxPl9vUyFoX/k=";
|
||||
hash = "sha256-3h4dTjGQ0Ds2BDG0cUmbNvtEmDuizDJ0BYvpCfMz+I0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPecl rec {
|
||||
pname = "mongodb";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-php-driver";
|
||||
rev = version;
|
||||
hash = "sha256-iaDhI3LA/kTJqk6ViMlwLsmSpg20EogGskBrinVKpME=";
|
||||
hash = "sha256-stY9je5gMaBIds45NxSLZaXaiapRRd/wUImrJxHnzZI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
|
@ -23,6 +24,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-NncPUZ31vs08v+C+5Ku/v5ufa0604DNh0oK378/E8N8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Starting with Python 3.14, both `-X` and `--xxx` are surrounded
|
||||
# by ANSI color codes in the argparse help text.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nose-devs/nose2/commit/2043fdfa264dc04e379e11c227e63a5704cb0185.patch";
|
||||
hash = "sha256-OWzBInMI0ef9g0H3muka7J7FP01IZEFkuzJfaku78bI=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
optional-dependencies = {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,12 @@ buildDotnetModule {
|
|||
|
||||
nugetDeps = engine.deps;
|
||||
|
||||
# Retarget from net6.0 to net8.0 (net6.0 is EOL)
|
||||
postPatch = ''
|
||||
substituteInPlace Directory.Build.props \
|
||||
--replace-fail ">net6.0<" ">net8.0<"
|
||||
'';
|
||||
|
||||
useAppHost = false;
|
||||
|
||||
dotnetFlags = [ "-p:Version=0.0.0.0" ]; # otherwise dotnet build complains, version is saved in VERSION file anyway
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@ buildOpenRAEngine {
|
|||
version = "20250330";
|
||||
hash = "sha256-chWkzn/NLZh2gOua9kE0ubRGjGCC0LvtZSWHBgXKqHw=";
|
||||
deps = ./deps.json;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ let
|
|||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.12.73";
|
||||
hash = "sha256-kmfxbFQduQ+ZLlvJ6M+ZvcEvDza12040SuQjIvHme+o=";
|
||||
version = "6.12.74";
|
||||
hash = "sha256-bG7PfKsFtMHQc1mKU00JE26echKDobLwCPvKmooNMLU=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.18.12";
|
||||
hash = "sha256-MU0Xc+UZSleOv0GIkil7RnoaCmMBxv5Zzz6Ng1NNDy8=";
|
||||
version = "6.18.13";
|
||||
hash = "sha256-K7cWtpsHd6Jqvve5J1oI+AOh/TyYLDjR/c+HyqaLNQw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@
|
|||
"version": "22.5.0"
|
||||
},
|
||||
"hcaptcha-for-forms-and-more": {
|
||||
"path": "hcaptcha-for-forms-and-more/tags/4.22.0",
|
||||
"rev": "3441969",
|
||||
"sha256": "1rargx812pi98mf0qynr5lcxs4y1fg7jpgxd96r72i97q8ck20l3",
|
||||
"version": "4.22.0"
|
||||
"path": "hcaptcha-for-forms-and-more/tags/4.23.0",
|
||||
"rev": "3456290",
|
||||
"sha256": "222ae768d76ba2e447185619357e5adc0282f14451534b11dcd6a2358f0d212e",
|
||||
"version": "4.23.0"
|
||||
},
|
||||
"hello-dolly": {
|
||||
"path": "hello-dolly/tags/1.7.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
|
@ -17,7 +18,7 @@ lib.recurseIntoAttrs {
|
|||
let
|
||||
pkgs' = import ../.. {
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
config = {
|
||||
config = config // {
|
||||
permittedInsecurePackages = builtins.seq pkgs'.glibc.version [ ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ pkgs, lib }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
|
|
@ -78,6 +82,7 @@ let
|
|||
crossPkgs = import pkgs.path {
|
||||
localSystem = { inherit (pkgs.stdenv.hostPlatform) config; };
|
||||
crossSystem = crossSystemFun system;
|
||||
inherit config;
|
||||
};
|
||||
|
||||
emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
stdenv,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
testers,
|
||||
}:
|
||||
|
||||
|
|
@ -21,7 +22,7 @@ let
|
|||
# use a early stdenv so when hacking on stdenv this test can be run quickly
|
||||
bootStdenv = earlyPkgs.stdenv.__bootPackages.stdenv.__bootPackages.stdenv or earlyPkgs.stdenv;
|
||||
pkgsStructured = import pkgs.path {
|
||||
config = {
|
||||
config = config // {
|
||||
structuredAttrsByDefault = true;
|
||||
};
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
|
|||
|
|
@ -2966,8 +2966,6 @@ with pkgs;
|
|||
|
||||
miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; };
|
||||
|
||||
minijail = callPackage ../tools/system/minijail { };
|
||||
|
||||
mir-qualia = callPackage ../tools/text/mir-qualia {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1302,10 +1302,10 @@
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
|
||||
sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.0";
|
||||
version = "2.14.1";
|
||||
};
|
||||
faraday-net_http = {
|
||||
dependencies = [ "net-http" ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue