Merge commit 97e6d418ed into haskell-updates

This commit is contained in:
sternenseemann
2025-05-02 11:31:20 +02:00
221 changed files with 3829 additions and 2530 deletions
+8
View File
@@ -179,6 +179,8 @@ let
xargs -I{} -P"$cores" \
${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir"
cp -r "$chunkOutputDir"/stats $out/stats-by-chunk
if (( chunkSize * chunkCount != attrCount )); then
# A final incomplete chunk would mess up the stats, don't include it
rm "$chunkOutputDir"/stats/"$seq_end"
@@ -253,6 +255,12 @@ let
done
} |
jq -s from_entries > $out/stats.json
mkdir -p $out/stats
for d in ${resultsDir}/*; do
cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
done
'';
compare = import ./compare {
@@ -39,7 +39,7 @@ in
htpasswd-file = lib.mkOption {
default = null;
type = lib.types.nullOr lib.types.path;
description = "The path to the servers .htpasswd file. Defaults to {dataDir}/htpasswd.";
description = "The path to the servers .htpasswd file. Defaults to `\${dataDir}/.htpasswd`.";
};
privateRepos = lib.mkOption {
@@ -68,6 +68,8 @@ in
options.services.mautrix-signal = {
enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge";
package = lib.mkPackageOption pkgs "mautrix-signal" { };
settings = lib.mkOption {
apply = lib.recursiveUpdate defaultConfig;
type = settingsFormat.type;
@@ -206,7 +208,7 @@ in
# generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-signal}/bin/mautrix-signal \
${cfg.package}/bin/mautrix-signal \
--generate-registration \
--config='${settingsFile}' \
--registration='${registrationFile}'
@@ -234,7 +236,7 @@ in
StateDirectory = baseNameOf dataDir;
WorkingDirectory = dataDir;
ExecStart = ''
${pkgs.mautrix-signal}/bin/mautrix-signal \
${cfg.package}/bin/mautrix-signal \
--config='${settingsFile}' \
--registration='${registrationFile}'
'';
@@ -18,6 +18,8 @@ in
services.mautrix-telegram = {
enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge";
package = lib.mkPackageOption pkgs "mautrix-telegram" { };
settings = lib.mkOption rec {
apply = lib.recursiveUpdate default;
inherit (settingsFormat) type;
@@ -201,7 +203,7 @@ in
# generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-telegram}/bin/mautrix-telegram \
${cfg.package}/bin/mautrix-telegram \
--generate-registration \
--config='${settingsFile}' \
--registration='${registrationFile}'
@@ -220,9 +222,9 @@ in
umask $old_umask
''
+ lib.optionalString (pkgs.mautrix-telegram ? alembic) ''
+ lib.optionalString (cfg.package ? alembic) ''
# run automatic database init and migration scripts
${pkgs.mautrix-telegram.alembic}/bin/alembic -x config='${settingsFile}' upgrade head
${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head
'';
serviceConfig = {
@@ -238,13 +240,13 @@ in
ProtectControlGroups = true;
PrivateTmp = true;
WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found
WorkingDirectory = cfg.package; # necessary for the database migration scripts to be found
StateDirectory = baseNameOf dataDir;
UMask = "0027";
EnvironmentFile = cfg.environmentFile;
ExecStart = ''
${pkgs.mautrix-telegram}/bin/mautrix-telegram \
${cfg.package}/bin/mautrix-telegram \
--config='${settingsFile}'
'';
};
@@ -51,6 +51,8 @@ in
options.services.mautrix-whatsapp = {
enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp";
package = lib.mkPackageOption pkgs "mautrix-whatsapp" { };
settings = lib.mkOption {
type = settingsFormat.type;
default = defaultConfig;
@@ -168,7 +170,7 @@ in
# generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \
${cfg.package}/bin/mautrix-whatsapp \
--generate-registration \
--config='${settingsFile}' \
--registration='${registrationFile}'
@@ -196,7 +198,7 @@ in
StateDirectory = baseNameOf dataDir;
WorkingDirectory = dataDir;
ExecStart = ''
${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \
${cfg.package}/bin/mautrix-whatsapp \
--config='${settingsFile}' \
--registration='${registrationFile}'
'';
+2 -6
View File
@@ -206,11 +206,6 @@ in
assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null;
message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set";
}
{
assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath);
message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not";
}
];
users.users.ncps = {
@@ -245,7 +240,8 @@ in
systemd.services.ncps = {
description = "ncps binary cache proxy service";
after = [ "network.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
+6 -3
View File
@@ -10,15 +10,16 @@
tk,
fftw,
portaudio,
portmidi,
}:
stdenv.mkDerivation rec {
pname = "puredata";
version = "0.54-1";
version = "0.55-2";
src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls=";
};
patches = [
@@ -41,12 +42,12 @@ stdenv.mkDerivation rec {
alsa-lib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
portmidi
portaudio
];
configureFlags =
[
"--enable-universal"
"--enable-fftw"
"--enable-jack"
]
@@ -55,7 +56,9 @@ stdenv.mkDerivation rec {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"--enable-portaudio"
"--enable-portmidi"
"--without-local-portaudio"
"--without-local-portmidi"
"--disable-jack-framework"
"--with-wish=${tk}/bin/wish8.6"
];
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
fftw,
liblo,
libsndfile,
@@ -23,6 +24,14 @@ stdenv.mkDerivation rec {
hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";
};
patches = [
# Fixes build with recent liblo, see https://gitlab.com/then-try-this/samplebrain/-/merge_requests/16
(fetchpatch {
url = "https://gitlab.com/then-try-this/samplebrain/-/commit/032fd7c03931d1ca2d5c3d5e29901569aa2b2a86.patch";
hash = "sha256-aaZJh/vx8fOqrJTuFzQ9+1mXvDQQXLy1k/2SwkMkVk4=";
})
];
nativeBuildInputs = [
qmake
wrapQtAppsHook
@@ -4,48 +4,36 @@
editorconfig,
f,
fetchFromGitHub,
replaceVars,
jsonrpc,
nodejs,
s,
melpaBuild,
copilot-node-server,
copilot-language-server,
}:
let
# The Emacs package isn't compatible with the latest
# copilot-node-server so we have to set a specific revision
# https://github.com/copilot-emacs/copilot.el/issues/344
pinned-copilot-node-server = copilot-node-server.overrideAttrs (old: rec {
version = "1.27.0";
src = fetchFromGitHub {
owner = "jfcherng";
repo = "copilot-node-server";
rev = version;
hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo=";
};
});
in
melpaBuild {
melpaBuild (finalAttrs: {
pname = "copilot";
version = "0-unstable-2024-12-28";
version = "0.2.0";
src = fetchFromGitHub {
owner = "copilot-emacs";
repo = "copilot.el";
rev = "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4";
sha256 = "sha256-FzI08AW7a7AleEM7kSQ8LsWsDYID8SW1SmSN6/mIB/A=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-hIA+qdWoOJI9/hqBUSHhmh+jjzDnPiZkIzszCPuQxd0=";
};
files = ''(:defaults "dist")'';
patches = [
(replaceVars ./specify-copilot-install-dir.patch {
copilot-node-server = pinned-copilot-node-server;
})
];
postPatch = ''
substituteInPlace copilot.el \
--replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \
"defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\""
'';
packageRequires = [
dash
editorconfig
f
jsonrpc
s
];
@@ -64,4 +52,4 @@ melpaBuild {
"x86_64-windows"
];
};
}
})
@@ -1,14 +0,0 @@
diff --git a/copilot.el b/copilot.el
index f1f5e51..ddf2b5b 100644
--- a/copilot.el
+++ b/copilot.el
@@ -132,8 +132,7 @@ (defcustom copilot-indentation-alist
(defconst copilot-server-package-name "copilot-node-server"
"The name of the package to install copilot server.")
-(defcustom copilot-install-dir (expand-file-name
- (locate-user-emacs-file (f-join ".cache" "copilot")))
+(defcustom copilot-install-dir "@copilot-node-server@"
"Directory in which the servers will be installed."
:risky t
:type 'directory
+2 -2
View File
@@ -28,13 +28,13 @@ in
stdenv.mkDerivation rec {
pname = "tiled";
version = "1.11.2";
version = "1.11.90";
src = fetchFromGitHub {
owner = "mapeditor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";
};
nativeBuildInputs = [
File diff suppressed because it is too large Load Diff
@@ -152,7 +152,10 @@ in
# Set to `!privacySupport` or `false`.
crashreporterSupport ?
!privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl,
!privacySupport
&& !stdenv.hostPlatform.isLoongArch64
&& !stdenv.hostPlatform.isRiscV
&& !stdenv.hostPlatform.isMusl,
curl,
geolocationSupport ? !privacySupport,
webrtcSupport ? !privacySupport,
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "138.0";
version = "138.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "265eef505216f70d50ebb95a6b23983d0b70430320e7e2dcf497127890d7bbdff1c49c64790010c85b8e3fe0da5c90e95b2d44fb1adca64b1755428ccb2b91a2";
sha512 = "bc5a8d658140c4c3db29d51134c97105a0225567d5ce14757f69594066bf6a44a13e0626cebde2b7a078bac128a14690ee06083d0306d7789de2a5e9d8394b23";
};
meta = {
@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "anilibria-winmaclinux";
version = "2.2.26";
version = "2.2.27";
src = fetchFromGitHub {
owner = "anilibria";
repo = "anilibria-winmaclinux";
rev = version;
hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4=";
hash = "sha256-wu4kJCs1Bo6yVGLJuzXSCtv2nXhzlwX6jDTa0gTwPsw=";
};
sourceRoot = "${src.name}/src";
@@ -7,14 +7,14 @@
}:
buildLua (finalAttrs: {
pname = "modernz";
version = "0.2.7";
version = "0.2.8";
scriptPath = "modernz.lua";
src = fetchFromGitHub {
owner = "Samillion";
repo = "ModernZ";
rev = "v${finalAttrs.version}";
hash = "sha256-BMxwQa+G8FiTl3qpoFxz1czZH1UweTYPwN9tDluQFBo=";
hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg=";
};
postInstall = ''
@@ -74,9 +74,9 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
virtualboxVersion = "7.1.6";
virtualboxSubVersion = "a";
virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";
virtualboxVersion = "7.1.8";
virtualboxSubVersion = "";
virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
kvmPatchVersion = "20250207";
kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
@@ -249,8 +249,8 @@ stdenv.mkDerivation (finalAttrs: {
++ optional enableKvm (
let
patchVboxVersion =
# There is no updated patch for 7.0.22 yet, but the older one still applies.
if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion;
# There is no updated patch for 7.1.8 yet, but the older one still applies.
if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;
in
fetchpatch {
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
@@ -4,7 +4,7 @@
virtualbox,
}:
let
virtualboxExtPackVersion = "7.1.6";
virtualboxExtPackVersion = "7.1.8";
in
fetchurl rec {
name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let
value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b";
value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";
in
assert (builtins.stringLength value) == 64;
value;
@@ -5,7 +5,7 @@
}:
fetchurl {
url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc";
sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";
meta = {
description = "Guest additions ISO for VirtualBox";
longDescription = ''
@@ -12,9 +12,9 @@
libX11,
}:
let
virtualboxVersion = "7.1.6";
virtualboxSubVersion = "a";
virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";
virtualboxVersion = "7.1.8";
virtualboxSubVersion = "";
virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;
+11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
telegram-desktop,
withWebkit ? true,
}:
@@ -21,6 +22,16 @@ telegram-desktop.override {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
# https://github.com/desktop-app/lib_base/pull/268
url = "https://github.com/desktop-app/lib_base/commit/c952da37294b958e896b27528e7834f0892faa0a.patch";
extraPrefix = "Telegram/lib_base/";
stripLen = 1;
hash = "sha256-xiq8WLAiSZwpvdyK5JbRAdQ9us93+9oMmeMBqVb1TbI=";
})
];
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
(lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
];
+2 -2
View File
@@ -9,7 +9,7 @@
let
appName = "AeroSpace.app";
version = "0.18.2-Beta";
version = "0.18.4-Beta";
in
stdenv.mkDerivation {
pname = "aerospace";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
sha256 = "sha256-/Fc4Zk8KvAdaKXyHmeL9nh79CAQLx/Y6URFWIOL5YyQ=";
sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
};
nativeBuildInputs = [ installShellFiles ];
+4 -1
View File
@@ -71,9 +71,12 @@ let
src = fetchFromGitHub {
owner = "AOMediaCodec";
repo = "libavif";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";
};
patches = [ ];
doCheck = false;
};
in
stdenv.mkDerivation {
+3 -3
View File
@@ -17,11 +17,11 @@ let
rec {
x86_64-linux = {
urlSuffix = "linux-x86_64.tar.gz";
hash = "sha256-WUAyGx7RcLlQsYpfcbV69k1ESaif5VraxUFAslMi5lo=";
hash = "sha256-s3/975BJELl6J3u9reyVBEbismR32uJq6NXF7u/Dcp0=";
};
x86_64-darwin = {
urlSuffix = "macos-universal.zip";
hash = "sha256-fB6DCp2+7T9ozHuMdsv6IwwIyD6+t7LxVWMj9lDJ5Fw=";
hash = "sha256-xMEyJxucnVuxSa0zwOYr91C7yUuMvKkRTYZhuioV1xc=";
};
aarch64-darwin = x86_64-darwin;
}
@@ -30,7 +30,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "appflowy";
version = "0.8.8";
version = "0.8.9";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
@@ -1,18 +0,0 @@
diff --git a/src/arma3-unix-launcher/main.cpp b/src/arma3-unix-launcher/main.cpp
index 10f6ed9..c706734 100644
--- a/src/arma3-unix-launcher/main.cpp
+++ b/src/arma3-unix-launcher/main.cpp
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
w.show();
diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp
index f30bf8a..e0cef66 100644
--- a/src/dayz-linux-launcher/main.cpp
+++ b/src/dayz-linux-launcher/main.cpp
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
w.show();
@@ -1,19 +1,19 @@
diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake
index 2eb6ec5..9f1d67e 100644
index 76648b2..145e978 100644
--- a/cmake/external_dependencies.cmake
+++ b/cmake/external_dependencies.cmake
@@ -4,7 +4,7 @@ include(FetchContent)
@@ -3,7 +3,7 @@ include(FetchContent)
function(setup_library SOURCE_TO_TEST)
set(boolArgs HEADER_ONLY)
- set(oneValueArgs NAME CXX_FLAGS GIT_REPOSITORY GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)
+ set(oneValueArgs NAME CXX_FLAGS URL GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)
set(multiValueArgs WHEN)
cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -27,12 +27,11 @@ function(setup_library SOURCE_TO_TEST)
@@ -26,12 +26,11 @@ function(setup_library SOURCE_TO_TEST)
endif()
FetchContent_Declare(${LIB_SETUP_NAME}
- GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY}
- GIT_TAG ${LIB_SETUP_GIT_TAG})
@@ -26,7 +26,7 @@ index 2eb6ec5..9f1d67e 100644
FetchContent_Populate(${LIB_SETUP_NAME})
set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR")
set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR")
@@ -51,8 +50,7 @@ function(setup_argparse)
@@ -50,8 +49,7 @@ function(setup_argparse)
}")
setup_library("${CHECK_SOURCE}"
NAME argparse
@@ -36,7 +36,7 @@ index 2eb6ec5..9f1d67e 100644
HEADER_ONLY
)
if (NOT TARGET argparse::argparse)
@@ -64,7 +62,7 @@ function(setup_curlpp)
@@ -63,7 +61,7 @@ function(setup_curlpp)
set(CHECK_SOURCE "#error unimplemented}")
setup_library("${CHECK_SOURCE}"
NAME curlpp
@@ -63,7 +63,7 @@ index 2eb6ec5..9f1d67e 100644
+ URL @fmt_src@
TEST_LINK_LIBS fmt
)
@@ -126,7 +123,7 @@ function(setup_nlohmann_json)
add_library(nlohmann_json INTERFACE)
else()
@@ -84,7 +84,7 @@ index 2eb6ec5..9f1d67e 100644
)
get_target_property(TARGET_TYPE pugixml TYPE)
@@ -188,8 +184,7 @@ function(setup_spdlog)
setup_library("${CHECK_SOURCE}"
NAME spdlog
- GIT_REPOSITORY https://github.com/gabime/spdlog.git
@@ -94,7 +94,7 @@ index 2eb6ec5..9f1d67e 100644
TEST_LINK_LIBS ${FMT_TARGET_NAME}
CXX_FLAGS "-Wno-attributes -Wno-reorder -Wno-redundant-move"
@@ -198,8 +193,7 @@ endfunction()
function(setup_steamworkssdk)
FetchContent_Declare(steamworkssdk
- URL https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip
@@ -11,18 +11,19 @@
nlohmann_json,
qt5,
spdlog,
steam-run,
replaceVars,
buildDayZLauncher ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "arma3-unix-launcher";
version = "413-unstable-2025-02-10";
version = "420";
src = fetchFromGitHub {
owner = "muttleyxd";
repo = "arma3-unix-launcher";
rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5";
hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ=";
tag = "commit-${finalAttrs.version}";
hash = "sha256-QY3zDtfZt2ifF69Jzp0Ls1SpDCliKdkwLaGFXneT79o=";
};
patches = [
@@ -52,8 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
doctest_src = null;
trompeloeil_src = null;
})
# game won't launch with steam integration anyways, disable it
./disable_steam_integration.patch
# use steam-run when running the game directly
(replaceVars ./steam-run.patch {
steamRun = lib.getExe steam-run;
})
];
nativeBuildInputs = [
@@ -0,0 +1,35 @@
diff --git a/src/arma3-unix-launcher-library/arma3client.cpp b/src/arma3-unix-launcher-library/arma3client.cpp
index dbb17d0..ee8853c 100644
--- a/src/arma3-unix-launcher-library/arma3client.cpp
+++ b/src/arma3-unix-launcher-library/arma3client.cpp
@@ -63,7 +63,7 @@ namespace
disable_esync);
if (!is_proton)
{
- StdUtils::StartBackgroundProcess(fmt::format("env {} {} {}", user_environment_variables, executable_path, arguments),
+ StdUtils::StartBackgroundProcess(fmt::format("@steamRun@ env {} {} {}", user_environment_variables, executable_path, arguments),
arma_path.string());
return;
}
@@ -83,7 +83,7 @@ namespace
auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",
get_esync_prefix(disable_esync), arma3_id, ld_preload_path, steam_compat_data_path.string());
- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
+ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
optional_steam_runtime(steam_utils), compatibility_tool.first,
get_verb(compatibility_tool.second), executable_path.string(), arguments);
spdlog::info("Running Arma:\n{}\n", command);
diff --git a/src/dayz-linux-launcher-library/dayzclient.cpp b/src/dayz-linux-launcher-library/dayzclient.cpp
index 5fc9027..d2b9e92 100644
--- a/src/dayz-linux-launcher-library/dayzclient.cpp
+++ b/src/dayz-linux-launcher-library/dayzclient.cpp
@@ -76,7 +76,7 @@ namespace
auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",
get_esync_prefix(disable_esync), dayz_id, ld_preload_path, steam_compat_data_path.string());
- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
+ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
optional_steam_runtime(steam_utils), compatibility_tool.first,
get_verb(compatibility_tool.second), executable_path.string(), arguments);
spdlog::info("Running DayZ:\n{}\n", command);
+23 -15
View File
@@ -2,27 +2,30 @@
lib,
buildGoModule,
fetchFromGitHub,
terraform,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "atmos";
version = "1.95.0";
version = "1.171.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas=";
repo = "atmos";
tag = "v${finalAttrs.version}";
hash = "sha256-4A/sSJhF9syK1Z3HhBy8fXzdXBfAoofwQ+WLYeH1cvw=";
};
vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo=";
vendorHash = "sha256-JN6S1ncElUnZ9XEKEsgfYKXWZQpxogf9imopLeXX3ao=";
ldflags = [
"-s"
"-w"
"-X github.com/cloudposse/atmos/cmd.Version=v${version}"
"-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}"
];
nativeCheckInputs = [ terraform ];
preCheck = ''
# Remove tests that depend on a network connection.
rm -f \
@@ -31,21 +34,26 @@ buildGoModule rec {
pkg/describe/describe_affected_test.go
'';
doCheck = true;
# depend on a network connection.
doCheck = false;
# depend on a network connection.
doInstallCheck = false;
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/atmos version | grep "v${version}"
$out/bin/atmos version | grep "v${finalAttrs.version}"
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://atmos.tools";
changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}";
changelog = "https://github.com/cloudposse/atmos/releases/tag/v${finalAttrs.version}";
description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)";
mainProgram = "atmos";
license = licenses.asl20;
teams = [ teams.cloudposse ];
license = lib.licenses.asl20;
teams = [ lib.teams.cloudposse ];
};
}
})
+11 -15
View File
@@ -2,33 +2,29 @@
stdenv,
lib,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "backward";
version = "1.6";
src = fetchFromGitHub {
owner = "bombela";
repo = "backward-cpp";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";
};
installPhase = ''
runHook preInstall
nativeBuildInputs = [
cmake
];
mkdir -p $out/include
cp backward.hpp $out/include
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Beautiful stack trace pretty printer for C++";
homepage = "https://github.com/bombela/backward-cpp";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ ];
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ ];
};
}
})
+27 -22
View File
@@ -1,31 +1,33 @@
{
lib,
stdenv,
fetchurl,
autoPatchelfHook,
wrapGAppsHook3,
cairo,
e2fsprogs,
fetchurl,
gmp,
gtk3,
libGL,
libX11,
lib,
stdenv,
libgcrypt,
wrapGAppsHook3,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "banana-accounting";
version = "10.0.12";
version = "10.1.24";
srcs = fetchurl {
url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw=";
url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M=";
};
sourceRoot = ".";
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
];
buildInputs = [
cairo
@@ -38,25 +40,28 @@ stdenv.mkDerivation {
libgcrypt
];
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv ./* $out
ln -s $out/usr/bin/bananaplus $out/bin/
mkdir -p $out/opt $out/bin $out/share
cp -r . $out/opt/banana-accounting
ln -s $out/opt/banana-accounting/usr/bin/bananaplus $out/bin/bananaplus
ln -s $out/opt/banana-accounting/usr/share/applications $out/share/applications
ln -s $out/opt/banana-accounting/usr/share/icons $out/share/icons
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Accounting Software for small companies, associations and individuals";
homepage = "https://www.banana.ch/";
license = licenses.unfree;
homepage = "https://www.banana.ch";
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ jacg ];
maintainers = with lib.maintainers; [ jacg ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
}
})
+8 -6
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "barman";
version = "3.11.1";
version = "3.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "EnterpriseDB";
repo = "barman";
tag = "release/${version}";
hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU=";
hash = "sha256-CfzDO4u6JL4cLHvs7f1oQqQPc+j1lKng4J9wIBswIpA=";
};
patches = [ ./unwrap-subprocess.patch ];
@@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec {
mock
pytestCheckHook
versionCheckHook
zstandard
lz4
];
disabledTests =
@@ -57,13 +59,13 @@ python3Packages.buildPythonApplication rec {
"test_get_file_mode"
];
meta = with lib; {
meta = {
description = "Backup and Recovery Manager for PostgreSQL";
homepage = "https://www.pgbarman.org/";
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
mainProgram = "barman";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ freezeboy ];
platforms = platforms.unix;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ freezeboy ];
platforms = lib.platforms.unix;
};
}
+10 -3
View File
@@ -2,13 +2,11 @@
lib,
stdenvNoCC,
fetchzip,
gitUpdater,
}:
stdenvNoCC.mkDerivation rec {
pname = "beedii";
# 1.2.0 does not include font files.
# https://github.com/webkul/beedii/issues/1
version = "1.0.0";
src = fetchzip {
@@ -25,6 +23,15 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {
url = "https://github.com/webkul/beedii";
rev-prefix = "v";
# This version does not include font files in the released assets.
# https://github.com/webkul/beedii/issues/1
ignoredVersions = "^1\.2\.0$";
};
meta = {
description = "Free Hand Drawn Emoji Font";
homepage = "https://github.com/webkul/beedii";
+24 -10
View File
@@ -15,20 +15,31 @@ let
hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4=";
};
appimageContents = appimageTools.extract {
inherit version pname src;
inherit pname version src;
postExtract = ''
# disable creating a desktop file and icon in the home folder during runtime
linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
# disable auto update
sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs
# prevent updates
sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs
# hide version status element on about page otherwise a error message is shown
sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css
'';
};
in
appimageTools.wrapType2 {
inherit pname version src;
appimageTools.wrapAppImage {
inherit pname version;
src = appimageContents;
extraPkgs = pkgs: [ pkgs.libsecret ];
postExtract = ''
# disable creating a desktop file and icon in the home folder during runtime
linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
'';
extraInstallCommands = ''
install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png
install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/
@@ -50,10 +61,13 @@ appimageTools.wrapType2 {
text = ''
set -o errexit
latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)"
version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
update-source-version beeper "$version"
'';
});
# needed for nix-update
inherit src;
};
meta = with lib; {
@@ -34,13 +34,13 @@ let
in
buildNpmPackage' rec {
pname = "bitwarden-desktop";
version = "2025.2.0";
version = "2025.3.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8=";
hash = "sha256-nwm9ENTB1V+koUA3M8XR8DegmPHwYoszYlWbcxA6aXY=";
};
patches = [
@@ -76,7 +76,7 @@ buildNpmPackage' rec {
"--ignore-scripts"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs=";
npmDepsHash = "sha256-PjlTGR+e8uDe9KKEvW7cq/wYHRBO16Cf3oHh37YcNFc=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
@@ -86,7 +86,7 @@ buildNpmPackage' rec {
cargoRoot
patches
;
hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc=";
hash = "sha256-zIzgVvtTUIPKeOG/v9/7ugIIAVhoMjQ8QJ0Cbj9uZsQ=";
};
cargoRoot = "apps/desktop/desktop_native";
@@ -222,7 +222,6 @@ buildNpmPackage' rec {
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--commit"
"--version=stable"
"--version-regex=^desktop-v(.*)$"
];
+14 -2
View File
@@ -7,8 +7,10 @@
meson,
ninja,
python3,
runCommand,
stdenv,
testers,
wrapGAppsNoGuiHook,
xvfb-run,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
meson
ninja
wrapGAppsNoGuiHook
];
buildInputs = [
@@ -64,8 +67,17 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck
'';
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
# regression test that `blueprint-compiler` can be used in a standalone
# context outside of nix builds, and doesn't rely on the setup hooks of
# its propagated inputs for basic functionality.
# see https://github.com/NixOS/nixpkgs/pull/400415
standalone = runCommand "blueprint-compiler-test-standalone" { } ''
${lib.getExe finalAttrs.finalPackage} --help && touch $out
'';
};
meta = with lib; {
+9 -3
View File
@@ -15,22 +15,28 @@
pkg-config,
readline,
sbc,
python3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bluez-alsa";
version = "4.1.1";
version = "4.3.1";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${finalAttrs.version}";
hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0=";
tag = "v${finalAttrs.version}";
hash = "sha256-Vebxyku7xl/ReU025iThEbvfHsi4kCbvFqlBGDWrHxc=";
};
postPatch = ''
patchShebangs src/dbus-codegen.py
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
python3
];
buildInputs =
+3 -12
View File
@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch,
pkg-config,
bzip2,
openssl,
@@ -13,26 +12,18 @@
rustPlatform.buildRustPackage rec {
pname = "boa";
version = "0.17.3";
version = "0.20";
src = fetchFromGitHub {
owner = "boa-dev";
repo = "boa";
rev = "v${version}";
hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg=";
hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "fix-rust-1.71-lints.patch";
url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch";
hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ=";
})
];
useFetchCargoVendor = true;
cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4=";
cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w=";
cargoBuildFlags = [
"--package"
@@ -1,287 +0,0 @@
From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 23 Sep 2024 15:11:09 +0800
Subject: [PATCH] update time
---
Cargo.lock | 87 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 56 insertions(+), 31 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index be4fbeb..42f29b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -809,6 +809,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
[[package]]
name = "derivative"
version = "2.2.0"
@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2002,6 +2011,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2308,7 +2323,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2389,6 +2404,12 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -2407,9 +2428,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.57"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -2425,9 +2446,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.27"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -2711,22 +2732,22 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.163"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.163"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2981,9 +3002,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.16"
+version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3061,11 +3082,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.21"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
+ "deranged",
"itoa",
+ "num-conv",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -3073,16 +3097,17 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.9"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3443,7 +3468,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
"wasm-bindgen-shared",
]
@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
--
2.46.0
+8 -8
View File
@@ -7,6 +7,7 @@
gtk3,
xorg,
perl,
pkg-config,
openssl,
speechd-minimal,
libxkbcommon,
@@ -34,23 +35,22 @@ let
in
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "BoilR";
version = "1.9.4";
version = "1.9.6";
src = fetchFromGitHub {
owner = "PhilipK";
repo = "BoilR";
tag = "v.${version}";
hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80=";
hash = "sha256-qCY/I3ACrs5mWpgN+xmWi42rF9Mzqxxce2DIA+R1RNs=";
};
cargoPatches = [
./0001-update-time.patch
];
useFetchCargoVendor = true;
cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s=";
cargoHash = "sha256-9B2NcFO/Bj553yaOMi7oBZJTFtCQmBnJkU9nK+vjThU=";
nativeBuildInputs = [ perl ];
nativeBuildInputs = [
perl
pkg-config
];
buildInputs = rpathLibs;
+7 -7
View File
@@ -17,14 +17,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "buffer";
version = "0.9.7";
version = "0.9.10";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "cheywood";
repo = "buffer";
rev = finalAttrs.version;
hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg=";
tag = finalAttrs.version;
hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g=";
};
nativeBuildInputs = [
@@ -54,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
)
'';
meta = with lib; {
meta = {
description = "Minimal editing space for all those things that don't need keeping";
homepage = "https://gitlab.gnome.org/cheywood/buffer";
license = licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
mainProgram = "buffer";
maintainers = with maintainers; [ michaelgrahamevans ];
platforms = platforms.linux;
maintainers = with lib.maintainers; [ michaelgrahamevans ];
platforms = lib.platforms.linux;
};
})
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "buffrs";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "helsing-ai";
repo = "buffrs";
tag = "v${version}";
hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y=";
hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ=";
cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y=";
# Disabling tests meant to work over the network, as they will fail
# inside the builder.
+2 -2
View File
@@ -19,13 +19,13 @@ in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "c3c${optionalString debug "-debug"}";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "c3lang";
repo = "c3c";
tag = "v${finalAttrs.version}";
hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8=";
hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU=";
};
cmakeBuildType = if debug then "Debug" else "Release";
+3 -3
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cgif";
version = "0.3.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "dloebl";
repo = "cgif";
rev = "V${finalAttrs.version}";
sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4=";
tag = "v${finalAttrs.version}";
hash = "sha256-i8xngmVhRCGkczY3NzomLkXj+iqPb81lvLn6dXsByYs=";
};
nativeBuildInputs = [
+8 -6
View File
@@ -8,31 +8,33 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.23.7";
pname = "checkbashisms";
version = "2.25.10";
src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk=";
hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ perl ];
buildPhase = ''
runHook preBuild
substituteInPlace ./scripts/checkbashisms.pl \
--replace '###VERSION###' "$version"
--replace-fail '###VERSION###' "${finalAttrs.version}"
runHook postBuild
'';
installPhase = ''
runHook preInstall
installManPage scripts/$pname.1
installShellCompletion --bash --name $pname scripts/$pname.bash_completion
install -D -m755 scripts/$pname.pl $out/bin/$pname
installManPage scripts/checkbashisms.1
installShellCompletion --bash --name checkbashisms scripts/checkbashisms.bash_completion
install -D -m755 scripts/checkbashisms.pl $out/bin/checkbashisms
runHook postInstall
'';
+12 -12
View File
@@ -1,13 +1,13 @@
{
stdenv,
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
python3,
wrapGAppsHook3,
gtkmm3,
gtksourceview,
gtksourceview4,
gtksourceviewmm,
gspell,
libxmlxx,
@@ -19,15 +19,15 @@
vte,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cherrytree";
version = "1.1.4";
version = "1.4.0";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
tag = "v${version}";
hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE=";
tag = "v${finalAttrs.version}";
hash = "sha256-X87L3oSidnXH/IIHtVbeIn0ehWkSgrAkX0+TUGQomV0=";
};
nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtkmm3
gtksourceview
gtksourceview4
gtksourceviewmm
gspell
libxmlxx
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
vte
];
meta = with lib; {
meta = {
description = "Hierarchical note taking application";
mainProgram = "cherrytree";
longDescription = ''
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
a Cherrytree document where you can easily find it.
'';
homepage = "https://www.giuspen.com/cherrytree";
changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt";
license = licenses.gpl3Plus;
changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${finalAttrs.version}/changelog.txt";
license = lib.licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.unix;
platforms = lib.platforms.unix;
};
}
})
+14 -9
View File
@@ -4,25 +4,30 @@
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chess-tui";
version = "1.2.1";
version = "1.6.1";
src = fetchFromGitHub {
owner = "thomas-mauran";
repo = "chess-tui";
rev = "${version}";
hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4=";
tag = finalAttrs.version;
hash = "sha256-L7SaWNSS5tn8OyKTPixTtlMB+OmVd9I0VXtasQMI5GI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Ydn/y7HF8VppEjkRy3ayibgxpcLc1NiHlR5oLi3D11A=";
cargoHash = "sha256-u3Di/vTKbyehmNbTlMZPNRejgK9jYROQv8qdz2XT4Bs=";
meta = with lib; {
checkFlags = [
# assertion failed: result.is_ok()
"--skip=tests::test_config_create"
];
meta = {
description = "Chess TUI implementation in rust";
homepage = "https://github.com/thomas-mauran/chess-tui";
maintainers = with maintainers; [ ByteSudoer ];
license = licenses.mit;
maintainers = with lib.maintainers; [ ByteSudoer ];
license = lib.licenses.mit;
mainProgram = "chess-tui";
};
}
})
@@ -1,14 +0,0 @@
diff --git a/Makefile b/Makefile
index 99065da..2415738 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ endif
ifeq ($(CC), clang)
CFLAGS += $(CLANG_FLAGS)
endif
-ifeq ($(shell uname), Linux)
- CFLAGS += -static
-endif
Target = chsrc
+7 -9
View File
@@ -1,33 +1,31 @@
{
lib,
fetchFromGitHub,
stdenv,
fetchFromGitHub,
texinfo,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "chsrc";
version = "0.1.9";
version = "0.2.1";
src = fetchFromGitHub {
owner = "RubyMetric";
repo = "chsrc";
rev = "v${finalAttrs.version}";
hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw=";
tag = "v${finalAttrs.version}";
hash = "sha256-yZjza4BSgRCOwc719iNdG17WVuLPUBJjZb6Yz4FsTcA=";
};
nativeBuildInputs = [ texinfo ];
patches = [
./disable-static-compiling.patch
];
installPhase = ''
runHook preInstall
install -Dm755 chsrc $out/bin/chsrc
install -Dm644 doc/chsrc.1 -t $out/share/man/man1/
makeinfo doc/chsrc.texi --output=chsrc.info
install -Dm 644 chsrc.info -t $out/share/info/
install -Dm644 chsrc.info -t $out/share/info/
runHook postInstall
'';
+2 -2
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.21.0";
version = "2.21.1";
dontConfigure = true;
dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
hash = "sha256-pYNjb7jvYNgL6H+jhH1eviwk67JCDt1S5F2yxRaAO6g=";
hash = "sha256-l8ud3yiycRyWk4yQ8LkJIGpK2aZh8GwYKRBZEYqObHg=";
};
nativeBuildInputs = [
@@ -21,6 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
@@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applibrary";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
+1
View File
@@ -15,6 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-bg";
+1
View File
@@ -22,6 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
+1
View File
@@ -23,6 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
+1
View File
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
+1
View File
@@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-icons";
+1
View File
@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-idle";
@@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-notifications";
+1
View File
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-osd";
+1
View File
@@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-panel";
@@ -20,6 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
+1
View File
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-randr";
@@ -12,6 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-screenshot";
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-session";
@@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
@@ -29,6 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
+1
View File
@@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
+1
View File
@@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
@@ -10,6 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-wallpapers";
@@ -16,6 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.0-alpha.7";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
+2 -2
View File
@@ -21,7 +21,7 @@ let
in
buildDunePackage' rec {
pname = "docfd";
version = "10.2.0";
version = "11.0.1";
minimalOCamlVersion = "5.1";
@@ -29,7 +29,7 @@ buildDunePackage' rec {
owner = "darrenldl";
repo = "docfd";
rev = version;
hash = "sha256-wVhsZTG8yEkxKA0ta3IDe7O/ER5RuBuFOPKHP8xS2GA=";
hash = "sha256-uRC2QBn4gAfS9u85YaNH2Mm2C0reP8FnDHbyloY+OC8=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2025-04-23";
version = "2025-05-01";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-K5WQhYVO3z6gR2Jl5yJJW8vK8BA89iAwPzhq4jX27y0=";
hash = "sha256-C1tNKyTuzn7A923Y3ExNYkFwYx2frPAiifzGmkDEBag=";
};
nativeBuildInputs = [ makeWrapper ];
+7 -16
View File
@@ -1,33 +1,24 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "ffsubsync";
version = "0.4.25";
version = "0.4.29";
pyproject = true;
src = fetchFromGitHub {
owner = "smacke";
repo = "ffsubsync";
tag = version;
hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc=";
hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4=";
};
patches = [
# updates for python 3.12 (not currently included in a release)
(fetchpatch {
url = "https://github.com/smacke/ffsubsync/commit/de75bdbfe846b3376f8c0bcfe2e5e5db82d7ff20.patch";
hash = "sha256-JN7F9H9G8HK2aLOlm/Ec+GsWnU+65f1P658nq8FbAjo=";
})
];
build-system = with python3.pkgs; [ setuptools ];
nativeBuildInputs = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
auditok
charset-normalizer
faust-cchardet
@@ -50,10 +41,10 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "ffsubsync" ];
meta = with lib; {
meta = {
homepage = "https://github.com/smacke/ffsubsync";
description = "Automagically synchronize subtitles with video";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "ffsubsync";
};
+4 -10
View File
@@ -1,23 +1,21 @@
{
lib,
stdenv,
fetchFromGitHub,
buildGoModule,
writableTmpDirAsHomeHook,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "fleet";
version = "4.67.1";
version = "4.67.2";
src = fetchFromGitHub {
owner = "fleetdm";
repo = "fleet";
tag = "fleet-v${finalAttrs.version}";
hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM=";
hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8=";
};
vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg=";
vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
subPackages = [
"cmd/fleet"
@@ -28,11 +26,6 @@ buildGoModule (finalAttrs: {
"-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
];
doCheck = true;
nativeCheckInputs = [
writableTmpDirAsHomeHook
];
doInstallCheck = true;
versionCheckProgramArg = "version";
nativeInstallCheckInputs = [
@@ -46,6 +39,7 @@ buildGoModule (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
asauzeau
lesuisse
];
mainProgram = "fleet";
};
+13 -16
View File
@@ -1,44 +1,41 @@
{
lib,
buildGoModule,
fetchFromGitHub,
fleet,
writableTmpDirAsHomeHook,
versionCheckHook,
stdenv,
}:
buildGoModule rec {
pname = "fleectl";
version = "4.67.1";
buildGoModule (finalAttrs: {
pname = "fleetctl";
src = fetchFromGitHub {
owner = "fleetdm";
repo = "fleet";
tag = "fleet-v${version}";
hash = "sha256-shaOPK7BbIDARopzGehlIA6aPdRiFRP9hrFRNO3kfGA=";
};
vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
inherit (fleet) version src vendorHash;
subPackages = [
"cmd/fleetctl"
];
ldflags = [
"-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}"
"-X github.com/fleetdm/fleet/v4/server/version.version=${version}"
"-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl"
"-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
];
nativeCheckInputs = [
writableTmpDirAsHomeHook
versionCheckHook
];
# Try to access /var/empty/.goquery/history subfolders
doCheck = !stdenv.hostPlatform.isDarwin;
doInstallCheck = !stdenv.hostPlatform.isDarwin;
nativeInstallCheckInputs = [
versionCheckHook
];
meta = {
homepage = "https://github.com/fleetdm/fleet";
changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${version}";
changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}";
description = "CLI tool for managing Fleet";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
@@ -46,4 +43,4 @@ buildGoModule rec {
];
mainProgram = "fleetctl";
};
}
})
-1
View File
@@ -48,7 +48,6 @@ flutter327.buildFlutterApplication (
mainProgram = "fluffychat";
maintainers = with maintainers; [
mkg20001
gilice
tebriel
];
platforms = [
+2 -2
View File
@@ -20,13 +20,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "freetube";
version = "0.23.4";
version = "0.23.5";
src = fetchFromGitHub {
owner = "FreeTubeApp";
repo = "FreeTube";
tag = "v${finalAttrs.version}-beta";
hash = "sha256-JQob4NyZ00iOnRbSyNWjL4xyNQ14ixyZDXsJ7KBd9ZM=";
hash = "sha256-tVe//h20cTVgpHeo3IlfGfuAH+dM6H5MEfGny5Uhrjk=";
};
# Darwin requires writable Electron dist
+2 -2
View File
@@ -9,10 +9,10 @@
stdenv.mkDerivation rec {
pname = "gatk";
version = "4.6.1.0";
version = "4.6.2.0";
src = fetchzip {
url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip";
sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708=";
sha256 = "sha256-I2p7BLh4q0i8qn1fTbzsaKVnCkMrPIxEpBUjOxNxgxI=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gh";
version = "2.71.2";
version = "2.72.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
tag = "v${version}";
hash = "sha256-n1qGJ5/X7wp4kgQqgcUomNvln2WavDJOjwxjVokfbiU=";
hash = "sha256-0t3xt37Ij2OvBOnZZKVFJnLFU+uMv/A5utnsY55MTRw=";
};
vendorHash = "sha256-69bGTUdVD/jebvmxYu0Mx7poSlbkXBAXUWLJ1CclXJU=";
vendorHash = "sha256-dLHtq+CG3S5wHItF6+G3L4SYiPKo+2Hw5rYUIPQbN2A=";
nativeBuildInputs = [ installShellFiles ];
-2
View File
@@ -6,7 +6,6 @@
pkg-config,
python3,
gfortran,
lesstif,
cfitsio,
getopt,
perl,
@@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
buildInputs =
[
gtk2-x11
lesstif
cfitsio
python3Env
ncurses
+8 -7
View File
@@ -23,21 +23,21 @@
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-podcasts";
version = "0.7.2";
version = "25.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "podcasts";
rev = version;
hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI=";
tag = finalAttrs.version;
hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk=";
inherit (finalAttrs) pname version src;
hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM=";
};
nativeBuildInputs = [
@@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
description = "Listen to your favorite podcasts";
mainProgram = "gnome-podcasts";
homepage = "https://apps.gnome.org/Podcasts/";
changelog = "https://gitlab.gnome.org/World/podcasts/-/releases/${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
teams = [
lib.teams.gnome
@@ -86,4 +87,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin
};
}
})
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "go-dnscollector";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "dmachard";
repo = "go-dnscollector";
rev = "v${version}";
sha256 = "sha256-/jc9OEWxwcMFIdihlyxADHgZKumc/uOqkhjjN1mLw1U=";
sha256 = "sha256-antLNQEOA20XxmmZHFQcs0VuLVfgM5V3wyXOYIX4hlk=";
};
vendorHash = "sha256-koWDlmlabDiwnlx+BTTtSQglu2lpccoTh17fRUC3pvg=";
vendorHash = "sha256-9EQr4lhv6+PkAnMJ6iWnBsK/SzZaOyVkSpqSYsX07LY=";
subPackages = [ "." ];
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "gqlgenc";
version = "0.32.0";
version = "0.32.1";
src = fetchFromGitHub {
owner = "yamashou";
repo = "gqlgenc";
rev = "v${version}";
sha256 = "sha256-3Qz1o91IPKjhzIYzKcdl456AWn6nsrcQ04VglBlpe54=";
sha256 = "sha256-AGbE+R3502Igl4/HaN8yvFVJBsKQ6iVff8IEvddJLEo=";
};
excludedPackages = [ "example" ];
vendorHash = "sha256-Ax5MA4wqQdXSDEIkiG5TcvFIN6YtyXuiJOdQGPYIb+Y=";
vendorHash = "sha256-kBv9Kit5KdPB48V/g1OaeB0ABFd1A1I/9F5LaQDWxUE=";
meta = with lib; {
description = "Go tool for building GraphQL client with gqlgen";
+2 -2
View File
@@ -8,10 +8,10 @@
}:
stdenv.mkDerivation rec {
pname = "halo";
version = "2.20.18";
version = "2.20.19";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
hash = "sha256-N3hbiK/pmZ30wJA8VJI9ft6o7VKQEM2+evakk0EObx4=";
hash = "sha256-4xXg1pW6vXebrmmyhzQKmJReR8gfRrflrfuB3ijk4tc=";
};
nativeBuildInputs = [
+18 -17
View File
@@ -2,35 +2,31 @@
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
makeBinaryWrapper,
wget,
jq,
curl,
}:
let
version = "1.0";
in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "hedgedoc-cli";
inherit version;
version = "1.0-unstable-2025-05-01";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "cli";
rev = "v${version}";
sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4=";
rev = "defeac80ca97fedcb19bdcddc516fd8f6e55fe8c";
hash = "sha256-7E5Ka6SEPRg2O4+bJ6g3gSDMLnPMzg5Lbslgvt6gNEg=";
};
nativeBuildInputs = [
makeWrapper
makeBinaryWrapper
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp $src/bin/codimd $out/bin
wrapProgram $out/bin/codimd \
makeWrapper $src/bin/codimd $out/bin/hedgedoc-cli \
--prefix PATH : ${
lib.makeBinPath [
jq
@@ -38,18 +34,23 @@ stdenv.mkDerivation {
curl
]
}
ln -s $out/bin/codimd $out/bin/hedgedoc-cli
runHook postInstall
'';
checkPhase = ''
runHook preCheck
hedgedoc-cli help
runHook postCheck
'';
meta = with lib; {
meta = {
description = "Hedgedoc CLI";
homepage = "https://github.com/hedgedoc/cli";
license = licenses.agpl3Only;
maintainers = with maintainers; [ drupol ];
license = lib.licenses.agpl3Only;
mainProgram = "hedgedoc-cli";
maintainers = with lib.maintainers; [ drupol ];
};
}
})
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "hermit";
version = "0.44.6";
version = "0.44.8";
src = fetchFromGitHub {
rev = "v${version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-PNzMR9bYR7Dv62kN6tYBdabGR01iXw537WRUtJXl1CE=";
hash = "sha256-euSuOYHroTJTifUcthHr4oQktTmE62qf2y6p6fBy9fI=";
};
vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w=";
+4
View File
@@ -4,6 +4,8 @@
fetchFromGitHub,
SDL,
SDL_mixer,
libGL,
libGLU,
autoreconfHook,
gitUpdater,
}:
@@ -27,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
SDL
SDL_mixer
libGL
libGLU
];
strictDeps = true;
+13 -7
View File
@@ -8,25 +8,27 @@
let
pname = "hoppscotch";
version = "25.1.1-0";
version = "25.3.2-0";
src =
fetchurl
{
aarch64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
hash = "sha256-1KYc96WUlybXhgPeT97w1mLE2zxmohIhvNMCmEb5Vf0=";
hash = "sha256-l8R6pWu8lJSuji8lITFJFUagvFUFbJ5KKUBJ/1jE9WI=";
};
x86_64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
hash = "sha256-wdqgzTXFL7Dvq1DOrjyPE4O3OYfpvmRSLzk+HBJIaTU=";
hash = "sha256-6HT2IwdjaMjf+PcN6/keCSIqKAIOsQqocEibA+v5GJc=";
};
x86_64-linux = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
hash = "sha256-M9fQx4NBotLPe8i43E1uqHpFeoXdHGQePp4zgzbzDdM=";
hash = "sha256-TpR0vfOba34C+BMi5Yn1C1M83gPXzRnqi1w0+Jt5GNc=";
};
}
.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
passthru.updateScript = ./update.sh;
meta = {
description = "Open source API development ecosystem";
@@ -56,6 +58,7 @@ if stdenv.hostPlatform.isDarwin then
pname
version
src
passthru
meta
;
@@ -78,6 +81,7 @@ else
pname
version
src
passthru
meta
;
@@ -87,7 +91,9 @@ else
in
''
# Install .desktop files
install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps
install -Dm444 ${appimageContents}/Hoppscotch.desktop $out/share/applications/hoppscotch.desktop
install -Dm444 ${appimageContents}/Hoppscotch.png $out/share/pixmaps/hoppscotch.png
substituteInPlace $out/share/applications/hoppscotch.desktop \
--replace-fail "hoppscotch-desktop" "hoppscotch"
'';
}
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nix-update common-updater-scripts nix jq
set -euo pipefail
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hoppscotch.version or (lib.getVersion hoppscotch)" | tr -d '"')
latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/hoppscotch/releases/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
update-source-version hoppscotch $latestVersion || true
for system in \
x86_64-linux \
x86_64-darwin \
aarch64-darwin; do
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hoppscotch.src.url" --system "$system" | tr -d '"')))
update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version
done
+2 -2
View File
@@ -6,12 +6,12 @@
stdenvNoCC.mkDerivation rec {
pname = "JuliaMono-ttf";
version = "0.059";
version = "0.060";
src = fetchzip {
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz";
stripRoot = false;
hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE=";
hash = "sha256-PmMGro8K4OwtKBIBhe/RKpi+MveSfhpQsiJfF+iUBzI=";
};
installPhase = ''
+11
View File
@@ -26,6 +26,11 @@
withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
}:
let
uppercaseFirst =
x: (lib.toUpper (lib.substring 0 1 x)) + (lib.substring 1 ((lib.strings.stringLength x) - 1) x);
in
stdenv.mkDerivation (finalAttrs: {
pname = "kew";
version = "3.2.0";
@@ -37,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-nntbxDy1gfd4F/FvlilLeOAepqtxhnYE2XRjJSlFvgI=";
};
postPatch = ''
substituteInPlace Makefile \
--replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \
--replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
'';
nativeBuildInputs =
[
pkg-config
+10 -2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch,
cfitsio,
cmake,
curl,
@@ -22,13 +23,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "kstars";
version = "3.7.5";
version = "3.7.6";
src = fetchurl {
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
hash = "sha256-L9hyVfdgFlFfM6MyjR4bUa86FHPbVg7xBWPY8YSHUXw=";
hash = "sha256-6hwWMmAGKJmldL8eTLQzzBsumk5thFoqGvm2dWk0Jpo=";
};
patches = [
(fetchpatch {
url = "https://invent.kde.org/education/kstars/-/commit/92eb37bdb3e24bd06e6da9977f3bf76218c95339.diff";
hash = "sha256-f2m15op48FiPYsKJ7WudlejVwoiGYWGnX2QiCnBINU8=";
})
];
nativeBuildInputs = with kdePackages; [
extra-cmake-modules
kdoctools
+7
View File
@@ -6,6 +6,7 @@
SDL,
libGLU,
libGL,
libX11,
upx,
zlib,
}:
@@ -36,10 +37,16 @@ stdenv.mkDerivation {
SDL
libGLU
libGL
libX11
upx
zlib
];
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-Wno-error=implicit-int"
"-Wno-error=incompatible-pointer-types"
];
meta = {
description = "API for roguelike games";
homepage = "http://roguecentral.org/doryen/libtcod/";
+1 -1
View File
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0=";
buildFeatures = [ "mpris" ];
buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];
nativeBuildInputs = [
pkg-config
+8 -6
View File
@@ -1,21 +1,23 @@
{
lib,
buildGoModule,
buildGo123Module,
fetchFromGitHub,
}:
buildGoModule rec {
# Tests with go 1.24 do not work. For now
# https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
buildGo123Module rec {
pname = "mark";
version = "12.1.2";
version = "12.2.0";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI=";
rev = "${version}";
sha256 = "sha256-0w6rIOSnOS7EfTBA/mRNWm8KOtdviTxWdukl4reb4zE=";
};
vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU=";
vendorHash = "sha256-CqFCjSXw7/jLe1OYosUl6mKSPEsdHl8p3zb/LVNqnxM=";
ldflags = [
"-s"
@@ -59,7 +59,7 @@ buildNpmPackage rec {
$out/share/applications \
$out/share/icons/hicolor/512x512/apps
readonly dist=release/linux-unpacked
readonly dist=release/*-unpacked
cp -a $dist/resources $out/share/${pname}
+3 -3
View File
@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-katex";
version = "0.9.3";
version = "0.9.4";
src = fetchCrate {
inherit pname version;
hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ=";
hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU=";
cargoHash = "sha256-ULcjcY+CaVSohSzlm4KbSgG27IZyxX8zp8ifZNj5c54=";
meta = {
description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";

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