Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-09-17 18:05:29 +00:00
committed by GitHub
79 changed files with 19399 additions and 19029 deletions
@@ -12,8 +12,16 @@ head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github
commit="$(jq -r .commit.sha <<< "$head_info")"
# extract commit timestamp and convert to date
date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
# generate nix expression from cabal file, replacing the version with the commit date
output=pkgs/development/haskell-modules/cabal2nix-unstable.nix
echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > "$output"
cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> "$output"
nixfmt "$output"
function mkPackage() {
output=pkgs/development/haskell-modules/cabal2nix-unstable/$1.nix
echo "# This file defines $1-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh." > "$output"
cabal2nix --subpath "$1" "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -Ee 's/version = "(.*)"/version = "\1-unstable-'"$date"'"/' >> "$output"
nixfmt "$output"
}
mkPackage "cabal2nix"
mkPackage "distribution-nixpkgs"
mkPackage "hackage-db"
mkPackage "language-nix"
+16 -10
View File
@@ -7,7 +7,7 @@
let
cfg = config.services.murmur;
forking = cfg.logFile != null;
forking = cfg.logToFile;
configFile = pkgs.writeText "murmurd.ini" ''
database=${cfg.stateDir}/murmur.sqlite
dbDriver=QSQLITE
@@ -16,7 +16,7 @@ let
autobanTimeframe=${toString cfg.autobanTimeframe}
autobanTime=${toString cfg.autobanTime}
logfile=${lib.optionalString (cfg.logFile != null) cfg.logFile}
logfile=${lib.optionalString cfg.logToFile "/var/log/murmur/murmurd.log"}
${lib.optionalString forking "pidfile=/run/murmur/murmurd.pid"}
welcometext="${cfg.welcometext}"
@@ -51,6 +51,15 @@ let
'';
in
{
imports = [
(lib.mkRemovedOptionModule [
"services"
"murmur"
"logfile"
] "This option has been superseded by services.murmur.logToFile")
];
options = {
services.murmur = {
enable = lib.mkEnableOption "Mumble server";
@@ -108,12 +117,7 @@ in
description = "The amount of time an IP ban lasts (in seconds).";
};
logFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/var/log/murmur/murmurd.log";
description = "Path to the log file for Murmur daemon. Empty means log to journald.";
};
logToFile = lib.mkEnableOption "logging to a file instead of journald, which is stored in /var/log/murmur";
welcometext = lib.mkOption {
type = lib.types.str;
@@ -329,6 +333,8 @@ in
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini";
Restart = "always";
LogsDirectory = lib.mkIf cfg.logToFile "murmur";
LogsDirectoryMode = "0750";
RuntimeDirectory = "murmur";
RuntimeDirectoryMode = "0700";
User = cfg.user;
@@ -406,8 +412,8 @@ in
r /run/murmur/murmurd.ini,
r ${configFile},
''
+ lib.optionalString (cfg.logFile != null) ''
rw ${cfg.logFile},
+ lib.optionalString cfg.logToFile ''
rw /var/log/murmur/murmurd.log,
''
+ lib.optionalString (cfg.sslCert != "") ''
r ${cfg.sslCert},
@@ -17,6 +17,25 @@ in
default = true;
description = "Set to false to disable the tray icon and run as a CLI tool only.";
};
users = lib.mkOption {
type = lib.types.attrsOf (
lib.types.submodule {
options = {
inviteId = lib.mkOption {
type = lib.types.str;
description = ''
A unique ID that links the agent to Pareto Cloud.
Get it from the Join Team page on `https://cloud.paretosecurity.com/team/join/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
In Step 2, under Linux tab, enter your email then copy it from the generated command.
'';
example = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
};
};
}
);
default = { };
description = "Per-user Pareto Security configuration.";
};
};
config = lib.mkIf cfg.enable {
@@ -38,9 +57,64 @@ in
# if one is installed.
# The `paretosecurity-user` timer service that is configured lower has
# the same need.
systemd.services.paretosecurity.serviceConfig.Environment = [
"PATH=${config.system.path}/bin:${config.system.path}/sbin"
];
systemd.services = {
paretosecurity.serviceConfig.Environment = [
"PATH=${config.system.path}/bin:${config.system.path}/sbin"
];
}
// (
# Each user can set their inviteID, which creates a systemd service
# that runs `paretosecurity link ...` to link their device to Pareto Cloud.
lib.mapAttrs' (
username: userConfig:
lib.nameValuePair "paretosecurity-link-${username}" {
description = "Link Pareto Desktop to Pareto Cloud for user ${username}";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
User = username;
StateDirectory = "paretosecurity/${username}";
ExecStart = pkgs.writeShellScript "paretosecurity-link-${username}" ''
set -euo pipefail
INVITE_ID="${userConfig.inviteId}"
STATE_FILE="/var/lib/paretosecurity/${username}/linked-$INVITE_ID"
CONFIG_FILE="$HOME/.config/pareto.toml"
# Check if already linked with this specific invite
if [ -f "$STATE_FILE" ]; then
echo "Device already linked with invite $INVITE_ID for user ${username}"
exit 0
fi
# Ensure config directory exists
mkdir -p "$(dirname "$CONFIG_FILE")"
# Perform linking
echo "Linking device to Pareto Cloud for user ${username}..."
${cfg.package}/bin/paretosecurity link \
"paretosecurity://linkDevice/?invite_id=$INVITE_ID"
# Verify linking succeeded
if [ -f "$CONFIG_FILE" ] && grep -q "TeamID" "$CONFIG_FILE"; then
echo "Successfully linked to Pareto Cloud for user ${username}"
touch "$STATE_FILE"
else
echo "Failed to link to Pareto Cloud for user ${username}"
exit 1
fi
'';
};
wantedBy = [ "multi-user.target" ];
}
) cfg.users
);
# Enable the tray icon and timer services if the trayIcon option is enabled
systemd.user = lib.mkIf cfg.trayIcon {
+44 -38
View File
@@ -9,7 +9,7 @@
imports = [ ./common/user-account.nix ];
services.paretosecurity.enable = true;
services.paretosecurity.users.alice.inviteId = "test-invite-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
};
nodes.xfce =
@@ -46,46 +46,52 @@
terminal.systemctl("start network-online.target")
terminal.wait_for_unit("network-online.target")
# Test 1: Test the systemd socket is installed & enabled
terminal.succeed('systemctl is-enabled paretosecurity.socket')
with subtest("Test the systemd socket is installed & enabled"):
terminal.succeed('systemctl is-enabled paretosecurity.socket')
# Test 2: Test running checks
terminal.succeed(
"su - alice -c 'paretosecurity check"
# Disable some checks that need intricate test setup so that this test
# remains simple and fast. Tests for all checks and edge cases available
# at https://github.com/ParetoSecurity/agent/tree/main/test/integration
+ " --skip c96524f2-850b-4bb9-abc7-517051b6c14e" # SecureBoot
+ " --skip 37dee029-605b-4aab-96b9-5438e5aa44d8" # Screen lock
+ " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb" # Disk encryption
+ " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e" # Pareto Security is up to date
+ " --skip f962c423-fdf5-428a-a57a-827abc9b253e" # Password manager installed
+ "'"
)
with subtest("Test running checks"):
terminal.succeed(
"su - alice -c 'paretosecurity check"
# Disable some checks that need intricate test setup so that this test
# remains simple and fast. Tests for all checks and edge cases available
# at https://github.com/ParetoSecurity/agent/tree/main/test/integration
+ " --skip c96524f2-850b-4bb9-abc7-517051b6c14e" # SecureBoot
+ " --skip 37dee029-605b-4aab-96b9-5438e5aa44d8" # Screen lock
+ " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb" # Disk encryption
+ " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e" # Pareto Security is up to date
+ " --skip f962c423-fdf5-428a-a57a-827abc9b253e" # Password manager installed
+ "'"
)
# Test 3: Test the tray icon
xfce.wait_for_x()
for unit in [
'paretosecurity-trayicon',
'paretosecurity-user',
'paretosecurity-user.timer'
]:
status, out = xfce.systemctl("is-enabled " + unit, "alice")
assert status == 0, f"Unit {unit} is not enabled (status: {status}): {out}"
xfce.succeed("xdotool mousemove 460 10")
xfce.wait_for_text("Pareto Security")
xfce.succeed("xdotool click 1")
xfce.wait_for_text("Run Checks")
with subtest("Test linking to Pareto Cloud"):
# The linking service will fail because there is no Internet,
# but we can check that it tried
terminal.succeed('systemctl list-units --type=service | grep paretosecurity-link-alice')
terminal.succeed('journalctl -u paretosecurity-link-alice.service | grep "Linking device to Pareto Cloud for user alice"')
# Test 4: Desktop entry
xfce.succeed("xdotool mousemove 10 10")
xfce.succeed("xdotool click 1") # hide the tray icon window
xfce.succeed("xdotool click 1") # show the Applications menu
xfce.succeed("xdotool mousemove 10 200")
xfce.succeed("xdotool click 1")
xfce.wait_for_text("Pareto Security")
with subtest("Test 3: Test the tray icon"):
xfce.wait_for_x()
for unit in [
'paretosecurity-trayicon',
'paretosecurity-user',
'paretosecurity-user.timer'
]:
status, out = xfce.systemctl("is-enabled " + unit, "alice")
assert status == 0, f"Unit {unit} is not enabled (status: {status}): {out}"
xfce.succeed("xdotool mousemove 460 10")
xfce.wait_for_text("Pareto Security")
xfce.succeed("xdotool click 1")
xfce.wait_for_text("Run Checks")
# Test 5: paretosecurity:// URL handler is registered
xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
with subtest("Test 4: Desktop entry"):
xfce.succeed("xdotool mousemove 10 10")
xfce.succeed("xdotool click 1") # hide the tray icon window
xfce.succeed("xdotool click 1") # show the Applications menu
xfce.succeed("xdotool mousemove 10 200")
xfce.succeed("xdotool click 1")
xfce.wait_for_text("Pareto Security")
with subtest("Test 5: paretosecurity:// URL handler is registered"):
xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
'';
}
@@ -2103,6 +2103,32 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
claude-fzf-history-nvim = buildVimPlugin {
pname = "claude-fzf-history.nvim";
version = "2025-09-06";
src = fetchFromGitHub {
owner = "pittcat";
repo = "claude-fzf-history.nvim";
rev = "8257e346039e1a9089af307c04871c587fdb449a";
sha256 = "1zy6wj7cajkzdv7giazsmq8hi309khi82bqnd8kj6i6rj6mrzbkc";
};
meta.homepage = "https://github.com/pittcat/claude-fzf-history.nvim/";
meta.hydraPlatforms = [ ];
};
claude-fzf-nvim = buildVimPlugin {
pname = "claude-fzf.nvim";
version = "2025-09-05";
src = fetchFromGitHub {
owner = "pittcat";
repo = "claude-fzf.nvim";
rev = "769eb89d80de0e5247c7393f2cdffa57c5545dd3";
sha256 = "1kcg78jpsaiz0j0dpfnp7kvkqi6w530i7z2d1555xn33qx8mnlbi";
};
meta.homepage = "https://github.com/pittcat/claude-fzf.nvim/";
meta.hydraPlatforms = [ ];
};
claudecode-nvim = buildVimPlugin {
pname = "claudecode.nvim";
version = "2025-09-15";
@@ -401,6 +401,25 @@ assertNoAdditions {
];
};
claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs {
dependencies = with self; [
claudecode-nvim
fzf-lua
];
# Failed to build help tags!
# E670: Mix of help file encodings within a language: doc/claude-fzf-zh.txt
# E154: Duplicate tag "claude-fzf-keymaps" in file doc/claude-fzf-en.txt
preInstall = ''
rm -r doc
'';
};
claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs {
dependencies = with self; [
fzf-lua
];
};
clighter8 = super.clighter8.overrideAttrs {
preFixup = ''
sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \
@@ -160,6 +160,8 @@ https://github.com/projekt0n/circles.nvim/,,
https://github.com/zootedb0t/citruszest.nvim/,,
https://github.com/xavierd/clang_complete/,,
https://github.com/greggh/claude-code.nvim/,HEAD,
https://github.com/pittcat/claude-fzf-history.nvim/,HEAD,
https://github.com/pittcat/claude-fzf.nvim/,HEAD,
https://github.com/coder/claudecode.nvim/,HEAD,
https://github.com/rhysd/clever-f.vim/,,
https://github.com/bbchung/clighter8/,,
@@ -30,14 +30,14 @@
}:
let
version = "6.0.5414";
version = "6.0.5436";
subsurfaceSrc = (
fetchFromGitHub {
owner = "Subsurface";
repo = "subsurface";
rev = "528bc9785d53a485bf38270687abfe239060a8af";
hash = "sha256-TtqT+H/kvyP7LXrDv/pwPxmZcTCsmzuqS3/IJmBAdRY=";
rev = "2d3f73c2e1dd5d1f42419708866e40d973989d24";
hash = "sha256-dB7KKXbQOmyzlzAKDlFTGJDa/XIKQeKsiCt+dPeP9EU=";
fetchSubmodules = true;
}
);
+4 -2
View File
@@ -23,11 +23,12 @@
uvicorn,
requests,
prometheus-client,
shtab,
}:
buildPythonApplication rec {
pname = "glances";
version = "4.3.1";
version = "4.3.3";
pyproject = true;
disabled = isPyPy || pythonOlder "3.9";
@@ -36,7 +37,7 @@ buildPythonApplication rec {
owner = "nicolargo";
repo = "glances";
tag = "v${version}";
hash = "sha256-KaH2dV9bOtBZkfbIGIgQS8vL39XwSyatSjclcXpeVGM=";
hash = "sha256-RmGbd8Aa2jJ2DMrBUUoa8mPBa6bGnQd0s0y3p/zP0ng=";
};
build-system = [ setuptools ];
@@ -66,6 +67,7 @@ buildPythonApplication rec {
jinja2
which
prometheus-client
shtab
]
++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
+3 -3
View File
@@ -5,15 +5,15 @@
}:
let
pname = "ankama-launcher";
version = "3.13.5";
version = "3.13.16";
# The original URL for the launcher is:
# https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
# As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
# To update the client, head to web.archive.org and create a new snapshot of the download page.
src = fetchurl {
url = "https://web.archive.org/web/20250617174847/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
hash = "sha256-c3lG4Svd5gxsaUVJ3fiBO2ZL+U4pJxJX5Fg5ITZ/QwI=";
url = "https://web.archive.org/web/20250906013556/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
hash = "sha256-wG7xg6uQJsdJR9Xu2T9PCVQb+LSyO10BveGftOrc2Uo=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
+2 -8
View File
@@ -4,9 +4,7 @@
fetchFromGitLab,
testers,
gitUpdater,
autoconf,
automake,
libtool,
autoreconfHook,
pkg-config,
libpng,
}:
@@ -28,14 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
autoconf
automake
libtool
autoreconfHook
pkg-config
];
preConfigure = "autoreconf --install";
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+2 -2
View File
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "art";
version = "1.25.8";
version = "1.25.9";
src = fetchFromGitHub {
owner = "artpixls";
repo = "ART";
tag = version;
hash = "sha256-FsaTXGlQ390XgFrV4InF+xFr+Y9JgZefsR/AyHOuSsA=";
hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ=";
};
nativeBuildInputs = [
+12
View File
@@ -10,6 +10,7 @@
cjs,
evolution-data-server,
fetchFromGitHub,
fetchpatch,
gcr,
gdk-pixbuf,
gettext,
@@ -87,6 +88,17 @@ stdenv.mkDerivation rec {
patches = [
./use-sane-install-dir.patch
./libdir.patch
# js: Use DesktopAppInfo form GioUnix, not Gio
# https://github.com/linuxmint/cinnamon/pull/13091
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/fa3aef20533af4499fb1161011e62e048bbdc396.patch";
hash = "sha256-qhgBniaUE/8q9BQ+EXcY7BF6eMJg+wC7EYgktwAMbwM=";
})
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/330b9ff19f33ec1e94e36048ca46011404f796b4.patch";
hash = "sha256-YEQG6C4tx2T3wMfCLZXPFynAzEeIE1eVoadWVENZDFc=";
})
];
buildInputs = [
+6 -3
View File
@@ -19,13 +19,16 @@
stdenv.mkDerivation rec {
pname = "cjs";
version = "128.0";
version = "128.0-unstable-2025-09-15";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = version;
hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38=";
# Backport fixes to support GLib 2.86.0 typelibs
# nixpkgs-update: no auto update
# https://github.com/linuxmint/cjs/issues/130
rev = "1f39576bafe6bc05bce960e590dc743dd7990e39";
hash = "sha256-drKLaTZLIZfPIhcVcCAB48PdM2b0GNLe5xrHGBysVmM=";
};
outputs = [
+3 -3
View File
@@ -15,7 +15,7 @@
}:
let
version = "1.8.2";
version = "1.9";
devenvNixVersion = "2.30.4";
devenv_nix =
@@ -42,10 +42,10 @@ rustPlatform.buildRustPackage {
owner = "cachix";
repo = "devenv";
tag = "v${version}";
hash = "sha256-j1IujIUZFdKKv33ldsptrcbe0avAX725SYhGtNrGJcI=";
hash = "sha256-MG+c0mo4g9UHSuqibX3OVkiADWmMn/PWDfVhD4U29PM=";
};
cargoHash = "sha256-NNfqmdnDIKmp1upkBwJMp+VirSYsUXJNgGbAzcHs8LY=";
cargoHash = "sha256-7uB9oC0jHWBFeUtIyVpTjeximU6eSxSCiBzo/whoKxQ=";
buildAndTestSubdir = "devenv";
+2 -2
View File
@@ -10,13 +10,13 @@
}:
buildNpmPackage rec {
pname = "factoriolab";
version = "3.16.6";
version = "3.17.2";
src = fetchFromGitHub {
owner = "factoriolab";
repo = "factoriolab";
tag = "v${version}";
hash = "sha256-feKva+TuqRZ66VCoHlUK695FMvsjgX5sJOwTBne8qX4=";
hash = "sha256-umEIFN2TQV+T3MtLuUyHi5eORbixsGUDLozTFDStlP8=";
fetchLFS = true;
};
buildInputs = [ vips ];
+74
View File
@@ -0,0 +1,74 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule (finalAttrs: {
pname = "fasttrackml";
version = "0.6.0";
src = fetchFromGitHub {
owner = "G-Research";
repo = "fasttrackml";
tag = "v${finalAttrs.version}";
hash = "sha256-Z1Hx8nYaifdlnFqp709+rKVXXXMa6cS3+evTG8ZnwrU=";
};
vendorHash = "sha256-GPnhE85mHg4KyPeB6+fUP4Y1MlpYTgidqawPddg5kyw=";
tags = [
"netgo"
"osusergo"
"sqlite_foreign_keys"
"sqlite_math_functions"
"sqlite_omit_load_extension"
"sqlite_unlock_notify"
];
# skip several tests that need network access
checkFlags =
let
skippedTests = [
# failed to connect to `host=localhost user=postgres database=postgres
"TestImportTestSuite/Test_Ok/sqlite->postgres"
"TestImportTestSuite/Test_Ok/sqlcipher->postgres"
"TestImportTestSuite/Test_Ok/postgres->sqlite"
"TestImportTestSuite/Test_Ok/postgres->sqlcipher"
"TestImportTestSuite/Test_Ok/postgres->postgres"
# test timed out after 10m0s while creating Google Cloud storage bucket
"TestGetArtifactGSTestSuite/Test_Error"
"TestGetArtifactGSTestSuite/Test_Ok"
"TestListArtifactGSTestSuite/Test_Error"
"TestListArtifactGSTestSuite/Test_Ok"
# test failure while trying to create/access S3 bucket
"TestGetArtifactS3TestSuite/Test_Error"
"TestGetArtifactS3TestSuite/Test_Ok"
"TestListArtifactS3TestSuite/Test_Error"
"TestListArtifactS3TestSuite/Test_Ok"
# connect: network is unreachable
"TestArtifactFlowTestSuite/Test_Ok/TestCustomNamespaces"
"TestArtifactFlowTestSuite/Test_Ok/TestExplicitDefaultAndCustomNamespaces"
"TestArtifactFlowTestSuite/Test_Ok/TestImplicitDefaultAndCustomNamespaces"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
postInstall = ''
# we don't need this binary and it messes with our real python
rm $out/bin/python
'';
meta = {
description = "API for logging parameters and metrics when running machine learning code";
homepage = "https://github.com/G-Research/fasttrackml";
changelog = "https://github.com/G-Research/fasttrackml/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jherland ];
platforms = lib.platforms.unix;
mainProgram = "fasttrackml";
};
})
@@ -1,21 +1,21 @@
{
"version": "12.1.4",
"version": "12.2.0",
"sources": {
"aarch64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-aarch64.tar.xz",
"sha256": "3221bc1299edacf061f0c66a3543532fd67ef0b7f998f4c41b4c7f062f79685b"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.0/floorp-linux-aarch64.tar.xz",
"sha256": "bf95ddc45c507330ec8b6ec3fafd34065899aa6152449eaf41cfdefbf83e6c35"
},
"x86_64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-amd64.tar.xz",
"sha256": "86a5d86a52f3778ca3d3b7b250c3e36820ab792232e8dd8cd4482586e9c1f2f1"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.0/floorp-linux-amd64.tar.xz",
"sha256": "53e3a9a3929c1a3454d65152f4926bbd899c0b1adc8f26e83a00421d205413ac"
},
"aarch64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg",
"sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.0/floorp-macOS-universal.dmg",
"sha256": "b4c118e0e34b402303423f7687c9c7f284ae900a47f696186ebc1384f0d9e063"
},
"x86_64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg",
"sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.0/floorp-macOS-universal.dmg",
"sha256": "b4c118e0e34b402303423f7687c9c7f284ae900a47f696186ebc1384f0d9e063"
}
}
}
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitu";
version = "0.35.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "altsem";
repo = "gitu";
rev = "v${version}";
hash = "sha256-hN7Dj31t1Kh9m4Ou/yBALqEKVlKB0++Qu1H5UEiIUzs=";
hash = "sha256-4kBxVPiK3HoPvh8wR7xMUt0Zy5u4LRK6KfQCdk3q7fk=";
};
cargoHash = "sha256-gMSEaXoHK6hrZ2zrHOZkRgve66Zg1gshB3KqUjfxtnI=";
cargoHash = "sha256-r0ccEi81Znjhod87Ax5yBlKXEVT44kN4wr3HzMqyezo=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gollama";
version = "v1.37.1";
version = "v1.37.2";
src = fetchFromGitHub {
owner = "sammcj";
repo = "gollama";
tag = "v${version}";
hash = "sha256-HNRerVlnYfEAmxUk8nE8fyLozQ7zngFrcDrWG1RtqJw=";
hash = "sha256-vkAJOo8ZhnGHw/J/PULP1vrBZx7IZccVidF5EqVMYmk=";
};
vendorHash = "sha256-Hf1E55FHlyp7VAwaunvpG/hYNVHO2DSFDGFyaPiFieY=";
vendorHash = "sha256-0aaxj5F6zEEO98isarLSbA1tn0e4Ue6Lhgi4CYKMjnQ=";
doCheck = false;
+3 -3
View File
@@ -5,14 +5,14 @@
}:
buildGoModule rec {
pname = "goplantuml";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "jfeliu007";
repo = "goplantuml";
tag = "v${version}";
hash = "sha256-OnCAqws27e7WsXKmw0clH9Qek+6LNeu2UGD9sKaV4+I=";
hash = "sha256-+8RvifAYJv6cxIZ9sNKWNVhSNzUotGjjRjGynGqbO6o=";
};
vendorHash = null;
vendorHash = "sha256-IVuhzjPGzPVKHpPdkX/GWItbKaz4PLyUFQAQ7RQO9/M=";
meta = {
changelog = "https://github.com/jfeliu007/goplantuml/releases/tag/v${version}";
description = "PlantUML Class Diagram Generator for golang projects";
+2 -2
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "i2p";
version = "2.9.0";
version = "2.10.0";
src = fetchzip {
urls = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://files.i2p-projekt.de/"
"https://download.i2p2.no/releases/"
]);
hash = "sha256-8gnCjSBcTz8KxNPo9KUnnn2IWfCswA/sGDkqzOjNX34=";
hash = "sha256-Ogok7s5sawG27ucstG+NYiIAF66Pb3ExOYsL8mfNav8=";
};
strictDeps = true;
+1 -1
View File
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
pname = "immich-cli";
version = "2.2.89";
version = "2.2.90";
inherit (immich) src pnpmDeps;
postPatch = ''
+2 -2
View File
@@ -34,7 +34,7 @@
}:
let
pnpm = pnpm_10;
version = "1.142.0";
version = "1.142.1";
esbuild' = buildPackages.esbuild.override {
buildGoModule =
@@ -108,7 +108,7 @@ let
owner = "immich-app";
repo = "immich";
tag = "v${version}";
hash = "sha256-0nStZuSnb8tJ0+Y247MHitmMURl8vTuPLAhUm+OHctE=";
hash = "sha256-u538GWupnkH2K81Uk9yEuHc3pAeVexnJOnhWo7gElL0=";
};
pnpmDeps = pnpm.fetchDeps {
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
version = "2.16.0";
version = "2.18.5";
# See the repository for expected versions:
# <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "intel-graphics-compiler";
tag = "v${version}";
hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o=";
hash = "sha256-AvEeK3rySEu89br4JgeZlXVQ6IXEzStVZYvehzdWq7g=";
})
(fetchFromGitHub {
name = "llvm-project";
+2 -2
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "JankyBorders";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "JankyBorders";
rev = "v${finalAttrs.version}";
hash = "sha256-PUyq3m244QyY7e8+/YeAMOxMcAz3gsyM1Mg/kgjGVgU=";
hash = "sha256-LG3I2Zp7GU9khrDTBRMO0+qhreVL+4rwAQRI+AbXbW0=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -13,7 +13,7 @@
cairo,
pixman,
libsecret,
electron_35,
electron_36,
xcbuild,
buildPackages,
callPackage,
@@ -22,7 +22,7 @@
}:
let
electron = electron_35;
electron = electron_36;
yarn-berry = yarn-berry_4;
releaseData = lib.importJSON ./release-data.json;
@@ -0,0 +1,5 @@
{
writers,
}:
writers.writePerl "jre-generate-cacerts" { } ./generate-cacerts.pl
+58
View File
@@ -0,0 +1,58 @@
{
lib,
stdenv,
fetchFromGitea,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "l8w8jwt";
version = "2.5.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "GlitchedPolygons";
repo = "l8w8jwt";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-aR3r84AYvCNx3jm9lB1qtbbEh9rU3LTkI+TK9LPQaPk=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DL8W8JWT_PACKAGE=On"
(lib.cmakeBool "L8W8JWT_ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
];
# chillibuff header isn't installed correctly
preConfigure = ''
mv lib/chillbuff/include/chillbuff.h include/
'';
doCheck = true;
checkPhase = ''
runHook preCheck
./run_tests
runHook postCheck
'';
installPhase = ''
runHook preInstall
mkdir -p -m777 $out/include $out/lib64
cp -pr $src/include/l8w8jwt $out/include
cp -pr l8w8jwt/bin/release/libl8w8jwt.a $out/lib64
runHook postInstall
'';
meta = {
description = "Minimal, OpenSSL-less and super lightweight JWT library written in C";
homepage = "https://codeberg.org/GlitchedPolygons/l8w8jwt";
changelog = "https://codeberg.org/GlitchedPolygons/l8w8jwt/releases/tag/${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jherland ];
platforms = lib.platforms.unix;
};
})
+1 -1
View File
@@ -4,7 +4,7 @@
fetchPypi,
}:
python3Packages.buildPythonApplication rec {
python3Packages.buildPythonPackage rec {
pname = "lesscpy";
version = "0.15.1";
format = "pyproject";
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20250808";
version = "20250917";
src = fetchFromGitLab {
owner = "kernel-firmware";
repo = "linux-firmware";
tag = version;
hash = "sha256-bmvhAKAY43WaPr3VLUUYoX6BU2Ret47vDnyCVP7157s=";
hash = "sha256-tecFB6WYEfBK9FB7Rv8nHLdefIoaFnHrpzXBl+iSd08=";
};
postUnpack = ''
@@ -2,7 +2,9 @@
lib,
stdenv,
jdk,
jre-generate-cacerts,
maven,
perl,
writers,
}:
@@ -60,10 +62,10 @@ let
# handle cacert by populating a trust store on the fly
if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
keyStoreFile="$(mktemp -d)/keystore"
keyStorePwd="$(head -c10 /dev/random | base32)"
echo y | ${jdk}/bin/keytool -importcert -file "$NIX_SSL_CERT_FILE" -alias alias -keystore "$keyStoreFile" -storepass "$keyStorePwd"
MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=$keyStoreFile -Djavax.net.ssl.trustStorePassword=$keyStorePwd"
echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE
MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
fi
''
+ lib.optionalString buildOffline ''
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "badboy";
repo = "mdbook-mermaid";
tag = "v${version}";
hash = "sha256-+Dk3wW1pLWVfJy+OC648BQ5rZrHYqPdjV2hfJSIV6m0=";
hash = "sha256-Zn8jMlohSGlQFyKCUscS/jMiOU8kVzLva0GpHCMeOXc=";
};
cargoHash = "sha256-LbDlxQ2sbyYlXOzvA+9tLRxqGGxtgQ9KujsD7UBzskM=";
cargoHash = "sha256-AgFSsEDtOE4HKhJbqC0y0R5G79jHksEnhKd5/humaK0=";
meta = {
description = "Preprocessor for mdbook to add mermaid.js support";
+2 -2
View File
@@ -31,12 +31,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "nixos-anywhere";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixos-anywhere";
rev = finalAttrs.version;
hash = "sha256-hVTCvMnwywxQ6rGgO7ytBiSpVuLOHNgm3w3vE8UNaQY=";
hash = "sha256-rmmlgBlBnadD2pDKqDZeMm0IwZMekbFtdQ7R4cZmQfk=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
+7 -4
View File
@@ -9,7 +9,7 @@
let
pname = "notesnook";
version = "3.0.19";
version = "3.2.4";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@@ -17,6 +17,7 @@ let
suffix =
{
x86_64-linux = "linux_x86_64.AppImage";
aarch64-linux = "linux_arm64.AppImage";
x86_64-darwin = "mac_x64.dmg";
aarch64-darwin = "mac_arm64.dmg";
}
@@ -26,9 +27,10 @@ let
url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
hash =
{
x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q=";
x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE=";
aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI=";
x86_64-linux = "sha256-n4yDBaDq09idmjRZ+y2zT7rZcI4wsDhMidx9sNox5cM=";
aarch64-linux = "sha256-UQFySvvs+paCzt2XSrbYiChEQJIbef3rCOST1r+zZx8=";
x86_64-darwin = "sha256-42US8m6ZbGTUNkU0p4y0pgXKiSsjZZHlQhwv2/LDlO4=";
aarch64-darwin = "sha256-eJVyuL5nBGMr8WhOK4NOMNSMYBASQZbsbLPLgug7ZNs=";
}
.${system} or throwSystem;
};
@@ -53,6 +55,7 @@ let
];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
+3 -3
View File
@@ -19,14 +19,14 @@
}:
stdenv.mkDerivation rec {
version = "2025-08-16";
version = "2025-09-10";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "736632228a5f39573a15f4533b7672851f30bbe6";
sha256 = "sha256-NylC656n3cokbacg0YM8xjKtibBK8vvXG/7G3WXiIQw=";
rev = "9e23925b8581d22033f07f1983587412d3761494";
sha256 = "sha256-HhU7aP7tZP6x/dOO5fxKnrEqAv2fkwd3YcI/eq5cdC0=";
};
strictDeps = true;
+9 -8
View File
@@ -22,12 +22,12 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "0.9.0";
version = "0.9.9";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-NuVv/NToZGeKyYp2kIvN3j3x+R5ZUrd9VtzuZLaD268=";
hash = "sha256-VHg5yZeU380ggCUwgq2yUD4jV0IiacsIDlcoUjZzuFA=";
};
tui = buildGoModule {
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
modRoot = "packages/tui";
vendorHash = "sha256-KfK3qLt05J2N1DC25E2xyViR+aXsXQ/gEXZoiQ95UuM=";
vendorHash = "sha256-H+TybeyyHTbhvTye0PCDcsWkcN8M34EJ2ddxyXEJkZI=";
subPackages = [ "cmd/opencode" ];
@@ -81,10 +81,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
bun install \
--filter=opencode \
--force \
--frozen-lockfile \
--ignore-scripts \
--no-progress \
--production
--no-progress
# Remove `--frozen-lockfile` and `--production` they erroneously report the lockfile needs updating even though `bun install` does not change it.
# Related to https://github.com/oven-sh/bun/issues/19088
# --frozen-lockfile \
# --production
runHook postBuild
'';
@@ -101,7 +103,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-JTfm8r4IiV69XIKRVWLqh/jRjqKHyl6tJs0ygbmFwyg=";
outputHash = "sha256-sibjZaPzA4r/CjHg0ual5ueEELDUU1jeZjDnZEMrozI=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
@@ -135,7 +137,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \
--define OPENCODE_VERSION="'${finalAttrs.version}'" \
--compile \
--compile-exec-argv="--" \
--target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
--outfile=opencode \
./packages/opencode/src/index.ts \
+3 -3
View File
@@ -8,18 +8,18 @@
buildGoModule (finalAttrs: {
pname = "opkssh";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "openpubkey";
repo = "opkssh";
tag = "v${finalAttrs.version}";
hash = "sha256-c7cs7qSq5fhJuMhgRWAZmc4yWt+B219P2D0niP2sXlM=";
hash = "sha256-av8XmHRNttZ17y9DnUQkMG+ZHjEytvfetBDPjhn+6+o=";
};
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
vendorHash = "sha256-naQGvGjIRTy4BlXxM4bXnrBUWTUCFTDHOYEp91ss1wI=";
vendorHash = "sha256-vZb94nwfrqoWnFk1STDDiyqGn1Esqz5VvoQemXIzlNg=";
nativeInstallCheckInputs = [
versionCheckHook
@@ -1,31 +0,0 @@
From d4ead86b2184d1fc2748ed2b6fae8c0dceaf76c8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 11 Sep 2025 23:37:28 -0400
Subject: [PATCH ovn 1/2] tests: Expect musl error string for EIO errno.
Musl uses a slightly different string representation for the error,
which makes the test fail on cleanup because an unexpected warning is
observed in the service log.
This patch will ignore both glibc and musl error messages.
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
tests/ovn-controller.at | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index 0b00906ae..bec06e527 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -846,6 +846,7 @@ OVN_CLEANUP([hv1
/Certificate must be configured to use SSL/d
/SSL_read: error/d
/receive error: Input/d
+/receive error: I\/O error/d
/connection dropped/d
])
AT_CLEANUP
--
2.50.1
@@ -1,37 +0,0 @@
From 44d9d58461e15314edf507d0379bff991d7e9964 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 11 Sep 2025 23:40:51 -0400
Subject: [PATCH ovn 2/2] tests: Use localhost when setting "wrong" ovn-remote.
In some isolated environments (e.g. in nixpkgs build sandbox), the
network namespace doesn't have any routes or interfaces but `lo`. In
this case, an attempt to connect to 192.168.0.10 results in ENETUNREACH,
producing an unexpected "Network unreachable" warning message in service
log file - breaking the test cleanup checks.
Since the test case doesn't seem to care if the address is available, as
long as there is no SB database actually running at the configured
ovn-remote port, use the localhost address instead (which is always
present, even in the most isolated environments).
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
tests/ovn-controller.at | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index bec06e527..a8a9a2da2 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -404,7 +404,7 @@ check_sbdb_connection () {
OVS_WAIT_UNTIL([check_sbdb_connection connected])
-ovs-vsctl set open . external_ids:ovn-remote=tcp:192.168.0.10:6642
+ovs-vsctl set open . external_ids:ovn-remote=tcp:127.0.0.1:12345
OVS_WAIT_UNTIL([check_sbdb_connection 'not connected'])
# reset the remote for clean-up
--
2.50.1
+35 -20
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
libbpf,
libcap_ng,
@@ -13,6 +14,8 @@
python3,
unbound,
xdp-tools,
openvswitch,
makeWrapper,
}:
let
withOpensslConfigureFlag = "--with-openssl=${lib.getLib openssl.dev}";
@@ -29,19 +32,32 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
outputs = [
"out"
"lib"
"man"
"dev"
"tools"
];
patches = [
# Fix test failure with musl libc.
# https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-1-ihar.hrachyshka@gmail.com/
./0001-tests-Expect-musl-error-string-for-EIO-errno.patch
(fetchpatch {
url = "https://github.com/ovn-org/ovn/commit/d0b187905c45ce039163d18cc82869918946a41c.patch";
hash = "sha256-mTpNpH1ZSSMLtpZmy6jKjGDu84jL0ECr+HVh1PQzaVA=";
})
# Fix sandbox test failure.
# https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-2-ihar.hrachyshka@gmail.com/
./0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch
(fetchpatch {
url = "https://github.com/ovn-org/ovn/commit/b396babaa54ea0c8d943bbfef751dbdbf288c7af.patch";
hash = "sha256-RjWxT3EYKjGhtvCq3bAhKN9PrPTkSR72xPkQQ4SPWWU=";
})
];
nativeBuildInputs = [
autoreconfHook
pkg-config
python3
makeWrapper
];
buildInputs = [
@@ -83,23 +99,22 @@ stdenv.mkDerivation (finalAttrs: {
];
postInstall = ''
mkdir -vp $out/share/openvswitch/scripts
mkdir -vp $out/etc/ovn
cp ovs/ovsdb/ovsdb-client $out/bin
cp ovs/ovsdb/ovsdb-server $out/bin
cp ovs/ovsdb/ovsdb-tool $out/bin
cp ovs/vswitchd/ovs-vswitchd $out/bin
cp ovs/utilities/ovs-appctl $out/bin
cp ovs/utilities/ovs-vsctl $out/bin
cp ovs/utilities/ovs-ctl $out/share/openvswitch/scripts
cp ovs/utilities/ovs-lib $out/share/openvswitch/scripts
cp ovs/utilities/ovs-kmod-ctl $out/share/openvswitch/scripts
cp ovs/vswitchd/vswitch.ovsschema $out/share/openvswitch
sed -i "s#/usr/local/etc#/var/lib#g" $out/share/openvswitch/scripts/ovs-lib
sed -i "s#/usr/local/bin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib
sed -i "s#/usr/local/sbin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib
sed -i "s#/usr/local/share#$out/share#g" $out/share/openvswitch/scripts/ovs-lib
moveToOutput 'share/ovn/bugtool-plugins' "$tools"
moveToOutput 'share/ovn/scripts/ovn-bugtool-*' "$tools"
moveToOutput 'bin/ovn-detrace' "$tools"
moveToOutput 'bin/ovn_detrace*' "$tools"
moveToOutput 'bin/ovn-trace' "$tools"
moveToOutput 'bin/ovn-debug' "$tools"
moveToOutput 'bin/ovn-docker*' "$tools"
sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl
mkdir -vp $out/share/openvswitch/scripts
ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib
wrapProgram $out/share/ovn/scripts/ovn-ctl \
--prefix PATH : ${lib.makeBinPath [ openvswitch ]}
'';
env = {
+12 -8
View File
@@ -78,13 +78,15 @@ buildGoModule (finalAttrs: {
};
meta = {
description = "Agent that makes sure your laptop is correctly configured for security";
description = "A simple trayicon app that makes sure your laptop is correctly configured for security";
longDescription = ''
The Pareto Security agent is a free and open source app to help you make
sure that your laptop is configured for security.
[Pareto Desktop](https://paretosecurity.com/linux) is a free and open
source trayicon app to help you configure your laptop for security. It
nudges you to take care of 20% of security-related tasks that bring 80% of
protection.
By default, it's a CLI command that prints out a report on basic security
settings such as if you have disk encryption and firewall enabled.
In it's simplest form, it's a CLI command that prints out a report on basic
security settings such as if you have disk encryption and firewall enabled.
If you use the `services.paretosecurity` NixOS module, you also get a
root helper that allows you to run the checker in userspace. Some checks
@@ -96,9 +98,11 @@ buildGoModule (finalAttrs: {
once per hour. If you want to use just the CLI mode, set
`services.paretosecurity.trayIcon` to `false`.
Finally, you can run `paretosecurity link` to configure the agent
to send the status of checks to https://dash.paretosecurity.com to make
compliance people happy. No sending happens until your device is linked.
Finally, if you set `users.users.alice.paretosecurity.inviteId = "..."`
to the `inviteId` you get on [Pareto Cloud](https://cloud.paretosecurity.com/),
then Pareto Desktop acts as a read-only and push-only agent that sends the
status of checks to https://cloud.paretosecurity.com which makes
compliance people happy and your privacy intact.
'';
homepage = "https://github.com/ParetoSecurity/agent";
license = lib.licenses.gpl3Only;
+9
View File
@@ -7,8 +7,10 @@
gitUpdater,
graphviz,
gst_all_1,
perl,
pkg-config,
testers,
sox,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,6 +47,13 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
nativeCheckInputs = [
perl
sox
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+3 -3
View File
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pyrefly";
version = "0.28.1";
version = "0.33.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "pyrefly";
tag = finalAttrs.version;
hash = "sha256-KvMpuxQP4dofMXivMQnSgKnREv4rA8k2sj/TMuNycc0=";
hash = "sha256-sI+F+kI8ApE1cHpE3q/tSntaD/1c26jT5BLJ3BtzpBA=";
};
buildAndTestSubdir = "pyrefly";
cargoHash = "sha256-aOret3lR8oEF1ViHvn2atkalY3n9YS6vN4TlX/7QtCc=";
cargoHash = "sha256-+93SQA0KrJsskXUMA9S5eaq0EIWVK1/ZoUbp6wQ7Cc4=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "rt";
version = "5.0.5";
version = "5.0.8";
src = fetchFromGitHub {
repo = "rt";
rev = "rt-${version}";
owner = "bestpractical";
hash = "sha256-4E6xEk1sIiNBKJT4jD+SNK8Fs+hX8EuTv+jD1U1g6qY=";
hash = "sha256-4/iC1PjLgLAp7XWTafe8HW3bTkDWWQxtSEIOs8wluzE=";
};
patches = [
+3 -3
View File
@@ -36,17 +36,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rustdesk";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
hash = "sha256-ZUk/6r7HjlWAU7sUxbBxp9ZtxXUJftjcDy/V3LcMNPA=";
};
cargoHash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
cargoHash = "sha256-b0jsW0208zKFMyoqKti8TuTNZL7hQ8PX7Gwm0faW4po=";
patches = [
./make-build-reproducible.patch
+9 -9
View File
@@ -1,19 +1,19 @@
{
"version": "5.2.0",
"version": "5.3.0",
"darwin-amd64": {
"hash": "sha256-4hqTqRX3lGbE06CjPV2DkqUZP5Xzkcq1tvinKVRck0A=",
"url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_darwin_all.tar.gz"
"hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=",
"url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz"
},
"darwin-arm64": {
"hash": "sha256-4hqTqRX3lGbE06CjPV2DkqUZP5Xzkcq1tvinKVRck0A=",
"url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_darwin_all.tar.gz"
"hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=",
"url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz"
},
"linux-amd64": {
"hash": "sha256-bLzeY95f+CbcdMOFUQs0kbRSAYTf95nSkupVwbR2HBs=",
"url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_linux_amd64.tar.gz"
"hash": "sha256-52hfP1pgZkpLvVLelKJtELUOUug3gOw3juCdRRMSt/w=",
"url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_amd64.tar.gz"
},
"linux-arm64": {
"hash": "sha256-fvXb1+JOsExA6KBCCb7ULYUBaKbgStiEjpyLw/OIFUM=",
"url": "https://github.com/platformsh/cli/releases/download/5.2.0/upsun_5.2.0_linux_arm64.tar.gz"
"hash": "sha256-4rFYjh6lgbtD9h3yUtcJGpTvy/F+BW/7q1fvZWtRc/c=",
"url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_arm64.tar.gz"
}
}
+2
View File
@@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru = {
updateScript = gitUpdater {
rev-prefix = "v";
+9 -9
View File
@@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.12.5",
"version": "1.12.6",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-arm64-1.12.5.zip",
"sha256": "5b114d4dfea8ccc63a0bfbbbc07c0883a4638e0edaaca60fed3aefd0cdf9747f"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-darwin-arm64-1.12.6.zip",
"sha256": "6a0fa684a90cdf052af6c76f78f1781a8f968f44f14101b12b67ccf8b37ebbe0"
},
"x86_64-darwin": {
"version": "1.12.5",
"version": "1.12.6",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-x64-1.12.5.zip",
"sha256": "21b27ec4ed2e3b5e721b44251f56b6784b917b82dc58ed63e90e83b90830e63a"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-darwin-x64-1.12.6.zip",
"sha256": "df9c668f5716905c43e97c066b94b7a4c0ad1932072e83c385f99cffa9b878b1"
},
"x86_64-linux": {
"version": "1.12.5",
"version": "1.12.6",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-linux-x64-1.12.5.tar.gz",
"sha256": "a73bb9f23f8a9acb36d0d858b5c3c247f8ab2c66a8030852cea539c0ae8c4876"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-linux-x64-1.12.6.tar.gz",
"sha256": "fed4da2979aac3978cca4ed493af5fa15489417f03072fd8c283855b223861be"
}
}
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "zapzap";
version = "6.2";
version = "6.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "rafatosta";
repo = "zapzap";
tag = version;
hash = "sha256-PjnWe65L4RMUcgZrRYrK+k1+aqE0ti6Behkj2eHU7gQ=";
hash = "sha256-DvQuhoO7jxnkX7uW+fltEjKu2Ugg8cgLKe+5pkln6g4=";
};
nativeBuildInputs = [
-12
View File
@@ -74,18 +74,6 @@ let
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qttools qtx11extras;
};
lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin {
version = "1.4.1";
lxqt-build-tools = lxqt-build-tools_0_13;
libqtxdg = libqtxdg_3_12;
libfm-qt = libfm-qt_1_4;
inherit (pkgs.libsForQt5)
qtbase
qtsvg
qttools
libdbusmenu
;
};
qtermwidget_1_4 = callPackage ./qtermwidget {
version = "1.4.0";
lxqt-build-tools = lxqt-build-tools_0_13;
+3 -10
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
cmake,
libdbusmenu-lxqt,
libdbusmenu ? null,
libfm-qt,
libqtxdg,
lxqt-build-tools,
@@ -13,23 +12,17 @@
qtsvg,
qttools,
wrapQtAppsHook,
version ? "2.2.0",
}:
stdenv.mkDerivation rec {
pname = "lxqt-qtplugin";
inherit version;
version = "2.2.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash =
{
"1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
"2.2.0" = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
}
."${version}";
hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
};
nativeBuildInputs = [
@@ -40,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
(if lib.versionAtLeast version "2.0.0" then libdbusmenu-lxqt else libdbusmenu)
libdbusmenu-lxqt
libfm-qt
libqtxdg
qtbase
@@ -91,7 +91,7 @@ let
buildPhase = ''
runHook preBuild
HOME=. rebar3 bare compile -path ""
HOME=. rebar3 bare compile --paths "."
runHook postBuild
'';
@@ -30,7 +30,7 @@ lib.makeScope pkgs.newScope (
autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];
});
graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };
graalvm-oracle = self.graalvm-oracle_24;
graalvm-oracle = self.graalvm-oracle_25;
}
// lib.optionalAttrs config.allowAliases {
graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";
@@ -4,7 +4,7 @@
fetchurl,
graalvmPackages,
useMusl ? false,
version ? "24",
version ? "25",
}:
graalvmPackages.buildGraalvm {
+4 -4
View File
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "kotlin-native";
version = "2.1.0";
version = "2.2.20";
src =
let
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
getHash =
arch:
{
"macos-aarch64" = "sha256-FHXR5XA7B/fqox2GTIkCJ6BIaSKoufLY0yMLe2ZmoqM=";
"macos-x86_64" = "sha256-qXAnTdF9dkojOzb+vV08fZYYJUnQ43y8Yo0SxL6n2Ac=";
"linux-x86_64" = "sha256-5aAqD/ru6OGWitm+QGouXMNIc4xV8o4ltLWPc29t8P4=";
"macos-aarch64" = "sha256-UnDl9wj/7RXrEaApuAaLczIfz0lscQPf+pCeSdJxJeY=";
"macos-x86_64" = "sha256-mmsBQrx0yKqvvhnD8CU+oxqhWsOT1RzvzSniN3CeG7g=";
"linux-x86_64" = "sha256-2Ff+4rTj/W0tQBo6lADcQMIN4dAj32UnIXF9PRme0Nw=";
}
.${arch};
in
@@ -20,7 +20,6 @@
file,
which,
zip,
perl,
zlib,
cups,
freetype,
@@ -48,6 +47,7 @@
liberation_ttf,
cacert,
jre-generate-cacerts,
nixpkgs-openjdk-updater,
@@ -255,8 +255,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (!atLeast11) [
lndir
# Certificates generated using perl in `installPhase`
perl
]
++ lib.optionals (!atLeast11 && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
# Certificates generated using keytool in `installPhase`
@@ -555,7 +553,7 @@ stdenv.mkDerivation (finalAttrs: {
+ ''
cd $jre/lib/openjdk/jre/lib/security
rm cacerts
perl ${./8/generate-cacerts.pl} ${
${jre-generate-cacerts} ${
if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
"$jre/lib/openjdk/jre/bin/keytool"
else
@@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2025-09-09";
version = "2.20.1-unstable-2025-09-17";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";
sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";
url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -0,0 +1,53 @@
# This file defines distribution-nixpkgs-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
{
mkDerivation,
aeson,
base,
bytestring,
Cabal,
containers,
deepseq,
directory,
fetchzip,
hspec,
language-nix,
lens,
lib,
pretty,
process,
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.7.1.1-unstable-2025-09-17";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
base
bytestring
Cabal
containers
deepseq
language-nix
lens
pretty
process
];
testHaskellDepends = [
aeson
base
Cabal
deepseq
directory
hspec
language-nix
lens
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.licenses.bsd3;
}
@@ -0,0 +1,44 @@
# This file defines hackage-db-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
{
mkDerivation,
aeson,
base,
bytestring,
Cabal,
containers,
directory,
exceptions,
fetchzip,
filepath,
lib,
tar,
time,
utf8-string,
}:
mkDerivation {
pname = "hackage-db";
version = "2.1.3-unstable-2025-09-17";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson
base
bytestring
Cabal
containers
directory
exceptions
filepath
tar
time
utf8-string
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
description = "Access cabal-install's Hackage database via Data.Map";
license = lib.licenses.bsd3;
}
@@ -0,0 +1,41 @@
# This file defines language-nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
{
mkDerivation,
base,
deepseq,
fetchzip,
hspec,
lens,
lib,
parsec-class,
pretty,
QuickCheck,
}:
mkDerivation {
pname = "language-nix";
version = "2.3.0-unstable-2025-09-17";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
base
deepseq
lens
parsec-class
pretty
QuickCheck
];
testHaskellDepends = [
base
hspec
lens
parsec-class
pretty
QuickCheck
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
description = "Data types and functions to represent the Nix language";
license = lib.licenses.bsd3;
}
@@ -171,12 +171,16 @@ with haskellLib;
];
cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay;
distribution-nixpkgs-unstable = super.distribution-nixpkgs-unstable.overrideScope cabalInstallOverlay;
hackage-db-unstable = super.hackage-db-unstable.overrideScope cabalInstallOverlay;
}
)
cabal-install
cabal-install-solver
guardian
cabal2nix-unstable
distribution-nixpkgs-unstable
hackage-db-unstable
;
# Expected test output for these accidentally checks the absolute location of the source directory
@@ -354,22 +354,24 @@ self: super:
# after verifying they are indeed erroneous (e.g. cabal2nix) or just disable
# the check, sticking with the status quo. Ideally there'll be zero cases of
# the latter in the future!
inherit
(lib.mapAttrs (
_:
overrideCabal (old: {
postInstall = ''
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
# Note: The `data` output is needed at runtime.
remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"
cabal2nix = overrideCabal (old: {
postInstall = ''
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
# Note: The `data` output is needed at runtime.
remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"
${old.postInstall or ""}
'';
})
) super)
cabal2nix
cabal2nix-unstable
;
${old.postInstall or ""}
'';
}) super.cabal2nix;
cabal2nix-unstable = overrideCabal (old: {
postInstall = ''
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
# Note: The `data` output is needed at runtime.
remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "$out/bin/hackage2nix"
${old.postInstall or ""}
'';
}) super.cabal2nix-unstable;
# https://github.com/fpco/unliftio/issues/87
unliftio = dontCheck super.unliftio;
File diff suppressed because it is too large Load Diff
@@ -28,7 +28,16 @@ self: super:
# Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
# from the latest master instead of the current version on Hackage.
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable/cabal2nix.nix {
distribution-nixpkgs = self.distribution-nixpkgs-unstable;
hackage-db = self.hackage-db-unstable;
language-nix = self.language-nix-unstable;
};
distribution-nixpkgs-unstable = self.callPackage ./cabal2nix-unstable/distribution-nixpkgs.nix {
language-nix = self.language-nix-unstable;
};
hackage-db-unstable = self.callPackage ./cabal2nix-unstable/hackage-db.nix { };
language-nix-unstable = self.callPackage ./cabal2nix-unstable/language-nix.nix { };
ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { };
@@ -7,7 +7,6 @@
kconfig,
kcoreaddons,
kwindowsystem,
libdbusmenu,
phonon,
qttools,
qtx11extras,
@@ -25,7 +24,6 @@ mkDerivation {
kconfig
kcoreaddons
kwindowsystem
libdbusmenu
phonon
qtx11extras
]
@@ -1,33 +0,0 @@
{
lib,
stdenv,
fetchgit,
cmake,
qtbase,
}:
stdenv.mkDerivation rec {
pname = "libdbusmenu-qt";
version = "0.9.3+16";
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt";
rev = "import/${version}.04.20160218-1";
sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx";
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DWITH_DOC=OFF" ];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://launchpad.net/libdbusmenu-qt";
description = "Provides a Qt implementation of the DBusMenu spec";
maintainers = [ maintainers.ttuegel ];
inherit (qtbase.meta) platforms;
license = licenses.lgpl2;
};
}
@@ -6,33 +6,9 @@
fetchFromGitHub,
cmake,
pkg-config,
box2d,
unstableGitUpdater,
}:
let
inherit (lib) cmakeBool;
# 2.3.1 is the only supported version
box2d' = box2d.overrideAttrs (old: rec {
version = "2.3.1";
src = fetchFromGitHub {
owner = "erincatto";
repo = "box2d";
tag = "v${version}";
hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
};
patches = [ ];
postPatch = "";
sourceRoot = "${src.name}/Box2D";
cmakeFlags = old.cmakeFlags or [ ] ++ [
(cmakeBool "BOX2D_INSTALL" true)
(cmakeBool "BOX2D_BUILD_SHARED" true)
(cmakeBool "BOX2D_BUILD_EXAMPLES" false)
];
});
in
stdenv.mkDerivation {
pname = "qml-box2d";
version = "0-unstable-2024-04-15";
@@ -52,15 +28,10 @@ stdenv.mkDerivation {
];
buildInputs = [
box2d'
qtbase
qtdeclarative
];
cmakeFlags = [
(cmakeBool "USE_SYSTEM_BOX2D" true)
];
passthru = {
updateScript = unstableGitUpdater {
hardcodeZeroVersion = true;
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "buildstream-plugins";
version = "2.4.0";
version = "2.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "apache";
repo = "buildstream-plugins";
tag = version;
hash = "sha256-VAHDMy4DvNneWP1jhrIZzogZ5Gz5PS/GcFpOg2cGYvs=";
hash = "sha256-nWs18iYXRcEIWVvIC3pnbhczK7Fxf2Jqk4GT7Dv0EXs=";
};
build-system = [
@@ -37,14 +37,14 @@
buildPythonPackage rec {
pname = "dbt-core";
version = "1.10.9";
version = "1.10.11";
pyproject = true;
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "dbt-core";
tag = "v${version}";
hash = "sha256-4K00EVTOTTUHWwTpBlXKoHGof/s/H2acoWZPJ9FmBuk=";
hash = "sha256-qgfifygy+GY8LB+4pKYOH13cRaYNuMCSdCa++olgsBM=";
};
sourceRoot = "${src.name}/core";
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "itables";
version = "2.4.4";
version = "2.5.2";
# itables has 4 different node packages, each with their own
# package-lock.json, and partially depending on each other.
@@ -30,7 +30,7 @@ buildPythonPackage rec {
# the source tarball from pypi, which includes the javascript bundle already.
src = fetchPypi {
inherit pname version;
hash = "sha256-KeK3cff9OrcLnSI0YVtXPaMl5hCDJpfphmgMzANqr1s=";
hash = "sha256-7DS7rPv0MFVw6nWzaXDeRC+SQSbzcBwyOlpGAY3oTIo=";
};
pyproject = true;
@@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
lesscpy,
matplotlib,
notebook,
setuptools,
}:
buildPythonPackage rec {
pname = "jupyter-themes";
version = "0.20.0";
pyproject = true;
src = fetchFromGitHub {
owner = "dunovank";
repo = "jupyter-themes";
tag = "v${version}";
hash = "sha256-AWbUXMOA6k2LpZtcJOPxTZb1oL5vLDbBq4aEhXWvy9M=";
};
build-system = [ setuptools ];
dependencies = [
lesscpy
matplotlib
notebook
];
pythonImportsCheck = [ "jupyterthemes" ];
meta = {
description = "Theme-ify your Jupyter Notebooks!";
homepage = "https://github.com/dunovank/jupyter-themes";
changelog = "https://github.com/dunovank/jupyter-themes/blob/v${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jherland ];
mainProgram = "jupyter-theme";
};
}
@@ -21,20 +21,23 @@
pythonOlder,
vacuum-map-parser-roborock,
pyshark,
pyyaml,
click-shell,
syrupy,
}:
buildPythonPackage rec {
pname = "python-roborock";
version = "2.39.0";
version = "2.44.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "humbertogontijo";
owner = "Python-roborock";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-V0zuUlJ0wPpxOKtY7ydbJ7mhWT5xGSLv19csmpWCO1Q=";
hash = "sha256-Vd6ivFF55EXYymf6ulayW/X1yfNojL5N4p+I2CvWJP4=";
};
postPatch = ''
@@ -57,7 +60,9 @@ buildPythonPackage rec {
pycryptodome
pyrate-limiter
vacuum-map-parser-roborock
pyyaml
pyshark
click-shell
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
@@ -66,14 +71,15 @@ buildPythonPackage rec {
freezegun
pytest-asyncio
pytestCheckHook
syrupy
];
pythonImportsCheck = [ "roborock" ];
meta = with lib; {
description = "Python library & console tool for controlling Roborock vacuum";
homepage = "https://github.com/humbertogontijo/python-roborock";
changelog = "https://github.com/humbertogontijo/python-roborock/blob/${src.tag}/CHANGELOG.md";
homepage = "https://github.com/Python-roborock/python-roborock";
changelog = "https://github.com/Python-roborock/python-roborock/blob/${src.tag}/CHANGELOG.md";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "roborock";
@@ -11,7 +11,7 @@
darcs,
findutils,
gawk,
git,
gitMinimal,
git-lfs,
gnused,
jq,
@@ -73,7 +73,7 @@ rec {
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [
findutils
gawk
git
gitMinimal
git-lfs
];
nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "git-credential-gopass";
version = "1.15.16";
version = "1.15.17";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "git-credential-gopass";
rev = "v${version}";
hash = "sha256-R3PQtBUu2qApexr1jk1cROr73sWsGfDHimf2oZa1Y8U=";
hash = "sha256-dMCDRrq0o6naobsnKLedY6ORJdEOPdGG7L49VmcQiJQ=";
};
vendorHash = "sha256-FE4ZZjXOWx4swj5FMNN7keZjK2BHkGF0deegbZaBak0=";
vendorHash = "sha256-MoellcZ/4iDu1hZ/5qvupfozl+iUP7Uc4RV0LxPaIOc=";
subPackages = [ "." ];
+5 -5
View File
@@ -10327,10 +10327,10 @@ with self;
DBIxSearchBuilder = buildPerlPackage {
pname = "DBIx-SearchBuilder";
version = "1.77";
version = "1.82";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.77.tar.gz";
hash = "sha256-O/il1cjF/cYK0vY/Y/c90fZJP/TYJYcoOj4iM36P4HA=";
url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.82.tar.gz";
hash = "sha256-3IDX5PRVdt4/2Ui2slD+3FAM/QCrzTC2qLLXeJV2uPE=";
};
buildInputs = [ DBDSQLite ];
propagatedBuildInputs = [
@@ -16201,8 +16201,8 @@ with self;
pname = "HTML-RewriteAttributes";
version = "0.05";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz";
hash = "sha256-GAjsfN9A0nCFdf5hVaiPEDsX/sd5c6WDHC8kwlDnpYw=";
url = "mirror://cpan/authors/id/B/BP/BPS/HTML-RewriteAttributes-0.06.tar.gz";
hash = "sha256-vGQgAmEUL5pffgeG3FqySmMwvBm9Hj6btLbXwxYhtyI=";
};
propagatedBuildInputs = [ HTMLParser ];
meta = {
+2
View File
@@ -7651,6 +7651,8 @@ self: super: with self; {
jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };
jupyter-themes = callPackage ../development/python-modules/jupyter-themes { };
jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { };
jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { };
-4
View File
@@ -108,8 +108,6 @@ makeScopeWithSplicing' {
libcommuni = callPackage ../development/libraries/libcommuni { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
libiodata = callPackage ../development/libraries/libiodata { };
liblastfm = callPackage ../development/libraries/liblastfm { };
@@ -171,8 +169,6 @@ makeScopeWithSplicing' {
qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
qoauth = callPackage ../development/libraries/qoauth { };
qt5ct = callPackage ../tools/misc/qt5ct { };