Merge master into staging-next

Changed files
+339 -106
nixos
tests
pkgs
applications
emulators
bsnes
misc
networking
cluster
openshift
instant-messengers
session-desktop
twingate
radio
abracadabra
flrig
science
molecular-dynamics
gromacs
data
fonts
iosevka
desktops
lomiri
development
geonames
development
compilers
blueprint
dart
interpreters
wasmtime
libraries
raylib
python-modules
google-cloud-spanner
mypy-boto3-builder
pylitterbot
striprtf
types-colorama
types-decorator
types-python-dateutil
types-requests
types-retry
tools
bacon
continuous-integration
cirrus-cli
forgejo-actions-runner
misc
fastly
os-specific
linux
servers
sql
tools
backup
sanoid
graphics
smartcrop
misc
scanmem
networking
amass
package-management
security
system
pcstat
text
top-level
+4
nixos/tests/twingate.nix
···
testScript = { nodes, ... }: ''
machine.wait_for_unit("twingate.service")
machine.succeed("twingate --version | grep '${nodes.machine.services.twingate.package.version}' >&2")
+
machine.succeed("twingate config log-level 'debug'")
+
machine.systemctl("restart twingate.service")
+
machine.succeed("grep 'debug' /etc/twingate/log_level.conf >&2")
+
machine.succeed("twingate config log-level | grep 'debug' >&2")
'';
}
+2 -2
pkgs/applications/emulators/bsnes/ares/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
-
version = "132";
+
version = "133";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${finalAttrs.version}";
-
hash = "sha256-0D7bOv934k1cuP6qNxo0uLp5tSEstI8wm0FEwu6TuUw=";
+
hash = "sha256-KCpHiIdid5h5CU2uyMOo+p5h50h3Ki5/4mUpdTAPKQA=";
};
patches = [
+2 -2
pkgs/applications/misc/crow-translate/default.nix
···
stdenv.mkDerivation rec {
pname = "crow-translate";
-
version = "2.10.5";
+
version = "2.10.7";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
-
hash = "sha256-sAjgG2f0rAWakPd2cZNGXkooIxQQM5OPHm11ahyY1WU=";
+
hash = "sha256-OVRl9yQKK3hJgRVV/W4Fl3LxdFpJs01Mo3pwxLg2RXg=";
};
patches = [
+3 -3
pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch
···
diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp
-
index a73371b..b9d66ca 100644
+
index 32cabfb..aab92ea 100644
--- i/src/settings/appsettings.cpp
+++ w/src/settings/appsettings.cpp
-
@@ -75,7 +75,7 @@ void AppSettings::applyLocale(const QLocale &locale)
+
@@ -79,7 +79,7 @@ void AppSettings::applyLocale(const QLocale &locale)
const QLocale newLocale = locale == defaultLocale() ? QLocale::system() : locale;
QLocale::setDefault(newLocale);
-
s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory));
+
s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, i18nDir, QStandardPaths::LocateDirectory));
- s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations"));
}
+6 -5
pkgs/applications/networking/cluster/openshift/default.nix
···
, fetchFromGitHub
, gpgme
, installShellFiles
+
, pkg-config
, testers
, openshift
}:
buildGoModule rec {
pname = "openshift";
-
version = "4.12.0";
-
gitCommit = "854f807";
+
version = "4.13.0";
+
gitCommit = "e561d37";
src = fetchFromGitHub {
owner = "openshift";
repo = "oc";
-
rev = "854f807d8a84dde710c062a5281bca5bc07cb562";
-
hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg=";
+
rev = "e561d37285c8bde273ce00d086bea599a9cdd3be";
+
hash = "sha256-/ar96N+MSy0DPdza3UWiyolg1EZPBR6LCku4GV+HppM=";
};
vendorHash = null;
buildInputs = [ gpgme ];
-
nativeBuildInputs = [ installShellFiles ];
+
nativeBuildInputs = [ installShellFiles pkg-config ];
ldflags = [
"-s"
+2 -2
pkgs/applications/networking/instant-messengers/session-desktop/default.nix
···
}:
let
-
version = "1.10.8";
+
version = "1.11.0";
pname = "session-desktop";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-
sha256 = "sha256-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8=";
+
sha256 = "sha256-QartWtp5/OtJqQq5GXRoIQ/ytK9/YCW1ixXTUrnGwqw=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
+1 -1
pkgs/applications/networking/twingate/default.nix
···
homepage = "https://twingate.com";
license = licenses.unfree;
maintainers = with maintainers; [ tonyshkurenko ];
-
platforms = platforms.linux;
+
platforms = [ "x86_64-linux" ];
};
}
+2 -2
pkgs/applications/radio/abracadabra/default.nix
···
stdenv.mkDerivation rec {
pname = "abracadabra";
-
version = "2.1.1";
+
version = "2.2.1";
src = fetchFromGitHub {
owner = "KejPi";
repo = "AbracaDABra";
rev = "v${version}";
-
sha256 = "sha256-pjcao8KTEmgE54dUBxLLnStszR32LryfciMKScBOGdc=";
+
sha256 = "sha256-hK7mRDJqn0ETgHlvZl3m6lRDbsp5v7a8eGBFdm7ihdA=";
};
nativeBuildInputs = [
+2 -2
pkgs/applications/radio/flrig/default.nix
···
}:
stdenv.mkDerivation rec {
-
version = "2.0.01";
+
version = "2.0.02";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-
sha256 = "sha256-TFZZaTtU7TLBPA7jpBTu2JtkZpxjG57Rin8OVFedHwA=";
+
sha256 = "sha256-3I9ucz8XtGqY9I0tO9BRt1IQiOkpAkjMy3e7302gGMg=";
};
buildInputs = [
+2 -2
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
···
in stdenv.mkDerivation rec {
pname = "gromacs";
-
version = "2023.1";
+
version = "2023.2";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
-
sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ=";
+
sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4=";
};
nativeBuildInputs = [ cmake ];
+3 -3
pkgs/data/fonts/iosevka/default.nix
···
buildNpmPackage rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
-
version = "25.0.1";
+
version = "25.1.0";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
-
hash = "sha256-clbqr4hGtIkbgPYovYXHGW+FUTEjAn3Oq7aoPFMgGJU=";
+
hash = "sha256-hxkdigJYP0bPn1+HWlq7DoL/jTYAO1WCJcQN2WI8j/U=";
};
-
npmDepsHash = "sha256-TxMmUgwQPbSV+1qe0FEtSPAYwJRnpuQ+qOmWvrq9xKY=";
+
npmDepsHash = "sha256-zIH2rt+uhYO1pwumu6LeIpKX1y4y9ajwxK/vAVwzz9Q=";
nativeBuildInputs = [
remarshal
+1
pkgs/desktops/lomiri/default.nix
···
#### Development tools / libraries
cmake-extras = callPackage ./development/cmake-extras { };
deviceinfo = callPackage ./development/deviceinfo { };
+
geonames = callPackage ./development/geonames { };
gmenuharness = callPackage ./development/gmenuharness { };
lomiri-api = callPackage ./development/lomiri-api { };
};
+122
pkgs/desktops/lomiri/development/geonames/default.nix
···
+
{ stdenv
+
, lib
+
, fetchFromGitLab
+
, fetchpatch
+
, gitUpdater
+
, testers
+
, buildPackages
+
, cmake
+
, docbook-xsl-nons
+
, docbook_xml_dtd_45
+
, gettext
+
, glib
+
, glibcLocales
+
, withExamples ? true
+
, gtk3
+
# Uses gtkdoc-scan* tools, which produces a binary linked against lib for hostPlatform and executes it to generate docs
+
, withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
+
, gtk-doc
+
, pkg-config
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "geonames";
+
version = "0.3.0";
+
+
src = fetchFromGitLab {
+
owner = "ubports";
+
repo = "development/core/geonames";
+
rev = finalAttrs.version;
+
hash = "sha256-Mo7Khj2pgdJ9kT3npFXnh1WTSsY/B1egWTccbAXFNY8=";
+
};
+
+
outputs = [
+
"out"
+
"dev"
+
] ++ lib.optionals withExamples [
+
"bin"
+
] ++ lib.optionals withDocumentation [
+
"doc"
+
];
+
+
patches = [
+
# Improves install locations of demo & docs
+
# Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release
+
(fetchpatch {
+
name = "0001-geonames-Use-GNUInstallDirs-more.patch";
+
url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch";
+
hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY=";
+
})
+
];
+
+
postPatch = ''
+
patchShebangs src/generate-locales.sh tests/setup-test-env.sh
+
'';
+
+
strictDeps = true;
+
+
nativeBuildInputs = [
+
cmake
+
gettext
+
glib # glib-compile-resources
+
pkg-config
+
] ++ lib.optionals withDocumentation [
+
docbook-xsl-nons
+
docbook_xml_dtd_45
+
gtk-doc
+
];
+
+
buildInputs = [
+
glib
+
] ++ lib.optionals withExamples [
+
gtk3
+
];
+
+
# Tests need to be able to check locale
+
LC_ALL = lib.optionalString finalAttrs.doCheck "en_US.UTF-8";
+
nativeCheckInputs = [
+
glibcLocales
+
];
+
+
makeFlags = [
+
# gtkdoc-scan runs ld, can't find qsort & strncpy symbols
+
"LD=${stdenv.cc.targetPrefix}cc"
+
];
+
+
cmakeFlags = [
+
"-DWANT_DOC=${lib.boolToString withDocumentation}"
+
"-DWANT_DEMO=${lib.boolToString withExamples}"
+
"-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}"
+
# Keeps finding & using glib-compile-resources from buildInputs otherwise
+
"-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}"
+
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+
# only for cross without native execute support because the canExecute "emulator" call has a format that I can't get CMake to accept
+
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
+
];
+
+
preInstall = lib.optionalString withDocumentation ''
+
# gtkdoc-mkhtml generates images without write permissions, errors out during install
+
chmod +w doc/reference/html/*
+
'';
+
+
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+
passthru = {
+
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
updateScript = gitUpdater { };
+
};
+
+
meta = with lib; {
+
description = "Parse and query the geonames database dump";
+
homepage = "https://gitlab.com/ubports/development/core/geonames";
+
license = licenses.gpl3Only;
+
maintainers = teams.lomiri.members;
+
platforms = platforms.all;
+
# Cross requires hostPlatform emulation during build
+
# https://gitlab.com/ubports/development/core/geonames/-/issues/1
+
broken = stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.emulatorAvailable buildPackages;
+
pkgConfigModules = [
+
"geonames"
+
];
+
};
+
})
+4 -17
pkgs/development/compilers/blueprint/default.nix
···
{ dbus
, fetchFromGitLab
, gobject-introspection
-
, gtk4
, lib
, libadwaita
-
, makeFontsConf
, meson
, ninja
, python3
···
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blueprint-compiler";
-
version = "0.8.1";
+
version = "0.10.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "jwestman";
repo = "blueprint-compiler";
rev = "v${finalAttrs.version}";
-
hash = "sha256-3lj9BMN5aNujbhhZjObdTOCQfH5ERQCgGqIAw5eZIQc=";
+
hash = "sha256-pPrQc2ID84N+50j/A6VAJAOK+D1hjaokhFckOnOaeTw=";
};
nativeBuildInputs = [
···
];
nativeCheckInputs = [
-
xvfb-run
dbus
-
gtk4
+
xvfb-run
];
-
env = {
-
# Fontconfig error: Cannot load default config file: No such file: (null)
-
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
-
};
-
doCheck = true;
-
-
preBuild = ''
-
# Fontconfig error: No writable cache directories
-
export XDG_CACHE_HOME="$(mktemp -d)"
-
'';
checkPhase = ''
runHook preCheck
···
description = "A markup language for GTK user interface files";
homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";
license = licenses.lgpl3Plus;
-
maintainers = with maintainers; [ benediktbroich ranfdev ];
+
maintainers = with maintainers; [ benediktbroich paveloom ranfdev ];
platforms = platforms.linux;
};
})
+6 -6
pkgs/development/compilers/dart/sources.nix
···
-
let version = "3.0.5"; in
+
let version = "3.0.6"; 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 = "0c9a4fwwf5r4as4k1fa66ddmrjwlz5wr3j5fw1d26406hmw8m1qw";
+
sha256 = "0adasw9niwbsyk912330c83cqnppk56ph7yxalml23ing6x8wq32";
};
"${version}-aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-
sha256 = "1636yggn4ynq7axw79m2n8i8v193kx38zxc6iybagcv9hld8jck4";
+
sha256 = "0wj58cygjra1qq0ivsbjb710n03zi0jzx0iw5m2p8nr7w8ns551c";
};
"${version}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-
sha256 = "0cq5q94fcj9v5y3bhq9dzwhpmvfw8flpq4rwlcif5js46icpjyv6";
+
sha256 = "06wqq97d2v0bxp2pmc940dhbh8n8yf6p9r0sb1sldgv7f4r47qiy";
};
"${version}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-
sha256 = "0v5nn9j5rbvgnmkkj866mpwnp03ndc8lbg8bx7ydycj9srra7yq5";
+
sha256 = "1hg1g4pyr8cgy6ak4n9akidrmj6s5n86dqrx3ybi81c8z5lqw4r2";
};
"${version}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-
sha256 = "03drn7s6w6xz1szk6x4gny0kv4hcbwqvcz8yxxmqkinpgsf1ap4a";
+
sha256 = "1hbh3gahnny2wfs31r64940z5scrgd8jf29mrzfadkpz54g0aizz";
};
}
+3 -3
pkgs/development/interpreters/wasmtime/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
-
version = "10.0.1";
+
version = "11.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
-
hash = "sha256-UqjJVAmqITh7ixo71jfdQNZ5OLjmmmrk4b0saU2kyYo=";
+
hash = "sha256-8JPMkmixy/8kekwdEJ8xduScEBS7+nnUIEWhVUyPecA=";
fetchSubmodules = true;
};
-
cargoHash = "sha256-fEDvxstvBP/e2G8KbTVQKdxafQXxz4mnqCAso16HYaY=";
+
cargoHash = "sha256-xojU6tS3L2e1baErdqlaG0mbDbB201ulWr66YzP6ekY=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
+15
pkgs/development/libraries/raylib/default.nix
···
passthru.tests = [ raylib-games ];
+
patches = [
+
# Patch version in CMakeList to 4.5.0
+
# Remove this when updating to a new revision
+
(fetchpatch {
+
url = "https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7.patch";
+
hash = "sha256-RGokbQAwJAZm2FU2VNwraE3xko8E+RLLFjUfDRXeKhA=";
+
})
+
];
+
+
# fix libasound.so/libpulse.so not being found
+
preFixup = ''
+
${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${finalAttrs.version}"}
+
${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${finalAttrs.version}"}
+
'';
+
meta = with lib; {
description = "A simple and easy-to-use library to enjoy videogames programming";
homepage = "https://www.raylib.com/";
+2 -2
pkgs/development/python-modules/google-cloud-spanner/default.nix
···
buildPythonPackage rec {
pname = "google-cloud-spanner";
-
version = "3.36.0";
+
version = "3.37.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-zBKYxYvmUIAnC1StrhfzOSdkB4zhHlkds/6H5l1ZjG0=";
+
hash = "sha256-Q/tvve5pXpj77Ufu9Vp38jLSIL17Roi2PLSD27bvfIA=";
};
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/mypy-boto3-builder/default.nix
···
buildPythonPackage rec {
pname = "mypy-boto3-builder";
-
version = "7.14.6";
+
version = "7.15.1";
format = "pyproject";
disabled = pythonOlder "3.10";
···
owner = "youtype";
repo = "mypy_boto3_builder";
rev = "refs/tags/${version}";
-
hash = "sha256-7GAF583sr8ackeqalcd3rZsrSqeknlTZ82jsP2XJL7I=";
+
hash = "sha256-pZBAzy1MK8Mm9QyUM5/t8JKs3q/cYOmzCWRC4H0aWjY=";
};
nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pylitterbot/default.nix
···
buildPythonPackage rec {
pname = "pylitterbot";
-
version = "2023.4.2";
+
version = "2023.4.3";
format = "pyproject";
disabled = pythonOlder "3.9";
···
owner = "natekspencer";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-zB/LJGEPJ3uZEoVQiLQUCWqLo9YLXN6vge3RhIwA5D4=";
+
hash = "sha256-pUtOLQ4ftG0tYPued12CqKGt3LKyfmLPxIYKvkYg1nI=";
};
nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/striprtf/default.nix
···
buildPythonPackage rec {
pname = "striprtf";
-
version = "0.0.25";
+
version = "0.0.26";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-5soxa3sCeBeYeNsxr4Y96ztTVdeSHgSH/6z8WWUvGQI=";
+
hash = "sha256-/bK7p6xEAHLRxB6rUNjXSuiPYKi2V1xuLHgF3EYgk6o=";
};
pythonImportsCheck = [
+2 -2
pkgs/development/python-modules/types-colorama/default.nix
···
buildPythonPackage rec {
pname = "types-colorama";
-
version = "0.4.15.11";
+
version = "0.4.15.12";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-qUIesk2c/FhIgNwdM7f9QGoUInwfmfUMWrkmXgTQdjg=";
+
hash = "sha256-+9/F2dJNhcM70FT74zrcbOxE7tsZz7ur+7tX3CV65Lg=";
};
# Module has no tests
+2 -2
pkgs/development/python-modules/types-decorator/default.nix
···
buildPythonPackage rec {
pname = "types-decorator";
-
version = "5.1.8.3";
+
version = "5.1.8.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI=";
+
hash = "sha256-qMOQJGNOmYNL7xRs7C42xYX0eISt303GXW0Lex9idRc=";
};
# Modules doesn't have tests
+2 -2
pkgs/development/python-modules/types-python-dateutil/default.nix
···
buildPythonPackage rec {
pname = "types-python-dateutil";
-
version = "2.8.19.13";
+
version = "2.8.19.14";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-CaAnX5XuMc5oGWcQ7Sw9G53ELgthzEOsw2mkLLk5E08=";
+
hash = "sha256-H08QrJi7ixat6dvuNRjZrOAXgh2UsFekJbBp+DRzf0s=";
};
# Modules doesn't have tests
+2 -2
pkgs/development/python-modules/types-requests/default.nix
···
buildPythonPackage rec {
pname = "types-requests";
-
version = "2.31.0.1";
+
version = "2.31.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-PeZnz/oSPOaYWR3grX2wNKUxdFellusLSUTlqdno0aw=";
+
hash = "sha256-aqP3+vDqUtcouxjAoNFSLZv9jHLSb/b2G/w9BqQRz0A=";
};
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/types-retry/default.nix
···
buildPythonPackage rec {
pname = "types-retry";
-
version = "0.9.9.3";
+
version = "0.9.9.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-G3oKBK3xLyEjfnaDNXSpqPdV+IiJwiatmdbjv6W248g=";
+
hash = "sha256-5HMdxoS1a4ddl0ZFmtZl07woGla1MKzfHJdzAWd5mUE=";
};
# Modules doesn't have tests
+3 -3
pkgs/development/tools/bacon/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "bacon";
-
version = "2.11.1";
+
version = "2.12.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-LTWF1Grou3BCzyaj67cIi3g5HNJjKGFkrK8BQUzYNlE=";
+
hash = "sha256-4uvR+KATP1sYPNimU0qQRtVo7zX0xIfbn7nqynZwwfw=";
};
-
cargoHash = "sha256-DVjXilanc2pxngU9ueoIDucA7Xokjb5jrWsNtbdKFQ4=";
+
cargoHash = "sha256-PFPym2XxQrqhxgV67qMKcblL8dW7poX85YxzR5Xf9qU=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices
+2 -2
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
···
buildGoModule rec {
pname = "cirrus-cli";
-
version = "0.101.1";
+
version = "0.101.2";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-jTQUBcS8JYyXmdYo4sxuGrtuOfkKCZa0OXjGu3wvQBw=";
+
sha256 = "sha256-vPfdv1EtI5FAK2tIaHc+5hd1kiQvDk1Gwwqv5ug5Lco=";
};
vendorHash = "sha256-qYt3NRjlImRE/G2CUYTukOCP37slseYxiJGLFtZCiDk=";
+43
pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix
···
+
{ lib
+
, buildGoModule
+
, fetchFromGitea
+
, testers
+
, forgejo-actions-runner
+
}:
+
+
buildGoModule rec {
+
pname = "forgejo-actions-runner";
+
version = "2.3.0";
+
+
src = fetchFromGitea {
+
domain = "codeberg.org";
+
owner = "forgejo";
+
repo = "runner";
+
rev = "v${version}";
+
hash = "sha256-ZIhUlTGeNuJSrBVXYjAz/YHYmkR3wg1LAe0uUabEQRQ=";
+
};
+
+
vendorHash = "sha256-OauNDA0mkarSWrZBfJE/SYspa3CTEYKpLRMvbPdIoRo=";
+
+
ldflags = [
+
"-s"
+
"-w"
+
"-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}"
+
];
+
+
doCheck = false; # Test try to lookuyp code.forgejo.org.
+
+
passthru.tests.version = testers.testVersion {
+
package = forgejo-actions-runner;
+
version = src.rev;
+
};
+
+
meta = with lib; {
+
description = "A runner for Forgejo based on act";
+
homepage = "https://code.forgejo.org/forgejo/runner";
+
changelog = "https://gitea.com/gitea/act_runner/releases/tag/${src.rev}";
+
license = licenses.mit;
+
maintainers = with maintainers; [ kranzes ];
+
mainProgram = "act_runner";
+
};
+
}
+3 -3
pkgs/misc/fastly/default.nix
···
buildGoModule rec {
pname = "fastly";
-
version = "10.2.2";
+
version = "10.2.3";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
-
hash = "sha256-reHC3R6RrIDynttu2GqUfZvwMxk9rLBdIR/r9IKhba8=";
+
hash = "sha256-NSXaDPb1cMLDH1Twf/Nc+O/2hfTPobTvR0lzq2JR1EQ=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
···
"cmd/fastly"
];
-
vendorHash = "sha256-L8ylw05g8YkabjK5NDICjYCup+FjCz/vFLzVBNX35Dk=";
+
vendorHash = "sha256-mZg/IApgrYLpyWSWWnZE4Yu/K8daWW+phNuq3e/iwog=";
nativeBuildInputs = [
installShellFiles
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
···
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
-
version = "6.1.37";
-
hash = "sha256-g8cmAhsM03jBu7UZoNOLBX7cGg8rz70/xhF7sJj9nCY=";
+
version = "6.1.39";
+
hash = "sha256-H7KoNTl00OCQhUZXNM6PfiknI+lOVNxe2+levmJM5gA=";
variant = "lts";
};
mainVariant = {
-
version = "6.4.1";
-
hash = "sha256-WPnINDkOj0IoUDLBG/2LOrppVi9o9XSSgMrs/NBbqdA=";
+
version = "6.4.4";
+
hash = "sha256-EdyGAdWIPr91SNz68tVhya9YO4/dL/wEmEklo45i2p0=";
variant = "main";
};
+3 -3
pkgs/servers/sql/dolt/default.nix
···
buildGoModule rec {
pname = "dolt";
-
version = "1.7.5";
+
version = "1.8.2";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
-
sha256 = "sha256-nAcwH4RVvRPZfPnXyPDOO5GFpUxIBmJzl3QH+5G6jcY=";
+
sha256 = "sha256-tNKe0s1pPazVJOfDZvk5/PrG46v1Fd41HUbxrknbtEs=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
-
vendorHash = "sha256-ODOAxH73AflCp9tLeYMU46bqr3MAS1casuGAFWuLYjA=";
+
vendorHash = "sha256-iYbCeaXI1glfN/Ouj6vgnSsKMZGr1I3VpG25TklFFAU=";
proxyVendor = true;
doCheck = false;
+3 -3
pkgs/tools/backup/sanoid/default.nix
···
stdenv.mkDerivation rec {
pname = "sanoid";
-
version = "2.1.0";
+
version = "2.2.0";
src = fetchFromGitHub {
owner = "jimsalterjrs";
repo = pname;
rev = "v${version}";
-
sha256 = "12g5cjx34ys6ix6ivahsbr3bbbi1fmjwdfdk382z6q71w3pyxxzf";
+
sha256 = "sha256-qfRGZ10fhLL4tJL97VHrdOkO/4OVpa087AsL9t8LMmk=";
};
nativeBuildInputs = [ makeWrapper ];
···
description = "A policy-driven snapshot management tool for ZFS filesystems";
homepage = "https://github.com/jimsalterjrs/sanoid";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ lopsided98 ];
+
maintainers = with maintainers; [ lopsided98 Frostman ];
platforms = platforms.all;
};
}
+27
pkgs/tools/graphics/smartcrop/default.nix
···
+
{ lib
+
, buildGoModule
+
, fetchFromGitHub
+
}:
+
+
buildGoModule {
+
pname = "smartcrop";
+
version = "unstable-2023-03-16";
+
+
src = fetchFromGitHub {
+
owner = "muesli";
+
repo = "smartcrop";
+
rev = "f1935b108c21d44756141bfebf302dfd7b03fdbe";
+
hash = "sha256-3fNDmKR5b6SexG3fBn7uXrtL1gbXrpo8d8boKul1R6Y=";
+
};
+
+
vendorHash = "sha256-ov3dHF/NxqxWPaVzddaJSjz3boLpZtIPtvP1iNBtiTc=";
+
+
ldflags = [ "-s" "-w" ];
+
+
meta = with lib; {
+
description = "Find good image crops for arbitrary crop sizes";
+
homepage = "https://github.com/muesli/smartcrop";
+
license = licenses.mit;
+
maintainers = with maintainers; [ figsoda ];
+
};
+
}
+31 -6
pkgs/tools/misc/scanmem/default.nix
···
-
{ lib, stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }:
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, autoreconfHook
+
, gobject-introspection
+
, intltool
+
, wrapGAppsHook
+
, procps
+
, python3
+
, readline
+
}:
stdenv.mkDerivation rec {
-
version = "0.17";
pname = "scanmem";
+
version = "0.17";
src = fetchFromGitHub {
owner = "scanmem";
···
sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9";
};
-
nativeBuildInputs = [ autoconf automake intltool libtool ];
-
buildInputs = [ readline ];
+
nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook ];
+
buildInputs = [ readline python3 ];
+
configureFlags = ["--enable-gui"];
+
+
# we don't need to wrap the main executable, just the GUI
+
dontWrapGApps = true;
+
+
fixupPhase = ''
+
runHook preFixup
-
preConfigure = ''
-
./autogen.sh
+
# replace the upstream launcher which does stupid things
+
# also add procps because it shells out to `ps` and expects it to be procps
+
makeWrapper ${python3}/bin/python3 $out/bin/gameconqueror \
+
"''${gappsWrapperArgs[@]}" \
+
--set PYTHONPATH "${python3.pkgs.makePythonPath [ python3.pkgs.pygobject3 ]}" \
+
--prefix PATH : "${procps}/bin" \
+
--add-flags "$out/share/gameconqueror/GameConqueror.py"
+
+
runHook postFixup
'';
+
meta = with lib; {
homepage = "https://github.com/scanmem/scanmem";
description = "Memory scanner for finding and poking addresses in executing processes";
+3 -3
pkgs/tools/networking/amass/default.nix
···
buildGoModule rec {
pname = "amass";
-
version = "4.0.1";
+
version = "4.0.2";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
-
hash = "sha256-FdOfTZG2zzO8Lp3/CbSw8ouDmveXDzbIBB34EuKiyXg=";
+
hash = "sha256-2XFFOV2Z6oDpBj640+Y6ERqK+bqh3w9bspBEfw9Gpjw=";
};
-
vendorHash = "sha256-ZA9XKloUk46pdJK0Lutk1upPfT9irwR0NtmntCkzmlA=";
+
vendorHash = "sha256-4Ml9qiaXf2zBIDdJE7JWHf684YD1yuIPd4VTRcBNLcE=";
outputs = [
"out"
+4
pkgs/tools/package-management/nix/common.nix
···
(lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic")
];
+
postPatch = ''
+
patchShebangs --build tests
+
'';
+
preConfigure =
# Copy libboost_context so we don't get all of Boost in our closure.
# https://github.com/NixOS/nixpkgs/issues/45462
+3 -3
pkgs/tools/security/rbw/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "rbw";
-
version = "1.8.2";
+
version = "1.8.3";
src = fetchzip {
url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
-
sha256 = "sha256-CIQ+mU5lbw3ugjxL9i6sLaf9hZipUQUGR2HUgYNtWes=";
+
sha256 = "sha256-dC/x+ihH1POIFN/8pbk967wATXKU4YVBGI0QCo8d+SY=";
};
-
cargoHash = "sha256-eVojTcdDE6UDrmk0Ll+MRuW/UqQ7r7/SomSz84RfxxI=";
+
cargoHash = "sha256-nI1Pf7gREbAk+JVF3Gn2j8OqprexCQ5fVvECtq2aBPM=";
nativeBuildInputs = [
installShellFiles
+3 -3
pkgs/tools/system/pcstat/default.nix
···
buildGoModule rec {
pname = "pcstat";
-
version = "0.0.1";
+
version = "0.0.2";
src = fetchFromGitHub {
owner = "tobert";
repo = "pcstat";
rev = "v${version}";
-
sha256 = "sha256-rN6oqhvrzMBhwNLm8+r4rZWZYZUhOq2h764KVhSycNo=";
+
sha256 = "sha256-e8fQZEfsS5dATPgshJktfKVTdZ9CvN1CttYipMjpGNM=";
};
-
vendorSha256 = "sha256-1y6rzarkFNX8G4E9FzCLfWxULbdNYK3DeelNCJ+7Y9Q=";
+
vendorHash = "sha256-fdfiHTE8lySfyiKKiYJsQNCY6MBfjaVYSIZXtofIz3E=";
meta = with lib; {
description = "Page Cache stat: get page cache stats for files on Linux";
+5 -5
pkgs/tools/text/pru/default.nix
···
, bundlerUpdateScript
}:
-
bundlerApp rec {
+
bundlerApp {
pname = "pru";
gemdir = ./.;
exes = [ "pru" ];
-
meta = with lib; {
+
meta = {
homepage = "https://github.com/grosser/pru";
description = "Pipeable Ruby";
longDescription = ''
···
higher-level replacement of typical text processing tools (like sed, awk,
grep etc.).
'';
-
license = licenses.mit;
-
maintainers = with maintainers; [ AndersonTorres ];
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ AndersonTorres ];
};
-
passthru.updateScript = bundlerUpdateScript pname;
+
passthru.updateScript = bundlerUpdateScript "pru";
}
+4
pkgs/top-level/all-packages.nix
···
forgejo = callPackage ../applications/version-management/forgejo { };
+
forgejo-actions-runner = callPackage ../development/tools/continuous-integration/forgejo-actions-runner { };
+
gokart = callPackage ../development/tools/gokart { };
gl2ps = callPackage ../development/libraries/gl2ps { };
···
slowhttptest = callPackage ../tools/security/slowhttptest { };
slrn = callPackage ../applications/networking/newsreaders/slrn { };
+
+
smartcrop = callPackage ../tools/graphics/smartcrop { };
sniffnet = callPackage ../applications/networking/sniffnet { };