Merge remote-tracking branch 'origin/staging-next' into staging

This commit is contained in:
K900 2025-06-20 09:07:52 +03:00
commit 678cac2a01
207 changed files with 2808 additions and 4211 deletions

View File

@ -6722,6 +6722,7 @@
drakon64 = {
name = "Adam Chance";
email = "nixpkgs@drakon.cloud";
github = "drakon64";
githubId = 6444703;
};
dramaturg = {
@ -23224,6 +23225,7 @@
name = "Zhifan";
email = "nonno.felice69uwu@gmail.com";
matrix = "@c3n21:matrix.org";
github = "c3n21";
githubId = 37077738;
};
sinjin2300 = {
@ -24955,6 +24957,12 @@
githubId = 71843723;
keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D A75C BDD5 7BE9 9D55 5965"; } ];
};
theonlymrcat = {
name = "Max Guppy";
email = "theonly@mrcat.au";
github = "TheOnlyMrCat";
githubId = 23222857;
};
theoparis = {
email = "theo@tinted.dev";
github = "theoparis";

View File

@ -48,6 +48,8 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- The Perl implementation of the `switch-to-configuration` program is removed. All switchable systems now use the Rust rewrite. Any prior usage of `system.switch.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.
- The `no-broken-symlink` build hook now also fails builds whose output derivation contains links to $TMPDIR (typically /build, which contains the build directory).
- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.

View File

@ -24,6 +24,16 @@
pkgs.maliit-keyboard
];
environment.plasma6.excludePackages = [
# Optional wallpapers that add 126 MiB to the graphical installer
# closure. They will still need to be downloaded when installing a
# Plasma system, though.
pkgs.kdePackages.plasma-workspace-wallpapers
];
# Avoid bundling an entire MariaDB installation on the ISO.
programs.kde-pim.enable = false;
system.activationScripts.installerDesktop =
let

View File

@ -63,7 +63,7 @@ in
# find mistaken definitions
builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq
cfg.buildPlatform
cfg.pkgs;
cfg.pkgs.__splicedPackages;
nixpkgs.config = cfg.pkgs.config;
nixpkgs.overlays = cfg.pkgs.overlays;
nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;

View File

@ -13,6 +13,7 @@
let
cfg = config.services.desktopManager.cosmic;
notExcluded = pkg: utils.disablePackageByName pkg config.environment.cosmic.excludePackages;
excludedCorePkgs = lib.lists.intersectLists corePkgs config.environment.cosmic.excludePackages;
# **ONLY ADD PACKAGES WITHOUT WHICH COSMIC CRASHES, NOTHING ELSE**
corePkgs =
@ -162,6 +163,7 @@ in
services.avahi.enable = lib.mkDefault true;
services.gnome.gnome-keyring.enable = lib.mkDefault true;
services.gvfs.enable = lib.mkDefault true;
services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
services.power-profiles-daemon.enable = lib.mkDefault (
!config.hardware.system76.power-daemon.enable
);

View File

@ -136,7 +136,6 @@ in
breeze-icons
breeze-gtk
ocean-sound-theme
plasma-workspace-wallpapers
pkgs.hicolor-icon-theme # fallback icons
qqc2-breeze-style
qqc2-desktop-style
@ -158,6 +157,7 @@ in
[
aurorae
plasma-browser-integration
plasma-workspace-wallpapers
konsole
kwin-x11
(lib.getBin qttools) # Expose qdbus in PATH

View File

@ -29,6 +29,7 @@ in
"nvidia"
"nvidiafb"
"nvidia-drm"
"nvidia-uvm"
"nvidia-modeset"
];
boot.kernelModules = [ "bbswitch" ];

View File

@ -256,7 +256,7 @@ in
description = ''
A program that writes a bootloader installation script to the path passed in the first command line argument.
See `nixos/modules/system/activation/switch-to-configuration.pl`.
See `pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs`.
'';
type = types.unique {
message = ''

File diff suppressed because it is too large Load Diff

View File

@ -5,101 +5,49 @@
...
}:
let
perlWrapped = pkgs.perl.withPackages (
p: with p; [
ConfigIniFiles
FileSlurp
]
);
in
{
options.system.switch = {
enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether to include the capability to switch configurations.
Disabling this makes the system unable to be reconfigured via `nixos-rebuild`.
This is good for image based appliances where updates are handled
outside the image. Reducing features makes the image lighter and
slightly more secure.
'';
};
enableNg = lib.mkOption {
type = lib.types.bool;
default = config.system.switch.enable;
defaultText = lib.literalExpression "config.system.switch.enable";
description = ''
Whether to use `switch-to-configuration-ng`, the Rust-based
re-implementation of the original Perl `switch-to-configuration`.
'';
};
};
config = lib.mkMerge [
(lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) {
warnings = [
''
The Perl implementation of switch-to-configuration will be deprecated
and removed in the 25.05 release of NixOS. Please migrate to the
newer implementation by removing `system.switch.enableNg = false`
from your configuration. If you are unable to migrate due to any
issues with the new implementation, please create an issue and tag
the maintainers of `switch-to-configuration-ng`.
''
];
system.activatableSystemBuilderCommands = ''
mkdir $out/bin
substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \
--subst-var out \
--subst-var-by toplevel ''${!toplevelVar} \
--subst-var-by coreutils "${pkgs.coreutils}" \
--subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \
--subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \
--subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecksScript} \
--subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \
--subst-var-by perl "${perlWrapped}" \
--subst-var-by shell "${pkgs.bash}/bin/sh" \
--subst-var-by su "${pkgs.shadow.su}/bin/su" \
--subst-var-by systemd "${config.systemd.package}" \
--subst-var-by utillinux "${pkgs.util-linux}" \
;
chmod +x $out/bin/switch-to-configuration
${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then
echo "switch-to-configuration syntax is not valid:"
echo "$output"
exit 1
fi
''}
'';
})
(lib.mkIf config.system.switch.enableNg {
# Use a subshell so we can source makeWrapper's setup hook without
# affecting the rest of activatableSystemBuilderCommands.
system.activatableSystemBuilderCommands = ''
(
source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook
mkdir $out/bin
ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration
wrapProgram $out/bin/switch-to-configuration \
--set OUT $out \
--set TOPLEVEL ''${!toplevelVar} \
--set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \
--set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \
--set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \
--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \
--set SYSTEMD ${config.systemd.package}
)
'';
})
imports = [
(lib.mkRemovedOptionModule [ "system" "switch" "enableNg" ] ''
This option controlled the usage of the new switch-to-configuration-ng,
which is now the only switch-to-configuration implementation. This option
can be removed from configuration. If there are outstanding issues
preventing you from using the new implementation, please open an issue on
GitHub.
'')
];
options.system.switch.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether to include the capability to switch configurations.
Disabling this makes the system unable to be reconfigured via `nixos-rebuild`.
This is good for image based appliances where updates are handled
outside the image. Reducing features makes the image lighter and
slightly more secure.
'';
};
config = lib.mkIf config.system.switch.enable {
# Use a subshell so we can source makeWrapper's setup hook without
# affecting the rest of activatableSystemBuilderCommands.
system.activatableSystemBuilderCommands = ''
(
source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook
mkdir $out/bin
ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration
wrapProgram $out/bin/switch-to-configuration \
--set OUT $out \
--set TOPLEVEL ''${!toplevelVar} \
--set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \
--set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \
--set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \
--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \
--set SYSTEMD ${config.systemd.package}
)
'';
};
}

View File

@ -247,7 +247,14 @@ in
_module.args.compression = "xz";
};
bind = runTest ./bind.nix;
bird = handleTest ./bird.nix { };
bird2 = import ./bird.nix {
inherit runTest;
package = pkgs.bird2;
};
bird3 = import ./bird.nix {
inherit runTest;
package = pkgs.bird3;
};
birdwatcher = handleTest ./birdwatcher.nix { };
bitbox-bridge = runTest ./bitbox-bridge.nix;
bitcoind = runTest ./bitcoind.nix;
@ -1283,14 +1290,7 @@ in
swapspace = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./swapspace.nix { };
sway = runTest ./sway.nix;
swayfx = runTest ./swayfx.nix;
switchTest = runTest {
imports = [ ./switch-test.nix ];
defaults.system.switch.enableNg = false;
};
switchTestNg = runTest {
imports = [ ./switch-test.nix ];
defaults.system.switch.enableNg = true;
};
switchTest = runTest ./switch-test.nix;
sx = runTest ./sx.nix;
sympa = runTest ./sympa.nix;
syncthing = runTest ./syncthing.nix;

View File

@ -1,18 +1,9 @@
# This test does a basic functionality check for all bird variants and demonstrates a use
# of the preCheckConfig option.
{
system ? builtins.currentSystem,
pkgs ? import ../.. {
inherit system;
config = { };
},
runTest,
package,
}:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) optionalString;
makeBirdHost =
hostId:
{ pkgs, ... }:
@ -33,6 +24,8 @@ let
};
services.bird = {
inherit package;
enable = true;
config = ''
@ -106,31 +99,37 @@ let
];
};
in
makeTest {
name = "bird";
{
twoNodeOSPF = runTest {
name = "bird-twoNodeOSPF";
nodes.host1 = makeBirdHost "1";
nodes.host2 = makeBirdHost "2";
nodes.host1 = makeBirdHost "1";
nodes.host2 = makeBirdHost "2";
testScript = ''
start_all()
testScript = ''
start_all()
host1.wait_for_unit("bird.service")
host2.wait_for_unit("bird.service")
host1.succeed("systemctl reload bird.service")
host1.wait_for_unit("bird.service")
host2.wait_for_unit("bird.service")
with subtest("Waiting for advertised IPv4 routes"):
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
with subtest("Waiting for advertised IPv6 routes"):
host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
host1.succeed("bird --version")
host2.succeed("bird --version")
with subtest("Check fake routes in preCheckConfig do not exists"):
host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host1.succeed("systemctl reload bird.service")
host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
'';
with subtest("Waiting for advertised IPv4 routes"):
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
with subtest("Waiting for advertised IPv6 routes"):
host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
with subtest("Check fake routes in preCheckConfig do not exists"):
host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
'';
};
}

View File

@ -663,7 +663,7 @@ in
'';
# Returns a comma separated representation of the given list in sorted
# order, that matches the output format of switch-to-configuration.pl
# order, that matches the output format of switch-to-configuration
sortedUnits = xs: lib.concatStringsSep ", " (builtins.sort builtins.lessThan xs);
dbusService =

View File

@ -227,12 +227,9 @@ let
) vimPlugins.nvim-treesitter.grammarPlugins;
isNvimGrammar = x: builtins.elem x nvimGrammars;
toNvimTreesitterGrammar = callPackage (
{ }:
makeSetupHook {
name = "to-nvim-treesitter-grammar";
} ./to-nvim-treesitter-grammar.sh
) { };
toNvimTreesitterGrammar = makeSetupHook {
name = "to-nvim-treesitter-grammar";
} ./to-nvim-treesitter-grammar.sh;
in
(toVimPlugin (

View File

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "handy";
version = "0-unstable-2024-10-21";
version = "0-unstable-2025-06-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-handy";
rev = "4e9e072796e5552a9d57f6ab83b3f85f27b17fb6";
hash = "sha256-ThzFEqLCX2JC06n6GZgkGzX5sFY5CxFDjkeekXRmbXY=";
rev = "fca239207e9c111da3e85d2faf0b1b9d7524e498";
hash = "sha256-8RpRhGgW5JWY6TZa9CEaXF66WpbjcjprorVqu+FGYu0=";
};
makefile = "Makefile";

View File

@ -6,31 +6,34 @@
sqlalchemy,
setproctitle,
icalendar,
colorama,
}:
buildPythonApplication rec {
pname = "yokadi";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz";
sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f";
hash = "sha256-zF2ffHeU+i7wzu1u4DhQ5zJXr8AjXboiyFAisXNX6TM=";
};
propagatedBuildInputs = [
dependencies = [
python-dateutil
sqlalchemy
setproctitle
icalendar
colorama
];
# Yokadi doesn't have any tests
doCheck = false;
meta = with lib; {
meta = {
description = "Command line oriented, sqlite powered, todo-list";
homepage = "https://yokadi.github.io/index.html";
license = licenses.gpl3Plus;
maintainers = [ maintainers.nkpvk ];
mainProgram = "yokadi";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.nkpvk ];
};
}

View File

@ -64,3 +64,37 @@ Tip: If you run into connectivity issues between nodes for specific applications
K3s has a config setting `prefer-bundled-bin` (and CLI flag `--prefer-bundled-bin`) that makes k3s use binaries from the `/var/lib/rancher/k3s/data/current/bin/aux/` directory, as unpacked by the k3s binary, before the system `$PATH`.
This works with the official distribution of k3s but not with the package from nixpkgs, as it does not bundle the upstream binaries from [`k3s-root`](https://github.com/k3s-io/k3s-root) into the k3s binary.
Thus the `prefer-bundled-bin` setting **cannot** be used to work around issues (like [this `mount` regression](https://github.com/util-linux/util-linux/issues/3474)) with binaries used/called by the kubelet.
### Building from a different source
Because the package is split into multiple derivations and the build process is generally more complex, it is not very obvious how to build k3s from a different source (fork or arbitrary commit).
To build k3s from a different source, you must use `.override` together with `overrideBundleAttrs` (for the k3sBundle derivation) and another `.overrideAttrs` (for the final derivation):
```nix
{ fetchgit, k3s }:
let
k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s";
rev = "99d91538b1327da933356c318dc8040335fbb66c";
hash = "sha256-vVqZzVp0Tea27s8HDVq4SgqlbHBdZcFzNKmPFi0Yktk=";
};
vendorHash = "sha256-jrPVY+FVZV9wlbik/I35W8ChcLrHlYbLAwUYU16mJLM=";
in
(k3s.override {
overrideBundleAttrs = {
src = k3sRepo;
inherit vendorHash;
};
}).overrideAttrs
{
src = k3sRepo;
inherit vendorHash;
}
```
- Additionally to `overrideBundleAttrs` there are also: `overrideCniPluginsAttrs` and `overrideContainerdAttrs`.
- `k3s --version` still prints the commit SHA (`k3sCommit` passed into `builder.nix`) from the "base" package instead of the actually used `rev`.
- Depending on the changes made in the fork / commit, the `k3s.override` (without the `overrideAttrs` of the final derivation) might already be enough.
- If the commit is for a different version of k3s, make sure to use the correct "base" package, e.g., `k3s_1_31.override`. Otherwise the build fails with `Tagged version 'v1.33.1+k3s1' does not match expected version 'v1.31.9[+-]*'`
- When adding an entirely new k3s version by calling `builder.nix`, keep in mind that the `k3sCommit` parameter is not used as the `k3sRepo` `rev` (it uses `v${k3sVersion}`). Therefore, you additionally must override the package, as shown above.

View File

@ -106,8 +106,8 @@ rec {
thunderbird-128 = common {
applicationName = "Thunderbird ESR";
version = "128.11.0esr";
sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810";
version = "128.11.1esr";
sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";

View File

@ -68,7 +68,7 @@ let
nativeCheckInputs = with pypkgs; [
pytestCheckHook
pytest-twisted
pytest-cov
pytest-cov-stub
mock
mccabe
pylint

View File

@ -1,39 +1,28 @@
From 9a0102fe1da038ebe08107ead991964df11b0271 Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Mon, 19 Feb 2024 03:31:20 +0000
Subject: [PATCH] no qtgui darwin bundle
---
qtgui/recoll.pro.in | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/qtgui/recoll.pro.in b/qtgui/recoll.pro.in
index a0ef314..6dbc3b5 100644
--- a/qtgui/recoll.pro.in
+++ b/qtgui/recoll.pro.in
@@ -180,7 +180,7 @@ windows {
}
@@ -192,7 +192,7 @@
}
}
-macx: {
-macx:macxbundlebuild() {
+if (false) {
QCBUILDLOC=Qt_6_4_2_for_macOS
# QT += webkit webkitwidgets
@@ -375,7 +375,7 @@ macx: {
QCBUILDLOC=Qt_6_7_3_for_macOS
RECOLLDEPS = $$PWD/../../..
QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
@@ -402,7 +402,7 @@
QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC
}
-unix:!macx {
-unix:!macxbundlebuild() {
+unix {
VPATH = @srcdir@
@@ -400,6 +400,13 @@ VPATH = @srcdir@
# For SingleApplication
@@ -425,6 +425,13 @@
SOURCES += crontool.cpp \
rtitool.cpp
+ macx {
+ macxbundlebuild() {
+ SOURCES += ../utils/closefrom.cpp \
+ ../utils/execmd.cpp \
+ ../utils/netcon.cpp \
@ -43,6 +32,3 @@ index a0ef314..6dbc3b5 100644
FORMS += crontool.ui \
rtitool.ui
--
2.43.0

View File

@ -75,11 +75,11 @@ in
mkDerivation rec {
pname = "recoll";
version = "1.39.1";
version = "1.43.2";
src = fetchurl {
url = "https://www.recoll.org/${pname}-${version}.tar.gz";
hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ=";
hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
};
mesonFlags =
@ -107,13 +107,10 @@ mkDerivation rec {
];
env.NIX_CFLAGS_COMPILE = toString [
"-DNIXPKGS"
"-fpermissive" # libxml2-2.12 changed const qualifiers
];
patches = [
# fix "No/bad main configuration file" error
./fix-datadir.patch
# use the same configure based build for darwin as linux
./0001-no-qtgui-darwin-bundle.patch
];

View File

@ -1,13 +0,0 @@
diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp
index 6bafc119..d997cd17 100644
--- a/utils/rclutil.cpp
+++ b/utils/rclutil.cpp
@@ -279,7 +279,7 @@ const string& path_pkgdatadir()
"a subfolder of the installation directory. \n"
"Please set the RECOLL_DATADIR environment variable to point to it\n"
"(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n";
-#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE)
+#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) && defined(NIXPKGS)
// The package manager builds (Macports, Homebrew, Nixpkgs ...) all arrange to set a proper
// compiled value for RECOLL_DATADIR. We can't do this when building a native bundle with
// QCreator, in which case we use the executable location.

View File

@ -1,12 +1,12 @@
{
pkgs,
python,
python3,
...
}:
# propagatedBuildInputs are for Python libraries and executables
# buildInputs are for libraries
let
py = python.pkgs;
py = python3.pkgs;
in
{
amixer.propagatedBuildInputs = [ pkgs.alsa-utils ];

View File

@ -1,16 +1,12 @@
{
buildPackages,
callPackage,
cargo,
cargo-nextest,
clang,
diffutils,
lib,
makeSetupHook,
maturin,
rust,
rustc,
stdenv,
pkgsHostTarget,
pkgsTargetTarget,
# This confusingly-named parameter indicates the *subdirectory of
@ -21,138 +17,118 @@
pkgsCross,
}:
{
cargoBuildHook = callPackage (
{ }:
makeSetupHook {
name = "cargo-build-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
cargoBuildHook = makeSetupHook {
name = "cargo-build-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
passthru.tests =
{
test = tests.rust-hooks.cargoBuildHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
};
passthru.tests =
{
test = tests.rust-hooks.cargoBuildHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
};
} ./cargo-build-hook.sh
) { };
} ./cargo-build-hook.sh;
cargoCheckHook = callPackage (
{ }:
makeSetupHook {
name = "cargo-check-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
cargoCheckHook = makeSetupHook {
name = "cargo-check-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
passthru.tests =
{
test = tests.rust-hooks.cargoCheckHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
};
passthru.tests =
{
test = tests.rust-hooks.cargoCheckHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
};
} ./cargo-check-hook.sh
) { };
} ./cargo-check-hook.sh;
cargoInstallHook = callPackage (
{ }:
makeSetupHook {
name = "cargo-install-hook.sh";
substitutions = {
targetSubdirectory = target;
cargoInstallHook = makeSetupHook {
name = "cargo-install-hook.sh";
substitutions = {
targetSubdirectory = target;
};
passthru.tests =
{
test = tests.rust-hooks.cargoInstallHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
};
passthru.tests =
{
test = tests.rust-hooks.cargoInstallHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
};
} ./cargo-install-hook.sh
) { };
} ./cargo-install-hook.sh;
cargoNextestHook = callPackage (
{ }:
makeSetupHook {
name = "cargo-nextest-hook.sh";
propagatedBuildInputs = [ cargo-nextest ];
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
cargoNextestHook = makeSetupHook {
name = "cargo-nextest-hook.sh";
propagatedBuildInputs = [ cargo-nextest ];
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
};
passthru.tests =
{
test = tests.rust-hooks.cargoNextestHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
};
passthru.tests =
{
test = tests.rust-hooks.cargoNextestHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
};
} ./cargo-nextest-hook.sh
) { };
} ./cargo-nextest-hook.sh;
cargoSetupHook = callPackage (
{ }:
makeSetupHook {
name = "cargo-setup-hook.sh";
propagatedBuildInputs = [ ];
substitutions = {
defaultConfig = ../fetchcargo-default-config.toml;
cargoSetupHook = makeSetupHook {
name = "cargo-setup-hook.sh";
propagatedBuildInputs = [ ];
substitutions = {
defaultConfig = ../fetchcargo-default-config.toml;
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
diff = "${lib.getBin diffutils}/bin/diff";
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
diff = "${lib.getBin diffutils}/bin/diff";
cargoConfig =
lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) ''
[target."${stdenv.targetPlatform.rust.rustcTarget}"]
"linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
"rustflags" = [ "-C", "target-feature=${
if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-"
}crt-static" ]
''
+ ''
[target."${stdenv.hostPlatform.rust.rustcTarget}"]
"linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
'';
cargoConfig =
lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) ''
[target."${stdenv.targetPlatform.rust.rustcTarget}"]
"linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
"rustflags" = [ "-C", "target-feature=${
if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-"
}crt-static" ]
''
+ ''
[target."${stdenv.hostPlatform.rust.rustcTarget}"]
"linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
'';
};
passthru.tests =
{
test = tests.rust-hooks.cargoSetupHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
};
passthru.tests =
{
test = tests.rust-hooks.cargoSetupHook;
}
// lib.optionalAttrs (stdenv.isLinux) {
testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
};
} ./cargo-setup-hook.sh
) { };
} ./cargo-setup-hook.sh;
maturinBuildHook = callPackage (
{ pkgsHostTarget }:
makeSetupHook {
name = "maturin-build-hook.sh";
propagatedBuildInputs = [
pkgsHostTarget.maturin
pkgsHostTarget.cargo
pkgsHostTarget.rustc
];
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
maturinBuildHook = makeSetupHook {
name = "maturin-build-hook.sh";
propagatedBuildInputs = [
pkgsHostTarget.maturin
pkgsHostTarget.cargo
pkgsHostTarget.rustc
];
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
} ./maturin-build-hook.sh
) { };
};
} ./maturin-build-hook.sh;
bindgenHook = callPackage (
{ }:
makeSetupHook {
name = "rust-bindgen-hook";
substitutions = {
libclang = (lib.getLib clang.cc);
inherit clang;
};
} ./rust-bindgen-hook.sh
) { };
bindgenHook = makeSetupHook {
name = "rust-bindgen-hook";
substitutions = {
libclang = (lib.getLib clang.cc);
inherit clang;
};
} ./rust-bindgen-hook.sh;
}

View File

@ -0,0 +1,33 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "annotation-mono";
version = "0.2";
src = fetchzip {
url = "https://github.com/qwerasd205/AnnotationMono/releases/download/v${finalAttrs.version}/AnnotationMono_v${finalAttrs.version}.zip";
hash = "sha256-81BcPYE4C9kuetiCzgGPl59WO4QkBML7dwAkD1DCCZo=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/dist/ttf/*.ttf
install -D -m444 -t $out/share/fonts/truetype $src/dist/variable/AnnotationMono-VF.ttf
install -D -m444 -t $out/share/fonts/opentype $src/dist/otf/*.otf
runHook postInstall
'';
meta = {
homepage = "https://github.com/qwerasd205/AnnotationMono";
description = "Lovingly crafted handwriting-style monospace font";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.theonlymrcat ];
};
})

View File

@ -1,39 +1,39 @@
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
pnpm_8,
pnpm_10,
nodejs,
makeBinaryWrapper,
shellcheck,
versionCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bash-language-server";
version = "5.4.0";
version = "5.6.0";
src = fetchFromGitHub {
owner = "bash-lsp";
repo = "bash-language-server";
rev = "server-${finalAttrs.version}";
hash = "sha256-yJ81oGd9aNsWQMLvDSgMVVH1//Mw/SVFYFIPsJTQYzE=";
tag = "server-${finalAttrs.version}";
hash = "sha256-Pe32lQSlyWcyUbqwhfoulwNwhrnWdRcKFIl3Jj0Skac=";
};
pnpmWorkspaces = [ "bash-language-server" ];
pnpmDeps = pnpm_8.fetchDeps {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
hash = "sha256-NvyqPv5OKgZi3hW98Da8LhsYatmrzrPX8kLOfLr+BrI=";
};
nativeBuildInputs = [
nodejs
pnpm_8.configHook
pnpm_10.configHook
makeBinaryWrapper
versionCheckHook
];
@ -45,31 +45,46 @@ stdenv.mkDerivation (finalAttrs: {
runHook postBuild
'';
preInstall = ''
# remove unnecessary files
rm node_modules/.modules.yaml
pnpm --ignore-scripts --prod prune
rm -r node_modules/.pnpm/@mixmark-io*/node_modules/@mixmark-io/domino/{test,.yarn}
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
# https://github.com/pnpm/pnpm/issues/3645
find node_modules server/node_modules -xtype l -delete
# remove non-deterministic files
rm node_modules/{.modules.yaml,.pnpm-workspace-state.json}
'';
installPhase = ''
runHook preInstall
pnpm --offline \
--frozen-lockfile --ignore-script \
--filter=bash-language-server \
deploy --prod $out/lib/bash-language-server
mkdir -p $out/{bin,lib/bash-language-server}
cp -r {node_modules,server} $out/lib/bash-language-server/
# Create the executable, based upon what happens in npmHooks.npmInstallHook
makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \
--suffix PATH : ${lib.makeBinPath [ shellcheck ]} \
--inherit-argv0 \
--add-flags $out/lib/bash-language-server/out/cli.js
--add-flags $out/lib/bash-language-server/server/out/cli.js
runHook postInstall
'';
doInstallCheck = true;
meta = with lib; {
meta = {
description = "Language server for Bash";
homepage = "https://github.com/bash-lsp/bash-language-server";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
changelog = "https://github.com/bash-lsp/bash-language-server/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
doronbehar
gepbird
];
mainProgram = "bash-language-server";
platforms = platforms.all;
platforms = lib.platforms.all;
};
})

View File

@ -57,7 +57,7 @@ bepastyPython.pkgs.buildPythonPackage rec {
build
flake8
pytestCheckHook
pytest-cov
pytest-cov-stub
selenium
tox
twine

View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--runstatedir=/run/bird"
];
passthru.tests = nixosTests.bird;
passthru.tests = nixosTests.bird2;
meta = {
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";

View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
"--runstatedir=/run/bird"
];
passthru.tests = nixosTests.bird;
passthru.tests = nixosTests.bird3;
meta = {
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";

View File

@ -40,14 +40,14 @@ buildPythonApplication rec {
nativeCheckInputs = [
hypothesis
pytest
pytestCheckHook
pytest-recording
pyyaml
mypy-extensions
click
pylint
flake8
pytest-cov
pytest-cov-stub
pyyaml
];

View File

@ -9,20 +9,20 @@
}:
let
version = "2025.6";
version = "2025.6.1";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-UtxyhXaXpVp9Ynm6vnHYxr+TEnRau1ZHU563xcUmu/0=";
hash = "sha256-At3+tScMbNrZI2qF+kwt41khou8aP5Qn33v6IT7n9HI=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-5kpmLkdnGxnt6bSUgAIJaXdFSmmvOffdQaAOlm9sNlo=";
hash = "sha256-1reZGan6hmXTg7RUjaian6Q5VAsR5iuye4kGWkpREM4=";
};
src = fetchurl {

View File

@ -58,7 +58,7 @@ python.pkgs.buildPythonApplication rec {
coverage
flask-webtest
pyquery
pytest-cov
pytest-cov-stub
pytest-httpserver
pytest-lazy-fixtures
pytest-smtpd

View File

@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# pull in fixtures needed for the test suite
src = fetchFromGitHub {
inherit owner;
repo = pname;
repo = "cargo-llvm-cov";
rev = "v${version}";
sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg=";
};

View File

@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "rust-osdev";
repo = pname;
repo = "cargo-xbuild";
rev = "v${version}";
hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4=";
};

View File

@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
meson,
ninja,
pkg-config,
@ -19,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "casilda";
version = "0.2.0";
version = "0.3.0-unstable-2025-06-16";
outputs = [
"out"
@ -30,22 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
domain = "gitlab.gnome.org";
owner = "jpu";
repo = "casilda";
tag = finalAttrs.version;
hash = "sha256-wTYx4Wj8u52+yNc/A5Lg0zqmhKh8X0q99e+TilpUrC4=";
rev = "5b5933d32f0221341c98a25dea1ce5ef78199a79";
hash = "sha256-LrXoVK7KMjIko6jUkrKY06QdZMQaVrHhG7/C5ickdJA=";
};
patches = [
# Fix missing clock_gettime function
# https://gitlab.gnome.org/jpu/casilda/-/merge_requests/4
(fetchpatch {
url = "https://gitlab.gnome.org/jpu/casilda/-/commit/dcebb8e67d6dc7c47332d1c76a1d5bf60eaee7b1.patch";
hash = "sha256-l3zu29PPRwzDuoeoqUs4Gi3JziyZ9vDdqvRfz7GQ4Sw=";
})
];
depsBuildBuild = [
pkg-config
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
meson
@ -61,12 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
wayland # for wayland-server
libxkbcommon
wlroots_0_18
];
propagatedBuildInputs = [
gtk4
wlroots_0_18 # todo: move to buildInputs after https://gitlab.gnome.org/jpu/casilda/-/merge_requests/7
];
propagatedBuildInputs = [ gtk4 ];
strictDeps = true;

View File

@ -11,18 +11,18 @@
pkg-config,
brotli,
zlib,
unstableGitUpdater,
gitUpdater,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "chawan";
version = "0-unstable-2025-06-14";
version = "0.2.0";
src = fetchFromSourcehut {
owner = "~bptato";
repo = "chawan";
rev = "288896b6f3da9bb6e4e24190d4163e031f8a2751";
hash = "sha256-/8pp1E4YAXXh8ORRHseIe48BIG14u8gNkmotA+CXPYY=";
rev = "v${finalAttrs.version}";
hash = "sha256-DiA7SEXPJTScdoFeGzH45wZP6gZRU8t/fvJLOufuNmU=";
};
patches = [ ./mancha-augment-path.diff ];
@ -73,7 +73,7 @@ stdenv.mkDerivation {
wrapProgram $out/bin/mancha ${makeWrapperArgs}
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "Lightweight and featureful terminal web browser";
@ -83,4 +83,4 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ ];
mainProgram = "cha";
};
}
})

View File

@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
pytest-cov
pytest-cov-stub
];
checkInputs = with python3.pkgs; [

View File

@ -31,7 +31,7 @@ buildDotnetModule rec {
(fetchFromGitHub {
name = pname;
inherit owner;
repo = pname;
repo = "CLPS2C-Compiler";
rev = "CLPS2C-Compiler-${version}";
sha256 = "sha256-4gLdrIxyw9BFSxF+EXZqTgUf9Kik6oK7eO9HBUzk4QM=";
})

View File

@ -50,7 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
env = {
XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic;
ORCA = "orca"; # get orca from $PATH
};
passthru = {
providedSessions = [ "cosmic" ];

View File

@ -0,0 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 19 Jun 2025 09:24:32 -0700
Subject: [PATCH] Use libdwarf-2 as the base include path
Signed-off-by: Philip Taron <philip.taron@gmail.com>
---
CMakeLists.txt | 6 +++---
src/symbols/dwarf/dwarf.hpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c607bd44e528a41ccd637f5293b4f56049f5770..53e1aedf463c5eb95dcfd77fa40de66f51381b47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,7 +419,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_link_libraries(${target_name} PRIVATE ${LIBDWARF_LIBRARIES})
endif()
# There seems to be no consistency at all about where libdwarf decides to place its headers........ Figure out if
- # it's libdwarf/libdwarf.h and libdwarf/dwarf.h or just libdwarf.h and dwarf.h
+ # it's libdwarf-2/libdwarf.h and libdwarf-2/dwarf.h or just libdwarf.h and dwarf.h
include(CheckIncludeFileCXX)
# libdwarf's cmake doesn't properly set variables to indicate where its libraries live
if(NOT CPPTRACE_FIND_LIBDWARF_WITH_PKGCONFIG)
@@ -428,9 +428,9 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_include_directories(${target_name} PRIVATE ${LIBDWARF_INCLUDE_DIRS})
endif()
set(CMAKE_REQUIRED_INCLUDES ${LIBDWARF_INCLUDE_DIRS})
- CHECK_INCLUDE_FILE_CXX("libdwarf/libdwarf.h" LIBDWARF_IS_NESTED)
+ CHECK_INCLUDE_FILE_CXX("libdwarf-2/libdwarf.h" LIBDWARF_IS_NESTED)
CHECK_INCLUDE_FILE_CXX("libdwarf.h" LIBDWARF_IS_NOT_NESTED)
- # check_include_file("libdwarf/libdwarf.h" LIBDWARF_IS_NESTED)
+ # check_include_file("libdwarf-2/libdwarf.h" LIBDWARF_IS_NESTED)
# check_support(LIBDWARF_IS_NESTED nested_libdwarf_include.cpp "" "" "")
if(${LIBDWARF_IS_NESTED})
target_compile_definitions(${target_name} PRIVATE CPPTRACE_USE_NESTED_LIBDWARF_HEADER_PATH)
diff --git a/src/symbols/dwarf/dwarf.hpp b/src/symbols/dwarf/dwarf.hpp
index 50b2696148584b7a16da602017793797ba98cb58..53fe275492f4fd7e8e905064696e86f837a55f72 100644
--- a/src/symbols/dwarf/dwarf.hpp
+++ b/src/symbols/dwarf/dwarf.hpp
@@ -10,8 +10,8 @@
#include <type_traits>
#ifdef CPPTRACE_USE_NESTED_LIBDWARF_HEADER_PATH
- #include <libdwarf/libdwarf.h>
- #include <libdwarf/dwarf.h>
+ #include <libdwarf-2/libdwarf.h>
+ #include <libdwarf-2/dwarf.h>
#else
#include <libdwarf.h>
#include <dwarf.h>

View File

@ -14,21 +14,26 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpptrace";
version = "0.8.3";
version = "1.0.1";
src = fetchFromGitHub {
owner = "jeremy-rifkin";
repo = "cpptrace";
tag = "v${finalAttrs.version}";
hash = "sha256-oFwRFFDLl4/3szVj/ge8cSrpuuHEzf4VsCPGTE0dxRc=";
hash = "sha256-HUUyH9N+e98Gp6TPeT6TCGpdzd09knHVDaQ3KeDp8LY=";
};
patches = [
./0001-Use-libdwarf-2-as-the-base-include-path.patch
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [ libdwarf ];
buildInputs = [ (lib.getDev libdwarf) ];
propagatedBuildInputs = [ zstd ] ++ (lib.optionals static [ libdwarf ]);
cmakeFlags = [
@ -40,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
];
checkInputs = [ gtest ];
doCheck = true;
passthru = {

1063
pkgs/by-name/cr/crc64fast-nvme/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,40 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "crc64fast-nvme";
version = "1.2.0";
src = fetchFromGitHub {
owner = "awesomized";
repo = "crc64fast-nvme";
tag = finalAttrs.version;
hash = "sha256-BEFdVspQU2exj6ndULCs0TfH7aIx/NvfUkTSL32bIPk=";
};
postPatch = ''
cp -L ${./Cargo.lock} Cargo.lock
'';
cargoLock = {
lockFile = ./Cargo.lock;
};
postInstall = ''
mv $out/bin/build_table $out/bin/pclmulqdq_build_table
install -Dm644 crc64fast_nvme.h -t $out/include/
'';
meta = {
description = "SIMD accelerated carryless-multiplication CRC-64/NVME checksum computation (based on Intel's PCLMULQDQ paper)";
homepage = "https://github.com/awesomized/crc64fast-nvme";
mainProgram = "crc_64_nvme_checksum";
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [ powwu ];
};
})

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "kerma";
repo = pname;
repo = "defaultbrowser";
rev = "d2860c00dd7fbb5d615232cc819d7d492a6a6ddb";
sha256 = "sha256-SelUQXoKtShcDjq8uKg3wM0kG2opREa2DGQCDd6IsOQ=";
};

View File

@ -39,7 +39,7 @@ buildGoModule {
src = fetchFromGitHub {
owner = "gabotechs";
repo = pname;
repo = "dep-tree";
rev = "v${version}";
hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM=";
};

View File

@ -13,7 +13,7 @@
wayland,
wayland-protocols,
libxkbcommon,
wlr-protocols,
libdecor,
pulseaudio,
nixosTests,
withWayland ? false,
@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation {
pname = "drawterm";
version = "0-unstable-2025-05-18";
version = "0-unstable-2025-06-13";
src = fetchFrom9Front {
owner = "plan9front";
repo = "drawterm";
rev = "a6c1ce4e0244ca70403dc4e795a9cee548159560";
hash = "sha256-W9IsFnJE4Bpdc2K9DcRq+zRPMU9Wd4xpM0lHkh5SirQ=";
rev = "4e32a9fa6e58c1474f747a99083303c4a2f14ea7";
hash = "sha256-j0s6xB8c8vQoOzL34Gu84elec0ig4z75NzlUx6PsW4E=";
};
enableParallelBuilding = true;
@ -50,7 +50,7 @@ stdenv.mkDerivation {
wayland
wayland-protocols
libxkbcommon
wlr-protocols
libdecor
]
++ lib.optionals withXorg [
xorg.libX11

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
version = "1.5.5pre";
src = fetchFromGitHub {
owner = "moretension";
repo = pname;
repo = "duti";
rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2";
sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";
};

View File

@ -2,26 +2,34 @@
lib,
fetchFromGitHub,
buildGoModule,
versionCheckHook,
}:
buildGoModule {
buildGoModule (finalAttrs: {
pname = "dwarf2json";
version = "unstable-2021-04-15";
version = "0.9.0";
src = fetchFromGitHub {
owner = "volatilityfoundation";
repo = "dwarf2json";
rev = "e8a1ce85dc33bf2039adc7f8a5f47f3016153720";
sha256 = "sha256-hnS00glAcj78mZp5as63CsEn+dcr+GNEkz8iC3KM0h0=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-M5KKtn5kly23TwbjD5MVLzIum58exXqCFs6jxsg6oGM=";
};
vendorHash = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34=";
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = with lib; {
homepage = "https://github.com/volatilityfoundation/dwarf2json";
description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON";
license = licenses.vol-sl;
maintainers = with maintainers; [ arkivm ];
maintainers = with maintainers; [
arkivm
asauzeau
];
mainProgram = "dwarf2json";
};
}
})

View File

@ -29,8 +29,6 @@ let
"LOONGARCH64"
else
throw "Unsupported architecture";
buildType = if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5";
in
stdenv.mkDerivation (finalAttrs: {
@ -172,6 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
finalAttrsInner:
let
attrs = lib.toFunction attrsOrFun finalAttrsInner;
buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5");
in
{
inherit (finalAttrs) src;

View File

@ -15,6 +15,7 @@
gjs,
gnome-autoar,
libsoup_3,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "embellish";
@ -47,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
libsoup_3
];
passthru.updateScript = nix-update-script { };
meta = {
description = "User-friendly application designed for managing Nerd Fonts on your system";
longDescription = ''

View File

@ -32,7 +32,7 @@ python3Packages.buildPythonPackage rec {
dontUseCmakeConfigure = true; # cmake is used for testing
nativeCheckInputs = with python3Packages; [
pytest
pytestCheckHook
pytest-cov-stub
];

View File

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.16.3";
version = "3.16.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
tag = "v${version}";
hash = "sha256-07dCSwRLIf/cmNsFuNHs9XXFGuJvwUNWgLuxRsMOXo4=";
hash = "sha256-tmxVk74eqN4qIe7cJF5IIWe7aXIH3Q2vi1galTF+FbI=";
};
pythonRelaxDeps = true;

View File

@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
repo = "git-machete";
rev = "v${version}";
hash = "sha256-iSuOiQC+dKqcDCS4nTPMrNFpo3ipPUQhfoofM11UInI=";
};

View File

@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytest
pytestCheckHook
git
];

View File

@ -27,8 +27,8 @@ python3Packages.buildPythonApplication rec {
'';
nativeCheckInputs = with python3Packages; [
pytest
pytest-cov
pytestCheckHook
pytest-cov-stub
mock
];
propagatedBuildInputs = with python3Packages; [
@ -38,8 +38,7 @@ python3Packages.buildPythonApplication rec {
six
];
checkPhase = "py.test";
doCheck = false;
pythonImportsCheck = [ "gitfs" ];
meta = {
description = "FUSE filesystem that fully integrates with git";
@ -53,5 +52,8 @@ python3Packages.buildPythonApplication rec {
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.robbinch ];
mainProgram = "gitfs";
# requires <=python39, otherwise you get this at runtime:
# AttributeError: module 'collections' has no attribute 'MutableMapping'
broken = true;
};
}

View File

@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
desktopName = "Gitify";
exec = "gitify %U";
icon = "gitify";
comment = "GitHub Notifications on your menu bar.";
comment = "GitHub notifications on your menu bar";
categories = [ "Development" ];
startupWMClass = "Gitify";
})
@ -104,9 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://www.gitify.io/";
homepage = "https://gitify.io/";
changelog = "https://github.com/gitify-app/gitify/releases/tag/v${finalAttrs.version}";
description = "GitHub Notifications on your menu bar";
description = "GitHub notifications on your menu bar";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pineapplehunter ];
platforms = lib.platforms.all;

View File

@ -5,6 +5,7 @@
coreutils,
installShellFiles,
makeWrapper,
gitMinimal,
writeShellScript,
curl,
jq,
@ -13,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gk-cli";
version = "2.1.2";
version = "3.0.9";
src = (
finalAttrs.passthru.sources.${stdenv.system}
@ -28,18 +29,34 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -Dm555 gk -t $out/bin/
install -Dm555 gk*/gk -t $out/bin/
installShellCompletion --bash ./**/gk.bash
installShellCompletion --fish ./**/gk.fish
installShellCompletion --zsh ./**/_gk
wrapProgram $out/bin/gk \
--prefix PATH : "${lib.makeBinPath [ gitMinimal ]}"
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/gk \
--prefix PATH : "${lib.makeBinPath [ coreutils ]}"
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# Use timeout because gk hangs instead of closing in the sandbox
installShellCompletion --cmd gk \
--bash <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion bash) \
--fish <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion fish) \
--zsh <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion zsh)
'';
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installCheckPhase = ''
OUTPUT="$(
HOME="$(mktemp --directory)" \
timeout 3 `# Use timeout because gk hangs instead of closing in the sandbox` \
$out/bin/gk setup \
2>/dev/null \
|| true # Command fails because not logged in
)"
echo "$OUTPUT" | grep --quiet '^Git binary found: $'
echo "$OUTPUT" | grep --quiet '^CLI version: ${finalAttrs.version}$'
'';
passthru = {
@ -48,49 +65,44 @@ stdenv.mkDerivation (finalAttrs: {
base_url = "https://github.com/gitkraken/gk-cli/releases/download/v${finalAttrs.version}/gk_${finalAttrs.version}_";
in
{
armv6l-linux = fetchzip {
url = "${base_url}Linux_arm6.zip";
hash = "sha256-pnEFTkx1JSmQlniVCXvIB6xGD8XyDh9OLDU0V9AZBTs=";
stripRoot = false;
};
armv7l-linux = fetchzip {
url = "${base_url}Linux_arm7.zip";
hash = "sha256-qj0++i698s4ELKHU9B2sGIqf9hUJip4+2Car+brkRkM=";
stripRoot = false;
};
aarch64-linux = fetchzip {
url = "${base_url}Linux_arm64.zip";
hash = "sha256-vHGhlRHbk2/s3YmBdOPDbalEydpQVFkHiCkBVywa4N0=";
url = "${base_url}linux_arm64.zip";
hash = "sha256-aYgHLpG4nX3Op0+j733jYbK4ZwVKkctMkDPweNTJWso=";
stripRoot = false;
};
x86_32-linux = fetchzip {
url = "${base_url}Linux_i386.zip";
hash = "sha256-t+P9SpS9u/17kga74kbYjD6nkjiFusyIwCRGDnkP3tU=";
url = "${base_url}linux_386.zip";
hash = "sha256-lVu25S7e6a/kHmiD5dxGAlHMQ5yN46+SdFpt8lghejM=";
stripRoot = false;
};
x86_64-linux = fetchzip {
url = "${base_url}Linux_x86_64.zip";
hash = "sha256-O6T27edHi20ZFHiNaZKdk/5dtCn2Tpxm0PR934SRwFk=";
url = "${base_url}linux_amd64.zip";
hash = "sha256-/z2G//Zh8lTHkeJPahyld1EEXXhd/cgIvCojUmzFX8E=";
stripRoot = false;
};
aarch64-darwin = fetchzip {
url = "${base_url}macOS_arm64.zip";
hash = "sha256-LW2K+aveJiyYqfga2jpF3DvvFeHJuozqbc/afgtq2Oc=";
url = "${base_url}darwin_arm64.zip";
hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "${base_url}macOS_x86_64.zip";
hash = "sha256-1w8B4YWouVViTGoUh987pPQIoqdzB0S+M2bBiRI6Kfg=";
url = "${base_url}darwin_amd64.zip";
hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4=";
stripRoot = false;
};
aarch64-windows = fetchzip {
url = "${base_url}windows_arm64.zip";
hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E=";
stripRoot = false;
};
i686-windows = fetchzip {
url = "${base_url}Windows_i386.zip";
hash = "sha256-t81/wK1weZ/uEZ5TzivylARTUqks9rLIG7WzeoWXb1k=";
url = "${base_url}windows_386.zip";
hash = "sha256-u6DyHoYIaExS2CHu20odDVJxzI4k9PpdFQf6UDPAzz0=";
stripRoot = false;
};
x86_64-windows = fetchzip {
url = "${base_url}Windows_x86_64.zip";
hash = "sha256-9yydDMI9Gz/OswRhJHF+2c3Ia0zDmXMbf7byj6PJe24=";
url = "${base_url}windows_amd64.zip";
hash = "sha256-nh+JPR95IWLm7CTrS8qK2dP3c4SH/zm1oIS5GNgxcyo=";
stripRoot = false;
};
};

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
repo = "gnome-session-ctl";
rev = version;
hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
};

View File

@ -27,17 +27,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "goose-cli";
version = "1.0.27";
version = "1.0.28";
src = fetchFromGitHub {
owner = "block";
repo = "goose";
tag = "v${finalAttrs.version}";
hash = "sha256-+HNAOw/BJVNHiDHeEBKoAAs66IXCdYhm1VzVFIzk4m8=";
hash = "sha256-ExFVgG05jlcz3nP6n94324sgXbIHpj8L30oNuqKyfto=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-v+UQFbFpkwX+7oNFvKf2v2u3OSkPdgOWntXLW6XJibE=";
cargoHash = "sha256-sW4rWLElTPVzD+KCOrikEFcoIRGujMz+wHOWlYBpi0o=";
nativeBuildInputs = [
pkg-config

View File

@ -66,7 +66,7 @@ lib.checkListOfEnum "${pname}: theme variants"
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
repo = "graphite-gtk-theme";
rev = version;
hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o=";
};

View File

@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "${pname}-${version}";
repo = "gtk-mac-integration";
rev = "gtk-mac-integration-${version}";
sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga";
};

View File

@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
gtk3,
gtklock,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gtklock-virtkb-module";
version = "0-unstable-2025-02-27";
src = fetchFromGitHub {
owner = "progandy";
repo = "gtklock-virtkb-module";
rev = "a11c2d8f14a79f271b02711b38220f927bc7fdf8";
hash = "sha256-+kEv5SlMINCORQQOOZ4Lb1dSJXLCbX2oAsD6NTbuhdE=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
gtk3
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.tests.testModule = gtklock.passthru.testModule finalAttrs.finalPackage;
meta = {
description = "Gtklock module adding a keyboard to the lockscreen";
homepage = "https://github.com/progandy/gtklock-virtkb-module";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
})

View File

@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
buildGoModule,
nix-update-script,
}:
buildGoModule rec {
@ -17,6 +18,8 @@ buildGoModule rec {
vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/tobias-kuendig/hacompanion/releases/tag/v${version}";
description = "Daemon that sends local hardware information to Home Assistant";

View File

@ -129,6 +129,10 @@ python3Packages.buildPythonApplication rec {
# Relies on FHS
# Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls
"test_new_selected_python"
# https://github.com/pypa/hatch/issues/2006
"test_project_location_basic_set_first_project"
"test_project_location_complex_set_first_project"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# This test assumes it is running on macOS with a system shell on the PATH.

View File

@ -17,14 +17,14 @@
python313Packages.buildPythonApplication rec {
pname = "high-tide";
version = "0.1.5";
version = "0.1.7";
pyproject = false;
src = fetchFromGitHub {
owner = "Nokse22";
repo = "high-tide";
tag = "v${version}";
hash = "sha256-HoPyqsLPLfqyQbrhoPzr3n81yX1MHZVUVmq5RKDN5pI=";
hash = "sha256-QFa9K/iSPe3cIx90PzPCkJszrygON9ijukv4px3Rob8=";
};
nativeBuildInputs = [
@ -45,8 +45,6 @@ python313Packages.buildPythonApplication rec {
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
libsecret
]);
@ -55,6 +53,7 @@ python313Packages.buildPythonApplication rec {
tidalapi
requests
mpd2
pypresence
];
dontWrapGApps = true;

View File

@ -13,7 +13,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "holocm";
repo = pname;
repo = "holo-build";
rev = "v${version}";
sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0";
};

View File

@ -2,21 +2,24 @@
lib,
rustPlatform,
fetchFromGitHub,
unstableGitUpdater,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "htmx-lsp";
version = "0.1.0";
version = "0.1.0-unstable-2025-06-14";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "htmx-lsp";
rev = version;
hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo=";
rev = "c45f55b2bf8be2d92489fd6d69a3db07fe5f214b";
hash = "sha256-7CAlYYwsanlOCGeY7gYE5Fzk5IEO4hThgINiJmXql7s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8=";
cargoHash = "sha256-/ypaTrctJo88DHtF/hv6B0dqB06axd/qKFnuI8zs8KA=";
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "Language server implementation for htmx";

View File

@ -15,7 +15,7 @@ let
version = "26.1.9";
itch-setup = fetchzip {
url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip";
url = "https://broth.itch.zone/itch-setup/linux-amd64/1.26.0/itch-setup.zip";
stripRoot = false;
hash = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA=";
};
@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
inherit version;
src = fetchzip {
url = "https://broth.itch.ovh/itch/linux-amd64/${finalAttrs.version}/archive/default#.zip";
url = "https://broth.itch.zone/itch/linux-amd64/${finalAttrs.version}/archive/default#.zip";
stripRoot = false;
hash = "sha256-4k6afBgOKGs7rzXAtIBpmuQeeT/Va8/0bZgNYjuJhgI=";
};

View File

@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec {
cargoDepsName = "kanidm";
src = fetchFromGitHub {
owner = pname;
repo = pname;
owner = "kanidm";
repo = "kanidm";
rev = "refs/tags/v${version}";
inherit hash;
};

View File

@ -0,0 +1,75 @@
{
lib,
fetchFromGitea,
meson,
ninja,
pkg-config,
glib,
gtk4,
libadwaita,
python3Packages,
clamav,
appstream-glib,
desktop-file-utils,
libxml2,
gobject-introspection,
wrapGAppsHook4,
librsvg,
}:
python3Packages.buildPythonApplication rec {
pname = "kapitano";
version = "1.1.2";
pyproject = false;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "zynequ";
repo = "Kapitano";
tag = version;
hash = "sha256-914M0VRyuzDiITUT5sjt9vNaqshn4skz/FWWMxgPTdc=";
fetchLFS = true;
};
nativeBuildInputs = [
meson
ninja
desktop-file-utils
libxml2
pkg-config
appstream-glib
wrapGAppsHook4
gobject-introspection
];
buildInputs = [
glib
gtk4
libadwaita
librsvg
];
dependencies = with python3Packages; [ pygobject3 ];
postPatch = ''
substituteInPlace src/config/paths_config.py \
--replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)'
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
''${gappsWrapperArgs[@]}
--prefix PATH : "${lib.makeBinPath [ clamav ]}"
)
'';
meta = {
description = "Modern ClamAV front-end that uses gtk4/libadwaita";
homepage = "https://codeberg.org/zynequ/Kapitano";
mainProgram = "kapitano";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lonerOrz ];
};
}

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
repo = "KDDockWidgets";
rev = "v${version}";
sha256 = "sha256-4xaTfNwfAIQox2YcusEZJt5f9/Kld+zveFEiIVw5dRc=";
};

