gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2025-01-11 00:14:32 +00:00
committed by GitHub
parent eede7811b4 e9b1bb016b
commit e0220561a9
110 changed files with 1324 additions and 2803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/hardware/upower.nix
+40 -3
View File
@@ -179,13 +179,31 @@ in
'';
};
allowRiskyCriticalPowerAction = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Enable the risky critical power actions "Suspend" and "Ignore".
'';
};
criticalPowerAction = lib.mkOption {
type = lib.types.enum [ "PowerOff" "Hibernate" "HybridSleep" ];
type = lib.types.enum [
"PowerOff"
"Hibernate"
"HybridSleep"
"Suspend"
"Ignore"
];
default = "HybridSleep";
description = ''
The action to take when `timeAction` or
`percentageAction` has been reached for the batteries
(UPS or laptop batteries) supplying the computer
(UPS or laptop batteries) supplying the computer.
When set to `Suspend` or `Ignore`,
{option}`services.upower.allowRiskyCriticalPowerAction` must be set
to `true`.
'';
};
@@ -193,10 +211,28 @@ in
};
###### implementation
config = lib.mkIf cfg.enable {
assertions = [
{
assertion =
let
inherit (builtins) elem;
riskyActions = [
"Suspend"
"Ignore"
];
riskyActionEnabled = elem cfg.criticalPowerAction riskyActions;
in
riskyActionEnabled -> cfg.allowRiskyCriticalPowerAction;
message = ''
services.upower.allowRiskyCriticalPowerAction must be true if
services.upower.criticalPowerAction is set to
'${cfg.criticalPowerAction}'.
'';
}
];
environment.systemPackages = [ cfg.package ];
@@ -218,6 +254,7 @@ in
TimeLow = cfg.timeLow;
TimeCritical = cfg.timeCritical;
TimeAction = cfg.timeAction;
AllowRiskyCriticalPowerAction = cfg.allowRiskyCriticalPowerAction;
CriticalPowerAction = cfg.criticalPowerAction;
};
};
nixos/tests/all-tests.nix
+1 -5
View File
@@ -360,11 +360,7 @@ in {
freenet = handleTest ./freenet.nix {};
freeswitch = handleTest ./freeswitch.nix {};
freetube = discoverTests (import ./freetube.nix);
freshrss-extensions = handleTest ./freshrss-extensions.nix {};
freshrss-sqlite = handleTest ./freshrss-sqlite.nix {};
freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};
freshrss-http-auth = handleTest ./freshrss-http-auth.nix {};
freshrss-none-auth = handleTest ./freshrss-none-auth.nix {};
freshrss = handleTest ./freshrss {};
frigate = handleTest ./frigate.nix {};
frp = handleTest ./frp.nix {};
frr = handleTest ./frr.nix {};
nixos/tests/freshrss/default.nix
+9
View File
@@ -0,0 +1,9 @@
{ system, pkgs, ... }:
{
extensions = import ./extensions.nix { inherit system pkgs; };
http-auth = import ./http-auth.nix { inherit system pkgs; };
none-auth = import ./none-auth.nix { inherit system pkgs; };
pgsql = import ./pgsql.nix { inherit system pkgs; };
sqlite = import ./sqlite.nix { inherit system pkgs; };
}
nixos/tests/freshrss-extensions.nix → nixos/tests/freshrss/extensions.nix
+2 -2
View File
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
import ../make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "freshrss";
name = "freshrss-extensions";
nodes.machine =
{ pkgs, ... }:
nixos/tests/freshrss-http-auth.nix → nixos/tests/freshrss/http-auth.nix
+2 -2
View File
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
import ../make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "freshrss";
name = "freshrss-http-auth";
meta.maintainers = with lib.maintainers; [ mattchrist ];
nodes.machine =
nixos/tests/freshrss-none-auth.nix → nixos/tests/freshrss/none-auth.nix
+2 -2
View File
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
import ../make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "freshrss";
name = "freshrss-none-auth";
meta.maintainers = with lib.maintainers; [ mattchrist ];
nodes.machine =
nixos/tests/freshrss-pgsql.nix → nixos/tests/freshrss/pgsql.nix
+2 -2
View File
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
import ../make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "freshrss";
name = "freshrss-pgsql";
meta.maintainers = with lib.maintainers; [
etu
stunkymonkey
nixos/tests/freshrss-sqlite.nix → nixos/tests/freshrss/sqlite.nix
+2 -2
View File
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
import ../make-test-python.nix (
{ lib, pkgs, ... }:
{
name = "freshrss";
name = "freshrss-sqlite";
meta.maintainers = with lib.maintainers; [
etu
stunkymonkey
pkgs/applications/audio/reaper/default.nix
+4 -4
View File
@@ -38,17 +38,17 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.29";
version = "7.30";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash =
if stdenv.hostPlatform.isDarwin then
"sha256-b1Gb5guaFyWrt9KEwptuXGvfrJAvgnFEl8QuwSufktE="
"sha256-nPt2dWbbctRrC3+UufMMLiAikOaMB33tDfFCscJx5cA="
else
{
x86_64-linux = "sha256-uFK8Y36pYTDK3foCKH9kiq3u1MTir2nNM5KrDwIHEm0=";
aarch64-linux = "sha256-KZTUeEtyAVwIFTmclYv4GcGJ2WXukEF0/mfYmmBPfz0=";
x86_64-linux = "sha256-rN4SMGkoO03JCmPOKabOdOlk2nfmGDYk1tSfniPyRnQ=";
aarch64-linux = "sha256-kASD5099XAoy6w3K5z0y8xrSNpomTWAFOWjtHgULwAA=";
}
.${stdenv.hostPlatform.system};
};
pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2024-11-15";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
rev = "1068cb8dbd6f312664ecf5901625cab4a6533204";
hash = "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA=";
rev = "60cf49e94e65d4023d93718161dc03b9e24da47a";
hash = "sha256-EFiLF/5zcoPFnzozEqkXWOEjx3KCgRoixYXqN9ai7qc=";
};
extraBuildInputs = lib.optionals withHw [
pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
mkLibretroCore {
core = "mednafen-supafaust";
version = "0-unstable-2024-10-01";
version = "0-unstable-2024-09-30";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/bsnes.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
version = "0-unstable-2024-12-13";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
rev = "a0bb11bbb1fc5d6b478baca53c3efe526c43986c";
hash = "sha256-unOJ2hdCA5LxNUcJe7fJCAetLpqrQzujxFDOsxLzXow=";
rev = "1e0054da1c158857dc444b9b52273ddd18858d49";
hash = "sha256-zm4X5RTaAm2njtvCBWBT1vhtf/YQvoBaaBSMzz9D2aQ=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/desmume2015.nix
+1 -1
View File
@@ -10,7 +10,7 @@
}:
mkLibretroCore {
core = "desmume2015";
version = "0-unstable-2024-10-21";
version = "0-unstable-2022-04-05";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2024-09-28";
version = "0-unstable-2024-12-31";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "9b4147fd14332a7354c9b76fa72653bda2d919e9";
hash = "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I=";
rev = "9e468f0087454c6c1b68975ead933977d5cf33b2";
hash = "sha256-tiyDXxwZapu+Ol1icOeemVQ5oAjMMx2/M4nA0CiRkMY=";
};
hardeningDisable = [ "format" ];
pkgs/applications/emulators/libretro/cores/easyrpg.nix
+3
View File
@@ -67,6 +67,9 @@ mkLibretroCore {
];
makefile = "Makefile";
# Do not update automatically since we want to pin a specific version
passthru.updateScript = null;
meta = {
description = "EasyRPG Player libretro port";
homepage = "https://github.com/EasyRPG/Player";
pkgs/applications/emulators/libretro/cores/fbneo.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2024-10-03";
version = "0-unstable-2025-01-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5";
hash = "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE=";
rev = "b8780c057029db8768c9a057b0bc28f9a12609d8";
hash = "sha256-cK3ILA0Ape6rHf5dPbXOMmQ69ZPZ/qrxeKYA1LniBEk=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/flycast.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2024-10-05";
version = "0-unstable-2025-01-09";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "d689c50e21bf956913ac607933cd4082eaedc06b";
hash = "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k=";
rev = "3114344414dbd8fb08efe1d6a25dbae457a2ec44";
hash = "sha256-UgH8L02WkAPaMMUnes6GYLjRbkuY8+9b6LCGaaQWhjQ=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/fuse.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fuse";
version = "0-unstable-2024-09-20";
version = "0-unstable-2024-11-24";
src = fetchFromGitHub {
owner = "libretro";
repo = "fuse-libretro";
rev = "6fd07d90acc38a1b8835bf16539b833f21aaa38f";
hash = "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s=";
rev = "cad85b7b1b864c65734f71aa4a510b6f6536881c";
hash = "sha256-SdwdcR9szJJoUxQ4y8rh40Bdnn5ZI2qV4OcS39BFViQ=";
};
meta = {
pkgs/applications/emulators/libretro/cores/gambatte.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2024-12-20";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "a870b6dcde66fba00cd7aab5ae4bb699e458a91b";
hash = "sha256-yarpWSRmfqufj3sXwO1SHZ7VnPSITK/WG8u6mHil/OE=";
rev = "36a0da43fe6a82aba6acc5336574dbd749b18fa8";
hash = "sha256-3PM7PK1ouMObNZEIIIBG8gxIydYFKP9RRGlWBr5PIGU=";
};
meta = {
pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "genesis-plus-gx";
version = "0-unstable-2024-12-13";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "Genesis-Plus-GX";
rev = "3c1698778080541927f3d7011a00d2c9efe545af";
hash = "sha256-H310/VeGDVNz3bYEb7qIcstFc2ae0F+5+0LVVSHLeqI=";
rev = "bf492bf3532b9d30e7a023e4329e202b15169e1c";
hash = "sha256-QxplBzath9xN0AaFOT8K0dVEnMnTaZpLfdsX81fmP9g=";
};
meta = {
pkgs/applications/emulators/libretro/cores/mame.nix
+3 -3
View File
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
version = "0-unstable-2024-11-01";
version = "0-unstable-2025-01-04";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
rev = "a67797ad2f7516906ed7acef87569c6f35ca8739";
hash = "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk=";
rev = "20db0f242e4e11a476b548dd57d2ef9cc3e84f03";
hash = "sha256-+xShU96m+KCHrFleEy55fBD5vCM+hsYMqIvRZQtzsr8=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/mame2000.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}:
mkLibretroCore {
core = "mame2000";
version = "0-unstable-2024-11-01";
version = "0-unstable-2024-07-01";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
version = "0-unstable-2024-12-29";
version = "0-unstable-2025-01-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
rev = "aaf1a95728d9ca6d4cf6633b6a839f8daa27db81";
hash = "sha256-AjeXfISAcH6RiHU5gJutZUdpg2p+ASVKsI1+Nl76xSY=";
rev = "aee3dac97c72e45b43423349289937dbe2d4a1ce";
hash = "sha256-X8K536+VfM/WAr4LIhYGWKEt8Oz8GCUMoSqYwQXBQos=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/mame2015.nix
+1 -1
View File
@@ -7,7 +7,7 @@
}:
mkLibretroCore {
core = "mame2015";
version = "0-unstable-2023-11-01";
version = "0-unstable-2023-10-31";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/mame2016.nix
+1 -1
View File
@@ -8,7 +8,7 @@
}:
mkLibretroCore {
core = "mame2016";
version = "0-unstable-2024-04-06";
version = "0-unstable-2022-04-06";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/mesen.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
mkLibretroCore {
core = "mesen";
version = "0.9.9-unstable-2024-10-21";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/mrboom.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
mkLibretroCore rec {
core = "mrboom";
version = "5.5-unstable-2024-10-21";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "Javanaise";
pkgs/applications/emulators/libretro/cores/nestopia.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "nestopia";
version = "0-unstable-2024-12-22";
version = "0-unstable-2025-01-05";
src = fetchFromGitHub {
owner = "libretro";
repo = "nestopia";
rev = "6bbfff9a56ead67f0da696ab2c3aea3c11896964";
hash = "sha256-D2FtfabikcZq0dl+ot/NJJkOaQXj0Sl5P2ioNrvxgSs=";
rev = "9762adc00668f3a2e1016f3ad07ff9cbf9d67459";
hash = "sha256-CLEwhQ91dxoTLyhlQwssoCL/dEqY6SetwWLogfJi8RU=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/opera.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}:
mkLibretroCore {
core = "opera";
version = "0-unstable-2024-10-17";
version = "0-unstable-2024-10-16";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "pcsx-rearmed";
version = "0-unstable-2024-11-17";
version = "0-unstable-2025-01-09";
src = fetchFromGitHub {
owner = "libretro";
repo = "pcsx_rearmed";
rev = "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e";
hash = "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0=";
rev = "c5d1f1dd5e304dfcba2adf0de8aa9188ca35fad3";
hash = "sha256-4stYqeGrKtNtjbhoG8IriV41xq3urH9QMNnqYMQ7CxQ=";
};
dontConfigure = true;
pkgs/applications/emulators/libretro/cores/pcsx2.nix
+22 -30
View File
@@ -2,62 +2,54 @@
lib,
cmake,
fetchFromGitHub,
gcc12Stdenv,
gettext,
libGL,
libGLU,
libaio,
libpcap,
libpng,
libxml2,
mkLibretroCore,
perl,
pkg-config,
xxd,
xz,
}:
mkLibretroCore {
core = "pcsx2";
version = "0-unstable-2023-01-30";
version = "0-unstable-2025-01-09";
src = fetchFromGitHub {
owner = "libretro";
repo = "lrps2";
rev = "f3c8743d6a42fe429f703b476fecfdb5655a98a9";
hash = "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=";
repo = "ps2";
rev = "397b8f54b92aeffd2dd502c2c9b601305fb1de9d";
hash = "sha256-zP4gOxAAWqgmGkilVijY2GF6awD7cbMICfxYSsI1wa0=";
fetchSubmodules = true;
};
extraNativeBuildInputs = [
cmake
gettext
pkg-config
];
extraBuildInputs = [
libaio
libGL
libGLU
libpcap
libpng
libxml2
perl
xz
xxd
];
# libretro/ps2 needs at least those flags to compile, and probably doesn't
# work on x86_64-v1
# https://github.com/libretro/ps2/blob/397b8f54b92aeffd2dd502c2c9b601305fb1de9d/cmake/BuildParameters.cmake#L101
env.NIX_CFLAGS_COMPILE = toString [
"-msse"
"-msse2"
"-msse4.1"
"-mfxsr"
];
makefile = "Makefile";
cmakeFlags = [ "-DLIBRETRO=ON" ];
# remove ccache
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail "ccache" ""
'';
postBuild = "cd pcsx2";
# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];
# FIXME: multiple build errors with GCC13.
# Unlikely to be fixed until we switch to libretro/pcsx2 that is a more
# up-to-date port (but still WIP).
stdenv = gcc12Stdenv;
preInstall = "cd bin";
meta = {
description = "Port of PCSX2 to libretro";
homepage = "https://github.com/libretro/lrps2";
homepage = "https://github.com/libretro/ps2";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.x86;
};
pkgs/applications/emulators/libretro/cores/picodrive.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "picodrive";
version = "0-unstable-2024-10-19";
version = "0-unstable-2024-12-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "picodrive";
rev = "0daf92b57fba1fdbc124651573e88373eef28aa5";
hash = "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE=";
rev = "bb4b7bcddb9f2f218e88971cccc66edf6c7669f0";
hash = "sha256-KbPsPG4pFZRHQoLuPVvBdXQTa+uXtmvSBKi7ShMyB3A=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/play.nix
+3 -3
View File
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2024-10-19";
version = "0-unstable-2025-01-09";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "c3cba5418b4e5618befd9c2790498cf3cf88372a";
hash = "sha256-xO2Pgl1E0JFEsthTmG+Ka+NqOTWG/JeeAIa6wBWXJyc=";
rev = "2958fa6c5ada62a3150513e4d8b6c4343c1cfbb8";
hash = "sha256-beo3tOUW62tiZISdAAGdeSVrS8w1l8x+JIi0nDDl5wA=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/ppsspp.nix
+3 -3
View File
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2024-11-15";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "2402eea4b16908ad59079bcf3fab06ba63531a3c";
hash = "sha256-bpeiZdcXkGWLFZOsxTGuVmo4xAiUb9v5Wf6pWkt5JV0=";
rev = "aa752ade6c99ec6db4c7f7cbc6c1133738005c5f";
hash = "sha256-zbDXAI3VnpPQbPMAN1ie5nPFCNzBQif1S1nZnar4fvg=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/snes9x.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "snes9x";
version = "1.63-unstable-2024-12-08";
version = "0-unstable-2024-12-17";
src = fetchFromGitHub {
owner = "snes9xgit";
repo = "snes9x";
rev = "9be3ed49a8711b016eb7280b758995bf2cbca4dd";
hash = "sha256-3FE90o+OJYiBzaiLEggZZ3jbLCFTRMwI/ayaJ5clm4c=";
rev = "48fe9344633001703782244651cdbf754532f9ab";
hash = "sha256-rPwav34DQPITmzIYB/iJOVjJQ96YJdJa4y4AbkZJMvg=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/snes9x2010.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
mkLibretroCore rec {
core = "snes9x2010";
version = "0-unstable-2024-11-18";
version = "0-unstable-2024-11-19";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/stella.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella";
version = "7.0-unstable-2024-12-18";
version = "0-unstable-2025-01-02";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = "dacf66131c938635a7017de364ba999ebbb35bb7";
hash = "sha256-X6haV9SKQn2lnWs5kcNePP9wfz3G3yq/rEIGiPiBTOY=";
rev = "66823c533a9b273293a18a342ffaea749218827b";
hash = "sha256-EQGpHnIcvgNdp5rwJVxQRdJwRzBTMxZDSF1521ybZqI=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}:
mkLibretroCore {
core = "thepowdertoy";
version = "0-unstable-2024-10-01";
version = "0-unstable-2024-09-30";
src = fetchFromGitHub {
owner = "libretro";
pkgs/applications/emulators/libretro/cores/vecx.nix
+3 -3
View File
@@ -7,13 +7,13 @@
}:
mkLibretroCore {
core = "vecx";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-vecx";
rev = "0e48a8903bd9cc359da3f7db783f83e22722c0cf";
hash = "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=";
rev = "a103a212ca8644fcb5d76eac7cdec77223c4fb02";
hash = "sha256-veCGW5mbR1V7cCzZ4BzDSdPZDycw4WNveie/DDVAzw8=";
};
extraBuildInputs = [
pkgs/applications/graphics/inkscape/extensions/textext/default.nix
+3 -2
View File
@@ -21,13 +21,13 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "textext";
version = "1.10.2";
version = "1.11.0";
src = fetchFromGitHub {
owner = "textext";
repo = "textext";
tag = version;
sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE=";
sha256 = "sha256-u0oNAauCUHNObE5Hp/X9hHcEP2wmLhcxH2aas3Mg5RY=";
};
patches = [
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
python3.pkgs.lxml
python3.pkgs.cssselect
python3.pkgs.numpy
python3.pkgs.tinycss2
];
# strictDeps do not play nicely with introspection setup hooks.
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+2 -2
View File
@@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.54.2";
version = "3.54.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-7eopEv/bZZnA6gKJw6muIBe/43oI14IjWEUhqlaGtXY=";
hash = "sha256-dGz4HvXDJa8X9Tsvq0bWcmDzsT2gFNiZTUrZ6Ea4Ves=";
};
nativeBuildInputs = [
pkgs/applications/networking/p2p/mldonkey/default.nix
+43 -32
View File
@@ -1,53 +1,64 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
fetchFromGitHub,
autoreconfHook,
autoconf-archive,
ocamlPackages,
pkg-config,
zlib,
}:
stdenv.mkDerivation rec {
pname = "mldonkey";
version = "3.1.7-2";
version = "3.2.1";
src = fetchurl {
url = "https://ygrek.org/p/release/mldonkey/mldonkey-${version}.tar.bz2";
sha256 = "b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794";
src = fetchFromGitHub {
owner = "ygrek";
repo = "mldonkey";
tag = "release-${lib.replaceStrings [ "." ] [ "-" ] version}";
hash = "sha256-Dbb7163CdqHY7/FJY2yWBFRudT+hTFT6fO4sFgt6C/A=";
};
patches = [
# Fixes C++17 compat
(fetchpatch {
url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch";
hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME=";
})
# Fixes OCaml 4.12 compat
(fetchpatch {
url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch";
hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8=";
})
# Fixes OCaml 4.14 compat
(fetchpatch {
url = "https://github.com/FabioLolix/AUR-artifacts/raw/6721c2d4ef0be9a99499ecf2787e378e50b915e9/mldonkey-fix-build.patch";
hash = "sha256-HPW/CKfhywy+Km5/64Iok4tO9LJjAk53jVlsYzIRPfs=";
})
];
preConfigure = ''
substituteInPlace Makefile --replace '+camlp4' \
'${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
postPatch = ''
substituteInPlace config/Makefile.in \
--replace-fail '+camlp4' '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
'';
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [
ocaml
camlp4
nativeBuildInputs = [
autoreconfHook
autoconf-archive
ocamlPackages.camlp4
ocamlPackages.findlib
ocamlPackages.ocaml
pkg-config
];
buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ];
buildInputs = [
ocamlPackages.num
zlib
];
preAutoreconf = ''
cd config
'';
postAutoreconf = ''
cd ..
'';
env =
{
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
}
# https://github.com/ygrek/mldonkey/issues/117
// lib.optionalAttrs stdenv.cc.isClang {
CXXFLAGS = "-std=c++98";
};
meta = {
broken = stdenv.hostPlatform.isDarwin;
description = "Client for many p2p networks, with multiple frontends";
homepage = "https://github.com/ygrek/mldonkey";
license = lib.licenses.gpl2Only;
pkgs/applications/networking/protonvpn-gui/default.nix
+6 -3
View File
@@ -21,14 +21,14 @@
buildPythonApplication rec {
pname = "protonvpn-gui";
version = "4.8.1";
version = "4.8.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "proton-vpn-gtk-app";
tag = "v${version}";
hash = "sha256-+UnMsjIJ0M1YiF+BcY7RObUoCeDZGtE0ul6KBaODzeY=";
hash = "sha256-kNWwrNpXCkAPvXXqv8HwOx0msYEVsO0JgrtG3wUVmQ4=";
};
nativeBuildInputs = [
@@ -80,6 +80,9 @@ buildPythonApplication rec {
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
mainProgram = "protonvpn-app";
maintainers = with lib.maintainers; [ sebtm ];
maintainers = with lib.maintainers; [
sebtm
rapiteanu
];
};
}
pkgs/build-support/make-darwin-bundle/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
# given a package with an executable and an icon, make a darwin bundle for
# it. This package should be used when generating launchers for native Darwin
# applications. If the package conatins a .desktop file use
# `desktopToDarwinLauncher` instead.
# `desktopToDarwinBundle` instead.
{
lib,
pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh
+8 -29
View File
@@ -21,38 +21,17 @@ composerInstallConfigureHook() {
exit 1
fi
install -Dm644 ${composerVendor}/composer.{json,lock} .
install -Dm644 ${composerVendor}/composer.json .
if [[ ! -f "composer.lock" ]]; then
composer \
--no-install \
--no-interaction \
--no-progress \
--optimize-autoloader \
${composerNoDev:+--no-dev} \
${composerNoPlugins:+--no-plugins} \
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
if [[ -f "${composerVendor}/composer.lock" ]]; then
install -Dm644 ${composerVendor}/composer.lock .
fi
chmod +w composer.{json,lock}
if [[ -f "composer.lock" ]]; then
chmod +w composer.lock
fi
chmod +w composer.json
echo "Finished composerInstallConfigureHook"
}
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
+30 -20
View File
@@ -22,8 +22,10 @@ composerVendorConfigureHook() {
install -Dm644 $composerLock ./composer.lock
fi
if [[ ! -f "composer.lock" ]]; then
composer \
--no-cache \
--no-install \
--no-interaction \
--no-progress \
@@ -33,25 +35,31 @@ composerVendorConfigureHook() {
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
if [[ -f "composer.lock" ]]; then
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
exit 1
fi
fi
chmod +w composer.{json,lock}
if [[ -f "composer.lock" ]]; then
chmod +w composer.lock
fi
chmod +w composer.json
echo "Finished composerVendorConfigureHook"
}
@@ -62,10 +70,7 @@ composerVendorBuildHook() {
setComposerEnvVariables
composer \
`# The acpu-autoloader is not reproducible and has to be disabled.` \
`# Upstream PR: https://github.com/composer/composer/pull/12090` \
`# --apcu-autoloader` \
`# --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)"` \
--no-cache \
--no-interaction \
--no-progress \
--optimize-autoloader \
@@ -89,7 +94,12 @@ composerVendorInstallHook() {
echo "Executing composerVendorInstallHook"
mkdir -p $out
cp -ar composer.{json,lock} $(composer config vendor-dir) $out/
cp -ar composer.json $(composer config vendor-dir) $out/
if [[ -f "composer.lock" ]]; then
cp -ar composer.lock $(composer config vendor-dir) $out/
fi
echo "Finished composerVendorInstallHook"
}
pkgs/by-name/ar/arti/package.nix
+15 -12
View File
@@ -6,7 +6,8 @@
pkg-config,
sqlite,
openssl,
darwin,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec {
group = "tpo";
owner = "core";
repo = "arti";
rev = "arti-v${version}";
tag = "arti-v${version}";
hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A=";
};
@@ -26,15 +27,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
buildInputs =
[ sqlite ]
++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
CoreServices
]
);
buildInputs = [ sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
cargoBuildFlags = [
"--package"
@@ -51,11 +44,21 @@ rustPlatform.buildRustPackage rec {
"--skip=reload_cfg::test::watch_multiple"
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Implementation of Tor in Rust";
mainProgram = "arti";
homepage = "https://arti.torproject.org/";
changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md";
changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${version}/CHANGELOG.md";
license = with lib.licenses; [
asl20
mit
pkgs/by-name/ci/cie-middleware-linux/deps.json
Generated
+49 -32
View File
@@ -137,49 +137,66 @@
}
},
"https://repo.maven.apache.org/maven2": {
"com/google/code/gson#gson-parent/2.10.1": {
"pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
"com/google/code/gson#gson-parent/2.11.0": {
"pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
},
"com/google/code/gson#gson/2.10.1": {
"jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
"pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
"com/google/code/gson#gson/2.11.0": {
"jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
"pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
},
"commons-io#commons-io/2.15.1": {
"jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=",
"pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0="
"com/google/errorprone#error_prone_annotations/2.27.0": {
"jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
"pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
},
"commons-logging#commons-logging/1.3.0": {
"jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=",
"pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8="
"com/google/errorprone#error_prone_parent/2.27.0": {
"pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
},
"net/java/dev/jna#jna/5.14.0": {
"jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=",
"pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0="
"commons-io#commons-io/2.18.0": {
"jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
"pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
},
"org/apache#apache/31": {
"pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
"commons-logging#commons-logging/1.3.3": {
"jar": "sha256-WCj5bAnYhvmxoJk8eASyfPT87IU0UXFk9RN6yLZ+qbk=",
"pom": "sha256-El1hQurD93REC6cCwF8o+eCYxS0QcSrhFJast3EGs7o="
},
"org/apache/commons#commons-parent/65": {
"pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424="
"net/java/dev/jna#jna/5.15.0": {
"jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=",
"pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU="
},
"org/apache/pdfbox#fontbox/3.0.2": {
"jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=",
"pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90="
"org/apache#apache/32": {
"pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
},
"org/apache/pdfbox#pdfbox-io/3.0.2": {
"jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=",
"pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c="
"org/apache#apache/33": {
"pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
},
"org/apache/pdfbox#pdfbox-parent/3.0.2": {
"pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g="
"org/apache/commons#commons-parent/71": {
"pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
},
"org/apache/pdfbox#pdfbox/3.0.2": {
"jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=",
"pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8="
"org/apache/commons#commons-parent/78": {
"pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
},
"org/junit#junit-bom/5.10.1": {
"module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
"pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
"org/apache/pdfbox#fontbox/3.0.3": {
"jar": "sha256-ZWkMPzmwShTRLBf0mYwVGGzod9Pi7CIscIV348wCgDA=",
"pom": "sha256-sik+UDqncEMGEVD4hGg9f2FMz1Fjvi0PBSyinzx2d+I="
},
"org/apache/pdfbox#pdfbox-io/3.0.3": {
"jar": "sha256-Ej6jGHtJfFTmYdUMPIZ0eb93Zo/0UOUHEMZY8rtGh7o=",
"pom": "sha256-EXAbuMWnNaSzFA9zroM6KBzqCeO8P583kbmpenRekNQ="
},
"org/apache/pdfbox#pdfbox-parent/3.0.3": {
"pom": "sha256-yGXhzv8Jq1Kwh+cmDE8V025bW4vk/+IERvqkCiygvcw="
},
"org/apache/pdfbox#pdfbox/3.0.3": {
"jar": "sha256-W+ONLsgWkbBdU163IN5NxWbF0H5aBHMfoAZo0VOotKY=",
"pom": "sha256-vgiV9rLCDzEdYjXJam/SqsECsxkE0/TDnqUll3WwcAg="
},
"org/junit#junit-bom/5.11.0-M2": {
"module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
"pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
},
"org/junit#junit-bom/5.11.2": {
"module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=",
"pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI="
}
}
}
pkgs/by-name/ci/cie-middleware-linux/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
let
pname = "cie-middleware-linux";
version = "1.5.2";
version = "1.5.6";
src = fetchFromGitHub {
owner = "M0rf30";
repo = pname;
rev = version;
sha256 = "sha256-M3Xwg3G2ZZhPRV7uhFVXQPyvuuY4zI5Z+D/Dt26KVM0=";
sha256 = "sha256-2P/1hQTmeQ6qE7RgAeLOZTszcLcIpa2XX1S2ahXRHcc=";
};
gradle = gradle_8;
pkgs/by-name/de/deno/package.nix
+3 -3
View File
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${version}";
hash = "sha256-CUfUYiD1ZVrbH4RowJN0PUCafpIsEWu0sCPzxngz4Ak=";
hash = "sha256-CeRMcMuwER6LnLGAheGS+v4FDw7KADefB3p5ve1HsfE=";
};
cargoHash = "sha256-bnX2tKX6nrUU/cUsavV7bWSOhjLyMdYc/y6GHqwx55Q=";
cargoHash = "sha256-m/cg5ElXf7vKNvUjrRbVAdYppqsAeHxlGw/bHafBgOg=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+14 -12
View File
@@ -1,5 +1,5 @@
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
index 5e65ec8..8ca28c6 100644
index 5e65ec8..2cae29d 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
@@ -42,23 +42,25 @@ index 5e65ec8..8ca28c6 100644
g_settings_set_string (
settings, SELF_UID_KEY,
e_contact_get_const (contact, E_CONTACT_UID));
@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact)
@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact)
* unfortunately the API doesn't allow that.
*/
g_mutex_lock (&mutex);
- if (!settings)
- settings = g_settings_new (SELF_UID_PATH_ID);
+ if (!settings) {
+ g_autoptr(GSettingsSchemaSource) schema_source;
+ g_autoptr(GSettingsSchema) schema;
+ schema_source = g_settings_schema_source_new_from_directory("@EDS@",
+ g_settings_schema_source_get_default(),
+ TRUE,
+ NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
+ SELF_UID_PATH_ID,
+ FALSE);
+ settings = g_settings_new_full(schema, NULL, NULL);
+ {
+ g_autoptr(GSettingsSchemaSource) schema_source;
+ g_autoptr(GSettingsSchema) schema;
+ schema_source = g_settings_schema_source_new_from_directory("@EDS@",
+ g_settings_schema_source_get_default(),
+ TRUE,
+ NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
+ SELF_UID_PATH_ID,
+ FALSE);
+ settings = g_settings_new_full(schema, NULL, NULL);
+ }
+ }
uid = g_settings_get_string (settings, SELF_UID_KEY);
g_mutex_unlock (&mutex);
pkgs/by-name/ev/evolution-data-server/package.nix
+2 -2
View File
@@ -51,7 +51,7 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.54.2";
version = "3.54.3";
outputs = [
"out"
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA=";
hash = "sha256-UQjcOO5cwfjvkVXof2xBKflkRVCglixa4j/4B7V8uNA=";
};
patches = [
pkgs/by-name/gl/glycin-loaders/package.nix
+2 -2
View File
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders";
version = "1.1.2";
version = "1.1.4";
src = fetchurl {
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
hash = "sha256-Qccr4eybpV2pDIL8GFc7dC3/WCsJr8N7RWXEfpnMj/Q=";
hash = "sha256-0bbVkLaZtmgaZ9ARmKWBp/cQ2Mp0UJNN1/XbJB+hJQA=";
};
patches = [
pkgs/by-name/gn/gnome-maps/package.nix
+2 -2
View File
@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
version = "47.2";
version = "47.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
hash = "sha256-WFHnhtrsZY8h5FeiBv8KmtFlnzdBqtlJCxvzGSFU/ps=";
hash = "sha256-HpAwe6/njiML1OrdCUcicakp+1FolCJFkG+fEdrhPLg=";
};
doCheck = !stdenv.hostPlatform.isDarwin;
pkgs/by-name/gn/gnote/package.nix
+2 -2
View File
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "gnote";
version = "47.0";
version = "47.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-vrNcreIMYOQxVRbyCsfr7p37wrgPAHy+2LxaUlIuRC4=";
hash = "sha256-mmDxaSSA9k0WbTHmVkoP8kgSelmOL/f2NX3AsuwlsWg=";
};
buildInputs = [
pkgs/by-name/gt/gtk-vnc/package.nix
+14 -6
View File
@@ -12,12 +12,13 @@
cyrus_sasl,
pulseaudioSupport ? stdenv.hostPlatform.isLinux,
libpulseaudio,
libgcrypt,
gmp,
gtk3,
vala,
gettext,
perl,
python3,
gi-docgen,
gnome,
gdk-pixbuf,
zlib,
@@ -25,18 +26,19 @@
stdenv.mkDerivation rec {
pname = "gtk-vnc";
version = "1.3.1";
version = "1.4.0";
outputs = [
"out"
"bin"
"man"
"dev"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "USdjrE4FWdAVi2aCyl3Ro71jPwgvXkNJ1xWOa1+A8c4=";
url = "mirror://gnome/sources/gtk-vnc/${lib.versions.majorMinor version}/gtk-vnc-${version}.tar.xz";
sha256 = "G+ZMTkdgxSs+wzBnKQ0e+kCtTOyrbGc4E4BOPFWdloM=";
};
nativeBuildInputs = [
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
gettext
perl # for pod2man
python3
gi-docgen
];
buildInputs =
@@ -57,7 +60,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
zlib
glib
libgcrypt
gmp
cyrus_sasl
gtk3
]
@@ -69,9 +72,14 @@ stdenv.mkDerivation rec {
"-Dpulseaudio=disabled"
];
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gtk-vnc";
versionPolicy = "none";
};
};
pkgs/by-name/j4/j4-dmenu-desktop/package.nix
+19 -9
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, dmenu }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, dmenu, fmt, spdlog }:
stdenv.mkDerivation (finalAttrs: {
pname = "j4-dmenu-desktop";
version = "unstable-2023-09-12";
version = "3.2";
src = fetchFromGitHub {
owner = "enkore";
repo = "j4-dmenu-desktop";
rev = "7e3fd045482a8ea70619e422975b52feabc75175";
hash = "sha256-8PmfzQkHlEdMbrcQO0bPruP3jaKEcr/17x0/Z7Jedh0=";
rev = "r${finalAttrs.version}";
hash = "sha256-Yrn6d2x9xOSV5FK0YP/mfD6BG9DeWlWobVafEzVYVJY=";
};
postPatch = ''
@@ -16,12 +16,22 @@ stdenv.mkDerivation (finalAttrs: {
--replace "dmenu -i" "${lib.getExe dmenu} -i"
'';
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
# tests are fetching an external git repository
cmakeFlags = [
"-DWITH_TESTS=OFF"
"-DWITH_GIT_CATCH=OFF"
buildInputs = [
fmt
spdlog
];
mesonFlags = [
# Disable unit tests.
"-Denable-tests=false"
# Copy pre-generated shell completions.
"-Dgenerate-shell-completions=disabled"
];
meta = with lib; {
pkgs/by-name/li/libshumate/package.nix
+2 -2
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libshumate";
version = "1.3.0";
version = "1.3.1";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
hash = "sha256-giem6Cgc3hIjKJT++Ddg1E+maznvAzxh7ZNKhsbcddQ=";
hash = "sha256-bv6TUtkXRIItQerUcUoqtLN4SBqGoiBLe+xAgt/8G4s=";
};
depsBuildBuild = [
pkgs/by-name/li/lips/package.nix
+43
View File
@@ -0,0 +1,43 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
buildNpmPackage rec {
pname = "lips";
version = "1.0.0-beta.20";
src = fetchFromGitHub {
owner = "jcubic";
repo = "lips";
tag = version;
hash = "sha256-zvdtFfa+1Ols3TZSe2XCbGX9hColwGV/ReTJcTrrA4k=";
};
npmDepsHash = "sha256-7YeKTcBGsyiI6U0PeddAcs2x/O0LL/DT00KuSkqfy2A=";
npmInstallFlags = [ "--only=prod" ];
dontBuild = true; # dist folder is checked in
dontNpmBuild = true;
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Powerful Scheme based Lisp in JavaScript";
homepage = "https://lips.js.org";
changelog = "https://github.com/jcubic/lips/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ DimitarNestorov ];
platforms = lib.platforms.all;
mainProgram = "lips";
};
}
pkgs/by-name/lu/lubelogger/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-Ee9jwbZNc5M9edGkPvbO7xaraYXVMbVazVOU6DV6nFc=";
hash = "sha256-+c/eXcOzl42Sc5V9hUr3FNcdnL8z28wreIbKrz6c45s=";
};
projectFile = "CarCareTracker.sln";
pkgs/by-name/me/meld/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "meld";
version = "3.22.2";
version = "3.22.3";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-RqCnE/vNGxU7N3oeB1fIziVcmCJGdljqz72JsekjFu8=";
sha256 = "sha256-N/fynrH/D+xNiwiNVIPFVt4QifbQGP5tSBmTyvJJnYQ=";
};
nativeBuildInputs = [
pkgs/by-name/mu/mullvad-browser/package.nix
+2 -2
View File
@@ -97,7 +97,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.0.3";
version = "14.0.4";
sources = {
x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-Kv69Q6o/Ww64yA8y5J3JXIV48A2B08YhNE9ib/UuA0o=";
hash = "sha256-Y1miKLvVagEVyMeDyGMuk2iYqT3d6f9nxm39RGPPzDM=";
};
};
pkgs/by-name/n9/n98-magerun/package.nix
+9
View File
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
php81,
nix-update-script,
}:
php81.buildComposerProject (finalAttrs: {
@@ -17,6 +18,14 @@ php81.buildComposerProject (finalAttrs: {
vendorHash = "sha256-n608AY6AQdVuN3hfVQk02vJQ6hl/0+4LVBOsBL5o3+8=";
passthru.updateScript = nix-update-script {
# Excludes 1.x versions from the Github tags list
extraArgs = [
"--version-regex"
"^(2\\.(.*))"
];
};
meta = {
changelog = "https://magerun.net/category/magerun/";
description = "Swiss army knife for Magento1/OpenMage developers";
pkgs/by-name/ok/okteto/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "okteto";
version = "3.2.2";
version = "3.3.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-NN6Y+QkER5Bs9vy09Y4Dl4LoK3HkCJ04vCe5ectFUok=";
hash = "sha256-0CMCP2ib0MEYJlbDPrbyKYw0yEzxnSx3WlO0iL+D3M0=";
};
vendorHash = "sha256-/V95521PFvLACuXVjqsW3TEHHGQYKY8CSAOZ6FwuR0k=";
vendorHash = "sha256-4fw3Qc1VPrPFVtQNtCRW6RqPqV7aF+t9GQDL/sCqNvw=";
postPatch = ''
# Disable some tests that need file system & network access.
pkgs/by-name/or/orca/package.nix
+4 -4
View File
@@ -29,13 +29,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "orca";
version = "47.2";
version = "47.3";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-XmevNX9xmOoApEOByrTE+U5oJtbtgAZo85QWziqrjlo=";
url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
hash = "sha256-GwsUW7aFzXTso+KMt7cJf5jRPuHMWLce3u06j5BFIxs=";
};
patches = [
@@ -93,7 +93,7 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "orca";
};
};
pkgs/by-name/ph/phpdocumentor/package.nix
+9 -12
View File
@@ -1,35 +1,32 @@
{ lib
, php
, fetchFromGitHub
, makeBinaryWrapper
{
lib,
php,
fetchFromGitHub,
makeBinaryWrapper,
}:
php.buildComposerProject (finalAttrs: {
php.buildComposerProject2 (finalAttrs: {
pname = "phpdocumentor";
version = "3.6.0";
src = fetchFromGitHub {
owner = "phpDocumentor";
repo = "phpDocumentor";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-8TQlqXhZ3rHmOAuxsBYa+7JD+SxMQY0NZgCyElStFag=";
};
vendorHash = "sha256-5EArmUc3a4+k0YncsPEfeJRR2uDgNKdIDONwQ8cAeVE=";
vendorHash = "sha256-Q1y18ERUs4iRd94JqBYVRNizR3v5MBTtItsxvGkrkyU=";
# Needed because of the unbound version constraint on phpdocumentor/json-path
composerStrictValidation = false;
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
runHook preInstall
postInstall = ''
wrapProgram "$out/bin/phpdoc" \
--set-default APP_CACHE_DIR /tmp \
--set-default APP_LOG_DIR /tmp/log
runHook postInstall
'';
meta = {
pkgs/by-name/ph/phpunit/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@ php.buildComposerProject2 (finalAttrs: {
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-0NVoaUFmmV4EtaErhaqLxJzCbD2WuMaVZC2OHG9+gSA=";
};
vendorHash = "sha256-EkTERk8jJWxCZCJnSHfg3Tnn//Ny2985qXJNX/gad58=";
vendorHash = "sha256-C1BmMURmAMQhDS6iAKC80wqZuYdSRPGyFpU9Jdr6snA=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/re/redpanda-client/package.nix
+3 -3
View File
@@ -7,12 +7,12 @@
stdenv,
}:
let
version = "24.2.14";
version = "24.3.3";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-FDzHREeld794HkLtkgIjMd2mNSvz1XV5mwvbx0sHz3o=";
sha256 = "sha256-jhk8hhnTkmkMeaoFZNfqZW31KFR/16pAEhq/wXnFfMg=";
};
in
buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-ZZRUmBx+jkZX8gqCYNlzto1D05atJ4zH+1kuZLYDeC0=";
vendorHash = "sha256-RoUrLJqGpXgFGMG5kLdwIxGTePiOFCM9QeX68vq/HrI=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/by-name/re/retroarch-bare/package.nix
+2 -2
View File
@@ -58,12 +58,12 @@ let
in
stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.19.1";
version = "1.20.0";
src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
hash = "sha256-NVe5dhH3w7RL1C7Z736L5fdi/+aO+Ah9Dpa4u4kn0JY=";
hash = "sha256-ER90i0BlHC8SXfz6DzoIPCP1G8n4NNyJcRE88YY0gXk=";
rev = "v${version}";
};
pkgs/by-name/ru/ruff/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
tag = version;
hash = "sha256-OAhjatPzwvLT3HyXYPzaL5pAC5CH75CyMmFo0c4726I=";
hash = "sha256-QLg86MDeIykILChyYaOPUEV2hZmeJkIPztNW5t+StFE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-vroKiwouk2E2WYB/B+8zszXqer5pENDYrxcrCQ17mF0=";
cargoHash = "sha256-dLZADdLWZtlN+vK2zyk2mH6GyMqRsm3cWtRJmr3NKWU=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop";
version = "7.36.0";
version = "7.37.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-hHgobx4q+nWtsq6uplVWY5ie0qu5ZoeFxYZNflza/CM=";
hash = "sha256-FMbJ28oNxJ6WhuD5pLNqG9hE88mOO76mGAgOQqZ/RJQ=";
};
sourceRoot = ".";
pkgs/by-name/si/signal-desktop/signal-desktop.nix
+2 -2
View File
@@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.36.0";
version = "7.37.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-5p9Vnxj53jOZbEirWamwv4Fkm/fMLeLfV93GDrV8XuA=";
hash = "sha256-rxBT8hJjtblCOx66QW16wE+dFdZKcg2DNeSlz6Y/TQQ=";
}
pkgs/by-name/sp/spral/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "spral";
version = "2024.05.08";
version = "2025.01.08";
src = fetchFromGitHub {
owner = "ralna";
repo = "spral";
rev = "v${version}";
hash = "sha256-1CdRwQ0LQrYcXvoGtGxR9Ug3Q2N4skXq8z+LdNpv8p4=";
hash = "sha256-tuhJClSjah/ud6PVr6biOq5KdKtspJ7hpWZ350yzz+U=";
};
postPatch =
pkgs/by-name/ta/tartan/package.nix
+3 -3
View File
@@ -13,14 +13,14 @@
stdenv.mkDerivation {
pname = "tartan";
version = "0.3.0-unstable-2023-10-11";
version = "0.3.0-unstable-2025-01-07";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "tartan";
repo = "tartan";
rev = "4a7c945535d746d3d874ebebc0217715d674a862";
hash = "sha256-DYvbBGgytf1JOYKejZB+ReehD8iKm1n4BhMmLQURay0=";
rev = "983aaf238946ced55da8824c1170a254992d9717";
hash = "sha256-4w9cAs6kA+RAmi2CC+5CHB1UWC+7zkBqvZlHAdgENu4=";
};
nativeBuildInputs = [
pkgs/by-name/to/tor-browser/package.nix
+3 -3
View File
@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.0.3";
version = "14.0.4";
sources = {
x86_64-linux = fetchurl {
@@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-WddDs5lQFZde8Qy/7nQhGTrrT9BiVswriqOpPVpgvwY=";
hash = "sha256-u5UlGYXVeTVSJcIJBJYn2L6+si8XmguB59Pf/bWfj7g=";
};
i686-linux = fetchurl {
@@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-DsTJiZkw0g4ip/yAwQ9IomZHQ6RP0hFNEzVJ8/fEbyQ=";
hash = "sha256-e1FMcTCgVPUud8hZNwl4r6J2ltATa0gBSiLqx/3DxzQ=";
};
};
pkgs/by-name/up/upower/package.nix
+4 -2
View File
@@ -18,6 +18,7 @@
, libusb1
, glib
, gettext
, polkit
, nixosTests
, useIMobileDevice ? true
, libimobiledevice
@@ -34,7 +35,7 @@ assert withDocs -> withIntrospection;
stdenv.mkDerivation (finalAttrs: {
pname = "upower";
version = "1.90.4";
version = "1.90.6";
outputs = [ "out" "dev" ]
++ lib.optionals withDocs [ "devdoc" ]
@@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "upower";
repo = "upower";
rev = "v${finalAttrs.version}";
hash = "sha256-5twHuDLisVF07Y5KYwlqWMi12+p6UpARJvoBN/+tX2o=";
hash = "sha256-Y3MIB6a11P00B/6E3UyoyjLLP8TIT3vM2FDO7zlBz/w=";
};
patches = lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
@@ -121,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
glib
polkit
];
mesonFlags = [
pkgs/by-name/za/zammad/gemset.nix
+8 -8
View File
@@ -1765,10 +1765,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh";
sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
type = "gem";
};
version = "2.22.0";
version = "2.23.1";
};
macaddr = {
dependencies = [ "systemu" ];
@@ -1905,10 +1905,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
type = "gem";
};
version = "2.8.7";
version = "2.8.8";
};
minitest = {
groups = [
@@ -2142,10 +2142,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny";
type = "gem";
};
version = "1.16.7";
version = "1.16.8";
};
nori = {
dependencies = [ "bigdecimal" ];
@@ -2890,10 +2890,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6";
sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
railties = {
dependencies = [
pkgs/by-name/za/zammad/package.nix
+1 -1
View File
@@ -22,7 +22,7 @@
let
pname = "zammad";
version = "6.4.0";
version = "6.4.1";
src = applyPatches {
src = fetchFromGitHub (lib.importJSON ./source.json);
pkgs/by-name/za/zammad/source.json
+2 -2
View File
@@ -1,8 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "1f09f838a2c9e484bb4f47e1abeeca3d763d4e7d",
"hash": "sha256-1N0tTYOUDtA/ZTOB5SqjwZKzLctgK8k76z847TFH1WQ=",
"rev": "453aeb09c1ad4584fae68b3a1c7d54b555d4384a",
"hash": "sha256-KlS9S6r787YJArhiWP0r4YsZQYEFet89MdwXGyrbe3g=",
"fetchSubmodules": true
}
pkgs/development/beam-modules/erlang-ls/1576.diff
+12
View File
@@ -0,0 +1,12 @@
diff --git a/apps/els_lsp/test/els_completion_SUITE.erl b/apps/els_lsp/test/els_completion_SUITE.erl
index b610b1d4..9c8614f0 100644
--- a/apps/els_lsp/test/els_completion_SUITE.erl
+++ b/apps/els_lsp/test/els_completion_SUITE.erl
@@ -711,6 +711,7 @@ exported_types(Config) ->
<<"filename_all">>,
<<"io_device">>
] ++
+ [<<"io_server">> || OtpRelease >= 27] ++
[<<"location">> || OtpRelease >= 26] ++
[
<<"mode">>,
pkgs/development/beam-modules/erlang-ls/default.nix
+19 -8
View File
@@ -1,4 +1,5 @@
{
erlang,
fetchFromGitHub,
fetchgit,
fetchHex,
@@ -13,6 +14,7 @@ let
version = "1.1.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
inherit fetchHex fetchFromGitHub fetchgit;
builder = buildRebar3;
@@ -41,12 +43,18 @@ let
in
rebar3Relx {
pname = "erlang-ls";
inherit version;
src = fetchFromGitHub {
inherit owner repo;
hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo=";
rev = version;
};
# remove when fixed upstream https://github.com/erlang-ls/erlang_ls/pull/1576
patches = lib.optionals (lib.versionAtLeast erlang.version "27") [ ./1576.diff ];
releaseType = "escript";
beamDeps = builtins.attrValues deps;
@@ -59,16 +67,11 @@ rebar3Relx {
HOME=. rebar3 ct
HOME=. rebar3 proper --constraint_tries 100
'';
installFlags = [ "PREFIX=$(out)" ];
# tests seem to be a bit flaky on darwin, skip them for now
doCheck = !stdenv.hostPlatform.isDarwin;
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/erlang-ls/erlang_ls";
description = "Erlang Language Server";
platforms = platforms.unix;
license = licenses.asl20;
mainProgram = "erlang_ls";
};
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip nixfmt-rfc-style "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"
@@ -88,4 +91,12 @@ rebar3Relx {
echo "erlang-ls is already up-to-date"
fi
'';
meta = with lib; {
homepage = "https://github.com/erlang-ls/erlang_ls";
description = "Erlang Language Server";
platforms = platforms.unix;
license = licenses.asl20;
mainProgram = "erlang_ls";
};
}
pkgs/development/compilers/ocaml/5.3.nix
+6
View File
@@ -0,0 +1,6 @@
import ./generic.nix {
major_version = "5";
minor_version = "3";
patch_version = "0";
sha256 = "sha256-sCKTNtnr4K+QWVS80a5bKTMGu8sIwB6tA1ANnlvJAWQ=";
}
pkgs/development/libraries/lief/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.16.1";
version = "0.16.2";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "sha256-Mq3IC1EbJpAwqHpiByFwdWl/rUOvv+oOtLgJ6dx7/P0=";
sha256 = "sha256-5T/lTtmm3jwkxoFU/8Cl+hPcysZOwnWWqVQ91D5G0LA=";
};
outputs = [ "out" "py" ];
pkgs/development/ocaml-modules/janestreet/0.17.nix
+19 -6
View File
@@ -1536,12 +1536,25 @@ with self;
];
};
ppxlib_jane = janePackage {
pname = "ppxlib_jane";
hash = "sha256-8NC8CHh3pSdFuRDQCuuhc2xxU+84UAsGFJbbJoKwd0U=";
meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree";
propagatedBuildInputs = [ ppxlib ];
};
ppxlib_jane = janePackage (
{
pname = "ppxlib_jane";
meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree";
propagatedBuildInputs = [ ppxlib ];
}
// (
if lib.versionAtLeast ocaml.version "5.3" then
{
version = "0.17.1";
hash = "sha256-kcGXqO1kFYds8KwLvpIQ7OKhqnp6JZs8WYYLi7o/nBw=";
}
else
{
version = "0.17.0";
hash = "sha256-8NC8CHh3pSdFuRDQCuuhc2xxU+84UAsGFJbbJoKwd0U=";
}
)
);
profunctor = janePackage {
pname = "profunctor";
pkgs/development/ocaml-modules/lo/default.nix
+8
View File
@@ -1,5 +1,6 @@
{
lib,
fetchpatch,
buildDunePackage,
fetchFromGitHub,
dune-configurator,
@@ -19,6 +20,13 @@ buildDunePackage rec {
sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2";
};
patches = [
(fetchpatch {
url = "https://github.com/savonet/ocaml-lo/commit/0b43bdf113c7e2c27d55c6a5f81f2fa4b30b5454.patch";
hash = "sha256-Y5xewkKgTX9WIpbmVA9uA6N7KOPPhNguTWvowgoAcNU=";
})
];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ liblo ];
pkgs/development/ocaml-modules/mlx/default.nix
+8
View File
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
fetchpatch,
buildDunePackage,
ppxlib,
menhir,
@@ -19,6 +20,13 @@ buildDunePackage rec {
hash = "sha256-3hPtyBKD2dp4UJBykOudW6KR2KXPnBuDnuJ1UNLpAp0=";
};
patches = [
(fetchpatch {
url = "https://github.com/ocaml-mlx/mlx/commit/01771e2a8b45f4f70cfd93533af2af9ed4a28a7e.patch";
hash = "sha256-czA2sIORmunIeaHn7kpcuv0y97uJhe6aUEMj/QHEag4=";
})
];
buildInputs = [
ppxlib
menhir
pkgs/development/ocaml-modules/sedlex/default.nix
+2 -1
View File
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
fetchurl,
ocaml,
buildDunePackage,
gen,
ppxlib,
@@ -74,7 +75,7 @@ buildDunePackage rec {
ppx_expect
];
doCheck = true;
doCheck = !lib.versionAtLeast ocaml.version "5.3";
dontStrip = true;
pkgs/development/php-packages/composer/default.nix
+18 -7
View File
@@ -2,12 +2,13 @@
lib,
stdenvNoCC,
fetchFromGitHub,
fetchpatch,
callPackage,
php,
unzip,
_7zz,
xz,
git,
gitMinimal,
curl,
cacert,
makeBinaryWrapper,
@@ -15,13 +16,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer";
version = "2.8.1";
version = "2.8.4";
# Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
# use together with the version from this package to keep the
# bootstrap phar file up-to-date together with the end user composer
# package.
passthru.pharHash = "sha256-kws3b70hR6Yj6ntwTrnTuLDWBymSIHqgU1qiH28FN44=";
passthru.pharHash = "sha256-xMTi4b6rDqBOC9BCpdu6n+2h+/XtoNNiA5WO3TQ8Coo=";
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
inherit (finalAttrs) version;
@@ -31,10 +32,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "composer";
repo = "composer";
rev = finalAttrs.version;
hash = "sha256-5UcbEx1d5jEz73mTFTacifl6ykxm6yQw3wvkJQtINHs=";
tag = finalAttrs.version;
hash = "sha256-m4CfWWbrmMN0j27XaMx/KRbFjpW5iMMNUlAtzlrorJc=";
};
patches = [
# Fix an issue preventing reproducible builds
# This patch should be removed at the next release (2.8.5)
# More information at https://github.com/composer/composer/pull/12090
(fetchpatch {
url = "https://github.com/composer/composer/commit/7b1e983ce9a0b30a6369cda11a7d61cca9c1ce46.patch";
hash = "sha256-veBdfZxzgL/R3P87GpvxQc+es3AdpaKSzCX0DCzH63U=";
})
];
nativeBuildInputs = [ makeBinaryWrapper ];
buildInputs = [ php ];
@@ -86,7 +97,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-FfFwx5E2LVDSqo2P31fqtvk2P30XnTm+TUqhNSHTt/M=";
outputHash = "sha256-McyO3Z4PSyC6LiWt8rsXziAIbEqOhiaT77gUdzZ6tzw=";
};
installPhase = ''
@@ -101,7 +112,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
lib.makeBinPath [
_7zz
curl
git
gitMinimal
unzip
xz
]
pkgs/development/php-packages/php-codesniffer/composer.lock
Generated
-1758
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/php-codesniffer/default.nix
+4 -5
View File
@@ -6,17 +6,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "php-codesniffer";
version = "3.11.0";
version = "3.11.2";
src = fetchFromGitHub {
owner = "PHPCSStandards";
repo = "PHP_CodeSniffer";
rev = "${finalAttrs.version}";
hash = "sha256-zCAaXKlKIBF7LK+DHkbzOqnSMj+ZaeafZnSOHOq3Z5Q=";
tag = "${finalAttrs.version}";
hash = "sha256-/rUkAQvdVMjeIS9UIKjTgk2D9Hb6HfQBRUXqbDYTAmg=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-r40bINMa9n4Rzlv75QSuz0TiV5qGsdh4mwMqj9BsKTY=";
vendorHash = "sha256-t5v+HyzOwa6+z5+PtEAAs9wSKxNBZ++tNc2iGO3tspY=";
meta = {
changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}";
pkgs/development/php-packages/php-cs-fixer/composer.lock
Generated
+435 -371
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/php-cs-fixer/default.nix
+4 -4
View File
@@ -6,19 +6,19 @@
php.buildComposerProject2 (finalAttrs: {
pname = "php-cs-fixer";
version = "3.64.0";
version = "3.67.0";
src = fetchFromGitHub {
owner = "PHP-CS-Fixer";
repo = "PHP-CS-Fixer";
rev = "v${finalAttrs.version}";
hash = "sha256-N2m3U0HjwQtm7loqYfEl7kstqljXC8evp6GEh+Cd9Hs=";
tag = "v${finalAttrs.version}";
hash = "sha256-FIqEVChYxtFqD9RcOttSk1QTPzG3HUBZmFI0wWY2BTQ=";
};
# Upstream doesn't provide a composer.lock.
# More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
composerLock = ./composer.lock;
vendorHash = "sha256-cOKfvNjFl9QKwPZp81IHaRurRhmXgbydhdTWYknlGBM=";
vendorHash = "sha256-lOlwQjBh/Uy+Hr3cc+NQC+2Fu3UODKOCSXpSrNOBNWY=";
meta = {
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
pkgs/development/php-packages/phpstan/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
hash = "sha256-pc65TtMFsei338t73kjKO8agPhyvYfJrtKleQG7ZLlY=";
};
vendorHash = "sha256-93HlbsEn5BX/9Ch0hCexLJS/zqJHyG0ngyiz/wnAqog=";
vendorHash = "sha256-HclF1hXWKwfq+r897FV8XMG1I31RyppyDz5LdFj2Sbg=";
composerStrictValidation = false;
meta = {
pkgs/development/php-packages/psalm/composer.lock
Generated
+225 -227
View File
File diff suppressed because it is too large Load Diff
pkgs/development/php-packages/psalm/default.nix
+3 -3
View File
@@ -6,19 +6,19 @@
php.buildComposerProject2 (finalAttrs: {
pname = "psalm";
version = "5.25.0";
version = "5.26.1";
src = fetchFromGitHub {
owner = "vimeo";
repo = "psalm";
tag = finalAttrs.version;
hash = "sha256-ecORCwTnTKzy/pgfODu9W9I/5xL+8Fo4OgZ5LsYDYLQ=";
hash = "sha256-TZm7HByPoCB4C0tdU5rzTfjMQEnhRhWPEiNR0bQDkTs=";
};
# Missing `composer.lock` from the repository.
# Issue open at https://github.com/vimeo/psalm/issues/10446
composerLock = ./composer.lock;
vendorHash = "sha256-lPUwhEUFIyFZPHFxQTE0l7GkkJxGCcSGSYqaVOohSgs=";
vendorHash = "sha256-po43yrMlvX7Y91Z3D5IYSpY7FOS6+tL/+a3AozopZ9Q=";
meta = {
changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}";
pkgs/development/php-packages/psysh/default.nix
+6 -6
View File
@@ -7,19 +7,19 @@
let
pname = "psysh";
version = "0.12.4";
version = "0.12.7";
src = fetchFromGitHub {
owner = "bobthecow";
repo = "psysh";
rev = "v${version}";
hash = "sha256-Zvo0QWHkQhYD9OeT8cgTo2AW5tClzQfwdohSUd8pRBQ=";
tag = "v${version}";
hash = "sha256-dgMUz7lB1XoJ08UvF9XMZGVXYcFK9sNnSb+pcwfeoqQ=";
};
composerLock = fetchurl {
name = "composer.lock";
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock";
hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw=";
hash = "sha256-JYJksHKyKKhU248hLPaNXFCh3X+5QiT8iNKzeGc1ZPw=";
};
in
php.buildComposerProject2 (finalAttrs: {
@@ -40,12 +40,12 @@ php.buildComposerProject2 (finalAttrs: {
preBuild = ''
composer config platform.php 7.4
composer require --no-update symfony/polyfill-iconv:1.29 symfony/polyfill-mbstring:1.29
composer require --no-update symfony/polyfill-iconv:1.31 symfony/polyfill-mbstring:1.31
composer require --no-update --dev roave/security-advisories:dev-latest
composer update --lock --no-install
'';
vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA=";
vendorHash = "sha256-ODUfR7PsM1YKkEIl4KEAHcY2irqlqMGlpvmEYV1M2jk=";
};
meta = {
pkgs/development/php-packages/vld/default.nix
+5
View File
@@ -2,6 +2,8 @@
lib,
buildPecl,
fetchFromGitHub,
nix-update-script,
php,
}:
buildPecl {
@@ -18,10 +20,13 @@ buildPecl {
# Tests relies on PHP 7.0
doCheck = false;
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Vulcan Logic Dumper hooks into the Zend Engine and dumps all the opcodes (execution units) of a script";
homepage = "https://github.com/derickr/vld";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ gaelreyrol ];
broken = lib.versionOlder php.version "8.2";
};
}
pkgs/development/python-modules/aniso8601/default.nix
+14 -9
View File
@@ -1,33 +1,38 @@
{
lib,
buildPythonPackage,
python-dateutil,
fetchPypi,
isPy3k,
mock,
pytestCheckHook,
python-dateutil,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "aniso8601";
version = "9.0.1";
format = "setuptools";
version = "10.0.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM=";
hash = "sha256-/x0PwjRmiMYsAVFUcTasMOMiiW7YrzFu92AsR9qUJs8=";
};
propagatedBuildInputs = [ python-dateutil ];
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ] ++ lib.optional (!isPy3k) mock;
dependencies = [ python-dateutil ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "aniso8601" ];
meta = with lib; {
description = "Python Parser for ISO 8601 strings";
homepage = "https://bitbucket.org/nielsenb/aniso8601";
license = with licenses; [ bsd3 ];
changelog = "https://bitbucket.org/nielsenb/aniso8601/src/v${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/graphene/default.nix
+7 -12
View File
@@ -1,6 +1,5 @@
{
lib,
aniso8601,
buildPythonPackage,
fetchFromGitHub,
setuptools,
@@ -11,42 +10,38 @@
pytest-mock,
pytest7CheckHook,
pythonOlder,
pytz,
snapshottest,
typing-extensions,
python-dateutil,
}:
buildPythonPackage rec {
pname = "graphene";
version = "3.3.0";
version = "3.4.3";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "graphql-python";
repo = "graphene";
tag = "v${version}";
hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ=";
hash = "sha256-K1IGKK3nTsRBe2D/cKJ/ahnAO5xxjf4gtollzTwt1zU=";
};
build-system = [ setuptools ];
dependencies = [
aniso8601
graphql-core
graphql-relay
python-dateutil
typing-extensions
];
# snaphottest->fastdiff->wasmer dependency chain does not support 3.12.
doCheck = pythonOlder "3.12";
nativeCheckInputs = [
pytest7CheckHook
pytest-asyncio
pytest-benchmark
pytest-mock
pytz
snapshottest
];
pytestFlagsArray = [ "--benchmark-disable" ];
pkgs/development/python-modules/huggingface-hub/default.nix
+2 -2
View File
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.26.5";
version = "0.27.1";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "huggingface_hub";
tag = "v${version}";
hash = "sha256-0yg0UwC0vyp8Q+2RTyAJkFP9I4/RQ6zRj3CaKJwU8Gc=";
hash = "sha256-7cfu+qBro6u7bcRTTWHq+AemHqW7yb702owGoE5iTVg=";
};
build-system = [ setuptools ];

Some files were not shown because too many files have changed in this diff Show More