mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +03:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
K900
commit
52b6eed9b1
54 changed files with 639 additions and 445 deletions
|
|
@ -10,13 +10,38 @@ import ../make-test-python.nix (
|
|||
enable = true;
|
||||
virtualHost = "localhost";
|
||||
selfUrlPath = "http://localhost/";
|
||||
pluginPackages = with pkgs; [
|
||||
tt-rss-plugin-auth-ldap
|
||||
tt-rss-plugin-feediron
|
||||
];
|
||||
plugins = [
|
||||
"auth_internal"
|
||||
"feediron"
|
||||
"note"
|
||||
];
|
||||
singleUserMode = true;
|
||||
themePackages = with pkgs; [ tt-rss-theme-feedly ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
import re
|
||||
machine.wait_for_unit("tt-rss.service")
|
||||
machine.succeed("curl -sSfL http://localhost/ | grep 'Tiny Tiny RSS'")
|
||||
|
||||
matches = re.search('__csrf_token = "([^"]*)"', machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar -sSfL http://localhost/"))
|
||||
if matches is None:
|
||||
assert False, "CSRF token not found"
|
||||
csrf_token = matches.group(1)
|
||||
|
||||
# Ensure themes are loaded. No API found for these, so it's a crude check.
|
||||
preference_page = machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar http://localhost/backend.php?op=Pref_Prefs")
|
||||
assert "feedly" in preference_page
|
||||
|
||||
plugins = json.loads(machine.succeed(f"curl -sSfL --cookie cjar --cookie-jar cjar 'http://localhost/backend.php' -X POST --data-raw 'op=Pref_Prefs&method=getPluginsList&csrf_token={csrf_token}'"))["plugins"]
|
||||
expected_plugins = ["auth_internal", "auth_ldap", "feediron", "note"];
|
||||
found_plugins = [p["name"] for p in plugins if p["name"] in expected_plugins]
|
||||
assert len(found_plugins) == len(expected_plugins), f"Expected plugins {expected_plugins}, found {found_plugins}"
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2109,8 +2109,8 @@ let
|
|||
publisher = "github";
|
||||
name = "copilot";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
|
||||
version = "1.303.0";
|
||||
hash = "sha256-xh1jdosoSdIdLbmKQJjIwqwC5aF6Ko7y+GC3Y+gBazI=";
|
||||
version = "1.309.0";
|
||||
hash = "sha256-i1PcbbOBgULd+inwypezE/ZsePrJaqM2z6qrDcNBLVA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -2127,8 +2127,8 @@ let
|
|||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json
|
||||
version = "0.26.2025040204"; # latest compatible with vscode ^1.98
|
||||
hash = "sha256-grG/pn+R4paCqkSx6DGzKjyjQVZ2FINRxdpXynGF35g=";
|
||||
version = "0.26.7"; # latest compatible with vscode ^1.98
|
||||
hash = "sha256-aR6AGU/boDmYef0GWna5sUsyv9KYGCkugWpFIusDMNE=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
|
||||
|
|
@ -4662,6 +4662,10 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
streetsidesoftware.code-spell-checker-french =
|
||||
callPackage ./streetsidesoftware.code-spell-checker-french
|
||||
{ };
|
||||
|
||||
streetsidesoftware.code-spell-checker-german =
|
||||
callPackage ./streetsidesoftware.code-spell-checker-german
|
||||
{ };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{ lib, vscode-utils }:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "code-spell-checker-french";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "0.4.3";
|
||||
hash = "sha256-FPnS/gU7+Kz3ZgbwiNIs/Rr1uiz5qIWsvpKB5lZGz+s=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-french/changelog";
|
||||
description = "French dictionary extension for VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker-french";
|
||||
homepage = "https://github.com/streetsidesoftware/vscode-cspell-dict-extensions#readme";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ aduh95 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "137.0.1-1",
|
||||
"packageVersion": "137.0.2-1",
|
||||
"source": {
|
||||
"rev": "137.0.1-1",
|
||||
"hash": "sha256-4C9RcdkNOYX215uom94yOi9ZQM0zEVgETNFFTsgkPns="
|
||||
"rev": "137.0.2-1",
|
||||
"hash": "sha256-PZapXnpVGdQrTXWjlNuFj3idqelTKTpwapuwx+XuwW8="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "137.0.1",
|
||||
"hash": "sha512-zCy+PdZWloScGxl7kIiHwREIP6i1CJqk6ubzPuQE2ynFZmGcSLd/tJWtf53JSi2dkQ5bKq+GRNsdADaAkfnctg=="
|
||||
"version": "137.0.2",
|
||||
"hash": "sha512-ghQMQyUjPqLi9XkIjOu5jA6NuISLQBjP+V1O1Cv4RwSe1lIPwFHZMO4melrLAIkIFwgl04FYnaDRCcoEph4cJA=="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ assert withQt -> qt6 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireshark-${if withQt then "qt" else "cli"}";
|
||||
version = "4.4.5";
|
||||
version = "4.4.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "wireshark";
|
||||
owner = "wireshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E=";
|
||||
hash = "sha256-dzVlHxrXVCSMP4ZfyUq4N9UvL941C50Zto6Mb78LnfQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.3.13";
|
||||
version = "16.3.17";
|
||||
pname = "jmol";
|
||||
|
||||
src =
|
||||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
in
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-ehJZSMhUsE0iO3sDD5Q0UMfcjNmTgPzMNgWG5nIeBFo=";
|
||||
hash = "sha256-5L9+JGVHKwgW9bOX/Xm/fQUOisO7aivWhhBdQaNpzyk=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easycrypt";
|
||||
version = "2025.02";
|
||||
version = "2025.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
tag = "r${version}";
|
||||
hash = "sha256-XkfFCPmc8vd6gGFiz/Lxzk7BtcCQBzPNVPGFdiylZmc=";
|
||||
hash = "sha256-Z6JaqR0BocEhDuof929HOvzWu6C77CAqeuYYY2PXvrs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boinc";
|
||||
version = "8.0.4";
|
||||
version = "8.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "client_release/${lib.versions.majorMinor version}/${version}";
|
||||
hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c=";
|
||||
hash = "sha256-kBCoDB0+STKIOVFnQ1FWKulJ0qNwNfvxB3QwaGnl7sM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.3.1957.0";
|
||||
version = "3.3.2299.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
tag = version;
|
||||
hash = "sha256-lOfeGkImwRxua3dSmefb1WcgnviHhOYtYK1VaRW9C6A=";
|
||||
hash = "sha256-8jqsAGnfn6+a+Zs9XfIyHzG/+jPO+UoSVsm0GHthq3E=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "anchor";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coral-xyz";
|
||||
repo = "anchor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4=";
|
||||
hash = "sha256-pvD0v4y7DilqCrhT8iQnAj5kBxGQVqNvObJUBzFLqzA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ack2/WFrycfYHYVnZt0Q94WJdQrvLU/VZYm1KeqOjIQ=";
|
||||
cargoHash = "sha256-fjhLA+utQdgR75wg+/N4VwASW6+YBHglRPj14sPHmGA=";
|
||||
|
||||
checkFlags = [
|
||||
# the following test cases try to access network, skip them
|
||||
|
|
|
|||
|
|
@ -65,8 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"lomiri"
|
||||
];
|
||||
};
|
||||
tests = {
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-bluetooth;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -137,7 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
};
|
||||
tests = {
|
||||
inherit (nixosTests) ayatana-indicators;
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-datetime;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -114,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"lomiri"
|
||||
];
|
||||
};
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
tests = {
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-display;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"lomiri"
|
||||
];
|
||||
};
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
tests = {
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-power;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"lomiri"
|
||||
];
|
||||
};
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
tests = {
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-session;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"lomiri"
|
||||
];
|
||||
};
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
tests = {
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-sound;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
|
|
|
|||
66
pkgs/by-name/cu/cutentr/package.nix
Normal file
66
pkgs/by-name/cu/cutentr/package.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{
|
||||
stdenv,
|
||||
libsForQt5,
|
||||
fetchFromGitLab,
|
||||
makeDesktopItem,
|
||||
lib,
|
||||
copyDesktopItems,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cutentr";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BoltsJ";
|
||||
repo = "cuteNTR";
|
||||
tag = version;
|
||||
hash = "sha256-KfnC9R38qSMhQDeaMBWm1HoO3Wzs5kyfPFwdMZCWw4E=";
|
||||
};
|
||||
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
name = "cuteNTR";
|
||||
desktopName = "cuteNTR";
|
||||
icon = "cutentr";
|
||||
exec = "cutentr";
|
||||
categories = [ "Game" ];
|
||||
});
|
||||
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
qmake
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp -r cutentr $out/bin
|
||||
|
||||
install -m 444 -D setup/gui/com.gitlab.BoltsJ.cuteNTR.svg $out/share/icons/hicolor/scalable/apps/cutentr.svg
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A 3DS streaming client for Linux";
|
||||
homepage = "https://gitlab.com/BoltsJ/cuteNTR";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "cutentr";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ lib.maintainers.EarthGman ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
dprint,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
mkDprintPlugin =
|
||||
|
|
@ -34,6 +36,21 @@ let
|
|||
mkdir -p $out
|
||||
cp $src $out/plugin.wasm
|
||||
'';
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
dprint
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
# Prevent schema unmatching errors
|
||||
# See https://github.com/NixOS/nixpkgs/pull/369415#issuecomment-2566112144 for detail
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
mkdir empty && cd empty
|
||||
dprint check --allow-no-files --plugins "$out/plugin.wasm"
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
passthru = {
|
||||
updateScript = ./update-plugins.py;
|
||||
inherit initConfig updateUrl;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "fluidd";
|
||||
version = "1.33.0";
|
||||
version = "1.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluidd-core";
|
||||
repo = "fluidd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-z1qb3n+BlvQhw6fKvfZ6s/uSdWbXAJ8xqvQRdLPnD+M=";
|
||||
hash = "sha256-7LnpGmZKY6zROaKxyZJiWuNuax5rsehL2feCgRhRhUg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -23,7 +23,7 @@ buildNpmPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-RpnZLJzxMmwo/XsXOWshw8xCpXG6GuhsaTb4rnXt/D0=";
|
||||
npmDepsHash = "sha256-5hIj9rqioMYx3BgrRHfEqSqw+cTFg6MKjjSNy7zg/Jg=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fluidd
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lego";
|
||||
version = "4.22.2";
|
||||
version = "4.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = "lego";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tvvTaRPOmNX0D8QvgA+8u5XsMxnT9PK4PMBcL6RHSIE=";
|
||||
hash = "sha256-lFsxUPFFZpsGqcya70El04AefFPBubqA/abhY7Egz8Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T6ZeQKrdz16zwppkFei21JjwGsoPLHazHTZew822xdU=";
|
||||
vendorHash = "sha256-L9fjkSrWoP4vs+BlWyEgK+SF3tWQFiEJjd0fJqcruVM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpqxx";
|
||||
version = "7.10.0";
|
||||
version = "7.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtv";
|
||||
repo = "libpqxx";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-llsnd1bxAyiEgo9PfWYdQp1RPPk1oF/02IgMvPhodZ0=";
|
||||
hash = "sha256-BVmIyJA5gDibwtmDvw7b300D0KdWv7c3Ytye6fiLAXU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2025.4.1";
|
||||
version = "2025.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WEzf091KJbXTsyCNaz2QdiNklPZ3054jATGkl5Y+6lA=";
|
||||
hash = "sha256-qnVLVT+evB/gUxU8HQaOhT3imdtVN2Iwh+7ldx6NR6s=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-N04vcOJjx0GCKYXJCkQFQT4D8WWJsi62f3cdUW+4zMk=";
|
||||
cargoHash = "sha256-TBkU10eqNT5825QlDyeBUAw3CZXUGSu4ufoC5XrmJ04=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -62,12 +62,16 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
checkFlags = [
|
||||
# last_modified will always be different in nix
|
||||
"--skip=tera::tests::test_last_modified"
|
||||
# requires https://github.com/rbenv/ruby-build
|
||||
"--skip=plugins::core::ruby::tests::test_list_versions_matching"
|
||||
];
|
||||
checkFlags =
|
||||
[
|
||||
# last_modified will always be different in nix
|
||||
"--skip=tera::tests::test_last_modified"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
|
||||
# started failing mid-April 2025
|
||||
"--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_with_cache"
|
||||
"--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_without_cache"
|
||||
];
|
||||
|
||||
cargoTestFlags = [ "--all-features" ];
|
||||
# some tests access the same folders, don't test in parallel to avoid race conditions
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "2.37.1";
|
||||
version = "2.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = "mold";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZGO3oT8NOOkAYTyoMUKxH3TFP4mw2z0BGdGSF2TbKaE=";
|
||||
hash = "sha256-qtSnzCgWcx1YEcN0LlQ0SNBvciu2Rj1bmekBhcB/la4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
}:
|
||||
buildDotnetModule (finalAttrs: rec {
|
||||
pname = "msbuild-structured-log-viewer";
|
||||
version = "2.2.465";
|
||||
version = "2.2.476";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KirillOsenkov";
|
||||
repo = "MSBuildStructuredLog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-09+Jo5nSNOFX7jTzMhetHHjTJdxlEZH4JWzv84stUDE=";
|
||||
hash = "sha256-HZhfrU7zPRaJWryEexf5/f3V22k5pdNMlVqDhOUw/UM=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orchard";
|
||||
version = "0.31.0";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-XUZq9+hO1L+VjipR5cNeA7IJXP4mg/fxnV64pcyJWU8=";
|
||||
hash = "sha256-XI2MoAaipQvfG5rgRC4Mcxcrvy/wD3GnyNJvCTHwZhY=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DfDnTJ5PeBE9QVV7FvGCO7VLbb8CMslOBR1lrvDoNkM=";
|
||||
vendorHash = "sha256-lLixmw4nnIjU61gXCPZhX/d2fBA57VPMrf7vsn+KrrE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "9.1.4";
|
||||
version = "9.1.5";
|
||||
pname = "oxipng";
|
||||
|
||||
# do not use fetchCrate (only repository includes tests)
|
||||
|
|
@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "shssoichiro";
|
||||
repo = "oxipng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cwujBgvGdNvD8vKp3+jNxcxkw/+M2FooNgsw+RejyrM=";
|
||||
hash = "sha256-UjiGQSLiUMuYm62wF7Xwhp2MRzCaQ9pbBBkvHnuspVw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Z0otTCFwtGuSC1XBM3jcgGDFPZuMzQikZaYCnR+S6Us=";
|
||||
cargoHash = "sha256-sdhyxJDUlb6+SJ/kvfqsplHOeCEbA3ls66eur3eeVVA=";
|
||||
|
||||
# don't require qemu for aarch64-linux tests
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sby";
|
||||
version = "0.51";
|
||||
version = "0.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "sby";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U9aIZ+D5BhAPWuyQgAvwO6Bu8na2KnYLVPoDHi18jj4=";
|
||||
hash = "sha256-E/je1lHvYCpmRlwM17PWTQemSnz8azviKiz4t9z17UM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lIVOML7UNR778RkmYvMvj4ynoOdMnb5lcsxFiO9BZAI=";
|
||||
hash = "sha256-b0omzuBPBDHCyUqC8xy8IPOqhFfm3ufeutxheZS7U+E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-llvVss7P9Bl9/6A4EtntXtmnFc5XbMvKms1lYNtaZaw=";
|
||||
cargoHash = "sha256-wtZeXaBV9bLj7MiXJnJT7AjH2jq9crifTxeCWEtJY2o=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -71,6 +71,7 @@ rustPlatform.buildRustPackage rec {
|
|||
maintainers = with lib.maintainers; [
|
||||
dywedir
|
||||
getchoo
|
||||
krovuxdev
|
||||
];
|
||||
mainProgram = "sk";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,45 +2,46 @@
|
|||
lib,
|
||||
fetchurl,
|
||||
stdenvNoCC,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sof-firmware";
|
||||
version = "2025.01.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM=";
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/firmware/intel
|
||||
cp -av sof $out/lib/firmware/intel/sof
|
||||
cp -av sof-tplg $out/lib/firmware/intel/sof-tplg
|
||||
cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg
|
||||
cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4
|
||||
cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg
|
||||
cp -av sof-ipc4-lib $out/lib/firmware/intel/sof-ipc4-lib
|
||||
# copy sof and sof-* recursively, preserving symlinks
|
||||
cp -R -d sof{,-*} $out/lib/firmware/intel/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${version}";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${finalAttrs.version}";
|
||||
description = "Sound Open Firmware";
|
||||
homepage = "https://www.sofproject.org/";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
bsd3
|
||||
isc
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
lblasc
|
||||
evenbrenden
|
||||
hmenke
|
||||
];
|
||||
platforms = with platforms; linux;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = with lib.platforms; linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -135,6 +135,10 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=smtp::inbound::antispam::antispam"
|
||||
# Failed to read system DNS config: io error: No such file or directory (os error 2)
|
||||
"--skip=smtp::inbound::vrfy::vrfy_expn"
|
||||
# thread 'smtp::management::queue::manage_queue' panicked at tests/src/smtp/inbound/mod.rs:45:23:
|
||||
# No queue event received.
|
||||
# NOTE: Test unreliable on high load systems
|
||||
"--skip=smtp::management::queue::manage_queue"
|
||||
];
|
||||
|
||||
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
cmake,
|
||||
writableTmpDirAsHomeHook,
|
||||
git,
|
||||
nixosTests,
|
||||
|
|
@ -13,19 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "starship";
|
||||
version = "1.22.1";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = "starship";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YoLi4wxBK9TFTtZRm+2N8HO5ZiC3V2GMqKFKKLHq++s=";
|
||||
hash = "sha256-5Euhbuu1uiJ5HJNlPs9sUoGcc5QWqXqNmEH0jpfGLlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
cmake
|
||||
];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ writableTmpDirAsHomeHook ];
|
||||
|
||||
|
|
@ -53,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
);
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-B2CCrSH2aTcGEX96oBxl/27hNMdDpdd2vxdt0/nlN6I=";
|
||||
cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylua";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = "stylua";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ=";
|
||||
sha256 = "sha256-yVie8/aey77WbeUGM6rzuKBKLmAH1Jhhj9Y7LxbvIUw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-uQCF/u1+slouHypepoPQtaYcsMD7NXhK1qcOl52txXs=";
|
||||
cargoHash = "sha256-ow8lldu36qBHcXFgeBhHo2u+sSAFCEFbxUk2oZI7sj4=";
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "thanos";
|
||||
version = "0.37.2";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thanos-io";
|
||||
repo = "thanos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IbQsUanLCDZ1Ku2Xu6ValR4iGM+cxxyEGxDFjJzsEcg=";
|
||||
hash = "sha256-3rNtiVTrA+MoCVuTSLIzh65U0kjA86EF+bQCyfVa6rA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+YjzHDVEVVwx4qApfNppuTYQJcwpQxRTxAkrkdBt/iY=";
|
||||
vendorHash = "sha256-Z/S4mVg+VbP8hNVB1xz1uGWR6N/1aTA0DqTHbntGMLg=";
|
||||
|
||||
subPackages = "cmd/thanos";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
|
@ -19,6 +20,10 @@ stdenv.mkDerivation {
|
|||
install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) tt-rss; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for TT-RSS to authenticate users via ldap";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # Plugin code does not conform to plugin API changes. See https://github.com/wltb/ff_instagram/issues/13
|
||||
description = "Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites";
|
||||
longDescription = ''
|
||||
Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
|
@ -23,6 +24,10 @@ stdenv.mkDerivation rec {
|
|||
cp -ra feedly *.css $out
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) tt-rss; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Feedly theme for Tiny Tiny RSS";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
# nixpkgs-update: no auto update
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
|
|
@ -30,13 +31,13 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (nixosTests) tt-rss;
|
||||
tests = { inherit (nixosTests) tt-rss; };
|
||||
updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web-based news feed (RSS/Atom) aggregator";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://tt-rss.org";
|
||||
maintainers = with maintainers; [
|
||||
gileri
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "video-compare";
|
||||
version = "20250223";
|
||||
version = "20250420";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixop";
|
||||
repo = "video-compare";
|
||||
tag = version;
|
||||
hash = "sha256-h74TWXPcbIjfejGfHnjKZqKzpV0DIkC5llSD1jmiDDY=";
|
||||
hash = "sha256-q61ZT2a2AkYWk4v2oZqCLHVu5eZQQrDLgD8vxitGyA4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.20.7";
|
||||
version = "1.20.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-1SBJ4E3rQBFPSCgb2Z3knEO5Y+xyJE4kyJW4we75CWA=";
|
||||
hash = "sha256-pia2Dv0FY28nkATOk60GqiAEnZmxgZvZfvkM8U/bZzU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,9 +4,12 @@
|
|||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
bashNonInteractive,
|
||||
curl,
|
||||
db,
|
||||
gnused,
|
||||
libgeotiff,
|
||||
libtiff,
|
||||
xorg,
|
||||
motif,
|
||||
pcre2,
|
||||
|
|
@ -24,19 +27,22 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "xastir";
|
||||
repo = "xastir";
|
||||
rev = "Release-${version}";
|
||||
tag = "Release-${version}";
|
||||
hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bashNonInteractive
|
||||
curl
|
||||
db
|
||||
libgeotiff
|
||||
libtiff
|
||||
xorg.libXpm
|
||||
xorg.libXt
|
||||
motif
|
||||
|
|
@ -48,15 +54,41 @@ stdenv.mkDerivation rec {
|
|||
libax25
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-motif-includes=${motif}/include" ];
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
configureFlags = [
|
||||
"--with-motif-includes=${lib.getDev motif}/include"
|
||||
"ac_cv_path_gm=${lib.getExe' graphicsmagick "gm"}"
|
||||
"ac_cv_path_convert=${lib.getExe' graphicsmagick "convert"}"
|
||||
"ac_cv_header_xtiffio_h=yes"
|
||||
"ac_cv_path_GMAGIC_BIN=${lib.getExe' (lib.getDev graphicsmagick) "GraphicsMagick-config"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build scripts/lang*.pl
|
||||
|
||||
# checks for files in /usr/bin/
|
||||
substituteInPlace acinclude.m4 \
|
||||
--replace-fail "AC_CHECK_FILE" "# AC_CHECK_FILE"
|
||||
# would pick up builder sed from $PATH
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AC_DEFINE_UNQUOTED(SED_PATH, "''${sed}", [Path to sed])' \
|
||||
'AC_DEFINE_UNQUOTED(SED_PATH, "${lib.getExe gnused}", [Path to sed])'
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
patchShebangs --host --update .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Graphical APRS client";
|
||||
homepage = "https://xastir.org";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/xastir/xastir";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.ehmry ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
tests = {
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
vm = nixosTests.ayatana-indicators;
|
||||
startup = nixosTests.ayatana-indicators;
|
||||
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-network;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "qcheck-multicoretests-util";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-multicore";
|
||||
repo = "multicoretests";
|
||||
rev = version;
|
||||
hash = "sha256-taaH+hBOdiCK2HT+5OfX892/f1ozlLdd/AteapYWK9Y=";
|
||||
hash = "sha256-4aAukkhyxJ4EojLF+rrxSRRz4isUelcVEYNP2UYR7WY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qcheck-core ];
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "tls";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
|
||||
hash = "sha256-aEcNa6hIAHWQjAzGn/6Cq7y7g6t/mI0mYzWhnxLCamI=";
|
||||
hash = "sha256-a6uNo61SjT8xLXtO4h2kxZw0qRrj5c9CNHFauaGCDq0=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "configshell-fb";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "configshell-fb";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q=";
|
||||
hash = "sha256-B5VEihg97r8BsKJdk1+LGyKb64QC+u/3ftumFXYTn6s=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Python library for building configuration shells";
|
||||
homepage = "https://github.com/open-iscsi/configshell-fb";
|
||||
changelog = "https://github.com/open-iscsi/configshell-fb/releases/tag/v${version}";
|
||||
changelog = "https://github.com/open-iscsi/configshell-fb/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gaphas";
|
||||
version = "5.0.0";
|
||||
version = "5.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uoAEq+IsPma/wSpLcSMe4ZcqFyYLiDd9Ou5TQCgPEDA=";
|
||||
hash = "sha256-Rw7j41S+u5jyYKTJqVI/36aLh/0HIWFsrPCZgY0qtgY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "localstack-client";
|
||||
version = "2.7";
|
||||
version = "2.10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "localstack_client";
|
||||
inherit version;
|
||||
hash = "sha256-FJkxGZAaS8vvfDLYmbJPSliodaZ2VpPt8QZNZrimhAg=";
|
||||
hash = "sha256-cyoH4j//1qWBrycUu+AGrW+ISsT4rJVSEaimMyHNxAk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boto3 ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "m2crypto";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OEu0y9F47g50AVMRt7H58sN342huA/oHCz7C9JRnHA8=";
|
||||
hash = "sha256-/8ENTQmQFRT0CNx09gpNffIcROvJv3dslHv9xzWUIc8=";
|
||||
};
|
||||
patches = [
|
||||
(fetchurl {
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
let
|
||||
paaCerts = stdenvNoCC.mkDerivation rec {
|
||||
pname = "matter-server-paa-certificates";
|
||||
version = "1.3.0.0";
|
||||
version = "1.4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-chip";
|
||||
repo = "connectedhomeip";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5MI6r0KhSTzolesTQ8YWeoko64jFu4jHfO5KOOKpV0A=";
|
||||
hash = "sha256-uJyStkwynPCm1B2ZdnDC6IAGlh+BKGfJW7tU4tULHFo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
|
||||
yquake2 = stdenv.mkDerivation rec {
|
||||
pname = "yquake2";
|
||||
version = "8.41";
|
||||
version = "8.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yquake2";
|
||||
repo = "yquake2";
|
||||
rev = "QUAKE2_${builtins.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-8xvY8XYZJa/gAVcxR+ffpE8naUTbGyM8AyAdpG6nKtA=";
|
||||
sha256 = "sha256-PR/Xw/u5auGFrrXnRsl2bAkOt8/JZWY3uGNfTHomAj8=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ buildGoModule rec {
|
|||
pname = "ocb";
|
||||
# Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
|
||||
# whenever that version changes.
|
||||
version = "0.122.1";
|
||||
version = "0.124.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "cmd/builder/v${version}";
|
||||
hash = "sha256-nkle8jY8y/+/4H7pFvVTqX+iFxjvVKsYqm6Rx6nvdPQ=";
|
||||
hash = "sha256-CfqCMVObS1TUYO0DqNdqRSPS1cG0TiKvyBaHH57BPNw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/builder";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-releases";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VJ/lIvTXU8jbmoA0eONotxIwo9TT8MZbbu7hbO0PK7k=";
|
||||
hash = "sha256-/I6kYm/j2hO2OAZaWVIRYI1ejBTGMI3PzTjRLcmwziQ=";
|
||||
};
|
||||
|
||||
# Then from this src, we use the tool to generate some go code, including
|
||||
|
|
@ -149,26 +149,26 @@ in
|
|||
lib.recurseIntoAttrs {
|
||||
otelcol = mkDistribution {
|
||||
name = "otelcol";
|
||||
sourceHash = "sha256-faGOyieJ5uEXWIsQ2OD8fDVQbZxyKxqVxhS/eHhe1hI=";
|
||||
vendorHash = "sha256-ACewGFHAa99Mu4xtn0vV8++im5CfqSuNT5w7A41lepE=";
|
||||
sourceHash = "sha256-XGQIHkRfCSdEnZlhodN38BKZGkgOPuUnxveG4yX0rMw=";
|
||||
vendorHash = "sha256-0i+eHVBwYvEKf4kXfyOuN/gEkDk2/5s7+3HQjYCtI94=";
|
||||
};
|
||||
|
||||
otelcol-contrib = mkDistribution {
|
||||
name = "otelcol-contrib";
|
||||
sourceHash = "sha256-NOvzp2izfSsNsvYV0/5bS1SDrqG2fYdKBHR82h7RiKU=";
|
||||
vendorHash = "sha256-8sUQIe8RiHw8Mw9/CuxpEPyROY7eSKmBg5t4gKaU74w=";
|
||||
sourceHash = "sha256-87VmiafluGem4p5hRP+UmPuSJeXdXjZkubWzqhXtyJg=";
|
||||
vendorHash = "sha256-/qSXvt8oQ0C3V49an7TNUw0bcNVnXd5Qmz5oCRp+KTE=";
|
||||
proxyVendor = true; # hash mismatch between linux and darwin
|
||||
};
|
||||
|
||||
otelcol-k8s = mkDistribution {
|
||||
name = "otelcol-k8s";
|
||||
sourceHash = "sha256-ACEi0YFMZvr64JAvjwZMQQTecFHx35jF8458lmUJq9Q=";
|
||||
vendorHash = "sha256-pIOAKqR4LA/z5B8yESokHpdvHmXh75fc6D+uaHm1GSI=";
|
||||
sourceHash = "sha256-B5NbbQBIz3RZ/+jSxNhuY+zpfhHlg26cvUlMqlYXtq0=";
|
||||
vendorHash = "sha256-2dGNrsskrCh76bTMuPYcRH+bMl/sE+KVn2mOqcF2PeI=";
|
||||
};
|
||||
|
||||
otelcol-otlp = mkDistribution {
|
||||
name = "otelcol-otlp";
|
||||
sourceHash = "sha256-H9Um4qVTjW28L/FvgNRS7EUevZ9h60r+Xl8X4ktcXy4=";
|
||||
vendorHash = "sha256-Cl+bdVF+rlcdiOskP0Nybo77asz1lVVp6EnSiJxLiKY=";
|
||||
sourceHash = "sha256-c83fzhC4XbvRHZ3XwXQgwsyW1TDiDs0T/bX3h53n2RE=";
|
||||
vendorHash = "sha256-QVNQFsaACvlByQWwpl2emSIrL+how78WtU51YJ2AvAU=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12114,9 +12114,6 @@ with pkgs;
|
|||
withoutInitTools = true;
|
||||
};
|
||||
|
||||
# FIXME: `tcp-wrapper' is actually not OS-specific.
|
||||
trickster = callPackage ../servers/trickster/trickster.nix { };
|
||||
|
||||
trinsic-cli = callPackage ../tools/admin/trinsic-cli { };
|
||||
|
||||
# Upstream U-Boots:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue