Merge master into staging-next
This commit is contained in:
@@ -24537,6 +24537,12 @@
|
||||
githubId = 71331875;
|
||||
name = "Edwin Mackenzie-Owen";
|
||||
};
|
||||
szaffarano = {
|
||||
email = "sebas@zaffarano.com.ar";
|
||||
github = "szaffarano";
|
||||
githubId = 58266;
|
||||
name = "Sebastián Zaffarano";
|
||||
};
|
||||
szczyp = {
|
||||
email = "qb@szczyp.com";
|
||||
github = "Szczyp";
|
||||
|
||||
@@ -52,6 +52,8 @@
|
||||
|
||||
- [Corteza](https://cortezaproject.org/), a low-code platform. Available as [services.corteza](#opt-services.corteza.enable).
|
||||
|
||||
- [TuneD](https://tuned-project.org/), a system tuning service for Linux. Available as [services.tuned](#opt-services.tuned.enable).
|
||||
|
||||
- [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable).
|
||||
|
||||
- [postfix-tlspol](https://github.com/Zuplu/postfix-tlspol), MTA-STS and DANE resolver and TLS policy server for Postfix. Available as [services.postfix-tlspol](#opt-services.postfix-tlspol.enable).
|
||||
|
||||
@@ -683,6 +683,7 @@
|
||||
./services/hardware/tlp.nix
|
||||
./services/hardware/trezord.nix
|
||||
./services/hardware/triggerhappy.nix
|
||||
./services/hardware/tuned.nix
|
||||
./services/hardware/tuxedo-rs.nix
|
||||
./services/hardware/udev.nix
|
||||
./services/hardware/udisks2.nix
|
||||
|
||||
@@ -0,0 +1,247 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.tuned;
|
||||
|
||||
moduleFromName = name: lib.getAttrFromPath (lib.splitString "." name) config;
|
||||
|
||||
settingsFormat = pkgs.formats.iniWithGlobalSection { };
|
||||
profileFormat = pkgs.formats.ini { };
|
||||
ppdSettingsFormat = pkgs.formats.ini { };
|
||||
|
||||
settingsSubmodule = {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options = {
|
||||
daemon = lib.mkEnableOption "the use of a daemon for TuneD" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
dynamic_tuning = lib.mkEnableOption "dynamic tuning";
|
||||
|
||||
sleep_interval = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 1;
|
||||
description = "Interval in which the TuneD daemon is waken up and checks for events (in seconds).";
|
||||
};
|
||||
|
||||
update_interval = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 10;
|
||||
description = "Update interval for dynamic tuning (in seconds).";
|
||||
};
|
||||
|
||||
recommend_command = lib.mkEnableOption "recommend functionality" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
reapply_sysctl =
|
||||
lib.mkEnableOption "the reapplying of global sysctls after TuneD sysctls are applied"
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
default_instance_priority = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 0;
|
||||
description = "Default instance (unit) priority.";
|
||||
};
|
||||
|
||||
profile_dirs = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/etc/tuned/profiles";
|
||||
# Ensure we always have the vendored profiles available
|
||||
apply = dirs: "${cfg.package}/lib/tuned/profiles," + dirs;
|
||||
description = "Directories to search for profiles, separated by `,` or `;`.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
ppdSettingsSubmodule = {
|
||||
freeformType = ppdSettingsFormat.type;
|
||||
|
||||
options = {
|
||||
main = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
default = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "balanced";
|
||||
description = "Default PPD profile.";
|
||||
example = "performance";
|
||||
};
|
||||
|
||||
battery_detection = lib.mkEnableOption "battery detection" // {
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = "Core configuration for power-profiles-daemon support.";
|
||||
};
|
||||
|
||||
profiles = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
default = {
|
||||
power-saver = "powersave";
|
||||
balanced = "balanced";
|
||||
performance = "throughput-performance";
|
||||
};
|
||||
description = "Map of PPD profiles to native TuneD profiles.";
|
||||
};
|
||||
|
||||
battery = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
default = {
|
||||
balanced = "balanced-battery";
|
||||
};
|
||||
description = "Map of PPD battery states to TuneD profiles.";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
options.services.tuned = {
|
||||
enable = lib.mkEnableOption "TuneD";
|
||||
|
||||
package = lib.mkPackageOption pkgs "tuned" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule settingsSubmodule;
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for TuneD.
|
||||
See {manpage}`tuned-main.conf(5)`.
|
||||
'';
|
||||
};
|
||||
|
||||
profiles = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
freeformType = profileFormat.type;
|
||||
}
|
||||
);
|
||||
default = { };
|
||||
description = ''
|
||||
Profiles for TuneD.
|
||||
See {manpage}`tuned.conf(5)`.
|
||||
'';
|
||||
example = {
|
||||
my-cool-profile = {
|
||||
main.include = "my-other-cool-profile";
|
||||
|
||||
my_sysctl = {
|
||||
type = "sysctl";
|
||||
replace = true;
|
||||
|
||||
"net.core.rmem_default" = 262144;
|
||||
"net.core.wmem_default" = 262144;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
ppdSupport = lib.mkEnableOption "translation of power-profiles-daemon API calls to TuneD" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
ppdSettings = lib.mkOption {
|
||||
type = lib.types.submodule ppdSettingsSubmodule;
|
||||
default = { };
|
||||
description = ''
|
||||
Settings for TuneD's power-profiles-daemon compatibility service.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
# From `tuned.service`
|
||||
{
|
||||
assertion = config.security.polkit.enable;
|
||||
message = "`services.tuned` requires `security.polkit` to be enabled.";
|
||||
}
|
||||
|
||||
{
|
||||
assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon;
|
||||
message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`.";
|
||||
}
|
||||
]
|
||||
# Declare service conflicts, also sourced from `tuned.service`
|
||||
++
|
||||
map
|
||||
(name: {
|
||||
assertion = !(moduleFromName name).enable;
|
||||
message = "`services.tuned` conflicts with `${name}`.";
|
||||
})
|
||||
[
|
||||
"services.auto-cpufreq"
|
||||
"services.power-profiles-daemon"
|
||||
"services.tlp"
|
||||
];
|
||||
|
||||
environment = {
|
||||
etc = lib.mkMerge [
|
||||
{
|
||||
"tuned/tuned-main.conf".source = settingsFormat.generate "tuned-main.conf" {
|
||||
sections = { };
|
||||
globalSection = cfg.settings;
|
||||
};
|
||||
|
||||
"tuned/ppd.conf".source = lib.mkIf cfg.ppdSupport (
|
||||
ppdSettingsFormat.generate "ppd.conf" cfg.ppdSettings
|
||||
);
|
||||
}
|
||||
|
||||
(lib.mapAttrs' (
|
||||
name: value:
|
||||
lib.nameValuePair "tuned/profiles/${name}/tuned.conf" {
|
||||
source = profileFormat.generate "tuned.conf" value;
|
||||
}
|
||||
) cfg.profiles)
|
||||
];
|
||||
|
||||
systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
security.polkit.enable = lib.mkDefault true;
|
||||
|
||||
services = {
|
||||
dbus.packages = [ cfg.package ];
|
||||
|
||||
# Many DEs (like GNOME and KDE Plasma) enable PPD by default
|
||||
# Let's try to make it easier to transition by only enabling this module
|
||||
power-profiles-daemon.enable = false;
|
||||
};
|
||||
|
||||
systemd = {
|
||||
packages = [ cfg.package ];
|
||||
|
||||
services = {
|
||||
tuned = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
tuned-ppd = lib.mkIf cfg.ppdSupport {
|
||||
wantedBy = [ "graphical.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
tmpfiles = {
|
||||
packages = [ cfg.package ];
|
||||
|
||||
# NOTE(@getchoo): `cfg.package` should contain a `tuned.conf` for tmpfiles.d already. Avoid a naming conflict!
|
||||
settings.tuned-profiles = {
|
||||
# Required for tuned-gui
|
||||
"/etc/tuned/profiles".d = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -8,6 +8,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.jitsi-meet;
|
||||
|
||||
# The configuration files are JS of format "var <<string>> = <<JSON>>;". In order to
|
||||
@@ -231,6 +232,14 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.prosody = mkIf cfg.prosody.enable {
|
||||
|
||||
# required for muc_breakout_rooms
|
||||
package = lib.mkDefault (
|
||||
config.services.prosody.package.override {
|
||||
withExtraLuaPackages = p: with p; [ cjson ];
|
||||
}
|
||||
);
|
||||
|
||||
enable = mkDefault true;
|
||||
xmppComplianceSuite = mkDefault false;
|
||||
modules = {
|
||||
@@ -419,6 +428,7 @@ in
|
||||
cfg.videobridge.passwordFile
|
||||
else
|
||||
"/var/lib/jitsi-meet/videobridge-secret";
|
||||
|
||||
in
|
||||
''
|
||||
${config.services.prosody.package}/bin/prosodyctl register focus auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jicofo-user-secret)"
|
||||
|
||||
@@ -98,20 +98,16 @@ let
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
description = "Commandline arguments to pass to the image's entrypoint.";
|
||||
example = literalExpression ''
|
||||
["--port=9000"]
|
||||
'';
|
||||
example = [ "--port=9000" ];
|
||||
};
|
||||
|
||||
labels = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = { };
|
||||
description = "Labels to attach to the container at runtime.";
|
||||
example = literalExpression ''
|
||||
{
|
||||
"traefik.https.routers.example.rule" = "Host(`example.container`)";
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
"traefik.https.routers.example.rule" = "Host(`example.container`)";
|
||||
};
|
||||
};
|
||||
|
||||
entrypoint = mkOption {
|
||||
@@ -125,24 +121,20 @@ let
|
||||
type = with types; attrsOf str;
|
||||
default = { };
|
||||
description = "Environment variables to set for this container.";
|
||||
example = literalExpression ''
|
||||
{
|
||||
DATABASE_HOST = "db.example.com";
|
||||
DATABASE_PORT = "3306";
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
DATABASE_HOST = "db.example.com";
|
||||
DATABASE_PORT = "3306";
|
||||
};
|
||||
};
|
||||
|
||||
environmentFiles = mkOption {
|
||||
type = with types; listOf path;
|
||||
default = [ ];
|
||||
description = "Environment files for this container.";
|
||||
example = literalExpression ''
|
||||
[
|
||||
/path/to/.env
|
||||
/path/to/.env.secret
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
/path/to/.env
|
||||
/path/to/.env.secret
|
||||
];
|
||||
};
|
||||
|
||||
log-driver = mkOption {
|
||||
@@ -223,12 +215,10 @@ let
|
||||
field; please refer to the
|
||||
[docker engine documentation](https://docs.docker.com/engine/storage/volumes/) for details.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
"volume_name:/path/inside/container"
|
||||
"/path/on/host:/path/inside/container"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"volume_name:/path/inside/container"
|
||||
"/path/on/host:/path/inside/container"
|
||||
];
|
||||
};
|
||||
|
||||
workdir = mkOption {
|
||||
@@ -249,10 +239,8 @@ let
|
||||
example = literalExpression ''
|
||||
virtualisation.oci-containers.containers = {
|
||||
node1 = {};
|
||||
node2 = {
|
||||
dependsOn = [ "node1" ];
|
||||
}
|
||||
}
|
||||
node2.dependsOn = [ "node1" ];
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -277,9 +265,7 @@ let
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
description = "Extra options for {command}`${defaultBackend} run`.";
|
||||
example = literalExpression ''
|
||||
["--network=host"]
|
||||
'';
|
||||
example = [ "--network=host" ];
|
||||
};
|
||||
|
||||
autoStart = mkOption {
|
||||
@@ -352,12 +338,10 @@ let
|
||||
When set to false, capability is dropped from the container.
|
||||
When null, default runtime settings apply.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
SYS_ADMIN = true;
|
||||
SYS_WRITE = false;
|
||||
{
|
||||
'';
|
||||
example = {
|
||||
SYS_ADMIN = true;
|
||||
SYS_WRITE = false;
|
||||
};
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
@@ -366,11 +350,9 @@ let
|
||||
description = ''
|
||||
List of devices to attach to this container.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
"/dev/dri:/dev/dri"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"/dev/dri:/dev/dri"
|
||||
];
|
||||
};
|
||||
|
||||
privileged = mkOption {
|
||||
|
||||
@@ -1499,6 +1499,7 @@ in
|
||||
ttyd = runTest ./web-servers/ttyd.nix;
|
||||
tt-rss = runTest ./web-apps/tt-rss.nix;
|
||||
txredisapi = runTest ./txredisapi.nix;
|
||||
tuned = runTest ./tuned.nix;
|
||||
tuptime = runTest ./tuptime.nix;
|
||||
turbovnc-headless-server = runTest ./turbovnc-headless-server.nix;
|
||||
turn-rs = runTest ./turn-rs.nix;
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "tuned";
|
||||
meta = { inherit (pkgs.tuned.meta) maintainers; };
|
||||
|
||||
nodes.machine = {
|
||||
imports = [ ./common/x11.nix ];
|
||||
|
||||
services.tuned = {
|
||||
enable = true;
|
||||
|
||||
profiles = {
|
||||
test-profile = {
|
||||
sysctls = {
|
||||
type = "sysctl";
|
||||
replace = true;
|
||||
|
||||
"net.core.rmem_default" = 262144;
|
||||
"net.core.wmem_default" = 262144;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
with subtest("Wait for service startup"):
|
||||
machine.wait_for_x()
|
||||
machine.wait_for_unit("tuned.service")
|
||||
machine.wait_for_unit("tuned-ppd.service")
|
||||
|
||||
with subtest("Get service status"):
|
||||
machine.succeed("systemctl status tuned.service")
|
||||
|
||||
# NOTE(@getchoo): `pkgs.tuned` provides its own `tuned.conf` for tmpfiles.d
|
||||
# A naming conflict with it and a `systemd.tmpfiles.settings` entry appeared in the initial PR for this module
|
||||
# This breaks the GUI in some cases, and it was annoying to figure out. Make sure it doesn't happen again!
|
||||
with subtest("Ensure systemd-tmpfiles paths are configured"):
|
||||
machine.succeed("systemd-tmpfiles --cat-config | grep '/etc/tuned/profiles'")
|
||||
machine.succeed("systemd-tmpfiles --cat-config | grep '/run/tuned'")
|
||||
|
||||
with subtest("Test GUI"):
|
||||
machine.execute("tuned-gui >&2 &")
|
||||
machine.wait_for_window("tuned")
|
||||
machine.wait_for_text("Start TuneD Daemon")
|
||||
machine.screenshot("gui")
|
||||
'';
|
||||
}
|
||||
@@ -17,6 +17,10 @@ lib.packagesFromDirectoryRecursive {
|
||||
|
||||
elpaca = callPackage ./manual-packages/elpaca { inherit (pkgs) git; };
|
||||
|
||||
emacs-application-framework = callPackage ./manual-packages/emacs-application-framework {
|
||||
inherit (pkgs) git;
|
||||
};
|
||||
|
||||
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
|
||||
inherit (pkgs)
|
||||
basedpyright
|
||||
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Updater
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
|
||||
pname = "eaf-pdf-viewer";
|
||||
version = "0-unstable-2025-07-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "eaf-pdf-viewer";
|
||||
rev = "ff08a6b48faac2d231fb1cfe968cec7e41bbeb98";
|
||||
hash = "sha256-7JAWgCECHnMGPH9GM8pi9lDzR+B4T6xgYQCor032zbM=";
|
||||
};
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
eafPythonDeps =
|
||||
ps: with ps; [
|
||||
packaging
|
||||
pymupdf
|
||||
];
|
||||
eafOtherDeps = [ ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fastest PDF Viewer in Emacs";
|
||||
homepage = "https://github.com/emacs-eaf/eaf-pdf-viewer";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
emacs-application-framework,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
withApplications =
|
||||
enabledApps:
|
||||
emacs-application-framework.override {
|
||||
inherit enabledApps;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
inherit withApplications;
|
||||
}
|
||||
+134
@@ -0,0 +1,134 @@
|
||||
{
|
||||
# Basic
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
symlinkJoin,
|
||||
# Python dependency
|
||||
python3,
|
||||
# Emacs dependencies
|
||||
all-the-icons,
|
||||
# Other dependencies
|
||||
git,
|
||||
nodejs,
|
||||
wmctrl,
|
||||
xdotool,
|
||||
# Updater
|
||||
unstableGitUpdater,
|
||||
# Sub-applications in the framework
|
||||
enabledApps ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
appPythonDeps = builtins.map (item: item.eafPythonDeps) enabledApps;
|
||||
appOtherDeps = builtins.map (item: item.eafOtherDeps) enabledApps;
|
||||
|
||||
pythonPackageLists = [
|
||||
(
|
||||
ps: with ps; [
|
||||
epc
|
||||
lxml
|
||||
pyqt6
|
||||
pyqt6-sip
|
||||
pyqt6-webengine
|
||||
sexpdata
|
||||
tld
|
||||
]
|
||||
)
|
||||
]
|
||||
++ appPythonDeps;
|
||||
pythonPkgs = ps: builtins.concatLists (builtins.map (f: f ps) pythonPackageLists);
|
||||
pythonEnv = python3.withPackages pythonPkgs;
|
||||
|
||||
otherPackageLists = [
|
||||
[
|
||||
git
|
||||
nodejs
|
||||
wmctrl
|
||||
xdotool
|
||||
]
|
||||
]
|
||||
++ appOtherDeps;
|
||||
otherPkgs = builtins.concatLists (otherPackageLists);
|
||||
|
||||
appsDrv = symlinkJoin {
|
||||
name = "emacs-application-framework-apps";
|
||||
paths = enabledApps;
|
||||
};
|
||||
depsBin = symlinkJoin {
|
||||
name = "emacs-application-framework-deps-bin";
|
||||
paths = otherPkgs;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf";
|
||||
version = "0-unstable-2025-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "emacs-application-framework";
|
||||
rev = "f7431199fb3143f4487213b7ea6a16a3d037b2ff";
|
||||
hash = "sha256-qpaLizkxuOKd/9kfym3+xAssVm+sV3IlxLCApv+yUz8=";
|
||||
};
|
||||
|
||||
packageRequires = [
|
||||
all-the-icons
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace eaf.el \
|
||||
--replace-fail "\"python.exe\" \"python3\"" \
|
||||
"\"python.exe\" \"${pythonEnv.interpreter}\""
|
||||
'';
|
||||
|
||||
files = ''
|
||||
("*.el"
|
||||
"*.py"
|
||||
"applications.json"
|
||||
"core"
|
||||
"extension")
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
EMACSLOADPATH="$EMACSLOADPATH:core/"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}
|
||||
APPLISPDIR=${appsDrv}/share/emacs/site-lisp/elpa
|
||||
if [ -d $APPLISPDIR ]; then
|
||||
cp -r $APPLISPDIR/. \
|
||||
$LISPDIR/app/
|
||||
fi
|
||||
|
||||
NATDIR=$out/share/emacs/native-lisp
|
||||
APPNATDIR=${appsDrv}/share/emacs/native-lisp
|
||||
if [ -d $APPNATDIR ]; then
|
||||
cp -r $APPNATDIR/. \
|
||||
$NATDIR/
|
||||
fi
|
||||
|
||||
mkdir -p $out/bin/
|
||||
for item in ${depsBin}/bin/*; do
|
||||
# Some symbolic links point to another symbolic link
|
||||
ln -s $(readlink -f $item) \
|
||||
$out/bin/$(basename $item)
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Extensible framework of Emacs";
|
||||
homepage = "https://github.com/emacs-eaf/emacs-application-framework";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
thattemperature
|
||||
];
|
||||
};
|
||||
|
||||
})
|
||||
@@ -162,11 +162,11 @@ let
|
||||
patches = [ ../patches/kotlinc-path.patch ];
|
||||
postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin'}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
|
||||
buildPhase = ''
|
||||
runHook preInstall
|
||||
runHook preBuild
|
||||
|
||||
ant -Duser.home=${jpsRepo} -Dbuild.dir=/build/out -f jps-bootstrap-classpath.xml
|
||||
|
||||
runHook postInstall
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -42,7 +42,7 @@ let
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
runHook preInstallCheck
|
||||
|
||||
# Smoke check: run a test notebook using Papermill by creating a simple kernelspec
|
||||
mkdir -p kernels/cpp17
|
||||
@@ -61,7 +61,7 @@ let
|
||||
exit 1
|
||||
fi
|
||||
|
||||
runHook postCheck
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
|
||||
@@ -5311,6 +5311,8 @@ let
|
||||
|
||||
wakatime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { };
|
||||
|
||||
wgsl-analyzer.wgsl-analyzer = callPackage ./wgsl-analyzer.wgsl-analyzer { };
|
||||
|
||||
wholroyd.jinja = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jinja";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
jq,
|
||||
moreutils,
|
||||
wgsl-analyzer,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "wgsl-analyzer";
|
||||
publisher = "wgsl-analyzer";
|
||||
version = "0.10.178";
|
||||
hash = "sha256-ZYhvCZ/ww6GbFF5ythVSgI41dZsbC4Y77s6+KEeEkCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
jq '(.contributes.configuration[] | select(.title == "server") | .properties."wgsl-analyzer.server.path".default) = $s' \
|
||||
--arg s "${lib.getExe wgsl-analyzer}" \
|
||||
package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extension that integrates wgsl-analyzer a wgsl language server into VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=wgsl-analyzer.wgsl-analyzer";
|
||||
homepage = "https://github.com/wgsl-analyzer/wgsl-analyzer";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ timon ];
|
||||
};
|
||||
}
|
||||
@@ -80,6 +80,7 @@ buildFHSEnv {
|
||||
gcc
|
||||
glib
|
||||
gnutar
|
||||
gtk3
|
||||
libxml2
|
||||
libxslt
|
||||
procps
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webcamoid";
|
||||
version = "9.2.3";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "webcamoid";
|
||||
repo = "webcamoid";
|
||||
tag = version;
|
||||
hash = "sha256-j4FiRQeFsrZD48P1CUESFytz9l/64Lz1EuOZp0ZSEmI=";
|
||||
hash = "sha256-KU5iJqCGbqTZebP5yWb5VcxRGcRjQYQHn+GP6W57D9I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyprshade";
|
||||
version = "3.2.1";
|
||||
version = "4.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loqusion";
|
||||
repo = "hyprshade";
|
||||
tag = version;
|
||||
hash = "sha256-MlbNE9n//Qb6OJc3DMkOpnPtoodfV8JlG/I5rOfWMtQ=";
|
||||
hash = "sha256-NnKhIgDAOKOdEqgHzgLq1MSHG3FDT2AVXJZ53Ozzioc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Modern smart contract platform for Cardano";
|
||||
homepage = "https://aiken-lang.org";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ t4ccer ];
|
||||
maintainers = with lib.maintainers; [ aciceri ];
|
||||
mainProgram = "aiken";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,16 +21,17 @@
|
||||
libgbm,
|
||||
openssl,
|
||||
systemd,
|
||||
xcb-util-cursor,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "9.21.1";
|
||||
version = "9.22.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
|
||||
hash = "sha256-/Wue2Ag+ofv3z33PfpI7SlZWsGUjY33nOEcx5xPh5CA=";
|
||||
hash = "sha256-xZnpi0xKdPuKera3bJYLjfKB9nwgFyBYQ5P7teTvyn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -59,6 +60,7 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
stdenv.cc.cc
|
||||
systemd
|
||||
xcb-util-cursor
|
||||
xorg.libX11
|
||||
xorg.xcbutilwm
|
||||
xorg.xcbutilimage
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "amazon-qldb-shell";
|
||||
version = "2.0.1";
|
||||
package = rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "amazon-qldb-shell";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-tD35Py81QLDVlBahYzgskOQK5lQW03xuCnUwVUi4oLU=";
|
||||
|
||||
passthru.tests.version = testers.testVersion { inherit package; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interface to send PartiQL statements to Amazon Quantum Ledger Database (QLDB)";
|
||||
homepage = "https://github.com/awslabs/amazon-qldb-shell";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.terlar ];
|
||||
mainProgram = "qldb";
|
||||
# See https://hydra.nixos.org/build/255146098/log.
|
||||
broken = true; # Added 2024-04-06
|
||||
};
|
||||
};
|
||||
in
|
||||
package
|
||||
@@ -9,10 +9,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "4.1.1";
|
||||
version = "4.1.20";
|
||||
src = fetchurl {
|
||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
|
||||
hash = "sha256-uTPprGSOi2LlxzrHRtL2KSMPR4bOmQbV8g0Fm19T0n0=";
|
||||
hash = "sha256-4sJ61j9/DdZM9mn3JqrvjlWPDb6nN4A4wzQR5lXthxU=";
|
||||
};
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "binaryninja-free";
|
||||
version = "5.0.7648";
|
||||
version = "5.1.8005";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Vector35/binaryninja-api/releases/download/v${finalAttrs.version}-stable/binaryninja_free_linux.zip";
|
||||
hash = "sha256-CBRoQaVQ3/wlRA2SE3EOgM9BiU+WlT2nGi3CkBTrT+g=";
|
||||
url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip";
|
||||
hash = "sha256-vXR0TXcQwEoYz1qiGO3TYajUt+QR9wfV0es6yTZvYLs=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bmm";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhth";
|
||||
repo = "bmm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sfAUvvZ/LKOXfnA0PB3LRbPHYoA+FJV4frYU+BpC6WI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+o8bYi4Pe9zwiDBUMllpF+my7gp3iLX0+DntFtN7PoI=";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Get to your bookmarks in a flash";
|
||||
homepage = "https://github.com/dhth/bmm";
|
||||
changelog = "https://github.com/dhth/bmm/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ faukah ];
|
||||
mainProgram = "bmm";
|
||||
};
|
||||
})
|
||||
@@ -57,11 +57,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
|
||||
./build install x
|
||||
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -25,9 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
make test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
||||
+14
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"codebuff": "^1.0.436"
|
||||
"codebuff": "^1.0.441"
|
||||
}
|
||||
},
|
||||
"node_modules/chownr": {
|
||||
@@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/codebuff": {
|
||||
"version": "1.0.436",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.436.tgz",
|
||||
"integrity": "sha512-Xz1VjODWaG0K5pgsEm1HvjpjJjHilNubow6mx4ber+HqPdufN7r4fk3ZsPjO+GoJavcxG8z7OdPY8CLIouZ4gA==",
|
||||
"version": "1.0.441",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.441.tgz",
|
||||
"integrity": "sha512-2/u30sGXiEd1caB+doYWy34lbv8DJhQ2SomHXpCmmeEKITUgd9ckdVMLaaEgrR/FIUHyFBcu7aCVzmwsBEfnuQ==",
|
||||
"cpu": [
|
||||
"x64",
|
||||
"arm64"
|
||||
@@ -32,6 +32,7 @@
|
||||
"win32"
|
||||
],
|
||||
"dependencies": {
|
||||
"commander": "^12.0.0",
|
||||
"tar": "^6.2.0"
|
||||
},
|
||||
"bin": {
|
||||
@@ -41,6 +42,15 @@
|
||||
"node": ">=16"
|
||||
}
|
||||
},
|
||||
"node_modules/commander": {
|
||||
"version": "12.1.0",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
|
||||
"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/fs-minipass": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "codebuff";
|
||||
version = "1.0.436";
|
||||
version = "1.0.441";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
|
||||
hash = "sha256-eMoF+YrZttplzN+S9rEuHEBPSbGQnwWOFuZ+vVFrpik=";
|
||||
hash = "sha256-l57ZQTvvIR8mpFJGJeF6AqE6sbjIUkQdjlvdQ4UAQ9g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-VTThvsHSiKSHmE7PYBUb5yZW2SKhLB7O5VjV8RhO9ZU=";
|
||||
npmDepsHash = "sha256-/LiXKA0HdFg3K7xyioL0SKjWicktCpih1oJkEPLDzIA=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "databricks-cli";
|
||||
version = "0.260.0";
|
||||
version = "0.262.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-N3l7K+KQ7P7O4zooh3AgvAnLJM8Bsp4qJw9501SnO5c=";
|
||||
hash = "sha256-grA7HI9gJFgeqNxmd6SboAn9z2QKLok7BayGj2RMYog=";
|
||||
};
|
||||
|
||||
# Otherwise these tests fail asserting that the version is 0.0.0-dev
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-jwEJ0Uoq6pVo1/a1mXj7n2BRiWAmhlxLE0WxSrqcL8w=";
|
||||
vendorHash = "sha256-sJyinqKX4irO4rquJ1hxDU/GH4XcyxPGw7qH0ZLgdxU=";
|
||||
|
||||
excludedPackages = [
|
||||
"bundle/internal"
|
||||
|
||||
@@ -15,12 +15,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
|
||||
gzip -c -d "$src" > dbip-city-lite.mmdb
|
||||
install -Dm444 dbip-city-lite.mmdb "$out/share/dbip/dbip-city-lite.mmdb"
|
||||
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-city-lite.mmdb";
|
||||
|
||||
@@ -15,12 +15,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
|
||||
gzip -c -d "$src" > dbip-country-lite.mmdb
|
||||
install -Dm444 dbip-country-lite.mmdb "$out/share/dbip/dbip-country-lite.mmdb"
|
||||
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb";
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 dhcpdump "$out/bin/dhcpdump"
|
||||
installManPage dhcpdump.8
|
||||
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -36,9 +36,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/discord.sh --help
|
||||
runHook postCheck
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -93,11 +93,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/share/duckstation/common-tests
|
||||
|
||||
runHook postCheck
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# Since then, `dust` has been freed up, allowing this package to take that attribute.
|
||||
# However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
|
||||
pname = "du-dust";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootandy";
|
||||
repo = "dust";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tj+prO7KZrw0lrZahbw0c8TcfNrIc1Z08Tm1MHpOFLM=";
|
||||
hash = "sha256-AB7NTiH9Q2SNIxFXsVTPHFs+DDVRn3egk7rZKgtYs0c=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1pKk41dQlcrPzJ01uvo87G9iTDiBq9XHGOoZ0OH4Mls=";
|
||||
cargoHash = "sha256-TE+VkMDcfTMSyclyRf1HiNF7Q+qgIVI5x/f8Cou/4I4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstallPhase
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/512x512/apps/
|
||||
ln -s ${finalAttrs.src}/io.edcd.EDMarketConnector.png $out/share/icons/hicolor/512x512/apps/io.edcd.EDMarketConnector.png
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeWrapper ${pythonEnv}/bin/python $out/bin/edmarketconnector \
|
||||
--add-flags "${finalAttrs.src}/EDMarketConnector.py $@"
|
||||
|
||||
runHook postInstallPhase
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exodus";
|
||||
version = "25.9.2";
|
||||
version = "25.28.4";
|
||||
|
||||
src = requireFile {
|
||||
name = "exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
hash = "sha256-QEspr/n4TnwpCx9lBY874+dlcMvhXiYKhyqel7ebuzg=";
|
||||
hash = "sha256-AGeFsMHSywC32iaIGI9/VY2YC3gR5bHu33rOWJlyFFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s $out/bin/Exodus $out/bin/exodus
|
||||
ln -s $out/exodus.desktop $out/share/applications
|
||||
substituteInPlace $out/share/applications/exodus.desktop \
|
||||
--replace 'Exec=bash -c "cd \`dirname %k\` && ./Exodus %u"' "Exec=Exodus %u"
|
||||
--replace-fail 'Exec=bash -c "cd \\`dirname %k\\` && ./Exodus %u"' "Exec=Exodus %u"
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "forge-sparks";
|
||||
version = "0.4.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafaelmardojai";
|
||||
repo = "forge-sparks";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-H607u/VBuzzoYrYZc8fLqCQMZ+jRJOVZ34U8yKHfmYk=";
|
||||
hash = "sha256-4FzMhHE4601laKHYRN3NCZ7oBDH/2HaeCS9CdbmTNx0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@ assert backend == "mcode" || backend == "llvm" || backend == "gcc";
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghdl-${backend}";
|
||||
version = "5.0.1";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghdl";
|
||||
repo = "ghdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v3wl+tn92Bks0VnW80Q1KwHwUtUxlbeMSI3WWvgDky4=";
|
||||
hash = "sha256-vPeODNTptxIjN6qLoIHaKOFf3P3iAK2GloVreHPaAz8=";
|
||||
};
|
||||
|
||||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
sqlite,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gmap";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seeyebe";
|
||||
repo = "gmap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-L+Dv2B+ZbGW2loh7yOMwk4x5kRFaCc+n5FgAfCSbh3M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-awdNb81j7Zhh3aIMJh1d8LuZ8rlfBe0shk/GyNb1aiA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool for visualizing Git activity";
|
||||
longDescription = ''
|
||||
gmap helps you understand your Git repository at a glance — not
|
||||
just what changed, but when, how much, and by whom. Visualize
|
||||
commit activity over time, spot churn-heavy files, explore
|
||||
contributor dynamics, and more — all from your terminal.
|
||||
|
||||
Built for developers who live in the CLI and want quick,
|
||||
powerful insights.
|
||||
'';
|
||||
homepage = "https://github.com/seeyebe/gmap";
|
||||
changelog = "https://github.com/seeyebe/gmap/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
mainProgram = "gmap";
|
||||
};
|
||||
})
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
aqbanking,
|
||||
boost,
|
||||
cmake,
|
||||
@@ -38,12 +37,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "5.11";
|
||||
version = "5.12";
|
||||
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
|
||||
hash = "sha256-a6QjE6qqmbXwf/bk28WLM/v19L5ukRN2cB1lwm/U3r4=";
|
||||
hash = "sha256-s1tHVr4SvP2+1URo8wRD+lPyOFIKnOrVveLmxHc/vzk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -96,12 +95,6 @@ stdenv.mkDerivation rec {
|
||||
./0004-exec-fq-wrapper.patch
|
||||
# this patch adds in env vars to the Python lib that makes it able to find required resource files
|
||||
./0005-python-env.patch
|
||||
# this patch backports a fix to remove unused includes causing build failures
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/Gnucash/gnucash/commit/940085a0172216240232551022686cea4da86096.patch?full_index=1";
|
||||
name = "0006-remove-unused-includes.patch";
|
||||
hash = "sha256-4CpBtKDkcT1HlOAHsbASxPiHKVpZ9ETWS3fXEupOl0Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -133,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Gnucash";
|
||||
repo = "gnucash-docs";
|
||||
rev = version;
|
||||
hash = "sha256-uXpIAsucVUaAlqYTKfrfBg04Kb5Mza67l0ZU6fxkSUY=";
|
||||
hash = "sha256-9hXOgHdNtTcPOf44L2RrfOTXAgJi2Xu6gWnjDU7gHjU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -210,6 +203,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [
|
||||
nevivurn
|
||||
ryand56
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "gnucash";
|
||||
|
||||
@@ -34,10 +34,10 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install hello-wayland $out/bin
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromSourcehut,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -12,21 +12,24 @@
|
||||
libscfg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kanshi";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~emersion";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "emersion";
|
||||
repo = "kanshi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FDt+F5tWHLsMejlExb5yPh0SlWzuUlK9u54Uy+alrzw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-90FnVtiYR8AEAddIQe9sfgQDMO8OqlQ8fNy/nJsbhKs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@@ -34,18 +37,14 @@ stdenv.mkDerivation rec {
|
||||
scdoc
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland
|
||||
libvarlink
|
||||
libscfg
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sr.ht/~emersion/kanshi";
|
||||
meta = {
|
||||
description = "Dynamic display configuration tool";
|
||||
longDescription = ''
|
||||
kanshi allows you to define output profiles that are automatically enabled
|
||||
@@ -55,12 +54,15 @@ stdenv.mkDerivation rec {
|
||||
kanshi can be used on Wayland compositors supporting the
|
||||
wlr-output-management protocol.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
homepage = "https://gitlab.freedesktop.org/emersion/kanshi";
|
||||
changelog = "https://gitlab.freedesktop.org/emersion/kanshi/-/tags/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "kanshi";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
balsoft
|
||||
danielbarter
|
||||
aleksana
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.82.0";
|
||||
version = "1.83.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-F+RlfnKnMqlPTk1iv79ah/UaEjd7Og+gV1YVsZqkIBk=";
|
||||
hash = "sha256-cwNSjzCy4lv71O3XAcDXVF+75MhQ6gMrMz/IuePCdak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
./checktests
|
||||
runHook postChck
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doCheck = false; # hasdescriptor.c test fails, hrm.
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdns-scanner";
|
||||
version = "0.21.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CramBL";
|
||||
repo = "mdns-scanner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NtV/MnFjilxaB5+Kiug9JzqikTYMaw9BP/NpR2MxTl4=";
|
||||
hash = "sha256-iZc+KY/b7xQKm9bBJ+bRmcu6zFJAXcCRy72gDrBKRzQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Bsd+f8B7EBW/ugT0/k+T8gL/O4Ro6S2x8gMOcWia1Qs=";
|
||||
cargoHash = "sha256-L2g49bTh+Il+fWfb7kgNqbxd0Y+qnO7Q4laB2pFlXbw=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CramBL/mdns-scanner";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mfcl2740dwlpr";
|
||||
version = "3.2.0-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb";
|
||||
sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
|
||||
url = "https://download.brother.com/welcome/dlf101727/mfcl2740dwlpr-${finalAttrs.version}.i386.deb";
|
||||
hash = "sha256-EKK8ZyvVTnGLR486/H5H1FFVf31VExZ9OtNJo9AL/68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mkbrr";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "mkbrr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fX58/PRTVhUATWX5HOTtf6d6lmSRuE3xSrg/Qtzv/rs=";
|
||||
hash = "sha256-k8//hfqDwiF5NkpvflkGaSybYVb9lWwj91hH/KrofOU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G8WM5x99UZfAZUkE5W37Ogx/OKk8JypPzGBrIuBOFNo=";
|
||||
vendorHash = "sha256-MEDzZd67iXPY/MioMd1FcTLY+8CdJN7+oC7qus63yJ8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -46,13 +46,13 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preConfigure
|
||||
runHook preBuild
|
||||
|
||||
for f in SuiteSparse_config Mongoose; do
|
||||
(cd $f && cmakeConfigurePhase && make -j$NIX_BUILD_CORES)
|
||||
done
|
||||
|
||||
runHook postConfigure
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nakama";
|
||||
version = "3.27.1";
|
||||
version = "3.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "heroiclabs";
|
||||
repo = "nakama";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gMbDXkRxR6jAOHpA+JKQAWLpEW2CDXmGDTsX+Urf/ss=";
|
||||
hash = "sha256-mgHvgq/sbwWVIKpfQuZVp9xHgVHOMYJt2YEdeKTaDqA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
breeze-icons,
|
||||
gtk-engine-murrine,
|
||||
jdupes,
|
||||
plasma-framework,
|
||||
plasma-workspace,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@@ -16,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "d9b5c42cebf9a165bcce7b6b8a019f5cfd5b789c";
|
||||
hash = "sha256-OkXjwaoXyWfTgNkeU+ab+uv+U/5OaJ8oTt/G8YLz84o=";
|
||||
name = "Nordic";
|
||||
@@ -24,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "361f0d1d23177a1154d415f793ce52a2c09629d4";
|
||||
hash = "sha256-0IBuCMbHxTL3YtIK35g9xiBEs1DZgA4MwMAVPIw3Omk=";
|
||||
name = "Nordic-standard-buttons";
|
||||
@@ -32,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "bf05d41c7c7cd03e391854739bcc843fc6053ced";
|
||||
hash = "sha256-AjVvciUrm/X3U6Pmo52ZrucLRJdsRFPeEMRwSKyjwi4=";
|
||||
name = "Nordic-darker";
|
||||
@@ -40,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "98cdf88d77fa7f0535ff660148e0ccbabe47a579";
|
||||
hash = "sha256-70l5+renDhniZroPoMrCHsPgT6Pg3cr5w86LjkaWchg=";
|
||||
name = "Nordic-darker-standard-buttons";
|
||||
@@ -48,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "f1e43cf9ba83602f73f71407a8a4ba768122b7f4";
|
||||
hash = "sha256-yLE/M9PXfQv2JD+HTsBHFiFaKuY8vOkZiOlQLLON+HM=";
|
||||
name = "Nordic-bluish-accent";
|
||||
@@ -56,7 +54,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
repo = "nordic";
|
||||
rev = "52a37ebce50f948129507e4804240d9e7788a7a2";
|
||||
hash = "sha256-zwnCaS08vceHjFHn9ET2509Zat7a1gHEG1RDR+xrbhc=";
|
||||
name = "Nordic-bluish-accent-standard-buttons";
|
||||
@@ -64,7 +62,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
repo = "nordic-polar";
|
||||
rev = "24dc0325c4a38508039f5fee9a5391c1d9d8d5d5";
|
||||
hash = "sha256-Y3PFuIc7UPbRg9NZie4buKCUiMXzl5idg7LSrj/lsos=";
|
||||
name = "Nordic-Polar";
|
||||
@@ -72,7 +70,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
repo = "nordic-polar";
|
||||
rev = "fe0d657613a1e6330fa8c41378c324af93a42c3a";
|
||||
hash = "sha256-fusSDXawWttXWQfGloRkpkHWvfLPuljm1l0BpAKvNSg=";
|
||||
name = "Nordic-Polar-standard-buttons";
|
||||
@@ -156,7 +154,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
mkdir -p $sddm/nix-support
|
||||
|
||||
printWords ${breeze-icons} ${plasma-framework} ${plasma-workspace} \
|
||||
printWords ${libsForQt5.breeze-icons} ${libsForQt5.plasma-framework} ${libsForQt5.plasma-workspace} \
|
||||
>> $sddm/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
@@ -165,6 +163,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/EliverLara/Nordic";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
maintainers = with lib.maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@@ -29,7 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# which can be provided by a pure Nix expression, for example in a shell.
|
||||
./system-raylib.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Odin is still using 'arm64-apple-macos' as the target name on
|
||||
# aarch64-darwin architectures. This results in a warning whenever the
|
||||
# Odin compiler runs a build. Replacing the target in the Odin compiler
|
||||
# removes the nix warning when the Odin compiler is ran on aarch64-darwin.
|
||||
substituteInPlace src/build_settings.cpp \
|
||||
--replace-fail "arm64-apple-macosx" "arm64-apple-darwin"
|
||||
|
||||
rm -r vendor/raylib/{linux,macos,macos-arm64,wasm,windows}
|
||||
|
||||
patchShebangs --build build_odin.sh
|
||||
|
||||
@@ -43,7 +43,7 @@ python3'.pkgs.buildPythonApplication rec {
|
||||
description = "Simple pythonic programming language for Smart Contracts on Cardano";
|
||||
homepage = "https://opshin.dev";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ t4ccer ];
|
||||
maintainers = with maintainers; [ aciceri ];
|
||||
mainProgram = "opshin";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
ffmpeg,
|
||||
vulkan-loader,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "palettum";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arrowpc";
|
||||
repo = "palettum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xJGXLJPsfrU/BiS2GuEoJNbXaQZbbkZaArf4otiUqqA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-c1Xx7U7OU9hcjHNEkFAJ1dYksZq0rL6QcSKGGXuUJYY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI tool that lets you recolor images, GIFs and videos";
|
||||
longDescription = ''
|
||||
Palettum is a web app and CLI tool that lets you recolor images,
|
||||
GIFs, and videos with any custom palette of your choosing. It
|
||||
lets you apply any custom palette by either snapping each pixel
|
||||
to its closest color (ideal for pixel-art styles), or blending
|
||||
the palette as a filter for a smoother effect.
|
||||
'';
|
||||
homepage = "https://github.com/arrowpc/palettum";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
mainProgram = "palettum";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "paq";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gregl83";
|
||||
repo = "paq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oB805M37oLLV2Nttchwzd6V2AUqCo8JFhj6Mfg/JfH0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ziYcaUGYxp+gR5v/yxQElNGLugo3bJtjVwCaHiFkMpw=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Hash file or directory recursively";
|
||||
homepage = "https://github.com/gregl83/paq";
|
||||
changelog = "https://github.com/gregl83/paq/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lafrenierejm ];
|
||||
mainProgram = "paq";
|
||||
};
|
||||
})
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-pass";
|
||||
version = "1.32.2";
|
||||
version = "1.32.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-j/25TaZKvMFIB18InRD1kknwXNmHxUpl6xU3WdrvRrk=";
|
||||
hash = "sha256-tVjiY+AwzCTPAb9rB7/gnRjElf2vhHRcX3kLUj6lwIg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
makeDesktopItem,
|
||||
cmake,
|
||||
python3Packages,
|
||||
@@ -57,11 +58,31 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
# A script is already created by the `[project.scripts]` directive
|
||||
# in `pyproject.toml`.
|
||||
patches = [ ./script-already-exists.patch ];
|
||||
patches = [
|
||||
./script-already-exists.patch
|
||||
|
||||
# Fix python3.13 and numpy 2 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/schrodinger/pymol-open-source/commit/fef4a026425d195185e84d46ab88b2bbd6d96cf8.patch";
|
||||
hash = "sha256-F/5UcYwgHgcMQ+zeigedc1rr3WkN9rhxAxH+gQfWKIY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/schrodinger/pymol-open-source/commit/97cc1797695ee0850621762491e93dc611b04165.patch";
|
||||
hash = "sha256-H2PsRFn7brYTtLff/iMvJbZ+RZr7GYElMSINa4RDYdA=";
|
||||
})
|
||||
# Fixes failing test testLoadPWG
|
||||
(fetchpatch {
|
||||
url = "https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch";
|
||||
hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"'
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"cmake>=3.13.3",' ""
|
||||
'';
|
||||
|
||||
env.PREFIX_PATH = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${msgpack}";
|
||||
@@ -74,8 +95,6 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3Packages.numpy_1
|
||||
python3Packages.pyqt5
|
||||
qt5.qtbase
|
||||
glew
|
||||
glm
|
||||
@@ -89,6 +108,11 @@ python3Packages.buildPythonApplication rec {
|
||||
msgpack
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
numpy
|
||||
pyqt5
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
|
||||
|
||||
postInstall =
|
||||
@@ -115,6 +139,7 @@ python3Packages.buildPythonApplication rec {
|
||||
python3Packages.msgpack
|
||||
pillow
|
||||
pytestCheckHook
|
||||
requests
|
||||
];
|
||||
|
||||
# some tests hang for some reason
|
||||
@@ -151,12 +176,12 @@ python3Packages.buildPythonApplication rec {
|
||||
wrapQtApp "$out/bin/pymol"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
inherit description;
|
||||
mainProgram = "pymol";
|
||||
homepage = "https://www.pymol.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
natsukium
|
||||
samlich
|
||||
];
|
||||
|
||||
@@ -56,13 +56,13 @@ let
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstallPhase
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv Quiet.app $out/Applications
|
||||
makeWrapper $out/Applications/Quiet.app/Contents/MacOS/Quiet $out/bin/${pname}
|
||||
|
||||
runHook postInstallPhase
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = meta // {
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/resources
|
||||
find . -type f -executable -exec cp {} $out/bin \;
|
||||
for d in *; do
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
|
||||
cp -ar "$d/src/resources" "$out/resources/$d"
|
||||
fi
|
||||
done
|
||||
runHook postBuild
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rkik";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aguacero7";
|
||||
repo = "rkik";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MVNqc0IHFZTi3Vz1OeKeRrKbk4kcM3GvfTPajs+FHew=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CuFQFHN9O/bnZ32sQoj4aduLECpKmBXfJt5n0IH/5Tc=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool for querying NTP servers and comparing clock offsets";
|
||||
longDescription = ''
|
||||
Most systems rely on a daemon (like chronyd or ntpd) to
|
||||
synchronize time. But what if you just want to inspect the
|
||||
current offset between your system clock and one or more NTP
|
||||
servers — without root, without sync, and without installing
|
||||
anything heavyweight?
|
||||
|
||||
RKIK is a Rust-based CLI tool designed for stateless and passive
|
||||
NTP inspection, just as dig or ping are for DNS and ICMP.
|
||||
'';
|
||||
homepage = "https://github.com/aguacero7/rkik";
|
||||
changelog = "https://github.com/aguacero7/rkik/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
mainProgram = "rkik";
|
||||
};
|
||||
})
|
||||
+6
-6
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"name": "shopify",
|
||||
"version": "3.83.0",
|
||||
"version": "3.83.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "shopify",
|
||||
"version": "3.83.0",
|
||||
"version": "3.83.1",
|
||||
"dependencies": {
|
||||
"@shopify/cli": "3.83.0"
|
||||
"@shopify/cli": "3.83.1"
|
||||
},
|
||||
"bin": {
|
||||
"shopify": "node_modules/@shopify/cli/bin/run.js"
|
||||
@@ -579,9 +579,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@shopify/cli": {
|
||||
"version": "3.83.0",
|
||||
"resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.0.tgz",
|
||||
"integrity": "sha512-xdSrGV8FZAqyvtyj1fXeNbBhb9qH76l11vVhoCXKgorSCjmnYlJu9Ugffv3KqkseTR5PZsDzVJ5P6jL3f3iAXQ==",
|
||||
"version": "3.83.1",
|
||||
"resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.1.tgz",
|
||||
"integrity": "sha512-jjyfKXZjYVHwWBAool91Yh6HTUsy8CuQiEYhMFl6gXa/aRiq/YW5jfEqeMA6XEFiqBtdMSQGLZ10pk9FbHVvMQ==",
|
||||
"license": "MIT",
|
||||
"os": [
|
||||
"darwin",
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "shopify",
|
||||
"version": "3.83.0",
|
||||
"version": "3.83.1",
|
||||
"private": true,
|
||||
"bin": {
|
||||
"shopify": "node_modules/@shopify/cli/bin/run.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@shopify/cli": "3.83.0"
|
||||
"@shopify/cli": "3.83.1"
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user