View File

@ -21,7 +21,7 @@ let
free_src = fetchFromGitHub {
owner = "miki151";
repo = pname;
repo = "keeperrl";
rev = version;
sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
};

View File

@ -10,7 +10,7 @@ maven.buildMavenPackage rec {
src = fetchFromGitHub {
owner = "aerogear";
repo = pname;
repo = "keycloak-metrics-spi";
rev = "refs/tags/${version}";
hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI=";
};

View File

@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
version = "2.1.0";
version = "2.1.1";
pname = "lcalc";
src = fetchFromGitLab {
owner = "sagemath";
repo = "lcalc";
tag = version;
hash = "sha256-v+7Uh6tPOfb3E9dqxx//RqD22XM4S/8ejS2v+D5G5pE=";
hash = "sha256-0CYrRGn5YQ07BaGu0Q5otnjwyh3sNq21EXp3M/KlRdw=";
};
nativeBuildInputs = [

View File

@ -1,24 +1,26 @@
{ lib, collectd }:
collectd.overrideAttrs (oldAttrs: {
collectd.overrideAttrs (prevAttrs: {
pname = "libcollectdclient";
buildInputs = [ ];
configureFlags = (oldAttrs.configureFlags or [ ]) ++ [
configureFlags = (prevAttrs.configureFlags or [ ]) ++ [
"--with-perl-bindings=no"
"--disable-daemon"
"--disable-all-plugins"
];
postInstall = "rm -rf $out/{bin,etc,sbin,share}";
meta = with lib; {
meta = {
description = "C Library for collectd, a daemon which collects system performance statistics periodically";
homepage = "http://collectd.org";
license = licenses.gpl2;
platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
maintainers = [
maintainers.sheenobu
maintainers.bjornfor
homepage = "https://collectd.org";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
sheenobu
bjornfor
];
};
})

View File

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
name = "lib" + pname + "-" + version;
name = "lib" + "crossguid" + "-" + version;
pname = "crossguid";
version = "2016-02-21";
src = fetchFromGitHub {
owner = "graeme-hill";
repo = pname;
repo = "crossguid";
rev = "8f399e8bd4252be9952f3dfa8199924cc8487ca4";
sha256 = "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9";
};

View File

@ -1,41 +0,0 @@
{
lib,
stdenv,
fetchurl,
buildInputs,
hash,
version,
url,
knownVulnerabilities,
}:
stdenv.mkDerivation {
pname = "libdwarf";
inherit version;
src = fetchurl {
inherit url hash;
};
configureFlags = [
"--enable-shared"
"--disable-nonshared"
];
inherit buildInputs;
outputs = [
"bin"
"lib"
"dev"
"out"
];
meta = {
homepage = "https://github.com/davea42/libdwarf-code";
platforms = lib.platforms.unix;
license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.atry ];
inherit knownVulnerabilities;
};
}

View File

@ -1,16 +1,48 @@
{
callPackage,
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
zlib,
zstd,
}:
callPackage ./common.nix rec {
version = "0.11.1";
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
hash = "sha512:d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f";
stdenv.mkDerivation (finalAttrs: {
pname = "libdwarf";
version = "2.0.0";
src = fetchFromGitHub {
owner = "davea42";
repo = "libdwarf-code";
tag = "v${finalAttrs.version}";
hash = "sha256-SsFg+7zGBEGxDSzfiIP5bxdttlBkhEiEQWaU12hINas=";
};
nativeBuildInputs = [
meson
ninja
];
buildInputs = [
zlib
zstd
];
knownVulnerabilities = [ ];
}
outputs = [
"bin"
"lib"
"dev"
"out"
];
meta = {
description = "Library for reading DWARF2 and later DWARF";
mainProgram = "dwarfdump";
homepage = "https://github.com/davea42/libdwarf-code";
changelog = "https://github.com/davea42/libdwarf-code/releases/tag/v${finalAttrs.version}/CHANGELOG.md";
platforms = lib.platforms.unix;
license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.atry ];
};
})

View File

@ -5,12 +5,12 @@
cmake,
nghttp2,
openssl,
boost,
boost186,
}:
stdenv.mkDerivation {
pname = "libnghttp2_asio";
version = "unstable-2022-08-11";
version = "0-unstable-2022-08-11";
outputs = [
"out"
@ -30,7 +30,7 @@ stdenv.mkDerivation {
];
buildInputs = [
boost
boost186
nghttp2
openssl
];

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "librespeed-cli";
version = "1.0.10";
version = "1.0.12";
src = fetchFromGitHub {
owner = "librespeed";
repo = "speedtest-cli";
tag = "v${version}";
hash = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
hash = "sha256-njaQ/Be5rDCqkZJkij0nRi8aIO5uZYo8t3BjIcdKoCM=";
};
vendorHash = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";
vendorHash = "sha256-dmaq9+0FjqYh2ZLg8bu8cPJZ9QClcvwid1nmsftmrf0=";
# Tests have additional requirements
doCheck = false;

View File

@ -5,46 +5,53 @@
lua5_4,
meson,
ninja,
cmake,
pcre2,
pkg-config,
SDL2,
sdl3,
stdenv,
}:
stdenv.mkDerivation rec {
let
pname = "lite-xl";
version = "2.1.7";
version = "2.1.8";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "lite-xl";
repo = "lite-xl";
rev = "v${version}";
hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo=";
hash = "sha256-9JpD7f5vOGhLW8dBjjYUI5PSaz/XWW5sIOZCAbKhxtE=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
cmake
];
buildInputs = [
freetype
lua5_4
pcre2
SDL2
sdl3
];
mesonFlags = [
"-Duse_system_lua=true"
];
meta = with lib; {
meta = {
description = "Lightweight text editor written in Lua";
homepage = "https://github.com/lite-xl/lite-xl";
license = licenses.mit;
maintainers = with maintainers; [ sefidel ];
platforms = platforms.unix;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
luftmensch-luftmensch
sefidel
];
platforms = lib.platforms.unix;
mainProgram = "lite-xl";
};
}

View File

@ -13,14 +13,14 @@ let
in
stdenv.mkDerivation rec {
pname = "lxqt-panel-profiles";
version = "1.1";
version = "1.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "MrReplikant";
repo = "lxqt-panel-profiles";
rev = version;
hash = "sha256-YGjgTLodVTtDzP/SOEg+Ehf1LYggTnG1H1rN5m1jaNM=";
hash = "sha256-V76R3mWF/PgweMaDYTr6eJ3IDBsSJ8BSP5MYpKAWxM8=";
};
postPatch = ''
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--replace-fail "python3" "${pythonWithPyqt6}/bin/python"
substituteInPlace usr/share/lxqt-panel-profiles/lxqt-panel-profiles.py \
--replace-fail "qdbus" "${qt6.qttools}/bin/qdbus"
--replace-fail "qdbus6" "${qt6.qttools}/bin/qdbus"
'';
installPhase = ''

View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rgcr";
repo = pname;
repo = "m-cli";
rev = "v${version}";
sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4=";
};

View File

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "marge-bot";
version = "0.15.3";
version = "0.16.0";
pyproject = true;
src = fetchFromGitLab {
owner = "marge-org";
repo = "marge-bot";
rev = version;
hash = "sha256-i/hnfoBxgP1mo4RV4F10+QOOkPP/fkcwqaLKBlOuP0I=";
hash = "sha256-UgdbeJegeTFP6YF6oMxAeQDI9AO2k6yk4WAFZ/Xspu8=";
};
nativeBuildInputs = [

View File

@ -28,7 +28,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
repo = "matcha-gtk-theme";
rev = version;
sha256 = "sha256-vPAGEa3anWAynEg2AYme4qpHJdLDKk2CmL5iQ1mBYgM=";
};
@ -60,8 +60,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col
${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
--dest $out/share/themes
mkdir -p $out/share/doc/${pname}
cp -a src/extra/firefox $out/share/doc/${pname}
mkdir -p $out/share/doc/matcha-gtk-theme
cp -a src/extra/firefox $out/share/doc/matcha-gtk-theme
jdupes --quiet --link-soft --recurse $out/share

View File

@ -31,18 +31,18 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "0.5.0-rc.5";
version = "0.5.0-rc.6";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
tag = "v${finalAttrs.version}";
hash = "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o=";
hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-bjjGR3++CaDEtlsQj9GgdViCEB5l72sI868uTFBtIwg=";
cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k=";
nativeBuildInputs = [
pkg-config

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mautrix-discord";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "mautrix";
repo = "discord";
rev = "v${version}";
hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc=";
hash = "sha256-ygnFZ1I8sPgpKwLK+Zr6ZUStGAH2egVDxS/pXmRqXYI=";
};
vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ=";
vendorHash = "sha256-S3MWJi77TXs7gjPt6O2ruSIUHpsrLPIHQz3rQam1Wsg=";
ldflags = [
"-s"

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mautrix-gmessages";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "mautrix";
repo = "gmessages";
tag = "v${version}";
hash = "sha256-NzLHCVJaYl8q5meKZDy8St8J9c8oyASLLrXhWG7K+yw=";
hash = "sha256-s6d0fUH0md4oHWDGFDRR3SKbJBCH6qJIk4En6J53yIM=";
};
vendorHash = "sha256-+aX0r7IvsjXwmz5d6X0yzhG28mBYKvyDGoCbKMwkvk8=";
vendorHash = "sha256-d6UVKu9Al445JqwhPXSlQDs0hOTom56p+hVZN2C4S0M=";
ldflags = [
"-s"

View File

@ -15,7 +15,7 @@
buildGoModule rec {
pname = "mautrix-meta";
version = "0.4.6";
version = "0.5.0";
subPackages = [ "cmd/mautrix-meta" ];
@ -23,13 +23,13 @@ buildGoModule rec {
owner = "mautrix";
repo = "meta";
rev = "v${version}";
hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8=";
hash = "sha256-SM57PLfRVEKspqnAZz1XES6ba9Puuzvx8XZwAWKVRmw=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs=";
vendorHash = "sha256-+gQPlI9DHuY01JlUnEaYctOs+2XFAkw+X9SkvH0xlbc=";
passthru = {
tests = {

View File

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "mcp-grafana";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "mcp-grafana";
tag = "v${finalAttrs.version}";
hash = "sha256-3w6xnDAcuDMZPr6lGGh0FpcyG2fRpkeVcJlZMdszu/g=";
hash = "sha256-oFtih2X3ZXKeo0xP8PBafu9HXgzcLUkLCeHm47qZhNA=";
};
vendorHash = "sha256-61nn/p6Un+uHuPK4hipJ3A2DhAEqpWTGefM8ENAOP1E=";
vendorHash = "sha256-AVU1HE3RlEjkL0xO6j/Mii0B9BtUSdALUvSphCTwjrc=";
ldflags = [
"-s"

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mediawriter";
version = "5.2.5";
version = "5.2.6";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = "MediaWriter";
tag = version;
hash = "sha256-acKLKnAXTp1w8+pPVXO2gCi3GELEi3skYCYN13QjWyY=";
hash = "sha256-3O+b55H2/qbr8RrHNGz8dPQTt+ecVHtUWSDa24l2Dwc=";
};
nativeBuildInputs = [

View File

@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
with python3Packages;
[
ipython
pytest-cov # fix Unknown pytest.mark.no_cover
pytest-cov-stub # fix Unknown pytest.mark.no_cover
pytest-textual-snapshot
pytestCheckHook
]

View File

@ -9,18 +9,18 @@
buildGoModule rec {
pname = "meowlnir";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "maunium";
repo = "meowlnir";
tag = "v${version}";
hash = "sha256-1YuSXKRiMUCRbxGIDOQKGKK7CxM3VD0LLEeULQJ/zRo=";
hash = "sha256-TKt6uwj3RdhSEjGnWmYybJFaQ82qf3tXY4PPUAm6juQ=";
};
buildInputs = [ olm ];
vendorHash = "sha256-g0be4ftBRV6Ver1kULfhnVBAF+iL3+/4e25sozpJ7+s=";
vendorHash = "sha256-rFk4QUAI/Brclt/X/T7O0T6v2dTxpqbNLtoi0twYliw=";
doCheck = true;
doInstallCheck = true;

View File

@ -2,6 +2,7 @@
stdenv,
fetchFromGitHub,
lib,
nix-update-script,
}:
stdenv.mkDerivation rec {
@ -23,6 +24,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/rofl0r/microsocks/releases/tag/v${version}";
description = "Tiny, portable SOCKS5 server with very moderate resource usage";

View File

@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mihomo-party";
version = "1.7.5";
version = "1.7.6";
src =
let
@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
fetchurl {
url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${finalAttrs.version}/mihomo-party-linux-${finalAttrs.version}-${arch}.deb";
hash = selectSystem {
x86_64-linux = "sha256-Kw7VDyJ07DeinAzsilJU0vBhDLViB8zlpIA+mAPpp2M=";
aarch64-linux = "sha256-OljIM8BI8umkRB1wUqcwQ/H1i1FhYtQ4d5cXMi/Lt9E=";
x86_64-linux = "sha256-83RajPreGieOYBAkoR6FsFREnOGDDuMK6+Qg+R/koac=";
aarch64-linux = "sha256-oWOXLUYWRKRgPtNv9ZvM1ODd44dhymVTKHJBK/xxOOs=";
};
};

View File

@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "mitra";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "silverpill";
repo = "mitra";
rev = "v${version}";
hash = "sha256-ZonEMbafZWfURW7WKUAVmDq7bvi7oXBpKVudbrTF6eE=";
hash = "sha256-y77wLGmSJbGmqUXURjqp6Gz9+xpMvnUEcB9OZ4uF3M8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-n96B51fVkJcBDwcbYHNP6ZWWdU8fu0a0Y72IVbNAAMQ=";
cargoHash = "sha256-sfPnhB1GWIG8tA6Jqr1+03qxwS1DBbRAv4ZY+wKB/jY=";
# require running database
doCheck = false;

View File

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "Mellanox";
repo = pname;
rev = "${pname}-${version}";
repo = "mlxbf-bootctl";
rev = "mlxbf-bootctl-${version}";
hash = "sha256-F49ZZtty+NARXA/doAFLhsQn4XkPW6GWLXGy4waIaM0=";
};

View File

@ -27,14 +27,14 @@ let
main_src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
repo = "mojave-gtk-theme";
rev = version;
hash = "sha256-uL4lO6aWiDfOQkhpTnr/iVx1fI7n/fx7WYr5jDWPfYM=";
};
wallpapers_src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
repo = "mojave-gtk-theme";
rev = "1dc23c2b45d7e073e080cfb02f43aab0e59b6b2c";
hash = "sha256-nkw8gXYx8fN1yn0A5M2fWwOvfUQ6izynxRw5JA61InM=";
name = "wallpapers";

View File

@ -0,0 +1,47 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
dbus,
openssl,
stdenv,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mpris-discord-rpc";
version = "0.4.0";
src = fetchFromGitHub {
owner = "patryk-ku";
repo = "mpris-discord-rpc";
tag = "v${finalAttrs.version}";
hash = "sha256-szftij29YTLzqBNirvoTgZfPIRznM1Ax5MPTKqB1nYI=";
};
cargoHash = "sha256-/QYeNcmkW6cm1VJkzJfVGvZU79wGswhKUFYc54oQbGw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
dbus
openssl
];
postInstall = ''
mkdir --parents $out/etc/systemd/user
substitute $src/mpris-discord-rpc.service $out/etc/systemd/user/mpris-discord-rpc.service \
--replace-fail /usr/bin/mpris-discord-rpc $out/bin/mpris-discord-rpc
'';
meta = {
description = "Linux Discord rich presence for music, using MPRIS with album cover and progress bar support";
homepage = "https://github.com/patryk-ku/mpris-discord-rpc";
changelog = "https://github.com/patryk-ku/mpris-discord-rpc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.lukaswrz ];
mainProgram = "mpris-discord-rpc";
};
})

View File

@ -1,19 +1,21 @@
{
blas,
fetchzip,
gfortran,
lapack,
lib,
stdenv,
fetchzip,
mpi,
gfortran,
fixDarwinDylibNames,
blas,
lapack,
scalapack,
scotch,
metis,
parmetis,
withParmetis ? false, # default to false due to unfree license
scotch,
withPtScotch ? mpiSupport,
stdenv,
fixDarwinDylibNames,
mpiSupport ? false,
mpiCheckPhaseHook,
scalapack,
static ? stdenv.hostPlatform.isStatic,
mpiSupport ? false,
withParmetis ? false, # default to false due to unfree license
withPtScotch ? mpiSupport,
}:
assert withParmetis -> mpiSupport;
assert withPtScotch -> mpiSupport;
@ -46,14 +48,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
name = "mumps";
version = "5.7.3";
version = "5.8.0";
# makeFlags contain space and one should use makeFlagsArray+
# Setting this magic var is an optional solution
__structuredAttrs = true;
strictDeps = true;
src = fetchzip {
url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz";
hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw=";
hash = "sha256-opJW7+Z/YhyUFwYTTTuWZuykz8Z4do6/XTBThHyTVCs=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
@ -74,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
"LIBEXT_SHARED=.dylib"
]
++ [
"ISCOTCH=-I${scotch.dev}/include"
"ISCOTCH=-I${lib.getDev scotch}/include"
"LMETIS=${LMETIS}"
"LSCOTCH=${LSCOTCH}"
"ORDERINGSF=${ORDERINGSF}"
@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
"OPTC=-O3"
"OPTL=-O3"
"SCALAP=-lscalapack"
"allshared"
"${if static then "all" else "allshared"}"
];
installPhase =
@ -98,9 +102,12 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
'';
nativeBuildInputs = [
gfortran
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs =
[
gfortran
]
++ lib.optional mpiSupport mpi
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
# Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h"
buildInputs =
@ -114,9 +121,12 @@ stdenv.mkDerivation (finalAttrs: {
];
doInstallCheck = true;
nativeInstallCheckInputs = lib.optional mpiSupport mpiCheckPhaseHook;
installCheckPhase = ''
runHook preInstallCheck
${lib.optionalString stdenv.hostPlatform.isDarwin "export DYLD_LIBRARY_PATH=$out/lib\n"}
${lib.optionalString mpiSupport "export MPIRUN='mpirun -n 2'\n"}
cd examples
@ -131,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
$MPIRUN ./csimpletest_save_restore <input_simpletest_cmplx
$MPIRUN ./zsimpletest_save_restore <input_simpletest_cmplx
$MPIRUN ./c_example_save_restore
runHook postInstallCheck
'';
@ -140,7 +151,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "MUltifrontal Massively Parallel sparse direct Solver";
homepage = "http://mumps-solver.org/";
homepage = "https://mumps-solver.org/";
changelog = "https://mumps-solver.org/index.php?page=dwnld#cl";
license = lib.licenses.cecill-c;
maintainers = with lib.maintainers; [
nim65s

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