mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
1a9cdd1a7d
|
|
@ -9834,6 +9834,12 @@
|
|||
githubId = 4753752;
|
||||
name = "guttermonk";
|
||||
};
|
||||
guylamar2006 = {
|
||||
name = "guylamar2006";
|
||||
github = "guylamar2006";
|
||||
githubId = 4555064;
|
||||
keys = [ { fingerprint = "0438 6FD4 D588 E32B 206F 2B49 1C4F DEA2 DB34 FEE4"; } ];
|
||||
};
|
||||
guyonvarch = {
|
||||
github = "guyonvarch";
|
||||
githubId = 6768842;
|
||||
|
|
@ -9891,6 +9897,12 @@
|
|||
githubId = 5190539;
|
||||
keys = [ { fingerprint = "AD3D 53CB A68A FEC0 8065 BCBB 416A D9E8 E372 C075"; } ];
|
||||
};
|
||||
hadziqM = {
|
||||
name = "Hadziq Masfuh";
|
||||
email = "dimascrazz@gmail.com";
|
||||
github = "HadziqM";
|
||||
githubId = 50319538;
|
||||
};
|
||||
hagl = {
|
||||
email = "harald@glie.be";
|
||||
github = "hagl";
|
||||
|
|
|
|||
|
|
@ -160,6 +160,22 @@
|
|||
|
||||
- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
|
||||
|
||||
- `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.
|
||||
- OVMF images from underlying QEMU package are now made available under '/run/libvirt/nix-ovmf', fixing prior issues when using QEMU's automatic EFI firmware and feature handling, relied upon by GNOME Boxes, virsh, virt-manager, etc.
|
||||
- Domains that rely on automatic firmware and feature handling, i.e. `<os firmware='efi'>` need to trigger an update to `<loader>` and `<nvram>` entries.
|
||||
Using `virsh edit <domain>` and deleting aforementioned tags will cause libvirt to replace them with the new paths.
|
||||
- Configurations that relied on `virtualisation.libvirtd.qemu.ovmf` and had domains that did not use automatic firmware and feature handling, require a manual change to their domain configuration, updating `<loader>` and `<nvram>` entries from old path to the new path.
|
||||
| Old Path | New Path |
|
||||
|----------------------------------------|--------------------------------------------------|
|
||||
| /run/libvirt/nix-ovmf/OVMF_CODE.fd | /run/libvirt/nix-ovmf/edk2-x86_64-code.fd |
|
||||
| /run/libvirt/nix-ovmf/OVMF_VARS.fd | /run/libvirt/nix-ovmf/edk2-i386-vars.fd |
|
||||
| /run/libvirt/nix-ovmf/OVMF_CODE.ms.fd | /run/libvirt/nix-ovmf/edk2-x86_64-secure-code.fd |
|
||||
| /run/libvirt/nix-ovmf/OVMF_VARS.ms.fd | /run/libvirt/nix-ovmf/edk2-i386-vars.fd |
|
||||
| /run/libvirt/nix-ovmf/AAVMF_CODE.fd | /run/libvirt/nix-ovmf/edk2-aarch64-code.fd |
|
||||
| /run/libvirt/nix-ovmf/AAVMF_VARS.fd | /run/libvirt/nix-ovmf/edk2-arm-vars.fd |
|
||||
| /run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd | /run/libvirt/nix-ovmf/edk2-aarch64-code.fd |
|
||||
| /run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd | /run/libvirt/nix-ovmf/edk2-arm-vars.fd |
|
||||
|
||||
- The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/)
|
||||
for all the details and how to ensure smooth upgrades.
|
||||
|
||||
|
|
@ -281,6 +297,15 @@
|
|||
- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
|
||||
|
||||
- mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.
|
||||
-
|
||||
- A new option [](#opt-boot.isNspawnContainer) has been added. This option will be used to guard nspawn-specific configuration in NixOS since [](#opt-boot.isContainer) is also used for different container-runtimes such as LXC.
|
||||
- The new option is automatically set to `true` by the declarative container module and `nixos-container` when not using flakes.
|
||||
- Existing setups can be migrated by running either
|
||||
- `nixos-container update <container-name> --config-file /path/to/the/config-file-in-use.nix`
|
||||
- `nixos-container update <container-name> --config '/* config code */'`
|
||||
- Setting the option by hand in your configuration when using flakes.
|
||||
- In all other cases, you'll need to set this option to `true` yourself.
|
||||
- `boot.isNspawnContainer` being `true` implies [](#opt-boot.isContainer) being `true`.
|
||||
|
||||
- Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.
|
||||
|
||||
|
|
@ -333,6 +358,8 @@
|
|||
|
||||
- `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,
|
||||
|
||||
- `linux_libre` & `linux_latest_libre` have been removed due to a lack of maintenance.
|
||||
|
||||
- `services.pds` has been renamed to `services.bluesky-pds`.
|
||||
|
||||
- `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details.
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ if ($virt eq "microsoft") {
|
|||
|
||||
# Pull in NixOS configuration for containers.
|
||||
if ($virt eq "systemd-nspawn") {
|
||||
push @attrs, "boot.isContainer = true;";
|
||||
push @attrs, "boot.isNspawnContainer = true;";
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,10 @@ in
|
|||
default = false;
|
||||
internal = true;
|
||||
};
|
||||
options.boot.isNspawnContainer = lib.mkOption {
|
||||
default = false;
|
||||
internal = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ let
|
|||
++ (lib.optional (cfg.cache.secretKeyPath != null) "--cache-secret-key-path='%d/secretKey'")
|
||||
++ (lib.forEach cfg.upstream.caches (url: "--upstream-cache='${url}'"))
|
||||
++ (lib.forEach cfg.upstream.publicKeys (pk: "--upstream-public-key='${pk}'"))
|
||||
++ (lib.optional (cfg.netrcFile != null) "--netrc-file='${cfg.netrcFile}'")
|
||||
);
|
||||
|
||||
isSqlite = lib.strings.hasPrefix "sqlite:" cfg.cache.databaseURL;
|
||||
|
|
@ -211,6 +212,16 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
netrcFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "/etc/nix/netrc";
|
||||
description = ''
|
||||
The path to netrc file for upstream authentication.
|
||||
When unspecified ncps will look for ``$HOME/.netrc`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -341,5 +352,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ kalbasit ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
kalbasit
|
||||
aciceri
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -545,6 +545,30 @@ in
|
|||
|
||||
# Sync mount options with systemd's src/core/mount-setup.c: mount_table.
|
||||
boot.specialFileSystems = {
|
||||
# To hold secrets that shouldn't be written to disk
|
||||
"/run/keys" = {
|
||||
fsType = "ramfs";
|
||||
options = [
|
||||
"nosuid"
|
||||
"nodev"
|
||||
"mode=750"
|
||||
];
|
||||
};
|
||||
}
|
||||
// optionalAttrs (!config.boot.isContainer) {
|
||||
# systemd-nspawn populates /sys by itself, and remounting it causes all
|
||||
# kinds of weird issues (most noticeably, waiting for host disk device
|
||||
# nodes).
|
||||
"/sys" = {
|
||||
fsType = "sysfs";
|
||||
options = [
|
||||
"nosuid"
|
||||
"noexec"
|
||||
"nodev"
|
||||
];
|
||||
};
|
||||
}
|
||||
// optionalAttrs (!config.boot.isNspawnContainer) {
|
||||
"/proc" = {
|
||||
fsType = "proc";
|
||||
options = [
|
||||
|
|
@ -592,29 +616,6 @@ in
|
|||
"gid=${toString config.ids.gids.tty}"
|
||||
];
|
||||
};
|
||||
|
||||
# To hold secrets that shouldn't be written to disk
|
||||
"/run/keys" = {
|
||||
fsType = "ramfs";
|
||||
options = [
|
||||
"nosuid"
|
||||
"nodev"
|
||||
"mode=750"
|
||||
];
|
||||
};
|
||||
}
|
||||
// optionalAttrs (!config.boot.isContainer) {
|
||||
# systemd-nspawn populates /sys by itself, and remounting it causes all
|
||||
# kinds of weird issues (most noticeably, waiting for host disk device
|
||||
# nodes).
|
||||
"/sys" = {
|
||||
fsType = "sysfs";
|
||||
options = [
|
||||
"nosuid"
|
||||
"noexec"
|
||||
"nodev"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,14 +17,6 @@ let
|
|||
${cfg.extraConfig}
|
||||
'';
|
||||
qemuConfigFile = pkgs.writeText "qemu.conf" ''
|
||||
${optionalString cfg.qemu.ovmf.enable ''
|
||||
nvram = [
|
||||
"/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd",
|
||||
"/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd",
|
||||
"/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd",
|
||||
"/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd"
|
||||
]
|
||||
''}
|
||||
${optionalString (!cfg.qemu.runAsRoot) ''
|
||||
user = "qemu-libvirtd"
|
||||
group = "qemu-libvirtd"
|
||||
|
|
@ -38,36 +30,6 @@ let
|
|||
dirName = "libvirt";
|
||||
subDirs = list: [ dirName ] ++ map (e: "${dirName}/${e}") list;
|
||||
|
||||
ovmfModule = types.submodule {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Allows libvirtd to take advantage of OVMF when creating new
|
||||
QEMU VMs with UEFI boot.
|
||||
'';
|
||||
};
|
||||
|
||||
# mkRemovedOptionModule does not work in submodules, do it manually
|
||||
package = mkOption {
|
||||
type = types.nullOr types.package;
|
||||
default = null;
|
||||
internal = true;
|
||||
};
|
||||
|
||||
packages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [ pkgs.OVMF.fd ];
|
||||
defaultText = literalExpression "[ pkgs.OVMF.fd ]";
|
||||
example = literalExpression "[ pkgs.OVMFFull.fd pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd ]";
|
||||
description = ''
|
||||
List of OVMF packages to use. Each listed package must contain files names FV/OVMF_CODE.fd and FV/OVMF_VARS.fd or FV/AAVMF_CODE.fd and FV/AAVMF_VARS.fd
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
swtpmModule = types.submodule {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
|
|
@ -116,11 +78,28 @@ let
|
|||
};
|
||||
|
||||
ovmf = mkOption {
|
||||
type = ovmfModule;
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
internal = true;
|
||||
};
|
||||
package = mkOption {
|
||||
type = types.nullOr types.package;
|
||||
default = null;
|
||||
internal = true;
|
||||
};
|
||||
packages = mkOption {
|
||||
type = types.nullOr (types.listOf types.package);
|
||||
default = null;
|
||||
internal = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
QEMU's OVMF options.
|
||||
'';
|
||||
internal = true;
|
||||
description = "This submodule is deprecated and has been removed";
|
||||
};
|
||||
|
||||
swtpm = mkOption {
|
||||
|
|
@ -220,6 +199,21 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
qemuOvmfMetadata = pkgs.stdenv.mkDerivation {
|
||||
name = "qemu-ovmf-metadata";
|
||||
version = cfg.qemu.package.version;
|
||||
nativeBuildInputs = [ cfg.qemu.package ];
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ${cfg.qemu.package}/share/qemu/firmware/*.json $out
|
||||
substituteInPlace $out/*.json \
|
||||
--replace-fail "${cfg.qemu.package}/share/qemu/" "/run/${dirName}/nix-ovmf/"
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
|
|
@ -241,17 +235,16 @@ in
|
|||
[ "virtualisation" "libvirtd" "qemuVerbatimConfig" ]
|
||||
[ "virtualisation" "libvirtd" "qemu" "verbatimConfig" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "virtualisation" "libvirtd" "qemuOvmf" ]
|
||||
[ "virtualisation" "libvirtd" "qemu" "ovmf" "enable" ]
|
||||
)
|
||||
(mkRemovedOptionModule [ "virtualisation" "libvirtd" "qemuOvmfPackage" ]
|
||||
"If this option was set to `foo`, set the option `virtualisation.libvirtd.qemu.ovmf.packages' to `[foo.fd]` instead."
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "virtualisation" "libvirtd" "qemuSwtpm" ]
|
||||
[ "virtualisation" "libvirtd" "qemu" "swtpm" "enable" ]
|
||||
)
|
||||
(mkRemovedOptionModule [ "virtualisation" "libvirtd" "qemuOvmf" ]
|
||||
"The 'virtualisation.libvirtd.qemuOvmf' option has been removed. All OVMF images distributed with QEMU are now available by default."
|
||||
)
|
||||
(mkRemovedOptionModule [ "virtualisation" "libvirtd" "qemuOvmfPackage" ]
|
||||
"The 'virtualisation.libvirtd.qemuOvmfPackage' option has been removed. All OVMF images distributed with QEMU are now available by default."
|
||||
)
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
|
@ -408,17 +401,15 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.virtualisation.libvirtd.qemu.ovmf.package == null;
|
||||
message = ''
|
||||
The option virtualisation.libvirtd.qemu.ovmf.package is superseded by virtualisation.libvirtd.qemu.ovmf.packages.
|
||||
If this option was set to `foo`, set the option `virtualisation.libvirtd.qemu.ovmf.packages' to `[foo.fd]` instead.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = config.security.polkit.enable;
|
||||
message = "The libvirtd module currently requires Polkit to be enabled ('security.polkit.enable = true').";
|
||||
}
|
||||
|
||||
{
|
||||
assertion = ((lib.filterAttrs (n: v: v != null) cfg.qemu.ovmf) == { });
|
||||
message = "The 'virtualisation.libvirtd.qemu.ovmf' submodule has been removed. All OVMF images distributed with QEMU are now available by default.";
|
||||
}
|
||||
];
|
||||
|
||||
environment = {
|
||||
|
|
@ -488,20 +479,12 @@ in
|
|||
|
||||
ln -s --force ${cfg.qemu.package}/bin/qemu-pr-helper /run/${dirName}/nix-helpers/
|
||||
|
||||
${optionalString cfg.qemu.ovmf.enable (
|
||||
let
|
||||
ovmfpackage = pkgs.buildEnv {
|
||||
name = "qemu-ovmf";
|
||||
paths = cfg.qemu.ovmf.packages;
|
||||
};
|
||||
in
|
||||
''
|
||||
ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
''
|
||||
)}
|
||||
# Symlink to OVMF firmware code and variable template images distributed with QEMU
|
||||
cp -sfv $(
|
||||
${pkgs.jq}/bin/jq -rs \
|
||||
'[.[] | .mapping.executable.filename, .mapping."nvram-template".filename] | unique | .[]' \
|
||||
${cfg.qemu.package}/share/qemu/firmware/* \
|
||||
) /run/${dirName}/nix-ovmf
|
||||
|
||||
# Symlink hooks to /var/lib/libvirt
|
||||
${concatStringsSep "\n" (
|
||||
|
|
@ -620,7 +603,7 @@ in
|
|||
in
|
||||
[
|
||||
"L+ /var/lib/qemu/vhost-user - - - - ${vhostUserCollection}/share/qemu/vhost-user"
|
||||
"L+ /var/lib/qemu/firmware - - - - ${cfg.qemu.package}/share/qemu/firmware"
|
||||
"L+ /var/lib/qemu/firmware - - - - ${qemuOvmfMetadata}"
|
||||
];
|
||||
|
||||
security.polkit = {
|
||||
|
|
|
|||
|
|
@ -509,13 +509,25 @@ in
|
|||
|
||||
boot.isContainer = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
default = config.boot.isNspawnContainer;
|
||||
defaultText = "config.boot.isNspawnContainer";
|
||||
description = ''
|
||||
Whether this NixOS machine is a lightweight container running
|
||||
in another NixOS system.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.isNspawnContainer = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether the machine is running in an nspawn container. This
|
||||
option is added because [](#opt-boot.isContainer) is heavily used
|
||||
for non-nspawn environments as well, hence nspawn-specific settings
|
||||
are guarded by this option.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.enableContainers = mkOption {
|
||||
type = types.bool;
|
||||
default = config.containers != { };
|
||||
|
|
@ -558,7 +570,7 @@ in
|
|||
{ inherit (host.pkgs.stdenv) hostPlatform; }
|
||||
else
|
||||
{ localSystem = host.pkgs.stdenv.hostPlatform; };
|
||||
boot.isContainer = true;
|
||||
boot.isNspawnContainer = true;
|
||||
networking.hostName = mkDefault name;
|
||||
networking.useDHCP = false;
|
||||
assertions = [
|
||||
|
|
|
|||
|
|
@ -750,6 +750,7 @@ in
|
|||
iosched = runTest ./iosched.nix;
|
||||
ipget = runTest ./ipget.nix;
|
||||
ipv6 = runTest ./ipv6.nix;
|
||||
irqbalance = runTest ./irqbalance.nix;
|
||||
iscsi-multipath-root = runTest ./iscsi-multipath-root.nix;
|
||||
iscsi-root = runTest ./iscsi-root.nix;
|
||||
isolate = runTest ./isolate.nix;
|
||||
|
|
|
|||
29
nixos/tests/irqbalance.nix
Normal file
29
nixos/tests/irqbalance.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "irqbalance";
|
||||
meta.maintainers = with lib.maintainers; [ h7x4 ];
|
||||
|
||||
nodes.machine =
|
||||
{ config, ... }:
|
||||
{
|
||||
virtualisation.cores = 2;
|
||||
services.irqbalance.enable = true;
|
||||
|
||||
systemd.services.irqbalance.serviceConfig.ExecStart = [
|
||||
""
|
||||
"${lib.getExe config.services.irqbalance.package} --journal --debug"
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("irqbalance.service")
|
||||
|
||||
machine.wait_until_succeeds("journalctl -u irqbalance.service --grep='Package 0'")
|
||||
|
||||
unmanaged_irq_count = machine.succeed("journalctl -u irqbalance.service -o cat --grep 'affinity is now unmanaged' | sort -u | wc -l")
|
||||
|
||||
# The number of unmanaged IRQs is not entirely stable, but there is likely something
|
||||
# wrong if any more that 2 queues are unmanaged
|
||||
assert int(unmanaged_irq_count) <= 2
|
||||
'';
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ let
|
|||
{ config, ... }:
|
||||
{
|
||||
# We re-use the NixOS container option ...
|
||||
boot.isContainer = true;
|
||||
boot.isNspawnContainer = true;
|
||||
# ... and revert unwanted defaults
|
||||
networking.useHostResolvConf = false;
|
||||
|
||||
|
|
@ -98,11 +98,6 @@ in
|
|||
serviceConfig.Environment = [
|
||||
# Disable tmpfs for /tmp
|
||||
"SYSTEMD_NSPAWN_TMPFS_TMP=0"
|
||||
|
||||
# force unified cgroup delegation, which would be the default
|
||||
# if systemd could check the capabilities of the installed systemd.
|
||||
# see also: https://github.com/NixOS/nixpkgs/pull/198526
|
||||
"SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=1"
|
||||
];
|
||||
overrideStrategy = "asDropin";
|
||||
};
|
||||
|
|
@ -152,7 +147,7 @@ in
|
|||
|
||||
# Test if systemd-nspawn provides a working environment for nix to build derivations
|
||||
# https://nixos.org/guides/nix-pills/07-working-derivation
|
||||
machine.succeed('systemd-run --pty --wait -M ${containerName} /run/current-system/sw/bin/nix-instantiate --expr \'derivation { name = "myname"; builder = "/bin/sh"; args = [ "-c" "echo foo > $out" ]; system = "${pkgs.system}"; }\' --add-root /tmp/drv')
|
||||
machine.succeed('systemd-run --pty --wait -M ${containerName} /run/current-system/sw/bin/nix-instantiate --expr \'derivation { name = "myname"; builder = "/bin/sh"; args = [ "-c" "echo foo > $out" ]; system = "${pkgs.stdenv.hostPlatform.system}"; }\' --add-root /tmp/drv')
|
||||
machine.succeed('systemd-run --pty --wait -M ${containerName} /run/current-system/sw/bin/nix-store --option substitute false --realize /tmp/drv')
|
||||
|
||||
# Test nss_mymachines without nscd
|
||||
|
|
|
|||
|
|
@ -501,6 +501,8 @@ The `meta` attribute set should always be placed last in the derivativion and an
|
|||
* `meta.license` must be set and match the upstream license.
|
||||
* If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
|
||||
* If in doubt, try to contact the upstream developers for clarification.
|
||||
* `meta.sourceProvenance` must be set if the package is not built from source.
|
||||
* If you are repackaging a `.deb`, `.rpm`, `.whl`, or any other format provided by your upstream, this should almost always be set to `lib.sourceTypes.binaryNativeCode`.
|
||||
* `meta.mainProgram` must be set to the name of the executable which facilitates the primary function or purpose of the package, if there is such an executable in `$bin/bin/` (or `$out/bin/`, if there is no `"bin"` output).
|
||||
* Packages that only have a single executable in the applicable directory above should set `meta.mainProgram`.
|
||||
For example, the package `ripgrep` only has a single executable `rg` under `$out/bin/`, so `ripgrep.meta.mainProgram` is set to `"rg"`.
|
||||
|
|
|
|||
|
|
@ -49,13 +49,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clementine";
|
||||
version = "1.4.1-55-g03726250a";
|
||||
version = "1.4.1-58-gbae968a2f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clementine-player";
|
||||
repo = "Clementine";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tfXZH3E9VZUVnGbKYIWln76fJNwDvc+H4IGDL5U+3pI=";
|
||||
hash = "sha256-Ni+nbi0bADIPo9rPtt06loJ3MNU+y9bs1EZSenLfJSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3052,6 +3052,19 @@ final: prev: {
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
codecompanion-lualine-nvim = buildVimPlugin {
|
||||
pname = "codecompanion-lualine.nvim";
|
||||
version = "2025-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "franco-ruggeri";
|
||||
repo = "codecompanion-lualine.nvim";
|
||||
rev = "b264433444715bf07ee9f7d5015086b927ccf7f1";
|
||||
sha256 = "1s7rr1jwgfdr6gnf26cv9pws3jkhgblrpq48yryvfyd3wc8qii93";
|
||||
};
|
||||
meta.homepage = "https://github.com/franco-ruggeri/codecompanion-lualine.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
codecompanion-nvim = buildVimPlugin {
|
||||
pname = "codecompanion.nvim";
|
||||
version = "2025-10-02";
|
||||
|
|
@ -3065,6 +3078,19 @@ final: prev: {
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
codecompanion-spinner-nvim = buildVimPlugin {
|
||||
pname = "codecompanion-spinner.nvim";
|
||||
version = "2025-09-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "franco-ruggeri";
|
||||
repo = "codecompanion-spinner.nvim";
|
||||
rev = "c1fa2a84ea1aed687aaed60df65e347c280f4f22";
|
||||
sha256 = "05cyf6wnzfj7jdyd2ppfs2r5i3mld2h4lwsfjm5qkn9lc70samps";
|
||||
};
|
||||
meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
codewindow-nvim = buildVimPlugin {
|
||||
pname = "codewindow.nvim";
|
||||
version = "2025-05-22";
|
||||
|
|
|
|||
|
|
@ -233,6 +233,8 @@ https://github.com/iamcco/coc-tailwindcss/,,
|
|||
https://github.com/neoclide/coc.nvim/,release,
|
||||
https://github.com/manicmaniac/coconut.vim/,HEAD,
|
||||
https://github.com/ravitemer/codecompanion-history.nvim/,HEAD,
|
||||
https://github.com/franco-ruggeri/codecompanion-lualine.nvim/,HEAD,
|
||||
https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,HEAD,
|
||||
https://github.com/olimorris/codecompanion.nvim/,HEAD,
|
||||
https://github.com/gorbit99/codewindow.nvim/,HEAD,
|
||||
https://github.com/metakirby5/codi.vim/,,
|
||||
|
|
|
|||
|
|
@ -2348,8 +2348,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "Ionide-fsharp";
|
||||
publisher = "Ionide";
|
||||
version = "7.27.1";
|
||||
hash = "sha256-ur+/ZSewWBzLxkHVXHQJg4KzkC3Mi3E9fE3/wL6sD8g=";
|
||||
version = "7.28.0";
|
||||
hash = "sha256-d6AucdoKeVAobTj1cbELce2vcXsZW5TX74mkcnHPtkA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
|
||||
|
|
|
|||
|
|
@ -99,13 +99,13 @@
|
|||
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-Wv8B28h6idsni7peoKiQ7+5Uo5njw7zeNSRNq3ati8c=",
|
||||
"hash": "sha256-+Kc0fXO6E4U9NdRjI1VGM7RMuBVvP/5GeU6jpEjLgr0=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.30.0",
|
||||
"rev": "v1.31.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tS+LKp4n1SjCmdrJ0kbxrcUYR53NCsODD9Yiq8B8hok="
|
||||
"vendorHash": "sha256-H1RjKU852ovkrdJrhvedbQS835hN0atDNDCtAcGJMBo="
|
||||
},
|
||||
"avi": {
|
||||
"hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
|
||||
|
|
@ -270,13 +270,13 @@
|
|||
"vendorHash": "sha256-O/MSx6iZ0SkCsMLKMr1cetkPaePoVq62UTOhiPTzF6g="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-nIceDw766f32yn8qfgY89OYcOtwUc3650x0NO4XUrmk=",
|
||||
"hash": "sha256-Lc9bC1dM4wNe+ZN2EYFRYfoZosocBEOI9SHvxJIOQCY=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v5.10.1",
|
||||
"rev": "v5.11.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-U2lC4d3MSkD8W4qJtrYlnHFflG0xgyPtL6OnjHwxV2U="
|
||||
"vendorHash": "sha256-N1vG3U7gxEbVbBax7g6AfHr2Aj1ypVefsEIuvZyLPYQ="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "formula1";
|
||||
namespace = "plugin.video.formula1";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-oo5mS99fwMjMi8lUdiGNMOghVLd4dLr4SkoDzObufV4=";
|
||||
sha256 = "sha256-yz9SB0hiw5JKURGNvAazxazL+bMtfziNXlOLLoGUPOU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ in
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.25";
|
||||
version = "3.25.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-elastic-beanstalk-cli";
|
||||
tag = version;
|
||||
hash = "sha256-RqUVG4aIZDAVuKcT41ODKkyEidmschcFaY24P1CjosU=";
|
||||
hash = "sha256-objIzpYMyuFjEc85H9dXhQez3MZfNu3lWSWm6+E2iJs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoreconfHook,
|
||||
fetchurl,
|
||||
libjack2,
|
||||
gtk2,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitmeter";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libjack2
|
||||
gtk2
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
|
||||
sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://devel.tlrmx.org/audio/bitmeter/";
|
||||
description = "Also known as jack bitscope. Useful to detect denormals";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "bitmeter";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.312";
|
||||
version = "0.6.314";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = "brev-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IeX+SvNcz0S/gdInVM8fwA7TEDTMoJO8rSwCqK2rKoE=";
|
||||
sha256 = "sha256-/EzRKmpfQndZFL3c82u0w0V8EH/TFptU3zkHPvsIM6s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7MXZVdpsPHfHk8hNZM2CT0FW8gTKt3oUap7CTVYMNfI=";
|
||||
vendorHash = "sha256-CzGuEbq4I1ygYQsoyyXC6gDBMLg21dKQTKkrbwpAR2U=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -37,7 +37,10 @@ buildRubyGem rec {
|
|||
homepage = "https://bundler.io";
|
||||
changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ anthonyroussel ];
|
||||
maintainers = with lib.maintainers; [
|
||||
anthonyroussel
|
||||
guylamar2006
|
||||
];
|
||||
mainProgram = "bundler";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
wayland-scanner,
|
||||
scdoc,
|
||||
makeWrapper,
|
||||
wlroots_0_18,
|
||||
wlroots_0_19,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
pixman,
|
||||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cage";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cage-kiosk";
|
||||
repo = "cage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g=";
|
||||
hash = "sha256-P9MhIl2YIE2hwT5Yr0Cpes5S12evb0aj9oOPLeehkw0=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
wlroots_0_18
|
||||
wlroots_0_19
|
||||
wayland
|
||||
wayland-protocols
|
||||
pixman
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libX11
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString wlroots_0_18.enableXWayland ''
|
||||
postFixup = lib.optionalString wlroots_0_19.enableXWayland ''
|
||||
wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ciel";
|
||||
version = "3.9.8";
|
||||
version = "3.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "ciel-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-swYIy+e+N4MVmNXSttLUWKmG2xj9TA9sWwCrIdo+gIA=";
|
||||
hash = "sha256-WpP3rwiGXA5oeBZ3wQwSXPmRT5+zUOm2d1HTEdvnHFc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RBtERA9CkTdW++ikHkV1X11hg49IrvVFIdTi1qQp+ok=";
|
||||
cargoHash = "sha256-zby+QrzX7M714y50j2ZyfXYRhWeAwZbbHZF8KsjS/Hc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
4927
pkgs/by-name/co/colmap/openimageio.patch
Normal file
4927
pkgs/by-name/co/colmap/openimageio.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,19 +1,22 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
boost,
|
||||
ceres-solver,
|
||||
eigen,
|
||||
freeimage,
|
||||
openimageio,
|
||||
glog,
|
||||
libGLU,
|
||||
glew,
|
||||
qtbase,
|
||||
flann,
|
||||
cgal,
|
||||
gmp,
|
||||
mpfr,
|
||||
poselib,
|
||||
lz4,
|
||||
autoAddDriverRunpath,
|
||||
config,
|
||||
stdenv,
|
||||
|
|
@ -22,71 +25,115 @@
|
|||
cudaSupport ? config.cudaSupport,
|
||||
cudaCapabilities ? cudaPackages.flags.cudaCapabilities,
|
||||
cudaPackages,
|
||||
faiss,
|
||||
sqlite,
|
||||
llvmPackages,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
assert cudaSupport -> cudaPackages != { };
|
||||
|
||||
let
|
||||
boost_static = boost.override { enableStatic = true; };
|
||||
stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
|
||||
|
||||
depsAlsoForPycolmap = [
|
||||
boost
|
||||
eigen
|
||||
ceres-solver
|
||||
openimageio
|
||||
glog
|
||||
libGLU
|
||||
glew
|
||||
cgal
|
||||
poselib
|
||||
faiss
|
||||
sqlite
|
||||
gmp
|
||||
mpfr
|
||||
lz4
|
||||
qt5.qtbase
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudatoolkit
|
||||
cudaPackages.cuda_cudart.static
|
||||
]
|
||||
++ lib.optional stdenv'.cc.isClang llvmPackages.openmp;
|
||||
|
||||
# TODO: migrate to redist packages
|
||||
inherit (cudaPackages) cudatoolkit;
|
||||
in
|
||||
stdenv'.mkDerivation rec {
|
||||
version = "3.9.1";
|
||||
version = "unstable-3.12.5-openimageio";
|
||||
pname = "colmap";
|
||||
src = fetchFromGitHub {
|
||||
owner = "colmap";
|
||||
repo = "colmap";
|
||||
rev = version;
|
||||
hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8=";
|
||||
rev = "f8edccaa36909713b9d3930e1ca65cb364a38b26";
|
||||
hash = "sha256-0lD7ywM48ODe11u9D3XSk9btqQ4gs/APBFf9IyiXe6g=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals cudaSupport [
|
||||
(lib.cmakeBool "CUDA_ENABLED" true)
|
||||
# TODO: remove this when https://github.com/colmap/colmap/pull/3459 is in a release
|
||||
# This was produced with:
|
||||
# git diff f8edccaa36909713b9d3930e1ca65cb364a38b26 e40c0730020938587c9d4eb7634cbff93cbc2f81
|
||||
patches = [ ./openimageio.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "DOWNLOAD_ENABLED" false)
|
||||
(lib.cmakeBool "UNINSTALL_ENABLED" false)
|
||||
(lib.cmakeBool "FETCH_POSELIB" false)
|
||||
(lib.cmakeBool "FETCH_FAISS" false)
|
||||
(lib.cmakeBool "TESTS_ENABLED" true)
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
(lib.cmakeBool "CUDA_ENABLED" cudaSupport)
|
||||
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
|
||||
lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDots cudaCapabilities)
|
||||
))
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_static
|
||||
boost
|
||||
ceres-solver
|
||||
eigen
|
||||
freeimage
|
||||
openimageio
|
||||
glog
|
||||
libGLU
|
||||
glew
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
flann
|
||||
lz4
|
||||
cgal
|
||||
gmp
|
||||
mpfr
|
||||
xorg.libSM
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudatoolkit
|
||||
cudaPackages.cuda_cudart.static
|
||||
];
|
||||
++ depsAlsoForPycolmap;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt5.wrapQtAppsHook
|
||||
gtest
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
autoAddDriverRunpath
|
||||
];
|
||||
|
||||
passthru.depsAlsoForPycolmap = depsAlsoForPycolmap;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structure-From-Motion and Multi-View Stereo pipeline";
|
||||
longDescription = ''
|
||||
COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline
|
||||
with a graphical and command-line interface.
|
||||
'';
|
||||
mainProgram = "colmap";
|
||||
homepage = "https://colmap.github.io/index.html";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lebastr ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
lebastr
|
||||
usertam
|
||||
chpatrick
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "confluent-cli";
|
||||
version = "4.38.0";
|
||||
version = "4.39.1";
|
||||
|
||||
# To get the latest version:
|
||||
# curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
|
||||
|
|
@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchurl {
|
||||
url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-NetkaNbUCbNyajtwLUVW5KpFhkyngYoWxJJxDK42QCQ=";
|
||||
aarch64-linux = "sha256-xzMpG7BknzOdFoUZnnlCjsCxuFCkJMzGi+yH4+0QvtQ=";
|
||||
x86_64-darwin = "sha256-UP5+tnLuYore8t/qi2d3iLf47OMxwF51mfJzgfLnK7s=";
|
||||
aarch64-darwin = "sha256-IV0zEL4ApRZug0C0A0jQm9Vp78z/kk8MwcaXNOE3Agk=";
|
||||
x86_64-linux = "sha256-8KhsFMQXoIPp1oZR5Q6u1yNoNvrCulbWq/rb6pMLhTU=";
|
||||
aarch64-linux = "sha256-gLsNOAd9xzSbmenXhUN9nDGyFObtB2IG2z+OxHjrMSM=";
|
||||
x86_64-darwin = "sha256-t0PcZd3n2Bayct4/h/JtCJwyKYjtMaXmOvvrlJ6LzGc=";
|
||||
aarch64-darwin = "sha256-sSJd87dzsYLCdpP3tw4cMTyhnxmku70g1rCqhxGImGA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
container-structure-test,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
version = "1.20.0";
|
||||
version = "1.21.1";
|
||||
pname = "container-structure-test";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "container-structure-test";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7/RTWpj/W+W4mhQL2HX/6KuMbDFsjh9GGRCGZZ9sNHQ=";
|
||||
sha256 = "sha256-B2/fe3hfP2UCxxxHAdvxdjT+npB6u4OrxO7XyBDZuqw=";
|
||||
};
|
||||
vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k=";
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-reader";
|
||||
version = "0-unstable-2025-09-21";
|
||||
version = "0-unstable-2025-10-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-reader";
|
||||
rev = "a5b1b5c0583deacafde19de4ee936cdd126b25df";
|
||||
hash = "sha256-yXY1t67ws2PvK7IubNHT0jp+xnfDAdyK5H7LCMGcMQI=";
|
||||
rev = "2fa9595999cb654b5e6bb688035ea9ec0717b8db";
|
||||
hash = "sha256-7/nes4zMcvTtGWFABikcA1NM+LxWrin0POE76BbYgKE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cyme";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1a+8e9sVij9o1G/XlSf7tTECZOHTwqO9rORcYsVjp6Y=";
|
||||
hash = "sha256-OXwph3dV6gUAanlwzEL0CRjSOfqEvYDXdhs60MkMfcE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HMPjsaHrd3UdazPiAyrHs9Emh0XdjQ/qkaZm6kxOyq4=";
|
||||
cargoHash = "sha256-THNcrBD5GBorVsuFZ/XN91c1Zlc5NAbTnjWf7/td74o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-dmUNKhVEz5CpEVzKcDYPSKtYfOMXyXpzGJDJEebwLqU=";
|
||||
sha256 = "sha256-Fow1dIRugYjz0S4lxeW33k2Lt/+xS/HXBsXF5SvX4wU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "darklua";
|
||||
version = "0.17.1";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaofvoices";
|
||||
repo = "darklua";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jcq6zZ0KaDHXkIapPd38BR+ikVQAha3Bq5HuPEnKV0o=";
|
||||
hash = "sha256-RNm2d0VeLgHEawvZQYUcXesNwLc2m9Q6R6kNZhZDslg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yF+h7IiirvLw3WqqyCmcXbRa+fnsOpHrrmxkwl4lIG4=";
|
||||
cargoHash = "sha256-WfXIMuqO1KTiWeqMOnsylNlJKv1cKNZvp8qhalPlcnc=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "bbuchfink";
|
||||
repo = "diamond";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w6+lSc2YZ1PwPj3p6ieI/yTkoiSLWH2Za863n4BTClo=";
|
||||
sha256 = "sha256-nTMfWpXTsdcas0VwZzyU6ix4reNQX7EoyYRZ1wUN2pM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "do-agent";
|
||||
version = "3.18.2";
|
||||
version = "3.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalocean";
|
||||
repo = "do-agent";
|
||||
rev = version;
|
||||
sha256 = "sha256-+UoQhJkwxazfe6LwqNF4zn4jnc3ZQia0ZOL3GX27r3w=";
|
||||
sha256 = "sha256-YYckleFnWt7Wttmkb20g5fs9DOoL9VNDmOWdP3qNstU=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-credential-helpers";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "docker-credential-helpers";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5KrBiihpWY04PjI9M7NRS5fRu+ochzqRLvX+ZBj/wq8=";
|
||||
sha256 = "sha256-cDpo3hw0yP9QnFvlGUIpjfMzni57KNkY+S+SIYOKBKQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "doh-proxy-rust";
|
||||
version = "0.9.12";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "doh-proxy";
|
||||
hash = "sha256-Q+SjUB9XQlT+r1bjKJooqJ095yp5PMqMAQhoo+kp238=";
|
||||
hash = "sha256-uqFqDaq5a9wW46pTLfVN+5WuyYGvm3ZYQCtC6jkG1kg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XEHeGduKsIFW0tXto8DcghzNYMGE/zkWY2cTg8ZcPcU=";
|
||||
cargoHash = "sha256-eYhax+TM3N75qj0tyHioUeUt159ZfkuFFIZK1jUbojw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ buildGoModule rec {
|
|||
homepage = "https://fetchit.readthedocs.io";
|
||||
changelog = "https://github.com/containers/fetchit/releases/tag/${src.rev}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ guylamar2006 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
|
||||
homepage = "https://www.fluidsynth.org";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
lovek323
|
||||
guylamar2006
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "fluidsynth";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo-runner";
|
||||
version = "11.1.1";
|
||||
version = "11.1.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gItynq665YLHdSXcUrtgIp282t/TBjThDgAYyVYesx0=";
|
||||
hash = "sha256-/rkBrG8hRn52M1ybjbWtSDFYsJ4fHzw9qAoc5325g9A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U=";
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.61.0";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XDYJ+R/cQuzSfJyOYHKbbd+jrmAzumDs/wp5aoYEr80=";
|
||||
hash = "sha256-WUQW3I/dFO510v5JzShydMO3N8QYrKqDAJUzDdUZg0U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-700KyKqrtZ9HuMBZVUbazrGyqzLE4s0ZyrWqLc8Y5WY=";
|
||||
cargoHash = "sha256-8V++82edFMJ8/B1aLAK2MhW2g1usg3eBt60SIUuKong=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gl3w";
|
||||
version = "0-unstable-2025-08-02";
|
||||
version = "0-unstable-2025-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skaslev";
|
||||
repo = "gl3w";
|
||||
rev = "96ebe5eded05aa699e8feb25f7bbc9f1c821a207";
|
||||
hash = "sha256-Juv1LI8bw/dU/SKmtoOqu8TrCf68uqkpesQ1leRox+E=";
|
||||
rev = "97a85e153d7f43c8d2de8b776a33721e238ddb96";
|
||||
hash = "sha256-cpB/8qo9dDyKPxD6mRriKGZf7N7ei1oL5JtM4jgXsAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGo125Module rec {
|
||||
pname = "go-camo";
|
||||
version = "2.6.5";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cactus";
|
||||
repo = "go-camo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+EHJIohHSWg12Tmn6hu1XUSVRyYWu3aFI7MF7+PnfFg=";
|
||||
hash = "sha256-CuEnJcbLcehmAj+TCx3VbRLWhYhbzYaXfV6qweuoooA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rKdBAu0tNsxw7I66qjZhtrA2hs1qpBtOSuzq34paziw=";
|
||||
vendorHash = "sha256-3Yl0x02KcYG5+FVuON54NlO+ehvgvywep4Hu9sQ6nN4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-MjQufBtGAPgN80cdpGrugBLT4URdXqG+H7cSibB8xzU=";
|
||||
sha256 = "sha256-rrThgx1WAR5+BvM5PE4XNAx8yg/XupB2q43AYkdZ9/A=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goose";
|
||||
version = "3.25.0";
|
||||
version = "3.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pressly";
|
||||
repo = "goose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ouyvxlnJQIMqRZt4nsR01+9p227FGBlHoCMAq6Ufh7A=";
|
||||
hash = "sha256-3F9dnlu7fJ08Pcr64q6V3oRkDpm+N0Ot8drRp9m5YhU=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "h2";
|
||||
version = "2.3.232";
|
||||
version = "2.4.240";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -20,7 +20,7 @@ maven.buildMavenPackage rec {
|
|||
owner = "h2database";
|
||||
repo = "h2database";
|
||||
tag = "version-${version}";
|
||||
hash = "sha256-voqQ4JqYkHRxVdxMGsHmKirQXMP7s44rTXeasWWW2Jw=";
|
||||
hash = "sha256-Cy6MoumJBhhcYT6dCHWeOfmhjGRkdNvSONdIiZaf6uU=";
|
||||
};
|
||||
|
||||
mvnParameters = "-f h2/pom.xml";
|
||||
|
|
|
|||
29
pkgs/by-name/hx/hx-lsp/package.nix
Normal file
29
pkgs/by-name/hx/hx-lsp/package.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hx-lsp";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erasin";
|
||||
repo = "hx-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wTilbEK3BZehklAd+3SS2tW/vc8WEeMPUsYdDVRC/Ho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dcGInrfWftClvzrxYZvrazm+IWWRfOZmxDJPKwu7GwM=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
meta = {
|
||||
description = "LSP tool providing custom code snippets and Code Actions for Helix Editor";
|
||||
homepage = "https://github.com/erasin/hx-lsp";
|
||||
changelog = "https://github.com/erasin/hx-lsp/releases/tag/${finalAttrs.version}";
|
||||
mainProgram = "hx-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hadziqM ];
|
||||
};
|
||||
})
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "liske";
|
||||
repo = "ifstate";
|
||||
tag = version;
|
||||
hash = "sha256-QxjziDlkbTxAVd3qA8u4+JT8NWJxBMVAp7G5Zma9d10=";
|
||||
hash = "sha256-ghl2EVSum8KOh9wpFkrLGeIii2cj0a2+yOa48/JwFRk=";
|
||||
};
|
||||
docs = stdenv.mkDerivation {
|
||||
pname = "ifstate-docs";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immich-cli";
|
||||
version = "2.2.95";
|
||||
version = "2.2.96";
|
||||
inherit (immich) src pnpmDeps;
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
esbuild' = buildPackages.esbuild.override {
|
||||
buildGoModule =
|
||||
|
|
@ -108,7 +108,7 @@ let
|
|||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-N9/vDOZzx4BQvWQBPE6ANCJ9RhWmytw8j1BgDU6ob+g=";
|
||||
hash = "sha256-lpFUjjS7Q2F/Uhog1NdJ8vaVIGjmZM9ZWxW5d0zoQsc=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
libcap_ng,
|
||||
enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
|
||||
systemdMinimal,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -48,6 +49,8 @@ stdenv.mkDerivation rec {
|
|||
--replace-fail ' $IRQBALANCE_ARGS' ""
|
||||
'';
|
||||
|
||||
passthru.tests.nixos = nixosTests.irqbalance;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Irqbalance/irqbalance";
|
||||
changelog = lib.strings.optionalString (
|
||||
|
|
@ -57,5 +60,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ moni ];
|
||||
mainProgram = "irqbalance";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "jawiki-all-titles-in-ns0";
|
||||
version = "0-unstable-2025-09-01";
|
||||
version = "0-unstable-2025-10-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musjj";
|
||||
repo = "jawiki-archive";
|
||||
rev = "bcb0ee245aee3ba7769ceec6caf9696c8bae1624";
|
||||
hash = "sha256-Vb+8XE9FFEJfp6++WWr5fT6oWkF8eUtvYLz9ouRHWHA=";
|
||||
rev = "81e6379ffeb292a5ff6db4302347d80ba053fb1e";
|
||||
hash = "sha256-jbfJ+Vf7jkCjjePbwHP0BTFA/J1NcIQkhFK1jqD4bPE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.9.1";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "konstructio";
|
||||
repo = "kubefirst";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-llWJTBI0MBVDG2zgersQM7F5RM5ZhpbkF67QxcSeAU0=";
|
||||
hash = "sha256-/DmYPxnqAoCPXjkaYTj1iYliNfqyqrDrChU6fCbbCkk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libsodium,
|
||||
ncurses,
|
||||
|
|
@ -15,22 +15,23 @@
|
|||
let
|
||||
buildToxAV = !stdenv.hostPlatform.isAarch32;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtoxcore";
|
||||
version = "0.2.20";
|
||||
version = "0.2.21";
|
||||
|
||||
src =
|
||||
# We need the prepared sources tarball.
|
||||
fetchurl {
|
||||
url = "https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz";
|
||||
hash = "sha256-qciaja6nRdU+XXjnqsuZx7R5LEQApaaccSOPRdYWT0w=";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "c-toxcore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0lWUKW09JvHa0QDX7v4n5B2ckQrKU9TDkjKegDLTIUw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDHT_BOOTSTRAP=ON"
|
||||
"-DBOOTSTRAP_DAEMON=ON"
|
||||
(lib.cmakeBool "DHT_BOOTSTRAP" true)
|
||||
(lib.cmakeBool "BOOTSTRAP_DAEMON" true)
|
||||
]
|
||||
++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
|
||||
++ lib.optional buildToxAV (lib.cmakeBool "MUST_BUILD_TOXAV" true);
|
||||
|
||||
buildInputs = [
|
||||
libsodium
|
||||
|
|
@ -64,7 +65,8 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
peterhoeg
|
||||
zatm8
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "Lighthouse";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShayBox";
|
||||
repo = "Lighthouse";
|
||||
rev = version;
|
||||
hash = "sha256-FiS+jB5l5xtFIVISA6+K/jbyJZFPwLvy7G+dA+78kZU=";
|
||||
hash = "sha256-GgKY7HDu6e/hpYNOZdcjLvaNfQOZMl+H6CmKTbd1LNE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5IrY1ohG5oJF+LvrcHrHYT2nslICQPZptJYrrwMEmwQ=";
|
||||
cargoHash = "sha256-oC5HA6diRlRWoeeQQgWR32yxZ2BLyFmKbaSkFBLdrXc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -75,13 +75,13 @@ let
|
|||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "6479";
|
||||
version = "6670";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-wgfYjG9m/ainCI85FlCb12Dz01R+pZfFeDX613M4xpQ=";
|
||||
hash = "sha256-B4Qog7RLcre8KB9N+aVUZSJwlkHIIcCxR8jySoxbXoQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "4.9.3";
|
||||
version = "4.9.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
|
||||
sha256 = "sha256-y4ktyf/ydkL20k8ifgQfHJqZ2NhhNzPM0qWgEjbnZnI=";
|
||||
sha256 = "sha256-zsC8hMXHRi8xJro/IhihGzw8Nx8loaMh4Y8xlmtTyMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "museeks";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martpie/museeks/releases/download/${finalAttrs.version}/Museeks_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-CT/P6tVgS7KD401ZktJBz1rk9CAz6gCm5zefud+prqQ=";
|
||||
hash = "sha256-bji49ncJriDGrYoC0VYfblcGPDU66Ep+c/z9FNEXnkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
installShellFiles,
|
||||
pkg-config,
|
||||
glib,
|
||||
pcre,
|
||||
pcre2,
|
||||
util-linux,
|
||||
libsysprof-capture,
|
||||
|
|
@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib
|
||||
pcre
|
||||
pcre2
|
||||
util-linux
|
||||
libmysqlclient
|
||||
|
|
|
|||
|
|
@ -40,7 +40,10 @@ let
|
|||
homepage = "https://github.com/kalbasit/ncps";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "ncps";
|
||||
maintainers = [ lib.maintainers.kalbasit ];
|
||||
maintainers = with lib.maintainers; [
|
||||
kalbasit
|
||||
aciceri
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.31.2";
|
||||
version = "1.31.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RzLnhnnEDUIlRq89/CmhH7+o4Mt6GiXbGXDObSIk4tY=";
|
||||
hash = "sha256-hUltJCehmlIDRLdJNGC/Oyjl6rnQHzjxSjrQEaDCdAo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@ use Fcntl ':flock';
|
|||
use Getopt::Long qw(:config gnu_getopt no_bundling);
|
||||
use Cwd 'abs_path';
|
||||
use Time::HiRes;
|
||||
use IPC::Run 'run';
|
||||
|
||||
# Version::Compare et al. don't work because they do the wrong thing on e.g.
|
||||
# 25.11pre-git.
|
||||
my $nixpkgsLib = "@lib@";
|
||||
|
||||
my $nsenter = "@util-linux@/bin/nsenter";
|
||||
my $su = "@su@";
|
||||
|
|
@ -171,7 +176,7 @@ sub writeNixOSConfig {
|
|||
my $nixosConfig = <<EOF;
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{ boot.isContainer = true;
|
||||
{ boot.isNspawnContainer = true;
|
||||
networking.hostName = lib.mkDefault "$containerName";
|
||||
networking.useDHCP = false;
|
||||
$localExtraConfig
|
||||
|
|
@ -368,6 +373,35 @@ sub runInContainer {
|
|||
die "cannot run ‘nsenter’: $!\n";
|
||||
}
|
||||
|
||||
sub evalAttribute {
|
||||
my ($attribute, $nixosF, $nixosConfigF, $extraArgs) = @_;
|
||||
run [
|
||||
"nix-instantiate", $nixosF, "-I", "nixos-config=$nixosConfigF", "-A", $attribute, "--eval"
|
||||
], ">", \my $result;
|
||||
chomp $result;
|
||||
$result =~ s/^"([^"]+)"$/$1/g;
|
||||
return $result;
|
||||
}
|
||||
|
||||
sub evalAttributeFlake {
|
||||
my ($attribute) = @_;
|
||||
run [
|
||||
"nix", "eval", "$flake#nixosConfigurations.\"$flakeAttr\".$attribute"
|
||||
], ">", \my $result;
|
||||
chomp $result;
|
||||
$result =~ s/^"([^"]+)"$/$1/g;
|
||||
return $result;
|
||||
}
|
||||
|
||||
sub isAtLeast2511 {
|
||||
my ($version) = @_;
|
||||
run [
|
||||
"nix-instantiate", "--eval", "-E", "with import $nixpkgsLib; versionAtLeast \"$version\" \"25.11pre-git\""
|
||||
], ">", \my $result;
|
||||
chomp $result;
|
||||
return $result eq "true";
|
||||
}
|
||||
|
||||
# Remove a directory while recursively unmounting all mounted filesystems within
|
||||
# that directory and unmounting/removing that directory afterwards as well.
|
||||
#
|
||||
|
|
@ -426,6 +460,10 @@ elsif ($action eq "update") {
|
|||
}
|
||||
|
||||
if (defined $flake) {
|
||||
my $nixpkgsVersion = evalAttributeFlake "lib.version";
|
||||
if (isAtLeast2511($nixpkgsVersion) && evalAttributeFlake("config.boot.isNspawnContainer") ne "true") {
|
||||
die "$0: on 25.11 and newer, containers require boot.isNspawnContainer=true. Please set this in $flake";
|
||||
}
|
||||
buildFlake();
|
||||
system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
|
||||
or die "$0: failed to set container configuration\n";
|
||||
|
|
@ -441,6 +479,14 @@ elsif ($action eq "update") {
|
|||
}
|
||||
|
||||
my $nixenvF = $nixosPath // "<nixpkgs/nixos>";
|
||||
|
||||
my $nixpkgsVersion = evalAttribute "pkgs.lib.version", $nixenvF, $nixosConfigFile;
|
||||
if (isAtLeast2511($nixpkgsVersion)
|
||||
&& evalAttribute("config.boot.isNspawnContainer", $nixenvF, $nixosConfigFile) ne "true"
|
||||
) {
|
||||
die "$0: on 25.11 and newer, containers require boot.isNspawnContainer=true. Refresh your configuration (or check the 25.11 release notes on how to correctly do that)";
|
||||
}
|
||||
|
||||
system("nix-env", "-p", "$profileDir/system",
|
||||
"-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF,
|
||||
"--set", "-A", "system", @nixFlags) == 0
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
configurationDirectory ? "/etc/nixos-containers",
|
||||
stateDirectory ? "/var/lib/nixos-containers",
|
||||
nixosTests,
|
||||
path,
|
||||
}:
|
||||
replaceVarsWith {
|
||||
name = "nixos-container";
|
||||
|
|
@ -15,8 +16,12 @@ replaceVarsWith {
|
|||
src = ./nixos-container.pl;
|
||||
|
||||
replacements = {
|
||||
perl = perl.withPackages (p: [ p.FileSlurp ]);
|
||||
perl = perl.withPackages (p: [
|
||||
p.FileSlurp
|
||||
p.IPCRun
|
||||
]);
|
||||
su = "${shadow.su}/bin/su";
|
||||
lib = "${path + "/lib"}";
|
||||
|
||||
inherit configurationDirectory stateDirectory util-linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-modprobe";
|
||||
version = "580.82.09";
|
||||
version = "580.95.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = version;
|
||||
hash = "sha256-ZWQfl0hlbJELPRjjPef3AyTUIN/8T0J82i1NM8iYUvY=";
|
||||
hash = "sha256-2guTV77XY8yV9TmwbM17zQGYygv7kgzkX4cyGWqSuV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnum4 ];
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with lib.maintainers; [
|
||||
peterhoeg
|
||||
bertof
|
||||
guylamar2006
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
patches = [ ./provider-path-0_15.patch ];
|
||||
|
||||
passthru = {
|
||||
inherit full plugins withPlugins;
|
||||
inherit plugins;
|
||||
tests = {
|
||||
inherit opentofu_plugins_test;
|
||||
};
|
||||
|
|
@ -73,8 +73,6 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
|
||||
|
||||
opentofu_plugins_test =
|
||||
let
|
||||
mainTf = writeText "main.tf" ''
|
||||
|
|
@ -88,7 +86,7 @@ let
|
|||
|
||||
resource "random_id" "test" {}
|
||||
'';
|
||||
opentofu = package.withPlugins (p: [ p.random ]);
|
||||
opentofu = (pluggable package).withPlugins (p: [ p.random ]);
|
||||
test = runCommand "opentofu-plugin-test" { buildInputs = [ opentofu ]; } ''
|
||||
# make it fail outside of sandbox
|
||||
export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
|
||||
|
|
@ -105,89 +103,95 @@ let
|
|||
"recurseForDerivations"
|
||||
];
|
||||
|
||||
withPlugins =
|
||||
plugins:
|
||||
pluggable =
|
||||
opentofu:
|
||||
let
|
||||
actualPlugins = plugins package.plugins;
|
||||
withPlugins =
|
||||
plugins:
|
||||
let
|
||||
actualPlugins = plugins opentofu.plugins;
|
||||
|
||||
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
|
||||
wrapperInputs = lib.unique (
|
||||
lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))
|
||||
);
|
||||
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
|
||||
wrapperInputs = lib.unique (
|
||||
lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))
|
||||
);
|
||||
|
||||
passthru = {
|
||||
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
|
||||
passthru = {
|
||||
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
|
||||
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
|
||||
|
||||
# Expose wrappers around the override* functions of the terraform
|
||||
# derivation.
|
||||
#
|
||||
# Note that this does not behave as anyone would expect if plugins
|
||||
# are specified. The overrides are not on the user-visible wrapper
|
||||
# derivation but instead on the function application that eventually
|
||||
# generates the wrapper. This means:
|
||||
#
|
||||
# 1. When using overrideAttrs, only `passthru` attributes will
|
||||
# become visible on the wrapper derivation. Other overrides that
|
||||
# modify the derivation *may* still have an effect, but it can be
|
||||
# difficult to follow.
|
||||
#
|
||||
# 2. Other overrides may work if they modify the terraform
|
||||
# derivation, or they may have no effect, depending on what
|
||||
# exactly is being changed.
|
||||
#
|
||||
# 3. Specifying overrides on the wrapper is unsupported.
|
||||
#
|
||||
# See nixpkgs#158620 for details.
|
||||
overrideDerivation = f: (package.overrideDerivation f).withPlugins plugins;
|
||||
overrideAttrs = f: (package.overrideAttrs f).withPlugins plugins;
|
||||
override = x: (package.override x).withPlugins plugins;
|
||||
};
|
||||
# Expose wrappers around the override* functions of the terraform
|
||||
# derivation.
|
||||
#
|
||||
# Note that this does not behave as anyone would expect if plugins
|
||||
# are specified. The overrides are not on the user-visible wrapper
|
||||
# derivation but instead on the function application that eventually
|
||||
# generates the wrapper. This means:
|
||||
#
|
||||
# 1. When using overrideAttrs, only `passthru` attributes will
|
||||
# become visible on the wrapper derivation. Other overrides that
|
||||
# modify the derivation *may* still have an effect, but it can be
|
||||
# difficult to follow.
|
||||
#
|
||||
# 2. Other overrides may work if they modify the terraform
|
||||
# derivation, or they may have no effect, depending on what
|
||||
# exactly is being changed.
|
||||
#
|
||||
# 3. Specifying overrides on the wrapper is unsupported.
|
||||
#
|
||||
# See nixpkgs#158620 for details.
|
||||
overrideDerivation = f: (pluggable (opentofu.overrideDerivation f)).withPlugins plugins;
|
||||
overrideAttrs = f: (pluggable (opentofu.overrideAttrs f)).withPlugins plugins;
|
||||
override = x: (pluggable (opentofu.override x)).withPlugins plugins;
|
||||
};
|
||||
in
|
||||
# Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
|
||||
# of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
|
||||
if actualPlugins == [ ] then
|
||||
opentofu.overrideAttrs (orig: {
|
||||
passthru = orig.passthru // passthru;
|
||||
})
|
||||
else
|
||||
lib.appendToName "with-plugins" (
|
||||
stdenv.mkDerivation {
|
||||
inherit (opentofu) meta pname version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# Expose the passthru set with the override functions
|
||||
# defined above, as well as any passthru values already
|
||||
# set on `terraform` at this point (relevant in case a
|
||||
# user overrides attributes).
|
||||
passthru = opentofu.passthru // passthru;
|
||||
|
||||
buildCommand = ''
|
||||
# Create wrappers for terraform plugins because OpenTofu only
|
||||
# walks inside of a tree of files.
|
||||
# Also replace registry.terraform.io dir with registry.opentofu.org,
|
||||
# so OpenTofu can find the plugins.
|
||||
for providerDir in ${toString actualPlugins}
|
||||
do
|
||||
for file in $(find $providerDir/libexec/terraform-providers -type f)
|
||||
do
|
||||
relFile=''${file#$providerDir/}
|
||||
relFile=''${relFile/registry.terraform.io/registry.opentofu.org}
|
||||
mkdir -p $out/$(dirname $relFile)
|
||||
cat <<WRAPPER > $out/$relFile
|
||||
#!${runtimeShell}
|
||||
exec "$file" "$@"
|
||||
WRAPPER
|
||||
chmod +x $out/$relFile
|
||||
done
|
||||
done
|
||||
|
||||
# Create a wrapper for opentofu to point it to the plugins dir.
|
||||
mkdir -p $out/bin/
|
||||
makeWrapper "${opentofu}/bin/tofu" "$out/bin/tofu" \
|
||||
--set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \
|
||||
--prefix PATH : "${lib.makeBinPath wrapperInputs}"
|
||||
'';
|
||||
}
|
||||
);
|
||||
in
|
||||
# Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
|
||||
# of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
|
||||
if actualPlugins == [ ] then
|
||||
package.overrideAttrs (orig: {
|
||||
passthru = orig.passthru // passthru;
|
||||
})
|
||||
else
|
||||
lib.appendToName "with-plugins" (
|
||||
stdenv.mkDerivation {
|
||||
inherit (package) meta pname version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# Expose the passthru set with the override functions
|
||||
# defined above, as well as any passthru values already
|
||||
# set on `terraform` at this point (relevant in case a
|
||||
# user overrides attributes).
|
||||
passthru = package.passthru // passthru;
|
||||
|
||||
buildCommand = ''
|
||||
# Create wrappers for terraform plugins because OpenTofu only
|
||||
# walks inside of a tree of files.
|
||||
# Also replace registry.terraform.io dir with registry.opentofu.org,
|
||||
# so OpenTofu can find the plugins.
|
||||
for providerDir in ${toString actualPlugins}
|
||||
do
|
||||
for file in $(find $providerDir/libexec/terraform-providers -type f)
|
||||
do
|
||||
relFile=''${file#$providerDir/}
|
||||
relFile=''${relFile/registry.terraform.io/registry.opentofu.org}
|
||||
mkdir -p $out/$(dirname $relFile)
|
||||
cat <<WRAPPER > $out/$relFile
|
||||
#!${runtimeShell}
|
||||
exec "$file" "$@"
|
||||
WRAPPER
|
||||
chmod +x $out/$relFile
|
||||
done
|
||||
done
|
||||
|
||||
# Create a wrapper for opentofu to point it to the plugins dir.
|
||||
mkdir -p $out/bin/
|
||||
makeWrapper "${package}/bin/tofu" "$out/bin/tofu" \
|
||||
--set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \
|
||||
--prefix PATH : "${lib.makeBinPath wrapperInputs}"
|
||||
'';
|
||||
}
|
||||
);
|
||||
withPlugins (_: [ ]);
|
||||
in
|
||||
package
|
||||
pluggable package
|
||||
|
|
|
|||
39
pkgs/by-name/po/poselib/package.nix
Normal file
39
pkgs/by-name/po/poselib/package.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
eigen,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "poselib";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PoseLib";
|
||||
repo = "PoseLib";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-fARRKT2UoPuuk9FOOsBdrACwGiGXWg/mLV4R0QIjeak=";
|
||||
};
|
||||
|
||||
buildInputs = [ eigen ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of minimal solvers for camera pose estimation";
|
||||
homepage = "https://github.com/PoseLib/PoseLib";
|
||||
changelog = "https://github.com/PoseLib/PoseLib/releases/tag/v${final.version}";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ usertam ];
|
||||
};
|
||||
})
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "posting";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darrenburns";
|
||||
repo = "posting";
|
||||
tag = version;
|
||||
hash = "sha256-JkYcLh3S+vLfSCgIpiRu9tKPMjjDSdHtO8faeMlgbe8=";
|
||||
hash = "sha256-YaN7kuGRZ6UJTuf2vYDnIinyzMzsKDQEA4B5SmmggA4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
|
|||
44
pkgs/by-name/pw/pwmenu/package.nix
Normal file
44
pkgs/by-name/pw/pwmenu/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pwmenu";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "e-tho";
|
||||
repo = "pwmenu";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Q02kOMC6oQ3fNyDWW9ztLgMs3wR4cA53/wmkbecTr/o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jX4D4Xv2WYTcWnYO2cNsu7L9ppIw//Tkxl+Y7tflk+A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pipewire
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/e-tho/pwmenu";
|
||||
description = "Launcher-driven audio manager for Linux";
|
||||
longDescription = ''
|
||||
Use `pwmenu --launcher <launcher command>`
|
||||
Supported launchers are: `dmenu`, `fuzzel`, `rofi`, `walker` and `custom` with `stdin`
|
||||
for details refer to https://github.com/e-tho/pwmenu/blob/main/README.md#usage
|
||||
'';
|
||||
mainProgram = "pwmenu";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ vuimuich ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,13 +21,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qadwaitadecorations";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedoraQt";
|
||||
repo = "QAdwaitaDecorations";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZU3cwFwQECh4Z6YcTzD2WooZmJ2nSUABYft3dfakSuY=";
|
||||
hash = "sha256-Zg2G3vuRD/kK5C2fFq6Cft218uFyBvfXtO1DHKQECFQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
libpulseaudio,
|
||||
libconfig,
|
||||
pkg-config,
|
||||
# Needs a gnuradio built with qt gui support
|
||||
gnuradio,
|
||||
log4cpp,
|
||||
|
|
@ -24,30 +26,41 @@
|
|||
uhd,
|
||||
}:
|
||||
|
||||
gnuradio.pkgs.mkDerivation {
|
||||
gnuradio.pkgs.mkDerivation rec {
|
||||
pname = "qradiolink";
|
||||
# https://github.com/qradiolink/qradiolink/tree/gr_3.10
|
||||
version = "0.9.0-1-unstable-2024-08-29";
|
||||
version = "0.9.1-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qradiolink";
|
||||
repo = "qradiolink";
|
||||
rev = "f1006a20e0a642d0ac20aab18b19fa97567f2621";
|
||||
sha256 = "sha256-9AYFO+mmwLAH8gEpZn6qcENabc/KBMcg/0wCTKsInNY=";
|
||||
tag = version;
|
||||
hash = "sha256-0inXfeOSVmJYtNhD6WBExjT43STfBjePomKILxoHO6Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# dmr: add explicit cstdint import
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qradiolink/qradiolink/pull/131/commits/bdd3b47708edf42b281fb9e5507d356d475f3df9.patch";
|
||||
hash = "sha256-Uoi8/IK8yBmfPL7RAkCGuyHdcdJZ+YMxccviY7Z+hXs=";
|
||||
})
|
||||
# qmake: find protobuf via pkg-config
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qradiolink/qradiolink/pull/132/commits/cd3e4bc188a60bc85693fe3de4540c48f325deb4.patch";
|
||||
hash = "sha256-ufSStm0pyDkCUIx0SjVVHZhA4gW7Ip6PiexPg34DsCo=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cd src/ext
|
||||
protoc --cpp_out=. Mumble.proto
|
||||
protoc --cpp_out=. QRadioLink.proto
|
||||
cd ../..
|
||||
qmake
|
||||
cd -
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D qradiolink $out/bin/qradiolink
|
||||
install -Dm755 qradiolink -t $out/bin
|
||||
install -Dm644 qradiolink.desktop -t $out/share/applications
|
||||
install -Dm644 src/res/icon.png $out/share/pixmaps/qradiolink.png
|
||||
install -Dm644 qradiolink.desktop $out/share/applications/qradiolink.desktop
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -77,23 +90,30 @@ gnuradio.pkgs.mkDerivation {
|
|||
cppzmq
|
||||
gnuradio.qwt
|
||||
uhd
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio.unwrapped.python.pkgs.thrift
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
gnuradio.qt.qmake
|
||||
gnuradio.qt.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "SDR transceiver application for analog and digital modes";
|
||||
mainProgram = "qradiolink";
|
||||
homepage = "http://qradiolink.org/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = [ maintainers.markuskowa ];
|
||||
platforms = platforms.linux;
|
||||
license = with lib.licenses; [
|
||||
bsd2
|
||||
gpl3Only
|
||||
lgpl3Only
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ markuskowa ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "railway";
|
||||
version = "4.8.0";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zZiEhXVIffYALiXiKwLlPpr8XchGii/i6VmDnoZTeq0=";
|
||||
hash = "sha256-fvasxm9BjoHvSS5qqlYdCFN7j4E/MAsGhaKxt2y8Bhw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Khk4D7xSfm4q3EWR9UHSzrf+m6NHo74wrPYYAh6tG4g=";
|
||||
cargoHash = "sha256-yQtsL4FHEuA2Ji5HW4LYoYoY1CDQf8LO0E1en04JpOA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "river-classic";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
domain = "codeberg.org";
|
||||
owner = "river";
|
||||
repo = "river-classic";
|
||||
hash = "sha256-ZYJYQINv6aNj8jyPOtMh5kf/HweIweTztWUStbr/9Zc=";
|
||||
hash = "sha256-XLWvxSChYN5wyhr8R8/3Pfykw61k451XmvgoM45zkEk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rs-tftpd";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altugbakan";
|
||||
repo = "rs-tftpd";
|
||||
rev = version;
|
||||
hash = "sha256-iUoIBQTMC+oXsuZcnSp1K4uFuETKTcfaW6+fBa5PQw8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YxXUwbzkuxnRrri49DhjvO/LJRWWtFutLbg151GnT5M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZED5+WnOALLXAW/l/QMFKWco6kJnz4rFv8nfp00HS78=";
|
||||
cargoHash = "sha256-FKwQr4u7lVN12XPyDus7QoIpthYbT84SFkMJvLTqXRU=";
|
||||
|
||||
buildFeatures = [ "client" ];
|
||||
|
||||
|
|
@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "TFTP Server Daemon implemented in Rust";
|
||||
homepage = "https://github.com/altugbakan/rs-tftpd";
|
||||
changelog = "https://github.com/altugbakan/rs-tftpd/releases/tag/${finalAttrs.version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
adamcstephens
|
||||
|
|
@ -32,4 +33,4 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
mainProgram = "tftpd";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsop";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "heiko";
|
||||
repo = "rsop";
|
||||
rev = "rsop/v${version}";
|
||||
hash = "sha256-6vP+epxsDid3M7cpfpOY29VWeIbuCB30qtmotPhzShc=";
|
||||
hash = "sha256-bbB2IefXauVV6LjpJxSNy4RVYjAGH0osTpUZGGscGec=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BSsqI3zo7eC4zGIsU1xScnjWNwt4iTqs4SWzbOUt7Iw=";
|
||||
cargoHash = "sha256-P27PnFNArKn3CQtik6TaV7eW/8bQiOZ57ZbMth2pNiY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "schemacrawler";
|
||||
version = "16.28.2";
|
||||
version = "16.28.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
|
||||
hash = "sha256-TF6VCnAQBXnxO9h28Q93rSeYs4GaABxb6lxjk6x6nA4=";
|
||||
hash = "sha256-OtQYAJe5eHoEis8Azy1LPxJdZR4HlKn8UhlDglqarto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/amhndu/SimpleNES";
|
||||
description = "NES emulator written in C++";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ guylamar2006 ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "SimpleNES";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "snapweb";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "snapweb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vrPmN06dLEoz7vFrH8kOdudg9FQcd1BpMWKpU6kZrzE=";
|
||||
hash = "sha256-7W7rvJPVcRtXcQt+wWAvrl0DOIh7zEfXZdFDcH23/ls=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-VDGoZ6XgVtr7xePXmfW4Vk6iTZv1HRx7bjsS+Qauz3U=";
|
||||
npmDepsHash = "sha256-STZ/+vmiUAOZ8+yeaFg+428pZ/iZZXXUeGx6gLmnDQ8=";
|
||||
|
||||
# For 'sharp' dependency, otherwise it will try to build it
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "sonar-scanner-cli";
|
||||
version = "7.2.0.5079";
|
||||
version = "7.3.0.5189";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SonarSource";
|
||||
repo = "sonar-scanner-cli";
|
||||
tag = version;
|
||||
hash = "sha256-ndpOjFE7RvGoQ32iTupC0RORFeUMikjWnDdty5XRApE=";
|
||||
hash = "sha256-Vbd+vQKFQo/wzGF4ekcCiEczlyuTD41Liz+nePR9lVA=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-fS5Hbt0p+DxFpB2x1ot/FGG1R0OdVIys+BbyDTtTLQQ=";
|
||||
mvnHash = "sha256-1SPpGu6uQ1Xa0U/DUjfZAXi6SQN/8LImU6THv4e9CSo=";
|
||||
|
||||
mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.28.1";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I1Xh9F9c/h6GZxyE75Q3WN7BPN79QuKlB0XKR30vuwg=";
|
||||
hash = "sha256-oxn/78nQCvlEkSqabVV47siWSSnz32tpDOweqScPYvY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T90mj+EVqlHJVGaUOGwD8acHTbYH6g8NEzKGFwjKu4M=";
|
||||
vendorHash = "sha256-HW2j8swbaWwU1i3udqlT8VyFreML6ZH14zWxF8L5NTQ=";
|
||||
|
||||
excludedPackages = [ "./build" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thermald";
|
||||
version = "2.5.9";
|
||||
version = "2.5.10";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "thermal_daemon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ydv6wZ3r2QxVji9bSx0sgpaOQNtgN+Y4rPZ44XtxNh8=";
|
||||
sha256 = "sha256-+dk3lOlI8kaf8NvcWQSvTxSqVGPCgvVnTB9nltqQHrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trdl-client";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "trdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/rhRsKlkRYQwN5IrFcOXiU12nEQMN75o2DPku5YPFe0=";
|
||||
hash = "sha256-CVJdnGrQRaenQ8/1EzUr6BNc0DtfAL1fLVfqJzy5A3Q=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/client";
|
||||
|
|
|
|||
|
|
@ -19,20 +19,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "treedome";
|
||||
version = "0.5.4";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/solver-orgz/treedome";
|
||||
rev = version;
|
||||
hash = "sha256-fJnrM9I11JKqzrprXa51mJiz9oO5hDp6u69FqJs5l8o=";
|
||||
hash = "sha256-qa87pgNHGRhP1G4TEFHYrkiJ9AHWG7PUdgxEF4X9EM8=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-scCF4xpc1COdlg57/eNTPdgY7/cJkdcc2s1YNraXzXk=";
|
||||
cargoHash = "sha256-Rg65BiHQF7bBBCtc5F+gY31yhcuI0+IDfxr3pFmxT+w=";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-in1A1XcfZK5F/EV5CYgfqig+8vKsxd6XhzfSv7Z0nNQ=";
|
||||
hash = "sha256-Q0xsi1xymQne6qN0oxm4YkaDLnGL17iuj70CTdQlxzM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,70 +1,49 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ant,
|
||||
jdk21_headless,
|
||||
jre_minimal,
|
||||
makeWrapper,
|
||||
stripJavaArchivesHook,
|
||||
maven,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
jdk = jdk21_headless;
|
||||
# Reduce closure size
|
||||
jre = jre_minimal.override {
|
||||
modules = [
|
||||
"java.base"
|
||||
"java.logging"
|
||||
];
|
||||
jdk = jdk21_headless;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "trimmomatic";
|
||||
version = "0.39";
|
||||
version = "0.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usadellab";
|
||||
repo = "Trimmomatic";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-u+ubmacwPy/vsEi0YQCv0fTnVDesQvqeQDEwCbS8M6I=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pLUjSVePN++G2XZrdKEdobgBO+UD0PZ9wlhSUlZ7na8=";
|
||||
};
|
||||
|
||||
# Remove jdk version requirement
|
||||
postPatch = ''
|
||||
substituteInPlace ./build.xml \
|
||||
--replace 'source="1.5" target="1.5"' ""
|
||||
'';
|
||||
mvnHash = "sha256-1XnVdud8nI2SuEPXnwEmbudM+QAeoSVTn0UZ8PKJH44=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
makeWrapper
|
||||
stripJavaArchivesHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
ant
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 dist/jar/trimmomatic-*.jar -t $out/share/trimmomatic
|
||||
install -Dm644 target/trimmomatic-${version}.jar -t $out/share/trimmomatic
|
||||
cp -r adapters $out/share/trimmomatic
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/trimmomatic \
|
||||
--add-flags "-jar $out/share/trimmomatic/trimmomatic-*.jar"
|
||||
makeWrapper ${lib.getBin jre_minimal}/bin/java $out/bin/trimmomatic \
|
||||
--add-flags "-jar $out/share/trimmomatic/trimmomatic-${version}.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/usadellab/Trimmomatic/blob/main/versionHistory.txt";
|
||||
changelog = "https://github.com/usadellab/Trimmomatic/releases/tag/v${version}";
|
||||
description = "Flexible read trimming tool for Illumina NGS data";
|
||||
longDescription = ''
|
||||
Trimmomatic performs a variety of useful trimming tasks for illumina
|
||||
|
|
@ -82,4 +61,4 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "trimmomatic";
|
||||
maintainers = [ lib.maintainers.kupac ];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
vala,
|
||||
ctpl,
|
||||
libgee,
|
||||
libsoup_2_4,
|
||||
fcgi,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valum";
|
||||
version = "0.3.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valum-framework";
|
||||
repo = "valum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
vala
|
||||
ctpl
|
||||
libgee
|
||||
libsoup_2_4
|
||||
fcgi
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/valum-framework/valum";
|
||||
description = "Web micro-framework written in Vala";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
# Likely broken by GLib 2.74 switch to PCRE 2.
|
||||
# https://github.com/valum-framework/valum/issues/238
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MdbO74vAbsZyB6seOqxHvQL0HT4IdVnDjd+N3a9XAns=";
|
||||
hash = "sha256-FqRRpsS1NPpxJr6iaDvQJ3fuX07oo08lZ6f+oEQb3MM=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "volatility3";
|
||||
version = "2.26.0";
|
||||
version = "2.26.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatilityfoundation";
|
||||
repo = "volatility3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O12w1NM2Hdp3UeeHpvibYfqLlXdQ+baqWX1qrr6SxSE=";
|
||||
hash = "sha256-B7S66/HpXuMOXvKzrnQCskbDQ0kjwBXN85VLr90w+c4=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
let
|
||||
pname = "wootility";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
|
||||
sha256 = "sha256-y65aqHBAGkzjobUMoBPQNkfh19rNVarPctcxmNFxlho=";
|
||||
sha256 = "sha256-NDTRsrOZljvFOkvBN40CmH4GD6szT3c9qoFdFGpZ5Oc=";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -3,33 +3,37 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libXrandr,
|
||||
libxcb,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xrandr-invert-colors";
|
||||
version = "0.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zoltanp";
|
||||
repo = "xrandr-invert-colors";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MIbHNJFDQsvjPUbperTKKbHY5GSgItvRyV5OsfpzYT4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MIbHNJFDQsvjPUbperTKKbHY5GSgItvRyV5OsfpzYT4=";
|
||||
};
|
||||
|
||||
buildInputs = [ libXrandr ];
|
||||
buildInputs = [
|
||||
libXrandr
|
||||
libxcb
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv xrandr-invert-colors.bin xrandr-invert-colors
|
||||
install xrandr-invert-colors $out/bin
|
||||
runHook preInstall
|
||||
install -Dm755 xrandr-invert-colors.bin $out/bin/xrandr-invert-colors
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Inverts the colors of your screen";
|
||||
meta = {
|
||||
description = "Invert colors on all screens, using XRandR";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
homepage = "https://github.com/zoltanp/xrandr-invert-colors";
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "xrandr-invert-colors";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ let
|
|||
fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
|
||||
mixRelease = callPackage ./mix-release.nix { };
|
||||
|
||||
erlang-ls = callPackage ./erlang-ls { };
|
||||
erlfmt = callPackage ./erlfmt { };
|
||||
elvis-erlang = callPackage ./elvis-erlang { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/apps/els_lsp/test/els_completion_SUITE.erl b/apps/els_lsp/test/els_completion_SUITE.erl
|
||||
index b610b1d4..9c8614f0 100644
|
||||
--- a/apps/els_lsp/test/els_completion_SUITE.erl
|
||||
+++ b/apps/els_lsp/test/els_completion_SUITE.erl
|
||||
@@ -711,6 +711,7 @@ exported_types(Config) ->
|
||||
<<"filename_all">>,
|
||||
<<"io_device">>
|
||||
] ++
|
||||
+ [<<"io_server">> || OtpRelease >= 27] ++
|
||||
[<<"location">> || OtpRelease >= 26] ++
|
||||
[
|
||||
<<"mode">>,
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
{
|
||||
erlang,
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
fetchHex,
|
||||
rebar3Relx,
|
||||
buildRebar3,
|
||||
rebar3-proper,
|
||||
stdenv,
|
||||
writeScript,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "1.1.0";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
|
||||
deps = import ./rebar-deps.nix {
|
||||
inherit fetchHex fetchFromGitHub fetchgit;
|
||||
builder = buildRebar3;
|
||||
overrides = (
|
||||
self: super: {
|
||||
proper = super.proper.overrideAttrs (_: {
|
||||
configurePhase = "true";
|
||||
});
|
||||
redbug = super.redbug.overrideAttrs (_: {
|
||||
patchPhase = ''
|
||||
substituteInPlace rebar.config --replace ", warnings_as_errors" ""
|
||||
'';
|
||||
});
|
||||
json_polyfill = super.json_polyfill.overrideAttrs (_: {
|
||||
# When compiling with erlang >= 27, the json_polyfill rebar script will
|
||||
# delete the json.beam file as it's not needed. However, we need to
|
||||
# adjust this path as the nix build will put the beam file under `ebin`
|
||||
# instead of `$REBAR_DEPS_DIR/json_polyfill/ebin`.
|
||||
postPatch = ''
|
||||
substituteInPlace rebar.config.script --replace "{erlc_compile, \"rm \\\"\$REBAR_DEPS_DIR/json_polyfill/ebin/json.beam\\\"\"}" "{erlc_compile, \"rm \\\"ebin/json.beam\\\"\"}"
|
||||
'';
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
in
|
||||
rebar3Relx {
|
||||
pname = "erlang-ls";
|
||||
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
# remove when fixed upstream https://github.com/erlang-ls/erlang_ls/pull/1576
|
||||
patches = lib.optionals (lib.versionAtLeast erlang.version "27") [ ./1576.diff ];
|
||||
|
||||
releaseType = "escript";
|
||||
beamDeps = builtins.attrValues deps;
|
||||
|
||||
buildPlugins = [ rebar3-proper ];
|
||||
buildPhase = "HOME=. make";
|
||||
# based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml
|
||||
# these tests are excessively long and we should probably skip them
|
||||
checkPhase = ''
|
||||
HOME=. epmd -daemon
|
||||
HOME=. rebar3 ct
|
||||
HOME=. rebar3 proper --constraint_tries 100
|
||||
'';
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# tests seem to be a bit flaky on darwin, skip them for now
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"
|
||||
|
||||
set -ox errexit
|
||||
latest=$(list-git-tags | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
if [[ "$latest" != "${version}" ]]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls"
|
||||
update-source-version erlang-ls "$latest" --version-key=version --print-changes --file="$nix_path/default.nix"
|
||||
tmpdir=$(mktemp -d)
|
||||
cp -R $(nix-build $nixpkgs --no-out-link -A erlang-ls.src)/* "$tmpdir"
|
||||
DEBUG=1
|
||||
(cd "$tmpdir" && HOME=. rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")
|
||||
nixfmt "$nix_path/rebar-deps.nix"
|
||||
else
|
||||
echo "erlang-ls is already up-to-date"
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/erlang-ls/erlang_ls";
|
||||
description = "Erlang Language Server";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
mainProgram = "erlang_ls";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,242 +0,0 @@
|
|||
# Generated by rebar3_nix
|
||||
let
|
||||
fetchOnly = { src, ... }: src;
|
||||
in
|
||||
{
|
||||
builder ? fetchOnly,
|
||||
fetchHex,
|
||||
fetchgit,
|
||||
fetchFromGitHub,
|
||||
overrides ? (x: y: { }),
|
||||
}:
|
||||
let
|
||||
self = packages // (overrides self packages);
|
||||
packages = with self; {
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
version = "1.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "getopt";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
zipper = builder {
|
||||
name = "zipper";
|
||||
version = "1.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "zipper";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
quickrand = builder {
|
||||
name = "quickrand";
|
||||
version = "2.0.7";
|
||||
src = fetchHex {
|
||||
pkg = "quickrand";
|
||||
version = "2.0.7";
|
||||
sha256 = "sha256-uKy/iaIkvCF8MHDKi+vG6yNtvn+XZ5k7J0CE6gRNNfA=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
providers = builder {
|
||||
name = "providers";
|
||||
version = "1.8.1";
|
||||
src = fetchHex {
|
||||
pkg = "providers";
|
||||
version = "1.8.1";
|
||||
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
|
||||
};
|
||||
beamDeps = [ getopt ];
|
||||
};
|
||||
katana_code = builder {
|
||||
name = "katana_code";
|
||||
version = "2.1.1";
|
||||
src = fetchHex {
|
||||
pkg = "katana_code";
|
||||
version = "2.1.1";
|
||||
sha256 = "sha256-BoDzNSW5qILm9NMCJRixXEb2SL17Db6GkAmA/hwpFAQ=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
bucs = builder {
|
||||
name = "bucs";
|
||||
version = "1.0.16";
|
||||
src = fetchHex {
|
||||
pkg = "bucs";
|
||||
version = "1.0.16";
|
||||
sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
yamerl = builder {
|
||||
name = "yamerl";
|
||||
version = "git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlang-ls";
|
||||
repo = "yamerl";
|
||||
rev = "9a9f7a2e84554992f2e8e08a8060bfe97776a5b7";
|
||||
sha256 = "1gb44v27paxwxm443m5f554wiziqi2kd300hgjjdg6fyvy3mvhss";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
uuid = builder {
|
||||
name = "uuid";
|
||||
version = "2.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "uuid_erl";
|
||||
version = "2.0.1";
|
||||
sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
|
||||
};
|
||||
beamDeps = [ quickrand ];
|
||||
};
|
||||
tdiff = builder {
|
||||
name = "tdiff";
|
||||
version = "0.1.2";
|
||||
src = fetchHex {
|
||||
pkg = "tdiff";
|
||||
version = "0.1.2";
|
||||
sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
redbug = builder {
|
||||
name = "redbug";
|
||||
version = "2.0.6";
|
||||
src = fetchHex {
|
||||
pkg = "redbug";
|
||||
version = "2.0.6";
|
||||
sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
rebar3_format = builder {
|
||||
name = "rebar3_format";
|
||||
version = "0.8.2";
|
||||
src = fetchHex {
|
||||
pkg = "rebar3_format";
|
||||
version = "0.8.2";
|
||||
sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
|
||||
};
|
||||
beamDeps = [ katana_code ];
|
||||
};
|
||||
json_polyfill = builder {
|
||||
name = "json_polyfill";
|
||||
version = "0.1.4";
|
||||
src = fetchHex {
|
||||
pkg = "json_polyfill";
|
||||
version = "0.1.4";
|
||||
sha256 = "sha256-SMOX7iVH+kWe3gGjDsDoVxer7TAQhnpj7qrF8gMnQwM=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
jsx = builder {
|
||||
name = "jsx";
|
||||
version = "2.10.0";
|
||||
src = fetchHex {
|
||||
pkg = "jsx";
|
||||
version = "2.10.0";
|
||||
sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
gradualizer = builder {
|
||||
name = "gradualizer";
|
||||
version = "git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "josefs";
|
||||
repo = "gradualizer";
|
||||
rev = "3021d29d82741399d131e3be38d2a8db79d146d4";
|
||||
sha256 = "052f8x9x93yy00pbkl1745ffnwj3blcm39j12i4k166y1zbnwy00";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
erlfmt = builder {
|
||||
name = "erlfmt";
|
||||
version = "1.5.0";
|
||||
src = fetchHex {
|
||||
pkg = "erlfmt";
|
||||
version = "1.5.0";
|
||||
sha256 = "sha256-OTOkDPvnkK2U5bZQs2iB3nBFYxkmPBR5tVbpr9vYDHU=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
ephemeral = builder {
|
||||
name = "ephemeral";
|
||||
version = "2.0.4";
|
||||
src = fetchHex {
|
||||
pkg = "ephemeral";
|
||||
version = "2.0.4";
|
||||
sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
|
||||
};
|
||||
beamDeps = [ bucs ];
|
||||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "3.2.5";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "3.2.5";
|
||||
sha256 = "sha256-NNkhjwuAclEZA79sy/WesXZd7Pxz/MaDO6XIlZ2384M=";
|
||||
};
|
||||
beamDeps = [
|
||||
katana_code
|
||||
zipper
|
||||
];
|
||||
};
|
||||
docsh = builder {
|
||||
name = "docsh";
|
||||
version = "0.7.2";
|
||||
src = fetchHex {
|
||||
pkg = "docsh";
|
||||
version = "0.7.2";
|
||||
sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
|
||||
};
|
||||
beamDeps = [ providers ];
|
||||
};
|
||||
proper_contrib = builder {
|
||||
name = "proper_contrib";
|
||||
version = "0.2.0";
|
||||
src = fetchHex {
|
||||
pkg = "proper_contrib";
|
||||
version = "0.2.0";
|
||||
sha256 = "sha256-jFRRL1zr9JKaG1eqMDfcKk2xe93uOrXUenB14icVCBU=";
|
||||
};
|
||||
beamDeps = [ proper ];
|
||||
};
|
||||
proper = builder {
|
||||
name = "proper";
|
||||
version = "1.3.0";
|
||||
src = fetchHex {
|
||||
pkg = "proper";
|
||||
version = "1.3.0";
|
||||
sha256 = "sha256-SqGS/M3dA/2+UP72IL6dTS+SY1tU9V+4OuwYWZRAPLw=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
meck = builder {
|
||||
name = "meck";
|
||||
version = "0.9.0";
|
||||
src = fetchHex {
|
||||
pkg = "meck";
|
||||
version = "0.9.0";
|
||||
sha256 = "sha256-+BPpDdC4myUWoCAaNV6EsavHi1dRqgy/ZpqdhagQrGM=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
coveralls = builder {
|
||||
name = "coveralls";
|
||||
version = "2.2.0";
|
||||
src = fetchHex {
|
||||
pkg = "coveralls";
|
||||
version = "2.2.0";
|
||||
sha256 = "sha256-zVTbCqjGS1OSgBicVhns7hOkaiiw8ct3RUTdzBZiBKM=";
|
||||
};
|
||||
beamDeps = [ jsx ];
|
||||
};
|
||||
};
|
||||
in
|
||||
self
|
||||
|
|
@ -4,8 +4,8 @@ let
|
|||
base = callPackage ./generic.nix (
|
||||
_args
|
||||
// {
|
||||
version = "8.3.25";
|
||||
hash = "sha256-BuVHkeERkvCJ5NIMcW8lvdzr3elRtXC1Ve37WYiotxo=";
|
||||
version = "8.3.26";
|
||||
hash = "sha256-chtj1TSfEx9Ql1N7O+a6aAHi2Ob6uh8fLqlbT9YudSU=";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,24 +5,24 @@
|
|||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
async-timeout,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adax-local";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyAdaxLocal";
|
||||
tag = version;
|
||||
hash = "sha256-V3jSBdYDo32oTAGNTvHJi+GSwlL3keSDhXpNpMoCkWs=";
|
||||
hash = "sha256-HdhatjlN4oUzBV1cf/PfgOJbEks4KBdw4vH8Y/z6efQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
bleak
|
||||
async-timeout
|
||||
|
|
@ -36,7 +36,8 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module for local access to Adax";
|
||||
homepage = "https://github.com/Danielhiversen/pyAdaxLocal";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/Danielhiversen/pyAdaxLocal/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.2.18";
|
||||
version = "3.2.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = "aiohomekit";
|
||||
tag = version;
|
||||
hash = "sha256-0RCKJqhD/SMMB21ZwrR81jmb6yenZxGPQOQ+TkXb0Uo=";
|
||||
hash = "sha256-ML7j5OBbQyF+2Q1WHBwJfnRUnG8kf+cog1nMRp6fOSE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-storage";
|
||||
version = "23.0.1";
|
||||
version = "23.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "azure_mgmt_storage";
|
||||
inherit version;
|
||||
hash = "sha256-w6sqyTUtHAHYW1bWcW3M4eRoD5ILFIoktDabuRuSI7Q=";
|
||||
hash = "sha256-K92SL5DJL4+QHnMtNGPZDO5mF8f3leDLRyROzQrpiyA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.40.43";
|
||||
version = "1.40.44";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -367,7 +367,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-AdaNfweoWVM+3ArpQHOjvpOGBQ+ZzTGBzD6BSkEQx9k=";
|
||||
hash = "sha256-xJAw08ih9xni6ig9fv+DQDdAbvQeytR0kNeArooV/1w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -2,19 +2,22 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
python,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
|
||||
# tests
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cma";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CMA-ES";
|
||||
repo = "pycma";
|
||||
|
|
@ -22,22 +25,33 @@ buildPythonPackage rec {
|
|||
hash = "sha256-2uCn5CZma9RLK8zaaPhiQCqnK+2dWgLNr5+Ck2cV6vI=";
|
||||
};
|
||||
|
||||
# setuptools.errors.PackageDiscoveryError:
|
||||
# Multiple top-level packages discovered in a flat-layout: ['cma', 'notebooks'].
|
||||
postPatch = ''
|
||||
rm -rf notebooks
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
checkPhase = ''
|
||||
# At least one doctest fails, thus only limited amount of files is tested
|
||||
${python.executable} -m cma.test interfaces.py purecma.py logger.py optimization_tools.py transformations.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "cma" ];
|
||||
|
||||
meta = with lib; {
|
||||
# At least one doctest fails, thus only limited amount of files is tested
|
||||
checkPhase = ''
|
||||
${python.executable} -m cma.test \
|
||||
interfaces.py \
|
||||
purecma.py \
|
||||
logger.py \
|
||||
optimization_tools.py \
|
||||
transformations.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
|
||||
homepage = "https://github.com/CMA-ES/pycma";
|
||||
changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${src.tag}";
|
||||
license = licenses.bsd3;
|
||||
changelog = "https://github.com/CMA-ES/pycma/releases/tag/${src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "datafusion";
|
||||
version = "49.0.0";
|
||||
version = "50.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -32,12 +32,12 @@ buildPythonPackage rec {
|
|||
tag = version;
|
||||
# Fetch arrow-testing and parquet-testing (tests assets)
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-U3LRZQMjL8sNa5yQmwfhw9NRGC0299TRODylzZkvFh4=";
|
||||
hash = "sha256-to1GJQqI4aJOW8pGhWvU44ePrRo0cgeNwEGRJlb9grM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname src version;
|
||||
hash = "sha256-lCbqy6kZK+LSLvr+Odxt167ACnDap2enH/J4ILcPtOc=";
|
||||
hash = "sha256-ZACp7bBLYKmuZVAWEa2YxoCbQqwALv2bWf+zz6jbV9w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-pghistory";
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Opus10";
|
||||
repo = "django-pghistory";
|
||||
tag = version;
|
||||
hash = "sha256-zQqa4rBhjt2+kaCT4PvGXyTJ63JR3YM50GBQkqnWUKE=";
|
||||
hash = "sha256-Sx2dR5l86D+2t+1DViW1PfI74zyLmgwNm81zVmZ7IH8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue