Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #247

Merged
merged 88 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
e6515d8
tmuxinator: 3.3.2 -> 3.3.3
Marlinc Dec 4, 2024
5ae3243
kstars: 3.7.2 -> 3.7.4
Defelo Dec 17, 2024
41a4722
stackql: 0.6.7 -> 0.6.32
r-ryantm Dec 20, 2024
ce561f6
processing: 4.3 -> 4.3.1
evan-goode Dec 21, 2024
6afb168
prowler: 5.0.2 -> 5.0.4
fabaff Dec 21, 2024
8aaa023
nats-server: 2.10.23 -> 2.10.24
r-ryantm Dec 22, 2024
b8542b3
vivaldi: 7.0.3495.23 -> 7.0.3495.27
r-ryantm Dec 22, 2024
8dd90cf
shiori: 1.7.1 -> 1.7.2
r-ryantm Dec 22, 2024
cf8136f
mousam: 1.3.2 -> 1.4.0
r-ryantm Dec 22, 2024
ceaf204
mongosh: 2.3.3 -> 2.3.7
niklaskorz Dec 13, 2024
3221a34
libspatialindex: 2.0.0 -> 2.1.0
r-ryantm Dec 23, 2024
440a6ea
sqlitestudio: 3.4.10 -> 3.4.12
AsterisMono Dec 23, 2024
314723e
heptabase: 1.48.1 -> 1.49.0
r-ryantm Dec 23, 2024
410d846
satty: 0.14.0 -> 0.15.0
r-ryantm Dec 23, 2024
e77978f
syslinux: fixup build with gcc14
vcunat Dec 23, 2024
be4a61a
python312Packages.appthreat-vulnerability-db: 6.2.2 -> 6.2.3
fabaff Dec 23, 2024
e55ae8e
python312Packages.asyncio-dgram: fix hash
fabaff Dec 23, 2024
2311cf9
python312Packages.keba-kecontact: 3.0.3 -> 4.0.2
fabaff Dec 23, 2024
39b7639
python312Packages.pyswitchbot: 0.54.0 -> 0.55.4
fabaff Dec 23, 2024
00f5eec
python312Packages.pyexploitdb: 0.2.59 -> 0.2.60
fabaff Dec 23, 2024
012eed4
darklua: 0.14.1 -> 0.15.0
r-ryantm Dec 24, 2024
749f085
tuba: 0.9.0 -> 0.9.1
getchoo Dec 24, 2024
1077e45
ubports-click: unstable-2023-02-22 -> 0.5.2
OPNA2608 Dec 24, 2024
ab54cad
ubports-click: Modernise
OPNA2608 Dec 24, 2024
774cfbe
ubports-click: Add passthru.updateScript
OPNA2608 Dec 24, 2024
7cf7b90
mailpit: 1.21.6 -> 1.21.8
r-ryantm Dec 24, 2024
65121a8
ubports-click: Migrate to by-pkgs
OPNA2608 Dec 24, 2024
2bdbb27
python312Packages.flask-security: fix test
gador Dec 24, 2024
5f3da53
ubports-click: Get rid of externally-supplied self
OPNA2608 Dec 24, 2024
dba1cb7
ubports-click: nixfmt
OPNA2608 Dec 24, 2024
e820be2
python312Packages.apprise: 1.9.0 -> 1.9.1
fabaff Dec 24, 2024
987a75d
agebox: 0.7.1 -> 0.7.2
LeSuisse Dec 24, 2024
4cfa725
agebox: move to buildGoModule
LeSuisse Dec 24, 2024
859498b
yaralyzer: 0.9.5 -> 0.9.6
r-ryantm Dec 24, 2024
b810487
home-manager: 0-unstable-2024-12-12 -> 0-unstable-2024-12-23
r-ryantm Dec 24, 2024
a36a61d
shopware-cli: 0.4.61 -> 0.4.62
r-ryantm Dec 24, 2024
d619849
roadrunner: 2024.3.0 -> 2024.3.1
r-ryantm Dec 24, 2024
ee3ba59
commix: 3.9 -> 4.0
r-ryantm Dec 24, 2024
45ce75a
trivy: 0.58.0 -> 0.58.1
r-ryantm Dec 24, 2024
6735231
renovate: 39.65.2 -> 39.82.6
r-ryantm Dec 24, 2024
e5b556e
python312Packages.garth: 0.5.1 -> 0.5.2
r-ryantm Dec 24, 2024
ccc2d4c
cunicu: 0.5.72 -> 0.6.5
r-ryantm Dec 24, 2024
d9755f2
limbo: 0.0.9 -> 0.0.10
nartsisss Dec 25, 2024
7900f20
skeema: 1.12.1 -> 1.12.2
r-ryantm Dec 25, 2024
7352e1a
syslinux: fixup build with gcc14 (#367685)
K900 Dec 25, 2024
7a2cb2a
nixos/plasma6: default to Wayland for SDDM
K900 Dec 25, 2024
7d57a90
cunicu: 0.5.72 -> 0.6.5 (#368015)
nixpkgs-merge-bot[bot] Dec 25, 2024
8765af2
agebox: 0.7.1 -> 0.7.2 (#367884)
leona-ya Dec 25, 2024
dd19a73
python312Packages.pyswitchbot: 0.54.0 -> 0.55.4 (#367751)
fabaff Dec 25, 2024
ee0f85b
python312Packages.pyexploitdb: 0.2.59 -> 0.2.60 (#367754)
fabaff Dec 25, 2024
2437e43
python312Packages.apprise: 1.9.0 -> 1.9.1 (#367893)
fabaff Dec 25, 2024
5261bc0
python312Packages.keba-kecontact: 3.0.3 -> 4.0.2 (#367744)
fabaff Dec 25, 2024
7ee4dc8
python312Packages.appthreat-vulnerability-db: 6.2.2 -> 6.2.3 (#367743)
fabaff Dec 25, 2024
2f8a3d6
prowler: 5.0.2 -> 5.0.4 (#367200)
fabaff Dec 25, 2024
1a93279
commix: 3.9 -> 4.0 (#367934)
fabaff Dec 25, 2024
bd9c065
trivy: 0.58.0 -> 0.58.1 (#367944)
fabaff Dec 25, 2024
39490b0
python312Packages.garth: 0.5.1 -> 0.5.2 (#367991)
fabaff Dec 25, 2024
029393b
yaralyzer: 0.9.5 -> 0.9.6 (#367890)
fabaff Dec 25, 2024
06af86f
nixos/plasma6: default to Wayland for SDDM (#368074)
K900 Dec 25, 2024
45b0aee
ruby-grpc: gcc-14 fixes (#367783)
paparodeo Dec 25, 2024
6160689
satty: 0.14.0 -> 0.15.0 (#367671)
donovanglover Dec 25, 2024
e18b860
tuba: 0.9.0 -> 0.9.1 (#367818)
donovanglover Dec 25, 2024
f8ae38b
stackql: 0.6.7 -> 0.6.32 (#366889)
misuzu Dec 25, 2024
a2f7244
nats-server: 2.10.23 -> 2.10.24 (#367279)
misuzu Dec 25, 2024
29837d7
vivaldi: 7.0.3495.23 -> 7.0.3495.27 (#367333)
misuzu Dec 25, 2024
611abd4
shiori: 1.7.1 -> 1.7.2 (#367390)
misuzu Dec 25, 2024
5e0ff57
mousam: 1.3.2 -> 1.4.0 (#367426)
misuzu Dec 25, 2024
1b0e579
heptabase: 1.48.1 -> 1.49.0 (#367634)
misuzu Dec 25, 2024
9526f11
darklua: 0.14.1 -> 0.15.0 (#367798)
misuzu Dec 25, 2024
233d7cc
mailpit: 1.21.6 -> 1.21.8 (#367865)
misuzu Dec 25, 2024
d00a63a
libspatialindex: 2.0.0 -> 2.1.0 (#367528)
misuzu Dec 25, 2024
1046155
kstars: 3.7.2 -> 3.7.4 (#365965)
donovanglover Dec 25, 2024
bd7b083
mongosh: 2.3.3 -> 2.3.7 (#364954)
donovanglover Dec 25, 2024
083902d
tmuxinator: 3.3.2 -> 3.3.3 (#361879)
donovanglover Dec 25, 2024
87060a0
shopware-cli: 0.4.61 -> 0.4.62 (#367898)
nixpkgs-merge-bot[bot] Dec 25, 2024
661bd2f
roadrunner: 2024.3.0 -> 2024.3.1 (#367899)
nixpkgs-merge-bot[bot] Dec 25, 2024
9edf772
maintainers: drop milahu
mweinelt Dec 25, 2024
0db04a8
processing: 4.3 -> 4.3.1 (#367025)
donovanglover Dec 25, 2024
9e867d4
skeema: 1.12.1 -> 1.12.2 (#368050)
nixpkgs-merge-bot[bot] Dec 25, 2024
b29f28a
qt6.qtwebengine: backport aarch64 build fix for xnnpack
K900 Dec 25, 2024
06ebfab
renovate: 39.65.2 -> 39.82.6 (#367983)
nixpkgs-merge-bot[bot] Dec 25, 2024
a77ab0a
limbo: 0.0.9 -> 0.0.10 (#368035)
donovanglover Dec 25, 2024
72a8515
sqlitestudio: 3.4.10 -> 3.4.12 (#367569)
donovanglover Dec 25, 2024
b9095aa
python312Packages.flask-security: fix test (#367863)
gador Dec 25, 2024
6748e87
home-manager: 0-unstable-2024-12-12 -> 0-unstable-2024-12-23 (#367896)
nixpkgs-merge-bot[bot] Dec 25, 2024
eea4be5
qt6.qtwebengine: backport aarch64 build fix for xnnpack (#368101)
K900 Dec 25, 2024
bdfccb2
maintainers: drop milahu (#368094)
mweinelt Dec 25, 2024
04e40bc
ubports-click: Bump, modernise, fix GCC 14 compat (#367871)
OPNA2608 Dec 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14811,12 +14811,6 @@
name = "Marcin Mikuła";
keys = [ { fingerprint = "5547 2A56 AC30 69C9 15C8 B98D 997F 71FA 1D74 6E37"; } ];
};
milahu = {
email = "[email protected]";
github = "milahu";
githubId = 12958815;
name = "Milan Hauth";
};
milesbreslin = {
email = "[email protected]";
github = "MilesBreslin";
Expand Down
5 changes: 4 additions & 1 deletion nixos/modules/services/desktop-managers/plasma6.nix
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,10 @@ in
services.displayManager.sddm = {
package = kdePackages.sddm;
theme = mkDefault "breeze";
wayland.compositor = "kwin";
wayland = mkDefault {
enable = true;
compositor = "kwin";
};
extraPackages = with kdePackages; [
breeze-icons
kirigami
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/graphics/processing/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
libGL,
}:
let
buildNumber = "1293";
buildNumber = "1294";
vaqua = fetchurl {
name = "VAqua9.jar";
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
Expand Down Expand Up @@ -61,13 +61,13 @@ let
in
stdenv.mkDerivation rec {
pname = "processing";
version = "4.3";
version = "4.3.1";

src = fetchFromGitHub {
owner = "processing";
repo = "processing4";
rev = "processing-${buildNumber}-${version}";
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
sha256 = "sha256-nshhPeDXhrvk+2oQ9BPqJTZV9a+OjxeQiO31JAxQ40g=";
};

nativeBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/maui/booth.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ mkDerivation {
mainProgram = "booth";
homepage = "https://invent.kde.org/maui/booth";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ milahu ];
maintainers = with maintainers; [ ];
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "7.0.3495.23";
version = "7.0.3495.27";

suffix = {
aarch64-linux = "arm64";
Expand All @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-mnu76Lu4xKaA0mZYto3wOYZl65i6SDU56Lo3dH59mtM=";
x86_64-linux = "sha256-FtCmtwipbEyhTmt/d5tSEc7MKrrPssiSWzcC7AYy3tg=";
aarch64-linux = "sha256-AX6PCYPpz5z9bUZqdfoTqtW9USLQRh8YgITk7DdJkUU=";
x86_64-linux = "sha256-pZgmRLwx64m9SwYX2cTwYEkHLYFQgIFblW9dSiYxXv8=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/science/astronomy/kstars/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
stdenv,
mkDerivation,
extra-cmake-modules,
fetchurl,
kconfig,
Expand Down Expand Up @@ -34,15 +33,15 @@
wcslib,
stellarsolver,
libxisf,
curl,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "kstars";
version = "3.7.2";
version = "3.7.4";

src = fetchurl {
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
hash = "sha256-fEu3BGBW5cgrY38zBB3iL0/SRrobEtJVsGNWRNtT40s=";
hash = "sha256-WdVsPCwDQWW/NIRehuqk5f8rgtucAbGLSbmwZLMLiHM=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -80,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
wcslib
stellarsolver
libxisf
curl
];

cmakeFlags = [
Expand Down
12 changes: 5 additions & 7 deletions pkgs/by-name/ag/agebox/package.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{
lib,
# Required based on 'go' directive in go.mod,
# remove when Go in nixpkgs defaults to 1.23 or later.
buildGo123Module,
buildGoModule,
fetchFromGitHub,
}:

buildGo123Module rec {
buildGoModule rec {
pname = "agebox";
version = "0.7.1";
version = "0.7.2";

src = fetchFromGitHub {
owner = "slok";
repo = pname;
rev = "v${version}";
hash = "sha256-RtFa7k+tw0hyf7bYm51aIxptaD4uOH6/3WDjeoWEEKA=";
hash = "sha256-QH0kkquLnB00oKuwb5j2ZoAKPnZkSHJRGaq3RXO5ggg=";
};

vendorHash = "sha256-57YbYDvRYOzQATEFpAuGzQzOYNY8n5LUrcu8jhjSiNI=";
vendorHash = "sha256-s3LZgQpUF0t9ETNloJux4gXXSn5Kg+pcuhJSMfWWnSo=";

ldflags = [
"-s"
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/co/commix/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

python3.pkgs.buildPythonApplication rec {
pname = "commix";
version = "3.9";
version = "4.0";
pyproject = true;

src = fetchFromGitHub {
owner = "commixproject";
repo = "commix";
rev = "refs/tags/v${version}";
hash = "sha256-HX+gEL9nmq9R1GFw8xQaa7kBmW7R0IepitM08bIf3vY=";
tag = "v${version}";
hash = "sha256-AikhXMacsJ7AZyKWcmu+ngs9KeiwQE60cpM2CV8ej1Y=";
};

postPatch = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/cu/cunicu/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
}:
buildGoModule rec {
pname = "cunicu";
version = "0.5.72";
version = "0.6.5";

src = fetchFromGitHub {
owner = "cunicu";
repo = "cunicu";
rev = "v${version}";
hash = "sha256-W6EoFlRr8WVg5k5bk9L9RAMLLazd1uzufXmzP82WIiU=";
hash = "sha256-bDXZ0a9yQZMHmNrwKRQzLoPtwkthDIDRhBxDAeXN064=";
};

vendorHash = "sha256-gLvTLXNJkgqmDr08kH0dg0MBVMRawBG7lJjIFy2US14=";
vendorHash = "sha256-g2FA5b/80yRwIbAf3Sot74Eftj/Q/bTBj8lK+tQ2UNg=";

nativeBuildInputs = [
installShellFiles
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/da/darklua/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

rustPlatform.buildRustPackage rec {
pname = "darklua";
version = "0.14.1";
version = "0.15.0";

src = fetchFromGitHub {
owner = "seaofvoices";
repo = "darklua";
rev = "v${version}";
hash = "sha256-Q0kNt+4Nu7zVniiTRzGu7pNfWiXkxGaYkzgelaECn9U=";
hash = "sha256-OLx3J8E9PYXgWbQncWoezyptrbFYcw3xmXzYAn7IUFw=";
};

cargoHash = "sha256-G3XvfDQjx1wbALnTQbSHOvBWc5JTKzwJFwNABtK12sM=";
cargoHash = "sha256-bG5bjtA5a1gSabH9nqfYg/gdt2jfddlbPY3P6HEhQ2s=";

buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/he/heptabase/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
}:
let
pname = "heptabase";
version = "1.48.1";
version = "1.49.0";
src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
hash = "sha256-zscrloVYmR4NSNWINqdAP/9gHu5+GpFTRq0MF7bNE2Y=";
hash = "sha256-4YjhJEuDMKNvIHir6Je4MKbgZzTfPxdMeuvF/F+kYvw=";
};

appimageContents = appimageTools.extractType2 { inherit pname version src; };
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/ho/home-manager/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-12-12";
version = "0-unstable-2024-12-23";

src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "3066cc58f552421a2c5414e78407fa5603405b1e";
hash = "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=";
rev = "f1b1786ea77739dcd181b920d430e30fb1608b8a";
hash = "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/li/libspatialindex/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "libspatialindex";
version = "2.0.0";
version = "2.1.0";

src = fetchFromGitHub {
owner = "libspatialindex";
repo = "libspatialindex";
rev = finalAttrs.version;
hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20=";
hash = "sha256-a2CzRLHdQMnVhHZhwYsye4X644r8gp1m6vU2CJpSRpU=";
};

postPatch = ''
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/li/limbo/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "limbo";
version = "0.0.9";
version = "0.0.10";

src = fetchFromGitHub {
owner = "tursodatabase";
repo = "limbo";
tag = "v${version}";
hash = "sha256-cUGakjq6PFUKSMPKGL1CcYUjDMzdTUWUqMs0J8ZNaeQ=";
hash = "sha256-RTX/CRfUKvMSZhULhZD+PcYcc+a1gxANMxm+GmNyb3M=";
};

cargoHash = "sha256-pXMfAMD8ThMQvYRLTYuPimPoN42OXOL8Li0LsoQ/13A=";
cargoHash = "sha256-BzVPaT7eGOQKRkZe2ZK4rWjHQ2WM7YVMo2siUhpGfOM=";

cargoBuildFlags = [
"-p"
Expand All @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Interactive SQL shell for Limbo";
homepage = "https://github.com/tursodatabase/limbo";
changelog = "https://github.com/tursodatabase/limbo/releases/tag/${src.tag}";
changelog = "https://github.com/tursodatabase/limbo/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nartsiss ];
mainProgram = "limbo";
Expand Down
Loading
Loading