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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-12 00:15:54 +00:00
committed by GitHub
parent 729d583b0c c0c77416ac
commit e90ef4e1a6
205 changed files with 11807 additions and 1783 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+25
View File
@@ -3536,6 +3536,12 @@
github = "scaredmushroom";
githubId = 45340040;
};
caperren = {
name = "Corwin Perren";
email = "caperren@gmail.com";
github = "caperren";
githubId = 4566591;
};
CaptainJawZ = {
email = "CaptainJawZ@outlook.com";
name = "Danilo Reyes";
@@ -4763,6 +4769,12 @@
githubId = 743057;
name = "Danylo Hlynskyi";
};
danbulant = {
name = "Daniel Bulant";
email = "danbulant@gmail.com";
github = "danbulant";
githubId = 30036876;
};
danc86 = {
name = "Dan Callaghan";
email = "djc@djc.id.au";
@@ -18665,6 +18677,12 @@
githubId = 82817;
name = "Robert Kreuzer";
};
rksm = {
email = "robert@kra.hn";
github = "rksm";
githubId = 467450;
name = "Robert Krahn";
};
rlupton20 = {
email = "richard.lupton@gmail.com";
github = "rlupton20";
@@ -18759,6 +18777,13 @@
githubId = 521306;
name = "Rob Glossop";
};
robinkrahl = {
email = "nix@ireas.org";
github = "robinkrahl";
githubId = 165115;
keys = [ { fingerprint = "EC7E F0F9 B681 4C24 6236 3842 B755 6972 702A FD45"; } ];
name = "Robin Krahl";
};
roblabla = {
email = "robinlambertz+dev@gmail.com";
github = "roblabla";
nixos/doc/manual/release-notes/rl-2411.section.md
+2
View File
@@ -236,6 +236,8 @@
- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.
- `mutmut` has been updated to version 3.0.5.
- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
- `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: <https://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v5.2>. Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`).
nixos/modules/hardware/nitrokey.nix
+2 -4
View File
@@ -11,14 +11,12 @@ in
type = lib.types.bool;
default = false;
description = ''
Enables udev rules for Nitrokey devices. By default grants access
to users in the "nitrokey" group. You may want to install the
nitrokey-app package, depending on your device and needs.
Enables udev rules for Nitrokey devices.
'';
};
};
config = lib.mkIf cfg.enable {
services.udev.packages = [ pkgs.libnitrokey ];
services.udev.packages = [ pkgs.nitrokey-udev-rules ];
};
}
nixos/modules/services/databases/mysql.nix
+6
View File
@@ -334,6 +334,12 @@ in
environment.etc."my.cnf".source = cfg.configFile;
# The mysql_install_db binary will try to adjust the permissions, but fail to do so with a permission
# denied error in some circumstances. Setting the permissions manually with tmpfiles is a workaround.
systemd.tmpfiles.rules = [
"d ${cfg.dataDir} 0755 ${cfg.user} ${cfg.group} - -"
];
systemd.services.mysql = {
description = "MySQL Server";
nixos/modules/services/desktop-managers/lomiri.nix
+228 -170
View File
@@ -1,200 +1,258 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.desktopManager.lomiri;
in {
in
{
options.services.desktopManager.lomiri = {
enable = lib.mkEnableOption ''
the Lomiri graphical shell (formerly known as Unity8)
'';
basics = lib.mkOption {
internal = true;
description = ''
Enable basic things for getting Lomiri working.
'';
type = lib.types.bool;
default = config.services.xserver.displayManager.lightdm.greeters.lomiri.enable || cfg.enable;
};
};
config = lib.mkIf cfg.enable {
environment = {
systemPackages = (with pkgs; [
glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work
libayatana-common
ubports-click
]) ++ (with pkgs.lomiri; [
hfd-service
history-service
libusermetrics
lomiri
lomiri-calculator-app
lomiri-camera-app
lomiri-clock-app
lomiri-content-hub
lomiri-docviewer-app
lomiri-download-manager
lomiri-filemanager-app
lomiri-gallery-app
lomiri-polkit-agent
lomiri-schemas # exposes some required dbus interfaces
lomiri-session # wrappers to properly launch the session
lomiri-sounds
lomiri-system-settings
lomiri-terminal-app
lomiri-thumbnailer
lomiri-url-dispatcher
lomiri-wallpapers
mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
morph-browser
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
suru-icon-theme
telephony-service
teleports
]);
config = lib.mkMerge [
# Basics for getting Lomiri to work
(lib.mkIf cfg.basics {
environment = {
# To override the default keyboard layout in Lomiri
etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [ "," ] [
"\n"
] config.services.xserver.xkb.layout;
# To override the default keyboard layout in Lomiri
etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [","] ["\n"] config.services.xserver.xkb.layout;
};
pathsToLink = [
# Data
"/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it
"/share/wallpapers"
];
hardware = {
bluetooth.enable = lib.mkDefault true;
};
systemPackages = with pkgs.lomiri; [
lomiri-wallpapers # default + additional wallpaper
suru-icon-theme # basic indicator icons
];
};
networking.networkmanager.enable = lib.mkDefault true;
systemd.packages = with pkgs.lomiri; [
hfd-service
lomiri-download-manager
];
services.dbus.packages = with pkgs.lomiri; [
hfd-service
libusermetrics
lomiri-download-manager
];
fonts.packages = with pkgs; [
# Applications tend to default to Ubuntu font
ubuntu-classic
];
# Copy-pasted basic stuff
hardware.graphics.enable = lib.mkDefault true;
fonts.enableDefaultPackages = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
# Xwayland is partly hardcoded in Mir so it can't really be fully turned off, and it must be on PATH for X11 apps *and Lomiri's web browser* to work.
# Until Mir/Lomiri can be properly used without it, force it on so everything behaves as expected.
programs.xwayland.enable = lib.mkForce true;
services.accounts-daemon.enable = true;
services.ayatana-indicators = {
enable = true;
packages = (with pkgs; [
ayatana-indicator-datetime
ayatana-indicator-display
ayatana-indicator-messages
ayatana-indicator-power
ayatana-indicator-session
] ++ lib.optionals config.hardware.bluetooth.enable [
ayatana-indicator-bluetooth
] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
ayatana-indicator-sound
]) ++ (with pkgs.lomiri; [
telephony-service
] ++ lib.optionals config.networking.networkmanager.enable [
lomiri-indicator-network
]);
};
services.udisks2.enable = true;
services.upower.enable = true;
services.geoclue2.enable = true;
services.gnome.evolution-data-server = {
enable = true;
plugins = with pkgs; [
# TODO: lomiri.address-book-service
fonts.packages = with pkgs; [
ubuntu-classic # Ubuntu is default font
];
};
services.telepathy.enable = true;
# Xwayland is partly hardcoded in Mir so it can't really be fully turned off, and it must be on PATH for X11 apps *and Lomiri's web browser* to work.
# Until Mir/Lomiri can be properly used without it, force it on so everything behaves as expected.
programs.xwayland.enable = lib.mkForce true;
services.displayManager = {
defaultSession = lib.mkDefault "lomiri";
sessionPackages = with pkgs.lomiri; [ lomiri-session ];
};
services.ayatana-indicators = {
enable = true;
packages = (
with pkgs;
[
ayatana-indicator-datetime # Clock
ayatana-indicator-session # Controls for shutting down etc
]
);
};
})
services.xserver = {
enable = lib.mkDefault true;
displayManager.lightdm = {
# Full Lomiri DE
(lib.mkIf cfg.enable {
# We need the basic setup as well
services.desktopManager.lomiri.basics = true;
environment = {
systemPackages =
(with pkgs; [
glib # XDG MIME-related tools identify it as GNOME, add gio for MIME identification to work
libayatana-common
ubports-click
])
++ (with pkgs.lomiri; [
hfd-service
history-service
libusermetrics
lomiri
lomiri-calculator-app
lomiri-camera-app
lomiri-clock-app
lomiri-content-hub
lomiri-docviewer-app
lomiri-download-manager
lomiri-filemanager-app
lomiri-gallery-app
lomiri-polkit-agent
lomiri-schemas # exposes some required dbus interfaces
lomiri-session # wrappers to properly launch the session
lomiri-sounds
lomiri-system-settings
lomiri-terminal-app
lomiri-thumbnailer
lomiri-url-dispatcher
mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
morph-browser
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
telephony-service
teleports
]);
};
hardware = {
bluetooth.enable = lib.mkDefault true;
};
networking.networkmanager.enable = lib.mkDefault true;
systemd.packages = with pkgs.lomiri; [
hfd-service
lomiri-download-manager
];
services.dbus.packages = with pkgs.lomiri; [
hfd-service
libusermetrics
lomiri-download-manager
];
# Copy-pasted basic stuff
hardware.graphics.enable = lib.mkDefault true;
fonts.enableDefaultPackages = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
services.accounts-daemon.enable = true;
services.ayatana-indicators = {
enable = true;
packages =
(
with pkgs;
[
ayatana-indicator-display
ayatana-indicator-messages
ayatana-indicator-power
]
++ lib.optionals config.hardware.bluetooth.enable [ ayatana-indicator-bluetooth ]
++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
ayatana-indicator-sound
]
)
++ (
with pkgs.lomiri;
[ telephony-service ]
++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]
);
};
services.udisks2.enable = true;
services.upower.enable = true;
services.geoclue2.enable = true;
services.gnome.evolution-data-server = {
enable = true;
plugins = with pkgs; [
# TODO: lomiri.address-book-service
];
};
services.telepathy.enable = true;
services.displayManager = {
defaultSession = lib.mkDefault "lomiri";
sessionPackages = with pkgs.lomiri; [ lomiri-session ];
};
services.xserver = {
enable = lib.mkDefault true;
greeters.lomiri.enable = lib.mkDefault true;
};
};
environment.pathsToLink = [
# Configs for inter-app data exchange system
"/share/lomiri-content-hub/peers"
# Configs for inter-app URL requests
"/share/lomiri-url-dispatcher/urls"
# Splash screens & other images for desktop apps launched via lomiri-app-launch
"/share/lomiri-app-launch"
# TODO Try to get maliit stuff working
"/share/maliit/plugins"
# At least the network indicator is still under the unity name, due to leftover Unity-isms
"/share/unity"
# Data
"/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it
"/share/sounds"
"/share/wallpapers"
];
systemd.user.services = {
# Unconditionally run service that collects system-installed URL handlers before LUD
# TODO also run user-installed one?
"lomiri-url-dispatcher-update-system-dir" = {
description = "Lomiri URL dispatcher system directory updater";
wantedBy = [ "lomiri-url-dispatcher.service" ];
before = [ "lomiri-url-dispatcher.service" ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/";
displayManager.lightdm = {
enable = lib.mkDefault true;
greeters.lomiri.enable = lib.mkDefault true;
};
};
"lomiri-polkit-agent" = rec {
description = "Lomiri Polkit agent";
wantedBy = [ "lomiri.service" "lomiri-full-greeter.service" "lomiri-full-shell.service" "lomiri-greeter.service" "lomiri-shell.service" ];
after = [ "graphical-session.target" ];
partOf = wantedBy;
serviceConfig = {
Type = "simple";
Restart = "always";
ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent";
environment.pathsToLink = [
# Configs for inter-app data exchange system
"/share/lomiri-content-hub/peers"
# Configs for inter-app URL requests
"/share/lomiri-url-dispatcher/urls"
# Splash screens & other images for desktop apps launched via lomiri-app-launch
"/share/lomiri-app-launch"
# TODO Try to get maliit stuff working
"/share/maliit/plugins"
# At least the network indicator is still under the unity name, due to leftover Unity-isms
"/share/unity"
# Data
"/share/sounds"
];
systemd.user.services = {
# Unconditionally run service that collects system-installed URL handlers before LUD
# TODO also run user-installed one?
"lomiri-url-dispatcher-update-system-dir" = {
description = "Lomiri URL dispatcher system directory updater";
wantedBy = [ "lomiri-url-dispatcher.service" ];
before = [ "lomiri-url-dispatcher.service" ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/";
};
};
"lomiri-polkit-agent" = rec {
description = "Lomiri Polkit agent";
wantedBy = [
"lomiri.service"
"lomiri-full-greeter.service"
"lomiri-full-shell.service"
"lomiri-greeter.service"
"lomiri-shell.service"
];
after = [ "graphical-session.target" ];
partOf = wantedBy;
serviceConfig = {
Type = "simple";
Restart = "always";
ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent";
};
};
};
};
systemd.services = {
"dbus-com.lomiri.UserMetrics" = {
serviceConfig = {
Type = "dbus";
BusName = "com.lomiri.UserMetrics";
User = "usermetrics";
StandardOutput = "syslog";
SyslogIdentifier = "com.lomiri.UserMetrics";
ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice";
} // lib.optionalAttrs (!config.security.apparmor.enable) {
# Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks
Environment = "USERMETRICS_NO_AUTH=1";
systemd.services = {
"dbus-com.lomiri.UserMetrics" = {
serviceConfig =
{
Type = "dbus";
BusName = "com.lomiri.UserMetrics";
User = "usermetrics";
StandardOutput = "syslog";
SyslogIdentifier = "com.lomiri.UserMetrics";
ExecStart = "${pkgs.lomiri.libusermetrics}/libexec/libusermetrics/usermetricsservice";
}
// lib.optionalAttrs (!config.security.apparmor.enable) {
# Due to https://gitlab.com/ubports/development/core/libusermetrics/-/issues/8, auth must be disabled when not using AppArmor, lest the next database usage breaks
Environment = "USERMETRICS_NO_AUTH=1";
};
};
};
};
users.users.usermetrics = {
group = "usermetrics";
home = "/var/lib/usermetrics";
createHome = true;
isSystemUser = true;
};
users.users.usermetrics = {
group = "usermetrics";
home = "/var/lib/usermetrics";
createHome = true;
isSystemUser = true;
};
users.groups.usermetrics = { };
};
users.groups.usermetrics = { };
})
];
meta.maintainers = lib.teams.lomiri.members;
}
nixos/modules/services/hardware/udisks2.nix
+7 -5
View File
@@ -18,6 +18,8 @@ in
enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
package = lib.mkPackageOption pkgs "udisks2" {};
mountOnMedia = lib.mkOption {
type = lib.types.bool;
default = false;
@@ -67,11 +69,11 @@ in
config = lib.mkIf config.services.udisks2.enable {
environment.systemPackages = [ pkgs.udisks2 ];
environment.systemPackages = [ cfg.package ];
environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
let
libblockdev = pkgs.udisks2.libblockdev;
libblockdev = cfg.package.libblockdev;
majorVer = lib.versions.major libblockdev.version;
in {
# We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
@@ -82,18 +84,18 @@ in
security.polkit.enable = true;
services.dbus.packages = [ pkgs.udisks2 ];
services.dbus.packages = [ cfg.package ];
systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";
services.udev.packages = [ pkgs.udisks2 ];
services.udev.packages = [ cfg.package ];
services.udev.extraRules = lib.optionalString cfg.mountOnMedia ''
ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
'';
systemd.packages = [ pkgs.udisks2 ];
systemd.packages = [ cfg.package ];
};
}
nixos/modules/services/logging/vector.nix
+2 -2
View File
@@ -27,7 +27,7 @@ in
config = lib.mkIf cfg.enable {
# for cli usage
environment.systemPackages = [ pkgs.vector ];
environment.systemPackages = [ cfg.package ];
systemd.services.vector = {
description = "Vector event and log aggregator";
@@ -40,7 +40,7 @@ in
conf = format.generate "vector.toml" cfg.settings;
validateConfig = file:
pkgs.runCommand "validate-vector-conf" {
nativeBuildInputs = [ pkgs.vector ];
nativeBuildInputs = [ cfg.package ];
} ''
vector validate --no-environment "${file}"
ln -s "${file}" "$out"
nixos/modules/services/mail/roundcube.nix
+6 -1
View File
@@ -55,7 +55,12 @@ in
default = "";
};
passwordFile = lib.mkOption {
type = lib.types.str;
type = lib.types.path;
example = lib.literalExpression ''
pkgs.writeText "roundcube-postgres-passwd.txt" '''
hostname:port:database:username:password
'''
'';
description = ''
Password file for the postgresql connection.
Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
nixos/modules/services/monitoring/grafana.nix
+1
View File
@@ -255,6 +255,7 @@ in
Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
for available options. INI format is used.
'';
default = { };
type = types.submodule {
freeformType = settingsFormatIni.type;
nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
+9 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
@@ -17,6 +22,9 @@ in
};
config = lib.mkIf (ldmcfg.enable && cfg.enable) {
# Lomiri greeter == Lomiri shell in special mode, need some basics setup at least
services.desktopManager.lomiri.basics = true;
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
nixos/tests/lomiri.nix
+9 -12
View File
@@ -72,11 +72,13 @@ in
inherit description password;
};
services.desktopManager.lomiri.enable = lib.mkForce true;
services.displayManager.defaultSession = lib.mkForce "lomiri";
# Help with OCR
fonts.packages = [ pkgs.inconsolata ];
services.xserver.enable = true;
services.xserver.windowManager.icewm.enable = true;
services.xserver.displayManager.lightdm = {
enable = true;
greeters.lomiri.enable = true;
};
services.displayManager.defaultSession = lib.mkForce "none+icewm";
};
enableOCR = true;
@@ -110,13 +112,8 @@ in
# Login
machine.send_chars("${password}\n")
machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'")
# Output rendering from Lomiri has started when it starts printing performance diagnostics
machine.wait_for_console_text("Last frame took")
# Look for datetime's clock, one of the last elements to load
wait_for_text(r"(AM|PM)")
machine.screenshot("lomiri_launched")
machine.wait_for_x()
machine.screenshot("session_launched")
'';
}
);
pkgs/applications/networking/browsers/chromium/upstream-info.nix
+10 -10
View File
@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA=";
hash_darwin = "sha256-+Pcd++19/nJVsqGr2jzyjMTWYfb2U9wSgnNccDyGuGU=";
hash_darwin_aarch64 =
"sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk=";
hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c=";
version = "130.0.6723.91";
"sha256-vrbIpHrBwbzqars7D546eJ7zhEhAB0abq7MXiqlU4ts=";
hash_linux = "sha256-NbZ1GULLWJ6L3kczz23HoUhGk6VgBOXcjZlL7t4Z6Ec=";
version = "130.0.6723.116";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-09-09";
};
};
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
version = "130.0.6723.116";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-09-09";
};
ungoogled-patches = {
hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw=";
rev = "130.0.6723.91-1";
hash = "sha256-+94tSSaOp6vzWkXN1qF3UXMm/Rs3pKmjf+U4x+af818=";
rev = "130.0.6723.116-1";
};
};
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
version = "130.0.6723.116";
};
}
pkgs/applications/networking/browsers/netsurf/browser.nix
+2
View File
@@ -109,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
patchPhase = lib.optionalString stdenv.cc.isClang ''
runHook prePatch
pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
-1
View File
@@ -175,7 +175,6 @@ stdenv.mkDerivation rec {
libnotify
libdbusmenu
pipewire
stdenv.cc.cc
xdg-utils
wayland
];
pkgs/applications/networking/protonvpn-gui/default.nix
+2 -2
View File
@@ -21,14 +21,14 @@
buildPythonApplication rec {
pname = "protonvpn-gui";
version = "4.6.0";
version = "4.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "proton-vpn-gtk-app";
rev = "refs/tags/v${version}";
hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro=";
hash = "sha256-LcHloc4iHDgP6RCwFvJM6GfzTRd3RqYo0medjEhmj6M=";
};
nativeBuildInputs = [
pkgs/applications/science/electronics/caneda/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "caneda";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Caneda";
repo = "Caneda";
rev = version;
sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp
index b585702..3fd308c 100644
--- a/src/HyperionProperties.cpp
+++ b/src/HyperionProperties.cpp
@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)
signal_handler_connect(handler, "log", logger_message, this);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);
- connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);
+ connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);
connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);
pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+2
View File
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
patches = [ ./check-state-changed.patch ];
cmakeFlags = [
"-DOBS_SOURCE=${obs-studio.src}"
"-DGLOBAL_INSTALLATION=ON"
pkgs/applications/virtualization/docker/compose.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.29.7";
version = "2.30.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ=";
hash = "sha256-L31O/Hzn0jbu5VqVB18PZUSJPGfqU+73Jx3e1njxGiI=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE=";
vendorHash = "sha256-j9gV1PNTqVRctbhnYRydGwJvBpb9uQCxcdBrQCdbBrg=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+5 -2
View File
@@ -4,22 +4,25 @@
fetchFromGitHub,
hyprland,
mkHyprlandPlugin,
nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hy3";
version = "0.44.0";
version = "0.45.0";
src = fetchFromGitHub {
owner = "outfoxxed";
repo = "hy3";
rev = "refs/tags/hl${version}";
hash = "sha256-6TVaB+nWVanqZWqievg+m7tVNrSpQ9CQcwXJQeyU/Q0=";
hash = "sha256-b3PuEtRHTSxV809RLUiZVQhDQZ8NxxpWUjboTe9QAAY=";
};
nativeBuildInputs = [ cmake ];
dontStrip = true;
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/outfoxxed/hy3";
description = "Hyprland plugin for an i3 / sway like manual tiling layout";
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+3 -3
View File
@@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2024-10-10";
version = "0-unstable-2024-11-10";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "3ff4c2a053f7673b3b8cd45ada0886cbda13ebcc";
hash = "sha256-XMR9wDNXmY3pPp3imT5vA4Gc6yC3R2Fatp4B53uLHzI=";
rev = "a3427f2a7f1dc70236dbaa870eadead03d9807a6";
hash = "sha256-7nznQzeq0rzvTos2axd4LvzLJ64n0erP3WxMIpCE5Ew=";
};
dontUseCmakeConfigure = true;
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
+3 -3
View File
@@ -7,13 +7,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprfocus";
version = "0-unstable-2024-05-30";
version = "0-unstable-2024-10-09";
src = fetchFromGitHub {
owner = "pyt0xic";
repo = "hyprfocus";
rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2";
hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0=";
rev = "bead5b77d80f222c006d1a6c6f44ee8b02021d73";
hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY=";
};
installPhase = ''
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+4 -4
View File
@@ -11,15 +11,15 @@
nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
mkHyprlandPlugin hyprland {
pluginName = "hyprgrass";
version = "0.8.2";
version = "0.8.2-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "horriblename";
repo = "hyprgrass";
rev = "v${version}";
hash = "sha256-0dYMlNYuevQvsd6+imOkic3c6RSssM8WSx1hAepJ/wU=";
rev = "f97b6ac2b7de3bae194b776c388467db2604929f";
hash = "sha256-Jg5Q/v8tcNjopTMbra82y5n9QQdCnrbEFNgT1kA7pQE=";
};
nativeBuildInputs = [
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+2 -2
View File
@@ -14,13 +14,13 @@ let
mkHyprlandPlugin,
}:
let
version = "0.44.0";
version = "0.45.0";
hyprland-plugins-src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland-plugins";
rev = "refs/tags/v${version}";
hash = "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=";
hash = "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=";
};
in
mkHyprlandPlugin hyprland {
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
+3 -3
View File
@@ -9,13 +9,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprscroller";
version = "0-unstable-2024-10-10";
version = "0-unstable-2024-11-09";
src = fetchFromGitHub {
owner = "dawsers";
repo = "hyprscroller";
rev = "1a907fd38594ec58a8fe5d68be0dcf2f9e76b0f8";
hash = "sha256-cgwHl2YtqrnS0ThUyycFGYoYozpq7zT9POARrQAoahY=";
rev = "556e01458ba26aa63253ae590a6aa8b2601ecf03";
hash = "sha256-lILkkTNwPxMvfYNpusbakl2BW4lvNUZcIputwAfHHAE=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
+3 -3
View File
@@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprspace";
version = "0-unstable-2024-09-16";
version = "0-unstable-2024-11-02";
src = fetchFromGitHub {
owner = "KZDKM";
repo = "hyprspace";
rev = "8f14fa2e10d24742d713f04c278bc7651037b74b";
hash = "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=";
rev = "260f386075c7f6818033b05466a368d8821cde2d";
hash = "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=";
};
dontUseCmakeConfigure = true;
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+2 -2
View File
@@ -8,13 +8,13 @@
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hyprsplit";
version = "0.44.1";
version = "0.45.0";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
rev = "refs/tags/v${version}";
hash = "sha256-l+DQHWPMyUCXbKhbIFVooTKKnCRQ97Ic5smw4VzUcTc=";
hash = "sha256-otDIivy4sMZBN2t9eHVI5PaFacg2Je4U9gBPPcH/Vpo=";
};
nativeBuildInputs = [
pkgs/build-support/php/builders/v1/build-composer-repository.nix
+1 -1
View File
@@ -49,7 +49,7 @@ let
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository";
name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}";
# See https://github.com/NixOS/nix/issues/6660
dontPatchShebangs = previousAttrs.dontPatchShebangs or true;
pkgs/build-support/php/builders/v2/build-composer-vendor.nix
+1 -1
View File
@@ -34,7 +34,7 @@ let
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository";
name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}";
# See https://github.com/NixOS/nix/issues/6660
dontPatchShebangs = previousAttrs.dontPatchShebangs or true;
pkgs/by-name/ad/ad/package.nix
+61
View File
@@ -0,0 +1,61 @@
{
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "ad";
version = "0.1.3";
src = fetchFromGitHub {
owner = "sminez";
repo = "ad";
rev = "refs/tags/${version}";
hash = "sha256-l1SyrJW3lZIvoFZG57Bj134sUcoq60xfeXjzVaZPfzs=";
};
cargoHash = "sha256-wpR9wZA5SGyLI1ScfZwSENuUMI/iX3YS0P/o9drIwoo=";
nativeBuildInputs = [ installShellFiles ];
checkFlags = [
# both assume `/usr/bin/sh` exists
"--skip=buffer::tests::try_expand_known_works::file_that_exists_abs_path"
"--skip=buffer::tests::try_expand_known_works::file_that_exists_abs_path_with_addr"
];
postInstall = ''
installManPage doc/man/ad.1
'';
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Adaptable text editor";
longDescription = ''
ad (pronounced A.D.) is an attempt at combining a modal
editing interface of likes of vi and kakoune with the
approach to extensibility of Plan9's Acme. Inside
of ad text is something you can execute as well as edit.
It is primarily intended as playground for experimenting
with implementing various text editor features and
currently is not at all optimised or feature complete
enough for use as your main text editor.
'';
homepage = "https://github.com/sminez/ad";
license = lib.licenses.mit;
mainProgram = "ad";
maintainers = with lib.maintainers; [ aleksana ];
# rely on unix domain socket
# https://github.com/sminez/ad/issues/28
platforms = lib.platforms.unix;
};
}
pkgs/by-name/al/alacritty/package.nix
-1
View File
@@ -33,7 +33,6 @@ let
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libXxf86vm
xorg.libxcb
libxkbcommon
pkgs/by-name/al/alcom/Cargo.lock
Generated
+6008
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/al/alcom/deps.nix
Generated
+23
View File
@@ -0,0 +1,23 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.1"; hash = "sha256-vAqIkIrtqiJbQ8ngqSfxLA4XUyfqO1lr7NiYch5+TTc="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.1"; hash = "sha256-tiSDf189+7K788Z2qVmsP3PeUzkByUCtcjXR9onOdXA="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.1"; hash = "sha256-tYR6xGWvWoR0ITYHra9bsOxIhzhe/GYNVpB4R7KkKik="; })
(fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-u4JMGIe/rmXOzx+Y2tC5qlkP5aNVMHy6AQnYwxsXsN4="; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; hash = "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.1"; hash = "sha256-g4RhRWUP4o3dkNt2hV0ZNRRwDGIuAJ6gY02d3xhtFzY="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.1"; hash = "sha256-+fUVeiQ2qXBtP4HI+8+/SLqZOEuKi9/zC/pX9g+rhqs="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.1"; hash = "sha256-aRGVm8Ckd+uhkuAnJAuqHH6+muT+sXf+b+6nZ/Md77c="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.1"; hash = "sha256-UiJ5KdJdLg+/eDHsC4HgvYaY9h3av+/92VPoEixHDgQ="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.1"; hash = "sha256-JeYU02u4ln0v56QeCs+8ZLWhRlNxZ6c/xHr8Jy3koww="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.1"; hash = "sha256-TJbkjj3koeFN068auqXUojMLPrihO6sEMIPqglW7uTE="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.1"; hash = "sha256-SYctZpDlsEHxmy+/Oa1Qp99mpx8I7icYoSBKczF1Ybo="; })
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-oCzhhcSp2ZZ+R8ITzhVn21nmT+R6upf3IzsRtke4xxY="; })
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-BMDOdOJFDuItIL8gbYKJdoycvf2rJ8RI8FHsaaYYflY="; })
(fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-7FJEqNLs8DvqsSJQZETbL2uvRrqO5M1ReWCYkXtqVAE="; })
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; hash = "sha256-WOJqlt/ONpCqhfB2S++rY+iRqW6mlAddxGoqaC/boCM="; })
]
pkgs/by-name/al/alcom/package.nix
+122
View File
@@ -0,0 +1,122 @@
{
buildDotnetModule,
cargo-about,
cargo-tauri,
dotnetCorePackages,
fetchFromGitHub,
fetchNpmDeps,
glib-networking,
google-fonts,
lib,
libsoup,
nodejs,
npmHooks,
openssl,
pkg-config,
rustPlatform,
stdenv,
webkitgtk_4_0,
}:
let
pname = "alcom";
version = "1.8.2";
src = fetchFromGitHub {
owner = "vrc-get";
repo = "vrc-get";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-jkhjJTb/U2dXj/vyaip+gWoqIOdfFKSExeDl0T11DE4=";
};
subdir = "vrc-get-gui";
google-fonts' = google-fonts.override {
fonts = [
"NotoSans"
"NotoSansJP"
];
};
dotnetSdk = dotnetCorePackages.sdk_8_0;
dotnetRuntime = dotnetCorePackages.runtime_8_0;
dotnetBuild = buildDotnetModule {
inherit pname version src;
dotnet-sdk = dotnetSdk;
dotnet-runtime = dotnetRuntime;
projectFile = [
"vrc-get-litedb/dotnet/vrc-get-litedb.csproj"
"vrc-get-litedb/dotnet/LiteDB/LiteDB/LiteDB.csproj"
];
nugetDeps = ./deps.nix;
};
in
rustPlatform.buildRustPackage {
inherit pname version src;
nativeBuildInputs = [
cargo-about
cargo-tauri.hook
dotnetSdk
nodejs
npmHooks.npmConfigHook
pkg-config
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libsoup
webkitgtk_4_0
]
++ dotnetSdk.packages
++ dotnetBuild.nugetDeps;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
};
};
buildAndTestSubdir = subdir;
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}/${subdir}";
hash = "sha256-4zokKLhLgW2u1GxeTlIAAxJINSpxHRtY5HXmhi9nj6c=";
};
npmRoot = subdir;
patches = [
./use-local-fonts.patch
];
postPatch = ''
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSans[wdth,wght].ttf" ${subdir}/app/fonts/noto-sans.ttf
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSansJP[wght].ttf" ${subdir}/app/fonts/noto-sans-jp.ttf
'';
preConfigure = ''
dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true
'';
passthru = {
inherit (dotnetBuild) fetch-deps;
};
meta = {
description = "Experimental GUI application to manage VRChat Unity Projects";
homepage = "https://github.com/vrc-get/vrc-get";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Scrumplex ];
# aarch64-linux: Error failed to build app: Target aarch64-unknown-linux-gnu does not exist. Please run `rustup target list` to see the available targets.
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
mainProgram = "alcom";
};
}
pkgs/by-name/al/alcom/use-local-fonts.patch
+32
View File
@@ -0,0 +1,32 @@
diff --git a/vrc-get-gui/app/fonts.ts b/vrc-get-gui/app/fonts.ts
index 855de943..3fd6a0b6 100644
--- a/vrc-get-gui/app/fonts.ts
+++ b/vrc-get-gui/app/fonts.ts
@@ -1,5 +1,3 @@
-import {Noto_Sans_Mono} from "next/font/google";
+import localFont from "next/font/local";
-export const notoSansMono = Noto_Sans_Mono({
- subsets: ["latin"]
-});
+export const notoSansMono = localFont({ src: './fonts/noto-sans.ttf' })
diff --git a/vrc-get-gui/app/layout.tsx b/vrc-get-gui/app/layout.tsx
index f38ab32d..723101b7 100644
--- a/vrc-get-gui/app/layout.tsx
+++ b/vrc-get-gui/app/layout.tsx
@@ -1,13 +1,11 @@
import type {Metadata} from "next";
-import {Noto_Sans_JP} from "next/font/google";
+import localFont from "next/font/local";
import "./globals.css";
import 'react-toastify/dist/ReactToastify.css';
import {SideBar} from "@/components/SideBar";
import {Providers} from "@/components/providers";
-const notoSansJP = Noto_Sans_JP({
- subsets: ["latin"],
-});
+const notoSansJP = localFont({ src: "./fonts/noto-sans-jp.ttf", });
export const metadata: Metadata = {
title: "Create Next App",
pkgs/by-name/al/alejandra/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
hash = "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=";
hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=";
};
cargoHash = "sha256-tF8E9mnvkTXoViVss9cNjpU4UkEsARp4RtlxKWq55hc=";
cargoHash = "sha256-s3932c/k9UTbJ79fBQBRDILN2VWNM1tNEV7cW4fQK74=";
passthru.tests = {
version = testers.testVersion { package = alejandra; };
pkgs/by-name/al/alexandria/package.nix
+80
View File
@@ -0,0 +1,80 @@
{
rustPlatform,
lib,
fetchFromGitHub,
libsoup,
pkg-config,
webkitgtk_4_0,
openssl,
nodejs,
npmHooks,
fetchNpmDeps,
gtk3,
wrapGAppsHook3,
cargo-tauri,
}:
rustPlatform.buildRustPackage rec {
pname = "alexandria";
version = "0.12";
src = fetchFromGitHub {
owner = "btpf";
repo = "Alexandria";
rev = "refs/tags/v${version}";
hash = "sha256-NX89Sg639dSwUcUGrpgmdcO4tXl2iszctiRDcBVLbUA=";
fetchSubmodules = true;
};
prePatch = ''
chmod +w .. # make sure that /build/source is writeable
'';
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}";
hash = "sha256-/RGaZMCJftjzvFLp8J/d9+MsxQwe7P0WfISz0JE3fn4=";
};
cargoHash = "sha256-W8HCpGuDkq8XfdrSvYfAHyX+oh30/bX29qdclN4P5yo=";
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook3
];
buildInputs = [
openssl
webkitgtk_4_0
gtk3
libsoup
];
npmRoot = "..";
sourceRoot = "${src.name}/src-tauri";
buildAndTestDir = ".";
meta = {
homepage = "https://github.com/btpf/Alexandria";
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
description = "Minimalistic cross-platform eBook reader";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
mainProgram = "alexandria";
platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
license = lib.licenses.gpl3Plus;
};
}
pkgs/by-name/az/azure-storage-azcopy/package.nix
+3 -3
View File
@@ -5,18 +5,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.26.0";
version = "10.27.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "refs/tags/v${version}";
hash = "sha256-u6ngYEHqNVjz0YYkWhFnoQGCBRMHLdOzFTee8plwoDo=";
hash = "sha256-TF0vChuM3OF/YbCsP8Vg4x609Q1QgqwBNmKUdWCHHUc=";
};
subPackages = [ "." ];
vendorHash = "sha256-C8UopiCSp6qFeaDNE+w2QUKbSHALSSeV5WVo4lkLDrs=";
vendorHash = "sha256-dYIZb8sSh1Y8yllWOSsWEpiaIwcwZL2wCet3Terl0Ro=";
doCheck = false;
pkgs/by-name/ba/bashly/Gemfile.lock
+20 -10
View File
@@ -1,37 +1,47 @@
GEM
remote: https://rubygems.org/
specs:
bashly (1.1.10)
bashly (1.2.6)
colsole (>= 0.8.1, < 2)
completely (~> 0.6.1)
filewatcher (~> 2.0)
gtx (~> 0.1)
logger (>= 1, < 3)
lp (~> 0.2)
mister_bin (~> 0.7)
ostruct (>= 0, < 2)
psych (>= 3.3.2, < 7)
requires (~> 1.1.0)
tty-markdown (~> 0.7)
cgi (0.4.1)
colsole (1.0.0)
completely (0.6.2)
completely (0.6.3)
colsole (>= 0.8.1, < 2)
mister_bin (~> 0.7)
docopt_ng (0.7.1)
erb (4.0.4)
cgi (>= 0.3.3)
filewatcher (2.1.0)
module_methods (~> 0.1.0)
gtx (0.1.0)
gtx (0.1.1)
erb (~> 4.0)
kramdown (2.4.0)
rexml
logger (1.6.1)
lp (0.2.1)
mister_bin (0.7.6)
colsole (>= 0.8.1, < 2)
docopt_ng (~> 0.7, >= 0.7.1)
module_methods (0.1.0)
ostruct (0.6.1)
pastel (0.8.0)
tty-color (~> 0.5)
psych (5.1.2)
psych (5.2.0)
stringio
rexml (3.2.6)
rouge (4.2.1)
stringio (3.1.0)
requires (1.1.0)
rexml (3.3.9)
rouge (4.5.0)
stringio (3.1.2)
strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
@@ -46,14 +56,14 @@ GEM
tty-color (~> 0.5)
tty-screen (~> 0.8)
tty-screen (0.8.2)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
unicode_utils (1.4.0)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
bashly
BUNDLED WITH
2.3.26
2.5.16
pkgs/by-name/ba/bashly/gemset.nix
+69 -17
View File
@@ -1,14 +1,24 @@
{
bashly = {
dependencies = ["colsole" "completely" "filewatcher" "gtx" "lp" "mister_bin" "psych" "tty-markdown"];
dependencies = ["colsole" "completely" "filewatcher" "gtx" "logger" "lp" "mister_bin" "ostruct" "psych" "requires" "tty-markdown"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kdqpnkwgmb6kbrq9fyazj0jh0dh8srh86xjk92xrvgfps1kh5sy";
sha256 = "0dzyqwf43i92jq5j66j31qvsbfcpd6zk74ssqz14kj51wn2d8vw3";
type = "gem";
};
version = "1.1.10";
version = "1.2.6";
};
cgi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3";
type = "gem";
};
version = "0.4.1";
};
colsole = {
groups = ["default"];
@@ -26,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12vf279w44d520vw28drxyi05wi1hyrg262ifjlhk9chjrnzcc7k";
sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb";
type = "gem";
};
version = "0.6.2";
version = "0.6.3";
};
docopt_ng = {
groups = ["default"];
@@ -41,6 +51,17 @@
};
version = "0.7.1";
};
erb = {
dependencies = ["cgi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05wpc7pn1k6jik7i57vfrj6k5lda39hrny0q3706pi05c886w4fy";
type = "gem";
};
version = "4.0.4";
};
filewatcher = {
dependencies = ["module_methods"];
groups = ["default"];
@@ -53,14 +74,15 @@
version = "2.1.0";
};
gtx = {
dependencies = ["erb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10hfhicvv371gy1i16x6vry1xglvxl0zh7qr6f14pqsx32qih6ff";
sha256 = "1w0hbr9i6jpn9spbb13ipg2fajkwa51y56jw21ziwsddmv997274";
type = "gem";
};
version = "0.1.0";
version = "0.1.1";
};
kramdown = {
dependencies = ["rexml"];
@@ -73,6 +95,16 @@
};
version = "2.4.0";
};
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
type = "gem";
};
version = "1.6.1";
};
lp = {
groups = ["default"];
platforms = [];
@@ -104,6 +136,16 @@
};
version = "0.1.0";
};
ostruct = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
type = "gem";
};
version = "0.6.1";
};
pastel = {
dependencies = ["tty-color"];
groups = ["default"];
@@ -121,40 +163,50 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
sha256 = "0wq567f615x1ilgaqlh4yzf322f96rgn45xw4nm4vwfaddszw0v6";
type = "gem";
};
version = "5.1.2";
version = "5.2.0";
};
requires = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dlibxp6jfdl4favj2pgsm2pw84hhr2cdiizfs51ldkpddm50njp";
type = "gem";
};
version = "1.1.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
version = "3.2.6";
version = "3.3.9";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk";
sha256 = "0dllqyxlxsmsy4xdpgwbn6w9w6qsha9ay6cl5kq06jgw63k5dp10";
type = "gem";
};
version = "4.2.1";
version = "4.5.0";
};
stringio = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
type = "gem";
};
version = "3.1.0";
version = "3.1.2";
};
strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
@@ -213,10 +265,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
version = "2.5.0";
version = "2.6.0";
};
unicode_utils = {
groups = ["default"];
pkgs/by-name/ba/bashly/package.nix
+10 -25
View File
@@ -1,31 +1,16 @@
{ lib
, stdenvNoCC
, bundlerApp
{
lib,
bundlerApp,
bundlerUpdateScript,
}:
let
bashlyBundlerApp = bundlerApp {
pname = "bashly";
gemdir = ./.;
exes = [ "bashly" ];
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
name = "bashly";
bundlerApp {
pname = "bashly";
dontUnpack = true;
gemdir = ./.;
exes = [ "bashly" ];
installPhase = ''
runHook preInstall
mkdir $out;
cd $out;
mkdir bin; pushd bin;
ln -vs ${bashlyBundlerApp}/bin/bashly;
runHook postInstall
'';
passthru.updateScript = bundlerUpdateScript "bashly";
meta = {
description = "Bash command line framework and CLI generator";
@@ -35,4 +20,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.unix;
};
})
}
pkgs/by-name/be/benthos/package.nix
+18 -14
View File
@@ -1,41 +1,45 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "benthos";
version = "4.27.0";
version = "4.40.0";
src = fetchFromGitHub {
owner = "benthosdev";
owner = "redpanda-data";
repo = "benthos";
rev = "refs/tags/v${version}";
hash = "sha256-Jswy4Ku/dxIEfC+jNjLXu/WW24enc4Qn0vrOHvNDVYQ=";
hash = "sha256-FABy2Fl32qS0zVQ+pDYUXQjTvAxn3eDCqvQn8kpZCjw=";
};
proxyVendor = true;
vendorHash = "sha256-6CVDhy29bIn19EgKbKDNTBWdy+i18g0oz/NxABcQ6QE=";
doCheck = false;
subPackages = [
"cmd/benthos"
];
vendorHash = "sha256-LCw15Q/kr5XCoBAOyGVOCcD/FcqUodlYLETNsRbOeG8=";
# doCheck = false;
ldflags = [
"-s"
"-w"
"-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}"
"-X github.com/redpanda-data/benthos/v4/internal/cli.Version=${version}"
];
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Fancy stream processing made operationally mundane";
mainProgram = "benthos";
homepage = "https://www.benthos.dev";
changelog = "https://github.com/benthosdev/benthos/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ sagikazarmark ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sagikazarmark ];
};
}
pkgs/by-name/bo/bosh-cli/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
version = "7.8.0";
version = "7.8.2";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DiW7Vq1rfkOqMM3133mIRmRyFDjFITRkXqY34HMdZtc=";
sha256 = "sha256-ABoqJr2HDhox1ylTvAf5sQkYYzEWAnmXWavw0jXrRgo=";
};
vendorHash = null;
pkgs/by-name/cb/cbmp/package-lock.json
Generated
+2183
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/cb/cbmp/package.nix
+41
View File
@@ -0,0 +1,41 @@
{
buildNpmPackage,
fetchFromGitHub,
lib,
}:
buildNpmPackage rec {
pname = "cbmp";
version = "1.1.1";
# note: updating notes
# - use `prefetch-npm-deps` package for src hash
# - use `npm install --package-lock-only`
# in the cbmp repo for package-lock generation
# - update npmDepsHash
src = fetchFromGitHub {
owner = "ful1e5";
repo = "cbmp";
rev = "v${version}";
hash = "sha256-vOEz2KGJLCiiX+Or9y0JE9UF7sYbwaSCVm5iBv4jIdI=";
};
npmDepsHash = "sha256-zfZAZqnkKwsGkwGgfPvb3me4tFgAofE5H3d23mdAtqY=";
env = {
PUPPETEER_SKIP_DOWNLOAD = true;
};
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
meta = {
description = "CLI App for converting cursor svg file to png";
homepage = "https://github.com/ful1e5/cbmp";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.mrtnvgr ];
mainProgram = "cbmp";
};
}
pkgs/by-name/ch/changedetection-io/package.nix
+3 -12
View File
@@ -5,26 +5,17 @@
python3.pkgs.buildPythonApplication rec {
pname = "changedetection-io";
version = "0.46.04";
version = "0.47.06";
format = "setuptools";
src = fetchFromGitHub {
owner = "dgtlmoon";
repo = "changedetection.io";
rev = "refs/tags/${version}";
hash = "sha256-V1nGVURA4nksDX0kXxfPbO/rB0nmECqpfysenpzcfZs=";
hash = "sha256-kRoHCnXYWG09lrIiBA14OzhtbTqghXck5JXXNAMMtyc=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "apprise~=1.8.0" "apprise" \
--replace "cryptography~=3.4" "cryptography" \
--replace "dnspython==2.6.1" "dnspython" \
--replace "pytest ~=7.2" "" \
--replace "pytest-flask ~=1.2" "" \
--replace "selenium~=4.14.0" "selenium" \
--replace "werkzeug~=3.0" "werkzeug"
'';
pythonRelaxDeps = true;
propagatedBuildInputs = with python3.pkgs; [
apprise
pkgs/tools/misc/completely/Gemfile → pkgs/by-name/co/completely/Gemfile
View File
pkgs/by-name/co/completely/Gemfile.lock
+20
View File
@@ -0,0 +1,20 @@
GEM
remote: https://rubygems.org/
specs:
colsole (1.0.0)
completely (0.6.3)
colsole (>= 0.8.1, < 2)
mister_bin (~> 0.7)
docopt_ng (0.7.1)
mister_bin (0.7.6)
colsole (>= 0.8.1, < 2)
docopt_ng (~> 0.7, >= 0.7.1)
PLATFORMS
ruby
DEPENDENCIES
completely
BUNDLED WITH
2.5.16
pkgs/tools/misc/completely/gemset.nix → pkgs/by-name/co/completely/gemset.nix
+10 -10
View File
@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp";
sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg";
type = "gem";
};
version = "0.8.2";
version = "1.0.0";
};
completely = {
dependencies = ["colsole" "mister_bin"];
@@ -15,30 +15,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b";
sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb";
type = "gem";
};
version = "0.5.2";
version = "0.6.3";
};
docopt = {
docopt_ng = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k";
sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950";
type = "gem";
};
version = "0.6.1";
version = "0.7.1";
};
mister_bin = {
dependencies = ["colsole" "docopt"];
dependencies = ["colsole" "docopt_ng"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd";
sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas";
type = "gem";
};
version = "0.7.3";
version = "0.7.6";
};
}
pkgs/tools/misc/completely/default.nix → pkgs/by-name/co/completely/package.nix
+8 -7
View File
@@ -1,6 +1,7 @@
{ lib
, bundlerApp
, bundlerUpdateScript
{
lib,
bundlerApp,
bundlerUpdateScript,
}:
bundlerApp {
@@ -11,12 +12,12 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "completely";
meta = with lib; {
meta = {
description = "Generate bash completion scripts using a simple configuration file";
homepage = "https://github.com/DannyBen/completely";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ zendo ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ zendo ];
mainProgram = "completely";
};
}
pkgs/by-name/co/composefs/package.nix
+15 -7
View File
@@ -23,22 +23,30 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "composefs";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "containers";
repo = "composefs";
rev = "v${finalAttrs.version}";
hash = "sha256-9YEY7oTjWwVT2KbzTOOc6sJIGEAkdLSKDf1noF1cYuA=";
hash = "sha256-kbXmDdyRrtsERkUomjZUWP3QC2q27AWUTc/J2jCSXg4=";
};
strictDeps = true;
outputs = [ "out" "lib" "dev" ];
postPatch = lib.optionalString installExperimentalTools ''
substituteInPlace tools/meson.build \
--replace-fail "install : false" "install : true"
'';
postPatch =
# 'both_libraries' as an install target always builds both versions.
# This results in double disk usage for normal builds and broken static builds,
# so we replace it with the regular library target.
''
substituteInPlace libcomposefs/meson.build \
--replace-fail "both_libraries" "library"
''
+ lib.optionalString installExperimentalTools ''
substituteInPlace tools/meson.build \
--replace-fail "install : false" "install : true"
'';
nativeBuildInputs = [ meson ninja go-md2man pkg-config ];
buildInputs = [ openssl ]
@@ -74,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "File system for mounting container images";
homepage = "https://github.com/containers/composefs";
changelog = "https://github.com/containers/composefs/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [ gpl3Plus lgpl21Plus ];
license = with lib.licenses; [ gpl2Only asl20 ];
maintainers = with lib.maintainers; [ kiskae ];
mainProgram = "mkcomposefs";
pkgConfigModules = [ "composefs" ];
pkgs/by-name/co/coppwr/package.nix
-1
View File
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
libGL
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libX11
];
pkgs/by-name/co/cosmic-comp/package.nix
+1 -1
View File
@@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec {
# be the common case, so just make them available, don't link them.
postInstall = ''
wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr
xorg.libX11 xorg.libXcursor xorg.libXi
]})
'' + lib.optionalString useXWayland ''
wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})
pkgs/by-name/co/cosmic-edit/package.nix
+1 -1
View File
@@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec {
wrapProgram "$out/bin/cosmic-edit" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland
xorg.libX11 xorg.libXcursor xorg.libXi vulkan-loader libxkbcommon wayland
]}
'';
pkgs/by-name/co/cosmic-term/package.nix
-1
View File
@@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]}
'';
pkgs/by-name/cp/cppreference-doc/package.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "cppreference-doc";
version = "20240610";
version = "20241110";
src = fetchurl {
url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz";
hash = "sha256-vCQSper39glNTrcPdlvfj2SeZUqKq/IBYMWoFpdoR2E=";
hash = "sha256-Qx6Ahi63D9R5OmDX07bBPIYFKEl4+eoFKVcuj9FWLMY=";
};
sourceRoot = ".";
pkgs/by-name/do/dooit/package.nix
+31 -30
View File
@@ -5,53 +5,54 @@
python311,
testers,
nix-update-script,
extraPackages ? [ ],
}:
let
python3 = python311;
in
python3.pkgs.buildPythonApplication rec {
pname = "dooit";
version = "2.2.0";
version = "3.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "kraanzu";
owner = "dooit-org";
repo = "dooit";
rev = "v${version}";
hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k=";
rev = "refs/tags/v${version}";
hash = "sha256-DPmCADFduGc5n+6q9zl0f4x9C6RmzLvBeYh2j0ZSpH0=";
};
build-system = with python3.pkgs; [ poetry-core ];
pythonRelaxDeps = [
"tzlocal"
"textual"
"sqlalchemy"
];
propagatedBuildInputs = with python3.pkgs; [
appdirs
pyperclip
python-dateutil
pyyaml
(textual.overridePythonAttrs (oldAttrs: {
version = "0.47.1";
src = fetchFromGitHub {
owner = "Textualize";
repo = "textual";
rev = "refs/tags/v0.47.1";
hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU=";
};
disabledTests = [
"test_tracked_slugs"
"test_textual_env_var"
"test_register_language"
"test_register_language_existing_language"
];
}))
tzlocal
];
propagatedBuildInputs =
with python3.pkgs;
[
pyperclip
textual
pyyaml
python-dateutil
sqlalchemy
platformdirs
tzlocal
click
]
++ extraPackages;
# No tests available
doCheck = false;
# /homeless-shelter
preBuild = ''
export HOME=$(mktemp -d)
'';
checkInputs = with python3.pkgs; [
pytestCheckHook
faker
];
passthru = {
tests.version = testers.testVersion {
@@ -64,8 +65,8 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "TUI todo manager";
homepage = "https://github.com/kraanzu/dooit";
changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/dooit-org/dooit";
changelog = "https://github.com/dooit-org/dooit/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [
khaneliman
pkgs/by-name/ec/ecs-agent/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.87.0";
version = "1.87.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-JFEpwzeg+mcMBUYBenyWhYGE2J6iARz8oICZFlH1Azw=";
hash = "sha256-thgFlfEyjetNciBCIx1XFW4U59BL9TpRT9E7v4bac6s=";
};
vendorHash = null;
pkgs/by-name/fl/flat-remix-gnome/package.nix
+4 -4
View File
@@ -7,25 +7,25 @@
let
# make install will use dconf to find desktop background file uri.
# consider adding an args to allow specify pictures manually.
# https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L38
# https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L38
fake-dconf = writeScriptBin "dconf" "echo -n";
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20240721";
version = "20240922";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-eWZ5gwu/ovtnXZEFlUfaHfpQ7O4oInMnu0PQZpK/c9U=";
hash = "sha256-/Md1CbEDe+N8Nu0WPrIUkEudqMvEARmHD9NtgE7sPLQ=";
};
nativeBuildInputs = [ glib fake-dconf ];
makeFlags = [ "PREFIX=$(out)" ];
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L56
# https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L56
preInstall = ''
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
pkgs/by-name/gc/gcsfuse/package.nix
+6 -3
View File
@@ -1,20 +1,21 @@
{ lib
, buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "gcsfuse";
version = "2.4.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-4susiXFe1aBcakxRkhmOe7dvcwsNfam4KKyFFzYXhcU=";
hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100=";
};
vendorHash = "sha256-uOr929RS8q7LB+WDiyxEIyScE/brmvPJKfnq28PfsDM=";
vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0=";
subPackages = [ "." "tools/mount_gcsfuse" ];
@@ -41,5 +42,7 @@ buildGoModule rec {
changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
# internal/cache/file/downloader/job.go:386:77: undefined: syscall.O_DIRECT
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/gf/gfn-electron/package.nix
+80
View File
@@ -0,0 +1,80 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
electron,
nix-update-script,
makeBinaryWrapper,
}:
let
version = "2.1.2";
in
buildNpmPackage {
pname = "gfn-electron";
inherit version;
src = fetchFromGitHub {
owner = "hmlendea";
repo = "gfn-electron";
rev = "refs/tags/v${version}";
hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
};
npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo=";
nativeBuildInputs = [ makeBinaryWrapper ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
# FIXME: Git dependency node_modules/register-scheme contains install scripts,
# but has no lockfile, which is something that will probably break.
forceGitDeps = true;
makeCacheWritable = true;
buildPhase = ''
runHook preBuild
# NOTE: Upstream explicitly opts to not build an ASAR as it would cause all
# text to disappear in the app.
npm exec electron-builder -- \
--dir \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r dist/*-unpacked $out/dist
install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications
install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png
runHook postInstall
'';
postFixup = ''
makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
--add-flags "--no-sandbox --disable-gpu-sandbox" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
--replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
--replace-fail "Icon=nvidia" "Icon=geforcenow-electron"
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service";
homepage = "https://github.com/hmlendea/gfn-electron";
license = with lib.licenses; [ gpl3Only ];
platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms;
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "geforcenow-electron";
};
}
pkgs/by-name/go/golangci-lint/package.nix
+14 -7
View File
@@ -1,17 +1,22 @@
{ buildGo123Module, fetchFromGitHub, lib, installShellFiles }:
{
buildGoModule,
fetchFromGitHub,
lib,
installShellFiles,
}:
buildGo123Module rec {
buildGoModule rec {
pname = "golangci-lint";
version = "1.61.0";
version = "1.62.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg=";
hash = "sha256-9CT9+8wBjXflIYPtqTTMKaPySpDYGa0yUAhApcLIQ1k=";
};
vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8=";
vendorHash = "sha256-U79OfGm5EPuB8yTxLSLQKIBHuj/zzO4p5pXlvs+pVrU=";
subPackages = [ "cmd/golangci-lint" ];
@@ -19,7 +24,6 @@ buildGo123Module rec {
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.commit=v${version}"
"-X main.date=19700101-00:00:00"
@@ -38,6 +42,9 @@ buildGo123Module rec {
changelog = "https://github.com/golangci/golangci-lint/blob/v${version}/CHANGELOG.md";
mainProgram = "golangci-lint";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ SuperSandro2000 mic92 ];
maintainers = with maintainers; [
SuperSandro2000
mic92
];
};
}
pkgs/by-name/gr/gradle-completion/package.nix
+25 -10
View File
@@ -1,16 +1,26 @@
{ lib, stdenv, fetchFromGitHub }:
{
lib,
stdenvNoCC,
fetchFromGitHub,
installShellFiles,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gradle-completion";
version = "1.4.1";
src = fetchFromGitHub {
owner = "gradle";
repo = "gradle-completion";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2";
};
nativeBuildInputs = [
installShellFiles
];
strictDeps = true;
# we just move two files into $out,
@@ -18,20 +28,25 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle
install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle
installShellCompletion --name gradle \
--bash gradle-completion.bash \
--zsh _gradle
runHook postInstall
'';
meta = with lib; {
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = {
description = "Gradle tab completion for bash and zsh";
homepage = "https://github.com/gradle/gradle-completion";
license = licenses.mit;
maintainers = [ ] ++ teams.java.members;
license = lib.licenses.mit;
maintainers = [ ] ++ lib.teams.java.members;
};
}
})
pkgs/by-name/gr/grafana-dash-n-grab/package.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grafana-dash-n-grab";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "esnet";
repo = "gdg";
sha256 = "sha256-47zKZnq7ADIAti4fjGj6ctoM5Qo6UzAX1aLf87TknkQ=";
sha256 = "sha256-oJ0wXBfanpYS95ET+7lpKzLdQG5g/uKFs5+Qd+hPjHo=";
};
vendorHash = "sha256-XJSi+p++1QFfGk57trfIgyv0nWUm38H0n/qbJgV8lEM=";
vendorHash = "sha256-jnPnWcow5SiFHGfoAxBR8ncGHLyS7sFKNJT8YuUTg88=";
ldflags = [
"-s"
pkgs/by-name/ha/halloy/package.nix
-1
View File
@@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
pkgs/by-name/hw/hwatch/package.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hwatch";
version = "0.3.15";
version = "0.3.16";
src = fetchFromGitHub {
owner = "blacknon";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-UmNxdp9acRCKnUsKw7Z9z3knRvVkqQ5atxR/dqpGBYE=";
sha256 = "sha256-H9bZr5/XWS3MuGJOdxHYDlErpW0Tc7QkgkCIifDTlgM=";
};
cargoHash = "sha256-pEhogmK2WBj/PxcDtJs/H0XZhPiz3zCQMX2eUcAfnTE=";
cargoHash = "sha256-QMLtO0OQ+17H3QwpMGP9Fy4PxjPYOCd3pQ9k1BEPA5c=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ja/jazz2/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jazz2";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitHub {
owner = "deathkiller";
repo = "jazz2-native";
rev = finalAttrs.version;
hash = "sha256-qkR3j22tG8Q9WGeIFauWLibpMrF3AvU0abt/6lg763U=";
hash = "sha256-q/08lQ+HW2obWc8YAAEorKkNWy1d2uWeufOC5TVKpN4=";
};
patches = [ ./nocontent.patch ];
pkgs/by-name/ku/kubectl-graph/package.nix
+28
View File
@@ -0,0 +1,28 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "kubectl-graph";
version = "0.7.0";
src = fetchFromGitHub {
owner = "steveteuber";
repo = "kubectl-graph";
rev = "v${version}";
hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
};
vendorHash = "sha256-fvn+CoOyMRjsIemMRXitMjTlbbhjrlDIHu398b4/ZZ0=";
meta = {
description = "Kubectl plugin to visualize Kubernetes resources and relationships";
homepage = "https://github.com/steveteuber/kubectl-graph";
changelog = "https://github.com/steveteuber/kubectl-graph/releases/tag/v${version}";
mainProgram = "kubectl-graph";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.rksm ];
};
}
pkgs/by-name/li/libdatachannel/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libdatachannel";
version = "0.21.2";
version = "0.22.2";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = "libdatachannel";
rev = "v${version}";
hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA=";
hash = "sha256-ZGxv4JfJ3b0S7zacIHBlBtCbChADCQG1CfxStA1lKKE=";
};
outputs = [
pkgs/by-name/li/libnvme/package.nix
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libnvme";
version = "1.10";
version = "1.11";
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "linux-nvme";
repo = "libnvme";
rev = "v${finalAttrs.version}";
hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4=";
hash = "sha256-c7+vNUTU0J1e8aWl49C7rEbFAQZ3X53PKtv7r8CcheE=";
};
postPatch = ''
pkgs/by-name/li/libskk/package.nix
+10 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub,
{ lib, stdenv, fetchFromGitHub, fetchpatch,
libtool, gettext, pkg-config,
vala, gnome-common, gobject-introspection,
libgee, json-glib, skkDictionaries, libxkbcommon }:
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5";
};
patches = [
# fix parse error in default.json
# https://github.com/ueno/libskk/pull/90
(fetchpatch {
url = "https://github.com/ueno/libskk/commit/2382ebedc8dca88e745d223ad7badb8b73bbb0de.diff";
hash = "sha256-e1bKVteNjqmr40XI82Qar63LXPWYIfnUVlo5zQSkPNw=";
})
];
buildInputs = [ libxkbcommon ];
nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
propagatedBuildInputs = [ libgee json-glib ];
pkgs/by-name/lp/lprobe/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "lprobe";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "fivexl";
repo = "lprobe";
rev = "refs/tags/v${version}";
hash = "sha256-q7lH0aLgQNM4jrrrq2ua+pt4/VknxlzKzDH5J4MwjfA=";
hash = "sha256-WC0MDTyd5tRtSQ1LQsYJgV9CwJwtvnIO6tQnPrjpfcY=";
};
vendorHash = "sha256-B3lcE33Ny+XE7nK/QlVcV8yYgzYWNBfoecuL+AcavSk=";
vendorHash = "sha256-Ot9eePv/bjOZJfOjTCOJGXCaM8hoO4ZUPrpec8lT/JY=";
buildInputs = [
libpcap
pkgs/development/tools/language-servers/lua-language-server/default.nix → pkgs/by-name/lu/lua-language-server/package.nix
+46 -21
View File
@@ -2,11 +2,17 @@
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
ninja,
makeWrapper,
CoreFoundation,
Foundation,
ditto,
# buildInputs
apple-sdk_11,
darwinMinVersionHook,
rsync,
versionCheckHook,
nix-update-script,
}:
@@ -17,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = finalAttrs.version;
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU=";
fetchSubmodules = true;
};
@@ -28,36 +34,49 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
CoreFoundation
Foundation
ditto
# aligned_alloc
apple-sdk_11
(darwinMinVersionHook "10.15")
rsync
];
postPatch =
''
# filewatch tests are failing on darwin
# this feature is not used in lua-language-server
sed -i /filewatch/d 3rd/bee.lua/test/test.lua
substituteInPlace 3rd/bee.lua/test/test.lua \
--replace-fail 'require "test_filewatch"' ""
# flaky tests on linux
# https://github.com/LuaLS/lua-language-server/issues/2926
sed -i /load-relative-library/d test/tclient/init.lua
substituteInPlace test/tclient/init.lua \
--replace-fail "require 'tclient.tests.load-relative-library'" ""
pushd 3rd/luamake
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
+ lib.optionalString stdenv.hostPlatform.isDarwin (
# This package uses the program clang for C and C++ files. The language
# is selected via the command line argument -std, but this do not work
# in combination with the nixpkgs clang wrapper. Therefor we have to
# find all c++ compiler statements and replace $cc (which expands to
# clang) with clang++.
sed -i compile/ninja/macos.ninja \
-e '/c++/s,$cc,clang++,' \
-e '/test.lua/s,= .*,= true,' \
-e '/ldl/s,$cc,clang++,'
sed -i scripts/compiler/gcc.lua \
-e '/cxx_/s,$cc,clang++,'
'';
''
sed -i compile/ninja/macos.ninja \
-e '/c++/s,$cc,clang++,' \
-e '/test.lua/s,= .*,= true,' \
-e '/ldl/s,$cc,clang++,'
sed -i scripts/compiler/gcc.lua \
-e '/cxx_/s,$cc,clang++,'
''
# Avoid relying on ditto (impure)
+ ''
substituteInPlace compile/ninja/macos.ninja \
--replace-fail "ditto" "rsync -a"
substituteInPlace scripts/writer.lua \
--replace-fail "ditto" "rsync -a"
''
);
ninjaFlags = [
"-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja"
@@ -91,19 +110,25 @@ stdenv.mkDerivation (finalAttrs: {
# some tests require local networking
__darwinAllowLocalNetworking = true;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = with lib; {
meta = {
description = "Language server that offers Lua language support";
homepage = "https://github.com/luals/lua-language-server";
changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md";
license = licenses.mit;
maintainers = with maintainers; [
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
figsoda
gepbird
sei40kr
];
mainProgram = "lua-language-server";
platforms = platforms.linux ++ platforms.darwin;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})
pkgs/by-name/ma/matugen/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
owner = "InioX";
repo = "matugen";
rev = "refs/tags/v${version}";
hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I=";
hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
};
cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64=";
pkgs/by-name/me/mermerd/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "mermerd";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "KarnerTh";
repo = "mermerd";
rev = "refs/tags/v${version}";
hash = "sha256-7oBN9EeF3JBrOFuIM3lkNR2WMZA8PNDaKqdsVPawHBE=";
hash = "sha256-18GM/mb32MPI128ytM/Im+LO+N9cW1HoZ7M4tP2+i0o=";
};
vendorHash = "sha256-bd/1LT0Pw25NhbnwQH3nmuCm3m8jBKPOYGRIRpcOGQI=";
vendorHash = "sha256-r5/mztbAwj25QevcB1iYb6fJzNACPtJEurkbD1Iq7dM=";
ldflags = [
"-s"
pkgs/by-name/mi/miriway/package.nix
+22 -2
View File
@@ -4,35 +4,55 @@
fetchFromGitHub,
gitUpdater,
nixosTests,
bash,
cmake,
inotify-tools,
pkg-config,
mir,
libxkbcommon,
swaybg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "miriway";
version = "24.09";
version = "24.10.1";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg=";
hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'DESTINATION /usr/lib/systemd' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/systemd'
'';
strictDeps = true;
# Source has a path "systemd/usr/{libexec,lib}/...", don't break references to that
dontFixCmake = true;
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
bash
mir
libxkbcommon
];
postInstall = ''
substituteInPlace $out/bin/miriway-background \
--replace-fail 'exec swaybg' 'exec ${lib.getExe swaybg}'
substituteInPlace $out/bin/miriway-run \
--replace-fail 'inotifywait -qq' '${lib.getExe' inotify-tools "inotifywait"} -qq'
'';
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
providedSessions = [ "miriway" ];
pkgs/by-name/mo/mopac/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@ assert blas.isILP64 == lapack.isILP64;
stdenv.mkDerivation rec {
pname = "mopac";
version = "22.1.1";
version = "23.0.0";
src = fetchFromGitHub {
owner = "openmopac";
repo = pname;
rev = "v${version}";
hash = "sha256-tdVb/u89EBggfG3Ofz1ICBE2ug4fbMsUWAILwJP9Ito=";
hash = "sha256-5Ybhnq99609mb1BCf7SfBOu14VfG54aF1bEf96yhbVI=";
};
nativeBuildInputs = [ gfortran cmake ];
pkgs/by-name/mu/mutmut/package.nix
+22 -16
View File
@@ -1,31 +1,35 @@
{ lib
, fetchFromGitHub
, python3
, testers
{
lib,
fetchFromGitHub,
python3Packages,
}:
let self = with python3.pkgs; buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "mutmut";
version = "2.2.0";
version = "3.2.0";
src = fetchFromGitHub {
repo = pname;
owner = "boxed";
rev = version;
hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY=";
rev = "refs/tags/${version}";
hash = "sha256-+e2FmfpGtK401IW8LNqeHk0v8Hh5rF3LbZJkSOJ3yPY=";
};
postPatch = ''
substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9'
substituteInPlace requirements.txt --replace-fail 'junit-xml==1.8' 'junit-xml==1.9'
'';
disabled = pythonOlder "3.7";
disabled = python3Packages.pythonOlder "3.7";
doCheck = false;
propagatedBuildInputs = [ click glob2 parso pony junit-xml ];
passthru.tests.version = testers.testVersion { package = self; };
propagatedBuildInputs = with python3Packages; [
click
parso
junit-xml
setproctitle
textual
];
meta = with lib; {
description = "mutation testing system for Python, with a strong focus on ease of use";
@@ -33,7 +37,9 @@ let self = with python3.pkgs; buildPythonApplication rec {
homepage = "https://github.com/boxed/mutmut";
changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ synthetica ];
maintainers = with maintainers; [
l0b0
synthetica
];
};
};
in self
}
pkgs/by-name/nb/nbqa/package.nix
+14 -9
View File
@@ -1,6 +1,6 @@
{
lib,
python3,
python3Packages,
fetchFromGitHub,
# optional-dependencies
@@ -8,27 +8,29 @@
# tests
versionCheckHook,
nix-update-script,
}:
let
nbqa = python3.pkgs.buildPythonApplication rec {
nbqa = python3Packages.buildPythonApplication rec {
pname = "nbqa";
version = "1.9.0";
version = "1.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "nbQA-dev";
repo = "nbQA";
rev = "refs/tags/${version}";
hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY=";
hash = "sha256-qVNJ8f8vUlTCi5DbvG70orcSnulH60UcI5iABtXYUog=";
};
build-system = with python3.pkgs; [
build-system = with python3Packages; [
setuptools
];
optional-dependencies.toolchain =
(with python3.pkgs; [
(with python3Packages; [
black
blacken-docs
flake8
@@ -42,7 +44,7 @@ let
ruff
];
dependencies = with python3.pkgs; [
dependencies = with python3Packages; [
autopep8
ipython
tokenize-rt
@@ -60,7 +62,7 @@ let
'';
nativeCheckInputs =
(with python3.pkgs; [
(with python3Packages; [
autoflake
distutils
mdformat
@@ -71,6 +73,7 @@ let
])
++ lib.flatten (lib.attrValues optional-dependencies)
++ [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
disabledTests = [
# Test data not found
@@ -98,10 +101,12 @@ let
nbqa.overridePythonAttrs (
{ dependencies, ... }:
{
dependencies = dependencies ++ selector python3.pkgs;
dependencies = dependencies ++ selector python3Packages;
doCheck = false;
}
);
updateScript = nix-update-script { };
};
meta = {
pkgs/by-name/ne/networkmanager-iodine/package.nix
+3 -3
View File
@@ -18,14 +18,14 @@
stdenv.mkDerivation {
pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
version = "1.2.0-unstable-2024-05-12";
version = "1.2.0-unstable-2024-11-02";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "network-manager-iodine";
rev = "8ec0a35e12047ccf256b3951897c701661ddb8af";
sha256 = "cNjznry8wi1UmE5khf0JCEYjs9nDU/u8lFLte53MLTM=";
rev = "dd633f80913ae637d6f496bae1b7bac8c297860c";
sha256 = "sAndI8jjCcRENDGz4V3AKswybzC8PDzYPaEN1mLcti8=";
};
patches = [
pkgs/by-name/ni/niri/Cargo.lock
Generated
+614 -398
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ni/niri/package.nix
+19 -5
View File
@@ -4,6 +4,7 @@
dbus,
eudev,
fetchFromGitHub,
fetchpatch,
libdisplay-info,
libglvnd,
libinput,
@@ -25,15 +26,23 @@
rustPlatform.buildRustPackage rec {
pname = "niri";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "refs/tags/v${version}";
hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=";
hash = "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=";
};
patches = [
# Fix scrolling not working with missing mouse config
(fetchpatch {
url = "https://github.com/YaLTeR/niri/commit/1951d2a9f262196a706f2645efb18dac3c4d6839.patch";
hash = "sha256-P/0LMYZ4HD0iG264BMnK4sLNNLmtbefF230GyC+t6qg=";
})
];
postPatch = ''
patchShebangs resources/niri-session
substituteInPlace resources/niri.service \
@@ -43,8 +52,8 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-0.3.0" = "sha256-/3BO66yVoo63+5rwrZzoxhSTncvLyHdvtSaApFj3fBg=";
"libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
"smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
"libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk=";
};
};
@@ -86,9 +95,14 @@ rustPlatform.buildRustPackage rec {
+ lib.optionalString withDbus ''
install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
''
+ lib.optionalString withSystemd ''
+ lib.optionalString (withSystemd || withDinit) ''
install -Dm0755 resources/niri-session -t $out/bin
''
+ lib.optionalString withSystemd ''
install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user
''
+ lib.optionalString withDinit ''
install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
'';
env = {
pkgs/by-name/ni/nitrokey-udev-rules/package.nix
+31
View File
@@ -0,0 +1,31 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nitrokey-udev-rules";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-udev-rules";
rev = "v${finalAttrs.version}";
hash = "sha256-uq1+YQg+oe5UFphpy1AdxEYaPFyRle6ffYOPoU6Li28=";
};
installPhase = ''
install -D 41-nitrokey.rules -t $out/etc/udev/rules.d
'';
meta = with lib; {
description = "udev rules for Nitrokey devices";
homepage = "https://github.com/Nitrokey/nitrokey-udev-rules";
license = [ licenses.cc0 ];
maintainers = with maintainers; [
frogamic
robinkrahl
];
};
})
pkgs/by-name/ni/nix-unit/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nix-unit";
version = "2.24.0";
version = "2.24.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-unit";
rev = "v${finalAttrs.version}";
hash = "sha256-6O4Q51PSUbr/ODVbfEfAAcoRdID3fqn0lAuHERHq+h4=";
hash = "sha256-PcT0jtv2QFaht5eSs1Vq4XGDqtMLdPC49ao9uwGYclE=";
};
buildInputs = [
pkgs/by-name/nz/nzportable/assets.nix
+44
View File
@@ -0,0 +1,44 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "nzp-assets";
version = "0-unstable-2024-09-28-13-34-48";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "assets";
rev = "4a7b1b787061c1c7c17ab3b59a8e0e0f44c9546f";
hash = "sha256-gCTC/76r0ITIDLIph9uivq0ZJGaPUmlBGizdCUxJrng=";
};
outputs = [
"out"
"pc"
];
# TODO: add more outputs for other ports
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r common/* $out
mkdir -p $pc
cp -r pc/* $pc
chmod -R +w $pc/nzp
cp -r $out/* $pc/nzp
runHook postInstall
'';
meta = {
description = "Game asset repository for Nazi Zombies: Portable";
homepage = "https://github.com/nzp-team/assets";
license = with lib.licenses; [ cc-by-sa-40 ];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ pluiedev ];
};
}
pkgs/by-name/nz/nzportable/fteqw.nix
+176
View File
@@ -0,0 +1,176 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
pkg-config,
makeWrapper,
zip,
gettext,
libpng,
zlib,
gnutls,
libGL,
xorg,
alsa-lib,
libjpeg,
libogg,
libvorbis,
libopus,
dbus,
fontconfig,
SDL2,
bullet,
openexr,
sqlite,
addDriverRunpath,
enableEGL ? true,
libglvnd,
enableVulkan ? true,
vulkan-headers,
vulkan-loader,
enableWayland ? true,
wayland,
libxkbcommon,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nzp-fteqw";
version = "0-unstable-2024-09-11-20-07-31";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "fteqw";
rev = "593345a7f03245fc45580ac252857e5db5105033";
hash = "sha256-ANDHh4PKh8fAvbBiiW47l1XeGOCes0Sg595+65NFG6w=";
};
nativeBuildInputs = [
cmake
ninja
makeWrapper
pkg-config
zip
gettext
];
buildInputs =
[
libGL
xorg.libX11
xorg.libXrandr
xorg.libXcursor
xorg.libXScrnSaver
dbus
fontconfig
libjpeg
libpng
alsa-lib
libogg
libvorbis
libopus
SDL2
gnutls
zlib
bullet
]
++ lib.optional enableEGL libglvnd
++ lib.optionals enableWayland [
wayland
libxkbcommon
]
++ lib.optional enableVulkan vulkan-headers;
cmakeFlags = [
(lib.cmakeFeature "FTE_BUILD_CONFIG" "${finalAttrs.src}/engine/common/config_nzportable.h")
# Disable optional tools - only keep FTEQCC
(lib.cmakeBool "FTE_TOOL_IQM" false)
(lib.cmakeBool "FTE_TOOL_IMAGE" false)
(lib.cmakeBool "FTE_TOOL_QTV" false)
(lib.cmakeBool "FTE_TOOL_MASTER" false)
];
postInstall = ''
mv $out/games $out/bin
'';
postFixup =
let
# grep for `Sys_LoadLibrary` for more.
# Some of the deps listed in the source code are actually not active
# due to being either disabled by the nzportable profile (e.g. lua, bz2),
# available in /run/opengl-driver,
# or statically linked (e.g. libpng, libjpeg, zlib, freetype)
# Some of them are also just deprecated by better backend options
# (SDL audio is preferred over ALSA, OpenAL and PulseAudio, for example)
libs = [
addDriverRunpath.driverLink
# gl/gl_vidlinuxglx.c
xorg.libX11
xorg.libXrandr
xorg.libXxf86vm
xorg.libXxf86dga
xorg.libXi
xorg.libXcursor
libGL
libvorbis
sqlite # server/sv_sql.c
SDL2 # a lot of different files
gnutls # common/net_ssl_gnutls.c
openexr # client/image.c
(placeholder "out")
] ++ lib.optional enableWayland wayland ++ lib.optional enableVulkan vulkan-loader;
in
''
wrapProgram $out/bin/fteqw \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"
'';
meta = {
description = "Nazi Zombies: Portable's fork of Spike's FTEQW engine/client";
longDescription = ''
This package contains only the FTEQW engine, and none of the assets used in NZ:P.
Please use the `nzportable` package for an out-of-the-box NZ:P experience.
FTEQW supports several graphics options.
You can specify those graphics option by overriding the FTEQW package, like this:
```nix
nzp-fteqw.override {
enableVulkan = true;
}
```
And in the game, you need to run `setrenderer <renderer>` to change the current renderer.
Supported graphics options are as follows:
- `enableEGL`: Enable the OpenGL ES renderer (`egl`). Enabled by default.
- `enableVulkan`: Enable the Vulkan renderer (`xvk`). Enabled by default.
- `enableWayland`: Enable native Wayland support, instead of using X11.
Adds up to two renderers, based on whether EGL and Vulkan are installed: `wlgl` and `wlvk`.
Seems to be currently broken and currently not enabled by default.
'';
homepage = "https://github.com/nzp-team/fteqw";
license = lib.licenses.gpl2Plus;
# See README
platforms = [
"x86_64-linux"
"i686-linux"
"armv7l-linux"
"aarch64-linux"
"x86_64-windows"
"i686-windows"
];
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "fteqw";
};
})
pkgs/by-name/nz/nzportable/package.nix
+84
View File
@@ -0,0 +1,84 @@
{
lib,
callPackage,
writeShellApplication,
}:
let
assets = callPackage ./assets.nix { };
quakec = callPackage ./quakec.nix { };
fteqw = callPackage ./fteqw.nix { };
# We use the youngest version of all of the dependencies as the version number.
# This is similar to what upstream uses, except ours is a bit more accurate
# since we don't rely on a CI to run at an arbitrary time.
dateString =
lib.pipe
[
assets
fteqw
quakec
]
[
# Find the youngest (most recently updated) version
(lib.foldl' (acc: p: if lib.versionOlder acc p.version then p.version else acc) "")
(lib.splitString "-")
(lib.sublist 2 6) # drop the first two segments (0 and unstable) and only keep the date
lib.concatStrings
];
version = "2.0.0-indev+${dateString}";
in
writeShellApplication {
name = "nzportable";
text = ''
runDir=''${XDG_DATA_HOME:-$HOME/.local/share}/nzportable
data=${assets.pc}
relinkGameFiles() {
mkdir -p "$runDir"/nzp
# Remove existing links
find "$runDir" -type l -exec rm {} +
# Link game files
ln -s $data/default.fmf "$runDir"
ln -st "$runDir"/nzp $data/nzp/* ${quakec.fte}/*
# Write current version
echo "${version}" > "$runDir"/nzp/version.txt
}
if [[ ! -d $runDir ]]; then
echo "Game directory $runDir not found. Assuming first launch"
echo "Linking game files"
relinkGameFiles
else
currentVersion=$(<"$runDir"/nzp/version.txt)
if [[ "${version}" != "$currentVersion" ]]; then
echo "Version mismatch! (saved version $currentVersion != current version ${version})"
echo "Relinking game files"
relinkGameFiles
fi
fi
exec ${lib.getExe fteqw} -basedir "$runDir" "$@"
'';
derivationArgs = {
inherit version;
passthru = {
updateScript = callPackage ./update.nix { };
inherit assets quakec fteqw;
};
};
meta = {
inherit (fteqw.meta) platforms;
description = "Call of Duty: Zombies demake, powered by various Quake sourceports (PC version)";
homepage = "https://docs.nzp.gay";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "nzportable";
};
}
pkgs/by-name/nz/nzportable/quakec.nix
+64
View File
@@ -0,0 +1,64 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
python3,
nzportable,
}:
stdenvNoCC.mkDerivation {
pname = "nzp-quakec";
version = "0-unstable-2024-10-12-12-03-59";
src = fetchFromGitHub {
owner = "nzp-team";
repo = "quakec";
rev = "01e95c4dab91ce0e8b7387d2726d9ee307792ae7";
hash = "sha256-h4llx3tzeoI1aHLokM7NqkZJWuo6rcrmWfb0pDQL+zM=";
};
outputs = [
"out"
"fte"
];
nativeBuildInputs = [ python3 ];
buildInputs = with python3.pkgs; [
colorama
fastcrc
pandas
nzportable.fteqw
];
buildPhase = ''
runHook preBuild
python3 bin/qc_hash_generator.py -i tools/asset_conversion_table.csv -o source/server/hash_table.qc
mkdir -p build/{fte,standard}
fteqcc -srcfile progs/csqc.src
fteqcc -O3 -DFTE -srcfile progs/ssqc.src
fteqcc -O3 -srcfile progs/ssqc.src
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out $fte
cp -r build/standard/* $out
cp -r build/fte/* $fte
runHook postInstall
'';
meta = {
description = "QuakeC repository for Nazi Zombies: Portable";
homepage = "https://github.com/nzp-team/quakec";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux ++ darwin;
maintainers = with lib.maintainers; [ pluiedev ];
};
}
pkgs/by-name/nz/nzportable/update.nix
+41
View File
@@ -0,0 +1,41 @@
{
lib,
writeShellApplication,
jq,
curl,
nix-prefetch-git,
common-updater-scripts,
}:
lib.getExe (writeShellApplication {
name = "nzp-updater";
runtimeInputs = [
jq
curl
nix-prefetch-git
common-updater-scripts
];
text = ''
youngest=0
update() {
repo=$1
tag=$2
prefetch=$(nix-prefetch-git "https://github.com/nzp-team/$repo" --rev "$tag")
timestamp=$(echo "$prefetch" | jq -r '.date | strptime("%Y-%m-%dT%H:%M:%S%z") | mktime | strftime("%Y-%m-%d-%H-%M-%S")')
rev=$(echo "$prefetch" | jq -r ".rev")
hash=$(echo "$prefetch" | jq -r ".hash")
if [[ $youngest -lt $timestamp ]]; then
youngest=$timestamp
fi
update-source-version "$UPDATE_NIX_ATTR_PATH.$repo" "0-unstable-$timestamp" "$hash" --rev="$rev"
}
update fteqw bleeding-edge
update assets newest
update quakec bleeding-edge
'';
})
pkgs/by-name/ob/obsidian/package.nix
+1 -1
View File
@@ -61,7 +61,7 @@ let
-t $out/share/applications/
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
magick ${icon} -background none -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
done
runHook postInstall
'';
pkgs/by-name/op/open-isns/package.nix
+32 -7
View File
@@ -1,24 +1,49 @@
{ lib, stdenv, openssl, fetchFromGitHub }:
{
lib,
stdenv,
pkg-config,
meson,
ninja,
openssl,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "open-isns";
version = "0.102";
version = "0.103";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "open-isns";
rev = "v${version}";
sha256 = "sha256-Vz6VqqvEr0f8AdN9NcVnruapswmoOgvAXxXSfrM3yRA=";
sha256 = "sha256-buqQMsoxRCbWiBDq0XAg93J7bjbdxeIernV8sDVxCAA=";
};
# The location of /var/lib is not made configurable in the meson.build file
postPatch = ''
substituteInPlace meson.build \
--replace-fail "/var/lib" "$out/var/lib" \
'';
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ openssl ];
outputs = [ "out" "lib" ];
outputInclude = "lib";
outputs = [
"out"
"lib"
"dev"
"man"
];
configureFlags = [ "--enable-shared" ];
installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ];
installTargets = [ "install" "install_hdrs" "install_lib" ];
mesonFlags = [
"-Dslp=disabled" # openslp is not maintained and labeled unsafe
"-Dsystemddir=${placeholder "out"}/lib/systemd"
];
meta = with lib; {
description = "iSNS server and client for Linux";
pkgs/by-name/op/openiscsi/package.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
kmod
(lib.getLib open-isns)
open-isns
openssl
systemd
util-linux
pkgs/by-name/pd/pdal/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pdal";
version = "2.8.0";
version = "2.8.1";
src = fetchFromGitHub {
owner = "PDAL";
repo = "PDAL";
rev = finalAttrs.version;
hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg=";
hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM=";
};
nativeBuildInputs = [
pkgs/by-name/po/pomerium/package.nix
+3 -3
View File
@@ -13,15 +13,15 @@ let
in
buildGo123Module rec {
pname = "pomerium";
version = "0.27.1";
version = "0.27.2";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
hash = "sha256-+RKWl/weUYktS7jUB1lYpZCBKEfh7RMfKgRDbYV8Bjs=";
hash = "sha256-t1j5usgr/SO3Ev3JpCJWb3Ys8wgZUTGQVb6mo0oIsEc=";
};
vendorHash = "sha256-/iYUZp6EASDGApLymNuR10395PH8D3zPU+TlmmAN8Zc=";
vendorHash = "sha256-nTEFSLP0/GUVgtujVG6lQIxnj6DOEifc0MVh9CNxt8s=";
ui = mkYarnPackage {
inherit version;
pkgs/by-name/pr/prettypst/Cargo.lock
Generated
-467
View File
@@ -1,467 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "anstream"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys",
]
[[package]]
name = "clap"
version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "clap_lex"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "comemo"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4"
dependencies = [
"comemo-macros",
"siphasher",
]
[[package]]
name = "comemo-macros"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ecow"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02"
dependencies = [
"serde",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "hashbrown"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "indexmap"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]]
name = "memchr"
version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "once_cell"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "pin-project-lite"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "prettypst"
version = "1.1.0"
dependencies = [
"clap",
"serde",
"thiserror",
"toml",
"typst-syntax",
]
[[package]]
name = "proc-macro2"
version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
[[package]]
name = "serde"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_spanned"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
dependencies = [
"serde",
]
[[package]]
name = "siphasher"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "2.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thiserror"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "toml"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]]
name = "tracing"
version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing-core"
version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
]
[[package]]
name = "typst-syntax"
version = "0.10.0"
source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c"
dependencies = [
"comemo",
"ecow",
"once_cell",
"serde",
"tracing",
"unicode-ident",
"unicode-math-class",
"unicode-script",
"unicode-segmentation",
"unscanny",
]
[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-math-class"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"
[[package]]
name = "unicode-script"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unscanny"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[package]]
name = "windows_i686_gnu"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[package]]
name = "windows_i686_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
version = "0.5.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
dependencies = [
"memchr",
]
pkgs/by-name/pr/prettypst/package.nix
+4 -9
View File
@@ -5,21 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "prettypst";
version = "unstable-2023-12-06";
version = "unstable-2024-10-20";
src = fetchFromGitHub {
owner = "antonWetzel";
repo = "prettypst";
rev = "bf46317ecac4331f101b2752de5328de5981eeba";
hash = "sha256-wPayP/693BKIrHrRkx4uY0UuZRoCGPNW8LB3Z0oSBi4=";
rev = "a724b56de0527faf0f1f1eecb17d0b847872411c";
hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-syntax-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
};
};
cargoHash = "sha256-zUeCthQ2fQ1P0gxN5XXg6a+Op8JFMrzU02Mh0mpwv30=";
meta = {
changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md";
pkgs/by-name/pr/printrun/package.nix
+3 -3
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "printrun";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "kliment";
repo = "Printrun";
rev = "refs/tags/printrun-${version}";
hash = "sha256-MANgxE3z8xq8ScxdxhwfEVsLMF9lgcdSjJZ0qu5p3ps=";
hash = "sha256-INJNGAmghoPIiivQp6AV1XmhyIu8SjfKqL8PTpi/tkY=";
};
postPatch = ''
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ glib wrapGAppsHook3 ];
propagatedBuildInputs = with python3Packages; [
appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml
appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml puremagic
];
# pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None"
pkgs/by-name/pr/proton-ge-bin/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton9-18";
version = "GE-Proton9-20";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-NoRNM61Y9q8ksOXPeDV/NaIqHblWjXtK3tXcX5UEwkI=";
hash = "sha256-1twCv81KO1fcRcIb4H7VtAjtcKrX+DymsYdf885eOWo=";
};
outputs = [
pkgs/by-name/pr/proton-vpn-local-agent/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "proton-vpn-local-agent";
version = "0-unstable-2024-10-10";
cargoHash = "sha256-yAeqx9zo4xz4g/klo10vMEcecc8npIUY8tkV/nq11WA=";
version = "1.0.0";
cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0=";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-local-agent";
rev = "01332194d217d91a514ecaebcdfbfa3d21ccd1ed";
rev = version;
hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA=";
};
pkgs/by-name/pt/ptyxis/package.nix
+2 -2
View File
@@ -16,14 +16,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ptyxis";
version = "47.2";
version = "47.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "chergert";
repo = "ptyxis";
rev = finalAttrs.version;
hash = "sha256-8b+leFzVEj75xAnGwmVoCr6+mTO3e+DOPUNe0A5KGYY=";
hash = "sha256-G2WesIaz+eYiDExyMi6Ww2cHMthuxAX5b+B68dz6Yb0=";
};
nativeBuildInputs = [

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