mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 17:46:29 +09:00
Merge master into haskell-updates
This commit is contained in:
commit
cb21dbcf55
212 changed files with 2498 additions and 1303 deletions
8
.github/labeler.yml
vendored
8
.github/labeler.yml
vendored
|
@ -113,6 +113,14 @@
|
|||
- pkgs/applications/editors/jupyter-kernels/**/*
|
||||
- pkgs/applications/editors/jupyter/**/*
|
||||
|
||||
"6.topic: k3s":
|
||||
- any:
|
||||
- changed-files:
|
||||
- any-glob-to-any-file:
|
||||
- nixos/modules/services/cluster/k3s/**/*
|
||||
- nixos/tests/k3s/**/*
|
||||
- pkgs/applications/networking/cluster/k3s/**/*
|
||||
|
||||
"6.topic: kernel":
|
||||
- any:
|
||||
- changed-files:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
## Building Go modules with `buildGoModule` {#ssec-language-go}
|
||||
|
||||
The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build:
|
||||
The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://go.dev/wiki/Modules) through a two phase build:
|
||||
|
||||
- An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module.
|
||||
- A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
|
||||
|
|
|
@ -5383,6 +5383,12 @@
|
|||
githubId = 472846;
|
||||
name = "Sebastian Krohn";
|
||||
};
|
||||
drawbu = {
|
||||
email = "clement21.boillot@gmail.com";
|
||||
github = "drawbu";
|
||||
githubId = 69208565;
|
||||
name = "Clément Boillot";
|
||||
};
|
||||
drets = {
|
||||
email = "dmitryrets@gmail.com";
|
||||
github = "drets";
|
||||
|
|
|
@ -78,6 +78,7 @@ luaossl,,,,,5.1,
|
|||
luaposix,,,,34.1.1-1,,vyp lblasc
|
||||
luarepl,,,,,,
|
||||
luarocks-build-rust-mlua,,,,,,mrcjkb
|
||||
luarocks-build-treesitter-parser,,,,,,mrcjkb
|
||||
luasec,,,,,,flosse
|
||||
luasnip,,,,,,
|
||||
luasocket,,,,,,
|
||||
|
@ -131,6 +132,7 @@ tiktoken_core,,,,,,natsukium
|
|||
tl,,,,,,mephistophiles
|
||||
toml,,,,,,mrcjkb
|
||||
toml-edit,,,,,5.1,mrcjkb
|
||||
tree-sitter-norg,,,,,5.1,mrcjkb
|
||||
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
|
||||
vusted,,,,,,figsoda
|
||||
xml2lua,,,,,,teto
|
||||
|
|
|
|
@ -53,7 +53,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
|||
- `system.etc.overlay.enable` option was added. If enabled, `/etc` is
|
||||
mounted via an overlayfs instead of being created by a custom perl script.
|
||||
|
||||
- For each supporting version of the Linux kernel firmware blobs and kernel modules
|
||||
- For each supporting version of the Linux kernel firmware blobs
|
||||
are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however
|
||||
a significantly higher decompression speed.
|
||||
|
||||
|
|
|
@ -231,12 +231,14 @@ in
|
|||
};
|
||||
|
||||
systemd.services = {
|
||||
dex.serviceConfig = mkIf cfg.dex.enable {
|
||||
# `dex.service` is super locked down out of the box, but we need some
|
||||
# place to write the SQLite database. This creates $STATE_DIRECTORY below
|
||||
# /var/lib/private because DynamicUser=true, but it gets symlinked into
|
||||
# /var/lib/dex inside the unit
|
||||
StateDirectory = "dex";
|
||||
dex = mkIf cfg.dex.enable {
|
||||
serviceConfig = {
|
||||
# `dex.service` is super locked down out of the box, but we need some
|
||||
# place to write the SQLite database. This creates $STATE_DIRECTORY below
|
||||
# /var/lib/private because DynamicUser=true, but it gets symlinked into
|
||||
# /var/lib/dex inside the unit
|
||||
StateDirectory = "dex";
|
||||
};
|
||||
};
|
||||
|
||||
portunus = {
|
||||
|
|
|
@ -441,21 +441,45 @@ in
|
|||
{manpage}`systemd.time(7)`.
|
||||
'';
|
||||
};
|
||||
|
||||
randomizedDelaySec = mkOption {
|
||||
default = "6h";
|
||||
type = types.str;
|
||||
example = "12h";
|
||||
description = ''
|
||||
Add a randomized delay before each ZFS trim.
|
||||
The delay will be chosen between zero and this value.
|
||||
This value must be a time span in the format specified by
|
||||
{manpage}`systemd.time(7)`
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.zfs.autoScrub = {
|
||||
enable = mkEnableOption "periodic scrubbing of ZFS pools";
|
||||
|
||||
interval = mkOption {
|
||||
default = "Sun, 02:00";
|
||||
default = "monthly";
|
||||
type = types.str;
|
||||
example = "daily";
|
||||
example = "quarterly";
|
||||
description = ''
|
||||
Systemd calendar expression when to scrub ZFS pools. See
|
||||
{manpage}`systemd.time(7)`.
|
||||
'';
|
||||
};
|
||||
|
||||
randomizedDelaySec = mkOption {
|
||||
default = "6h";
|
||||
type = types.str;
|
||||
example = "12h";
|
||||
description = ''
|
||||
Add a randomized delay before each ZFS autoscrub.
|
||||
The delay will be chosen between zero and this value.
|
||||
This value must be a time span in the format specified by
|
||||
{manpage}`systemd.time(7)`
|
||||
'';
|
||||
};
|
||||
|
||||
pools = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
|
@ -862,6 +886,7 @@ in
|
|||
timerConfig = {
|
||||
OnCalendar = cfgScrub.interval;
|
||||
Persistent = "yes";
|
||||
RandomizedDelaySec = cfgScrub.randomizedDelaySec;
|
||||
};
|
||||
};
|
||||
})
|
||||
|
@ -879,7 +904,10 @@ in
|
|||
serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' ";
|
||||
};
|
||||
|
||||
systemd.timers.zpool-trim.timerConfig.Persistent = "yes";
|
||||
systemd.timers.zpool-trim.timerConfig = {
|
||||
Persistent = "yes";
|
||||
RandomizedDelaySec = cfgTrim.randomizedDelaySec;
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
@ -218,6 +218,8 @@ in
|
|||
|
||||
services.displayManager.logToJournal = true;
|
||||
|
||||
services.logrotate.enable = lib.mkDefault false;
|
||||
|
||||
# Make sure we use the Guest Agent from the QEMU package for testing
|
||||
# to reduce the closure size required for the tests.
|
||||
services.qemuGuest.package = pkgs.qemu_test.ga;
|
||||
|
|
|
@ -105,6 +105,37 @@ let
|
|||
path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
|
||||
}
|
||||
];
|
||||
|
||||
environment = lib.mkMerge [
|
||||
{
|
||||
INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
|
||||
INCUS_OVMF_PATH = ovmf;
|
||||
INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
|
||||
PATH = lib.mkForce serverBinPath;
|
||||
}
|
||||
(lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })
|
||||
];
|
||||
|
||||
incus-startup = pkgs.writeShellScript "incus-startup" ''
|
||||
case "$1" in
|
||||
start)
|
||||
systemctl is-active incus.service -q && exit 0
|
||||
exec incusd activateifneeded
|
||||
;;
|
||||
|
||||
stop)
|
||||
systemctl is-active incus.service -q || exit 0
|
||||
exec incusd shutdown
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
'';
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
|
@ -137,6 +168,14 @@ in
|
|||
description = "The incus client package to use. This package is added to PATH.";
|
||||
};
|
||||
|
||||
softDaemonRestart = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Allow for incus.service to be stopped without affecting running instances.
|
||||
'';
|
||||
};
|
||||
|
||||
preseed = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; });
|
||||
|
||||
|
@ -282,6 +321,8 @@ in
|
|||
systemd.services.incus = {
|
||||
description = "Incus Container and Virtual Machine Management Daemon";
|
||||
|
||||
inherit environment;
|
||||
|
||||
wantedBy = lib.mkIf (!cfg.socketActivation) [ "multi-user.target" ];
|
||||
after = [
|
||||
"network-online.target"
|
||||
|
@ -296,20 +337,10 @@ in
|
|||
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
environment = lib.mkMerge [
|
||||
{
|
||||
INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
|
||||
INCUS_OVMF_PATH = ovmf;
|
||||
INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
|
||||
PATH = lib.mkForce serverBinPath;
|
||||
}
|
||||
(lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/incusd --group incus-admin";
|
||||
ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}";
|
||||
ExecStop = "${cfg.package}/bin/incus admin shutdown";
|
||||
ExecStop = lib.optionalString (!cfg.softDaemonRestart) "${cfg.package}/bin/incus admin shutdown";
|
||||
|
||||
KillMode = "process"; # when stopping, leave the containers alone
|
||||
Delegate = "yes";
|
||||
|
@ -324,6 +355,27 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services.incus-startup = lib.mkIf cfg.softDaemonRestart {
|
||||
description = "Incus Instances Startup/Shutdown";
|
||||
|
||||
inherit environment;
|
||||
|
||||
after = [
|
||||
"incus.service"
|
||||
"incus.socket"
|
||||
];
|
||||
requires = [ "incus.socket" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${incus-startup} start";
|
||||
ExecStop = "${incus-startup} stop";
|
||||
RemainAfterExit = true;
|
||||
TimeoutStartSec = "600s";
|
||||
TimeoutStopSec = "600s";
|
||||
Type = "oneshot";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.sockets.incus = {
|
||||
description = "Incus UNIX socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
|
|
|
@ -70,51 +70,60 @@ in
|
|||
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
|
||||
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
|
||||
|
||||
with subtest("Container CPU limits can be managed"):
|
||||
set_container("limits.cpu 1")
|
||||
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()
|
||||
assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}"
|
||||
with subtest("resource limits"):
|
||||
with subtest("Container CPU limits can be managed"):
|
||||
set_container("limits.cpu 1")
|
||||
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()
|
||||
assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}"
|
||||
|
||||
set_container("limits.cpu 2")
|
||||
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()
|
||||
assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}"
|
||||
set_container("limits.cpu 2")
|
||||
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()
|
||||
assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}"
|
||||
|
||||
with subtest("Container memory limits can be managed"):
|
||||
set_container("limits.memory 64MB")
|
||||
meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip()
|
||||
meminfo_bytes = " ".join(meminfo.split(' ')[-2:])
|
||||
assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'"
|
||||
with subtest("Container memory limits can be managed"):
|
||||
set_container("limits.memory 64MB")
|
||||
meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip()
|
||||
meminfo_bytes = " ".join(meminfo.split(' ')[-2:])
|
||||
assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'"
|
||||
|
||||
set_container("limits.memory 128MB")
|
||||
meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip()
|
||||
meminfo_bytes = " ".join(meminfo.split(' ')[-2:])
|
||||
assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"
|
||||
set_container("limits.memory 128MB")
|
||||
meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip()
|
||||
meminfo_bytes = " ".join(meminfo.split(' ')[-2:])
|
||||
assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"
|
||||
|
||||
with subtest("lxc-container generator configures plain container"):
|
||||
# reuse the existing container to save some time
|
||||
machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
check_sysctl("container")
|
||||
with subtest("lxc-generator"):
|
||||
with subtest("lxc-container generator configures plain container"):
|
||||
# reuse the existing container to save some time
|
||||
machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
check_sysctl("container")
|
||||
|
||||
with subtest("lxc-container generator configures nested container"):
|
||||
machine.execute("incus delete --force container")
|
||||
machine.succeed("incus launch nixos container --config security.nesting=true")
|
||||
with machine.nested("Waiting for instance to start and be usable"):
|
||||
retry(instance_is_up)
|
||||
with subtest("lxc-container generator configures nested container"):
|
||||
machine.execute("incus delete --force container")
|
||||
machine.succeed("incus launch nixos container --config security.nesting=true")
|
||||
with machine.nested("Waiting for instance to start and be usable"):
|
||||
retry(instance_is_up)
|
||||
|
||||
machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
|
||||
assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
|
||||
machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
|
||||
assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
|
||||
|
||||
check_sysctl("container")
|
||||
check_sysctl("container")
|
||||
|
||||
with subtest("lxc-container generator configures privileged container"):
|
||||
machine.execute("incus delete --force container")
|
||||
machine.succeed("incus launch nixos container --config security.privileged=true")
|
||||
with machine.nested("Waiting for instance to start and be usable"):
|
||||
retry(instance_is_up)
|
||||
with subtest("lxc-container generator configures privileged container"):
|
||||
machine.execute("incus delete --force container")
|
||||
machine.succeed("incus launch nixos container --config security.privileged=true")
|
||||
with machine.nested("Waiting for instance to start and be usable"):
|
||||
retry(instance_is_up)
|
||||
|
||||
machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
|
||||
|
||||
check_sysctl("container")
|
||||
check_sysctl("container")
|
||||
|
||||
with subtest("softDaemonRestart"):
|
||||
with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"):
|
||||
pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip()
|
||||
machine.succeed(f"ps {pid}")
|
||||
machine.succeed("systemctl stop incus")
|
||||
machine.succeed(f"ps {pid}")
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
boot.initrd.systemd.enable = true;
|
||||
};
|
||||
};
|
||||
incusd-options = import ./incusd-options.nix { inherit system pkgs; };
|
||||
lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; };
|
||||
openvswitch = import ./openvswitch.nix { inherit system pkgs; };
|
||||
preseed = import ./preseed.nix { inherit system pkgs; };
|
||||
socket-activated = import ./socket-activated.nix { inherit system pkgs; };
|
||||
storage = import ./storage.nix { inherit system pkgs; };
|
||||
ui = import ./ui.nix { inherit system pkgs; };
|
||||
|
|
104
nixos/tests/incus/incusd-options.nix
Normal file
104
nixos/tests/incus/incusd-options.nix
Normal file
|
@ -0,0 +1,104 @@
|
|||
# this is a set of tests for non-default options. typically the default options
|
||||
# will be handled by the other tests
|
||||
import ../make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
releases = import ../../release.nix {
|
||||
configuration = {
|
||||
# Building documentation makes the test unnecessarily take a longer time:
|
||||
documentation.enable = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};
|
||||
container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};
|
||||
in
|
||||
{
|
||||
name = "incusd-options";
|
||||
|
||||
meta = {
|
||||
maintainers = lib.teams.lxc.members;
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
virtualisation = {
|
||||
cores = 2;
|
||||
memorySize = 1024;
|
||||
diskSize = 4096;
|
||||
|
||||
incus = {
|
||||
enable = true;
|
||||
softDaemonRestart = false;
|
||||
|
||||
preseed = {
|
||||
networks = [
|
||||
{
|
||||
name = "nixostestbr0";
|
||||
type = "bridge";
|
||||
config = {
|
||||
"ipv4.address" = "10.0.100.1/24";
|
||||
"ipv4.nat" = "true";
|
||||
};
|
||||
}
|
||||
];
|
||||
profiles = [
|
||||
{
|
||||
name = "default";
|
||||
devices = {
|
||||
eth0 = {
|
||||
name = "eth0";
|
||||
network = "nixostestbr0";
|
||||
type = "nic";
|
||||
};
|
||||
root = {
|
||||
path = "/";
|
||||
pool = "nixostest_pool";
|
||||
size = "35GiB";
|
||||
type = "disk";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
storage_pools = [
|
||||
{
|
||||
name = "nixostest_pool";
|
||||
driver = "dir";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
networking.nftables.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
def instance_is_up(_) -> bool:
|
||||
status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")
|
||||
return status == 0
|
||||
|
||||
machine.wait_for_unit("incus.service")
|
||||
machine.wait_for_unit("incus-preseed.service")
|
||||
|
||||
with subtest("Container image can be imported"):
|
||||
machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos")
|
||||
|
||||
with subtest("Container can be launched and managed"):
|
||||
machine.succeed("incus launch nixos container")
|
||||
with machine.nested("Waiting for instance to start and be usable"):
|
||||
retry(instance_is_up)
|
||||
machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -")
|
||||
|
||||
with subtest("Verify preseed resources created"):
|
||||
machine.succeed("incus profile show default")
|
||||
machine.succeed("incus network info nixostestbr0")
|
||||
machine.succeed("incus storage show nixostest_pool")
|
||||
|
||||
with subtest("Instance is stopped when softDaemonRestart is disabled and services is stopped"):
|
||||
pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip()
|
||||
machine.succeed(f"ps {pid}")
|
||||
machine.succeed("systemctl stop incus")
|
||||
machine.fail(f"ps {pid}")
|
||||
'';
|
||||
}
|
||||
)
|
|
@ -1,63 +0,0 @@
|
|||
import ../make-test-python.nix ({ pkgs, lib, ... } :
|
||||
|
||||
{
|
||||
name = "incus-preseed";
|
||||
|
||||
meta = {
|
||||
maintainers = lib.teams.lxc.members;
|
||||
};
|
||||
|
||||
nodes.machine = { lib, ... }: {
|
||||
virtualisation = {
|
||||
incus.enable = true;
|
||||
|
||||
incus.preseed = {
|
||||
networks = [
|
||||
{
|
||||
name = "nixostestbr0";
|
||||
type = "bridge";
|
||||
config = {
|
||||
"ipv4.address" = "10.0.100.1/24";
|
||||
"ipv4.nat" = "true";
|
||||
};
|
||||
}
|
||||
];
|
||||
profiles = [
|
||||
{
|
||||
name = "nixostest_default";
|
||||
devices = {
|
||||
eth0 = {
|
||||
name = "eth0";
|
||||
network = "nixostestbr0";
|
||||
type = "nic";
|
||||
};
|
||||
root = {
|
||||
path = "/";
|
||||
pool = "default";
|
||||
size = "35GiB";
|
||||
type = "disk";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
storage_pools = [
|
||||
{
|
||||
name = "nixostest_pool";
|
||||
driver = "dir";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
networking.nftables.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("incus.service")
|
||||
machine.wait_for_unit("incus-preseed.service")
|
||||
|
||||
with subtest("Verify preseed resources created"):
|
||||
machine.succeed("incus profile show nixostest_default")
|
||||
machine.succeed("incus network info nixostestbr0")
|
||||
machine.succeed("incus storage show nixostest_pool")
|
||||
'';
|
||||
})
|
|
@ -75,5 +75,11 @@ in
|
|||
machine.succeed("incus config set ${instance-name} limits.cpu=2")
|
||||
count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip())
|
||||
assert count == 2, f"Wrong number of CPUs reported, want: 2, got: {count}"
|
||||
|
||||
with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"):
|
||||
pid = machine.succeed("incus info ${instance-name} | grep 'PID'").split(":")[1].strip()
|
||||
machine.succeed(f"ps {pid}")
|
||||
machine.succeed("systemctl stop incus")
|
||||
machine.succeed(f"ps {pid}")
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -16,52 +16,60 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
|
|||
};
|
||||
|
||||
nodes = {
|
||||
defaultMachine = { ... }: { };
|
||||
defaultMachine = { ... }: {
|
||||
services.logrotate.enable = true;
|
||||
};
|
||||
failingMachine = { ... }: {
|
||||
services.logrotate.configFile = pkgs.writeText "logrotate.conf" ''
|
||||
# self-written config file
|
||||
su notarealuser notagroupeither
|
||||
'';
|
||||
services.logrotate = {
|
||||
enable = true;
|
||||
configFile = pkgs.writeText "logrotate.conf" ''
|
||||
# self-written config file
|
||||
su notarealuser notagroupeither
|
||||
'';
|
||||
};
|
||||
};
|
||||
machine = { config, ... }: {
|
||||
imports = [ importTest ];
|
||||
|
||||
services.logrotate.settings = {
|
||||
# remove default frequency header and add another
|
||||
header = {
|
||||
frequency = null;
|
||||
delaycompress = true;
|
||||
};
|
||||
# extra global setting... affecting nothing
|
||||
last_line = {
|
||||
global = true;
|
||||
priority = 2000;
|
||||
shred = true;
|
||||
};
|
||||
# using mail somewhere should add --mail to logrotate invocation
|
||||
sendmail = {
|
||||
mail = "user@domain.tld";
|
||||
};
|
||||
# postrotate should be suffixed by 'endscript'
|
||||
postrotate = {
|
||||
postrotate = "touch /dev/null";
|
||||
};
|
||||
# check checkConfig works as expected: there is nothing to check here
|
||||
# except that the file build passes
|
||||
checkConf = {
|
||||
su = "root utmp";
|
||||
createolddir = "0750 root utmp";
|
||||
create = "root utmp";
|
||||
"create " = "0750 root utmp";
|
||||
};
|
||||
# multiple paths should be aggregated
|
||||
multipath = {
|
||||
files = [ "file1" "file2" ];
|
||||
};
|
||||
# overriding imported path should keep existing attributes
|
||||
# (e.g. olddir is still set)
|
||||
import = {
|
||||
notifempty = true;
|
||||
services.logrotate = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# remove default frequency header and add another
|
||||
header = {
|
||||
frequency = null;
|
||||
delaycompress = true;
|
||||
};
|
||||
# extra global setting... affecting nothing
|
||||
last_line = {
|
||||
global = true;
|
||||
priority = 2000;
|
||||
shred = true;
|
||||
};
|
||||
# using mail somewhere should add --mail to logrotate invocation
|
||||
sendmail = {
|
||||
mail = "user@domain.tld";
|
||||
};
|
||||
# postrotate should be suffixed by 'endscript'
|
||||
postrotate = {
|
||||
postrotate = "touch /dev/null";
|
||||
};
|
||||
# check checkConfig works as expected: there is nothing to check here
|
||||
# except that the file build passes
|
||||
checkConf = {
|
||||
su = "root utmp";
|
||||
createolddir = "0750 root utmp";
|
||||
create = "root utmp";
|
||||
"create " = "0750 root utmp";
|
||||
};
|
||||
# multiple paths should be aggregated
|
||||
multipath = {
|
||||
files = [ "file1" "file2" ];
|
||||
};
|
||||
# overriding imported path should keep existing attributes
|
||||
# (e.g. olddir is still set)
|
||||
import = {
|
||||
notifempty = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,187 +0,0 @@
|
|||
Index: beast-0.7.1/shell/Makefile.in
|
||||
===================================================================
|
||||
--- beast-0.7.1.orig/shell/Makefile.in
|
||||
+++ beast-0.7.1/shell/Makefile.in
|
||||
@@ -859,10 +859,7 @@ check-before: check-installation
|
||||
check-installation:
|
||||
@for p in $(bin_PROGRAMS) ; do \
|
||||
pp="$(DESTDIR)$(bindir)/$$p" ; \
|
||||
- echo "TEST: test -x \"$$pp\"" ; \
|
||||
- test -x "$$pp" || \
|
||||
- { echo "Failed to verify installation of executable: $$pp"; \
|
||||
- exit 1 ; } \
|
||||
+ echo "TEST: test -x \"$$pp\" Test disabled" ; \
|
||||
done
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
Index: beast-0.7.1/shell/Makefile.am
|
||||
===================================================================
|
||||
--- beast-0.7.1.orig/shell/Makefile.am
|
||||
+++ beast-0.7.1/shell/Makefile.am
|
||||
@@ -859,10 +859,7 @@ check-before: check-installation
|
||||
check-installation:
|
||||
@for p in $(bin_PROGRAMS) ; do \
|
||||
pp="$(DESTDIR)$(bindir)/$$p" ; \
|
||||
- echo "TEST: test -x \"$$pp\"" ; \
|
||||
- test -x "$$pp" || \
|
||||
- { echo "Failed to verify installation of executable: $$pp"; \
|
||||
- exit 1 ; } \
|
||||
+ echo "TEST: test -x \"$$pp\" Test disabled" ; \
|
||||
done
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
Index: beast-0.7.1/birnet/birnettests.h
|
||||
===================================================================
|
||||
--- beast-0.7.1.orig/birnet/birnettests.h
|
||||
+++ beast-0.7.1/birnet/birnettests.h
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
+#include <signal.h>
|
||||
|
||||
BIRNET_EXTERN_C_BEGIN();
|
||||
|
||||
Index: beast-0.7.1/tools/bseloopfuncs.c
|
||||
===================================================================
|
||||
--- beast-0.7.1.orig/tools/bseloopfuncs.c
|
||||
+++ beast-0.7.1/tools/bseloopfuncs.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
+#include <signal.h>
|
||||
|
||||
typedef struct {
|
||||
gdouble score;
|
||||
--- beast-0.7.1.orig/bse/Makefile.am 2008-06-01 13:12:28.116708321 +0200
|
||||
+++ beast-0.7.1/bse/Makefile.am 2008-06-01 13:12:40.000000000 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
# need -I$(top_builddir) for <sfi/sficonfig.h>
|
||||
# need -I$(srcdir) for "bseserver.h" in .genprc.c
|
||||
# need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
|
||||
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
|
||||
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
|
||||
DEFS += $(strip \
|
||||
$(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
|
||||
$(filter $(<F), $(bse_sources) $(bse_sources))) \
|
||||
--- beast-0.7.1.orig/bse/zintern/Makefile.am 2008-06-01 13:14:25.880028999 +0200
|
||||
+++ beast-0.7.1/bse/zintern/Makefile.am 2008-06-01 13:14:38.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
## GNU Lesser General Public License version 2 or any later version.
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
|
||||
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
|
||||
|
||||
ZFILE_DEFS = $(strip \
|
||||
wave-mono $(srcdir)/wave-mono.bse \
|
||||
--- a/configure.in 2008-06-01 15:19:46.000000000 +0200
|
||||
+++ b/configure.in 2008-06-01 15:27:45.000000000 +0200
|
||||
@@ -159,39 +159,33 @@
|
||||
dnl # Define package requirements.
|
||||
dnl #
|
||||
dnl ## include acintltool.m4 to provide IT_PROG_INTLTOOL
|
||||
-builtin(include, acintltool.m4)dnl
|
||||
-AC_DEFUN([AC_I18N_REQUIREMENTS],
|
||||
-[
|
||||
- ALL_LINGUAS=`cat "$srcdir/po/LINGUAS" | grep -v '^#' | xargs echo -n `
|
||||
- AC_SUBST(ALL_LINGUAS)
|
||||
- AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/po/LINGUAS'])
|
||||
-
|
||||
- dnl # versioned BEAST gettext domain (po/)
|
||||
- BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION # version without -rcZ
|
||||
- AC_SUBST(BST_GETTEXT_DOMAIN)
|
||||
- AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])
|
||||
- GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN
|
||||
- AC_SUBST(GETTEXT_PACKAGE)
|
||||
-
|
||||
- dnl # locale directory for all domains
|
||||
- dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())
|
||||
- saved_prefix="$prefix"
|
||||
- saved_exec_prefix="$exec_prefix"
|
||||
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
- test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
||||
- if test "x$CATOBJEXT" = "x.mo" ; then
|
||||
- beastlocaledir=`eval echo "${libdir}/locale"`
|
||||
- else
|
||||
- beastlocaledir=`eval echo "${datadir}/locale"`
|
||||
- fi
|
||||
- exec_prefix="$saved_exec_prefix"
|
||||
- prefix="$saved_prefix"
|
||||
- AC_SUBST(beastlocaledir)
|
||||
-
|
||||
- dnl # do gettext checks and prepare for intltool
|
||||
- AM_GLIB_GNU_GETTEXT
|
||||
- IT_PROG_INTLTOOL
|
||||
-])
|
||||
+IT_PROG_INTLTOOL([0.35.0])
|
||||
+
|
||||
+dnl # versioned BEAST gettext domain (po/)
|
||||
+BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION # version without -rcZ
|
||||
+AC_SUBST(BST_GETTEXT_DOMAIN)
|
||||
+AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])
|
||||
+GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN
|
||||
+AC_SUBST(GETTEXT_PACKAGE)
|
||||
+
|
||||
+dnl # locale directory for all domains
|
||||
+dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())
|
||||
+saved_prefix="$prefix"
|
||||
+saved_exec_prefix="$exec_prefix"
|
||||
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
||||
+if test "x$CATOBJEXT" = "x.mo" ; then
|
||||
+ beastlocaledir=`eval echo "${libdir}/locale"`
|
||||
+else
|
||||
+ beastlocaledir=`eval echo "${datadir}/locale"`
|
||||
+fi
|
||||
+exec_prefix="$saved_exec_prefix"
|
||||
+prefix="$saved_prefix"
|
||||
+AC_SUBST(beastlocaledir)
|
||||
+
|
||||
+dnl # do gettext checks and prepare for intltool
|
||||
+AM_GLIB_GNU_GETTEXT
|
||||
+
|
||||
AC_DEFUN([AC_SFI_REQUIREMENTS],
|
||||
[
|
||||
dnl # check for GLib libs, libbirnet already provides gthread-2.0 and glib-2.0
|
||||
@@ -570,7 +564,6 @@
|
||||
AC_BIRNET_REQUIREMENTS
|
||||
|
||||
# Check requirement sets
|
||||
-AC_I18N_REQUIREMENTS
|
||||
AC_SFI_REQUIREMENTS
|
||||
AC_BSE_REQUIREMENTS
|
||||
AC_BSESCM_REQUIREMENTS
|
||||
--- a/po/POTFILES.in 2008-06-22 15:12:10.000000000 +0200
|
||||
+++ b/po/POTFILES.in 2008-06-22 15:13:28.000000000 +0200
|
||||
@@ -131,3 +131,29 @@
|
||||
plugins/davxtalstrings.c
|
||||
plugins/freeverb/bsefreeverb.c
|
||||
tools/bsewavetool.cc
|
||||
+
|
||||
+beast-gtk/bstgentypes.c
|
||||
+birnet/birnetcpu.cc
|
||||
+birnet/birnetutils.hh
|
||||
+bse/bsebus.genprc.c
|
||||
+bse/bsebusmodule.genidl.hh
|
||||
+bse/bsecontainer.genprc.c
|
||||
+bse/bsecore.genidl.hh
|
||||
+bse/bseieee754.h
|
||||
+bse/bseladspamodule.c
|
||||
+bse/bseparasite.genprc.c
|
||||
+bse/bsesong.genprc.c
|
||||
+bse/bsesource.genprc.c
|
||||
+bse/bsetrack.genprc.c
|
||||
+plugins/artscompressor.genidl.hh
|
||||
+plugins/bseamplifier.genidl.hh
|
||||
+plugins/bsebalance.genidl.hh
|
||||
+plugins/bsecontribsampleandhold.genidl.hh
|
||||
+plugins/bsenoise.genidl.hh
|
||||
+plugins/bsequantizer.genidl.hh
|
||||
+plugins/bsesummation.genidl.hh
|
||||
+plugins/davbassfilter.genidl.hh
|
||||
+plugins/davchorus.genidl.hh
|
||||
+plugins/standardguspatchenvelope.genidl.hh
|
||||
+plugins/standardsaturator.genidl.hh
|
||||
+tests/latency/bselatencytest.genidl.hh
|
|
@ -1,22 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flac123";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz";
|
||||
sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ flac libao libogg popt ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flac-tools.sourceforge.net/";
|
||||
description = "A command-line program for playing FLAC audio files";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
mainProgram = "flac123";
|
||||
};
|
||||
}
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "10.71";
|
||||
version = "10.72";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU=";
|
||||
hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, python3
|
||||
, mopidy
|
||||
, extraPkgs ? pkgs: []
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
ytmusicapi
|
||||
] ++ [
|
||||
mopidy
|
||||
];
|
||||
] ++ extraPkgs pkgs;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
vcrpy
|
||||
|
|
|
@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
it is published under the GNU General Public License.
|
||||
'';
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant orivej ];
|
||||
maintainers = with lib.maintainers; [ orivej ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "muse4";
|
||||
};
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surge-XT";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surge-synthesizer";
|
||||
repo = "surge";
|
||||
rev = "release_xt_${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ=";
|
||||
sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/build.xml b/build.xml
|
||||
index 1ba08e0..9248b76 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -56,10 +56,16 @@
|
||||
|
||||
<target name="compilejni" unless="isWindows">
|
||||
<description>JNI compilation task (builds libarecafs.so ... for unix-like operating systems only)</description>
|
||||
+
|
||||
<!--Generate the JNI header-->
|
||||
- <javah destdir="${root}/jni" force="yes" classpath="${root}/lib/areca.jar">
|
||||
- <class name="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/>
|
||||
- </javah>
|
||||
+ <exec executable="javah">
|
||||
+ <arg value="-d"/>
|
||||
+ <arg value="${root}/jni"/>
|
||||
+ <arg value="-force"/>
|
||||
+ <arg value="-classpath"/>
|
||||
+ <arg value="${root}/lib/areca.jar"/>
|
||||
+ <arg value="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/>
|
||||
+ </exec>
|
||||
|
||||
<!-- Compile the JNI code -->
|
||||
<exec dir="${root}/jni" executable="gcc">
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
|
||||
, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage
|
||||
, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }:
|
||||
, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused
|
||||
, callPackage, file ? null, gettext ? null, enableNls ? true, enableTiny ? false
|
||||
}:
|
||||
|
||||
assert enableNls -> (gettext != null);
|
||||
|
||||
|
@ -14,11 +15,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "7.2";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY=";
|
||||
sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
|
||||
|
@ -32,7 +33,9 @@ in stdenv.mkDerivation rec {
|
|||
(lib.enableFeature enableTiny "tiny")
|
||||
];
|
||||
|
||||
postInstall = if enableTiny then null else ''
|
||||
postInstall = if enableTiny then
|
||||
null
|
||||
else ''
|
||||
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
|
||||
'';
|
||||
|
||||
|
|
|
@ -2234,6 +2234,27 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
jackmacwindows.vscode-computercraft = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-computercraft";
|
||||
publisher = "jackmacwindows";
|
||||
version = "1.1.1";
|
||||
hash = "sha256-ec1I3oQ06iMdSUcqf8yA3GjE7Aqa0PiLzRQLwFcL0KU=";
|
||||
};
|
||||
postInstall = ''
|
||||
# Remove superflouous images to reduce closure size
|
||||
rm $out/$installPrefix/images/*.gif
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.vscode-computercraft/changelog";
|
||||
description = "A Visual Studio Code extension for ComputerCraft and CC: Tweaked auto-completion";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.vscode-computercraft";
|
||||
homepage = "https://github.com/MCJack123/vscode-computercraft";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomodachi94 ];
|
||||
};
|
||||
};
|
||||
|
||||
jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };
|
||||
|
||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.39.0";
|
||||
version = "1.45.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bAk+F81q0sPSgU8LkpniVJyKaQt6cxUaUzNSZ3f5v0Q=";
|
||||
hash = "sha256-gTZ2LuCsYFIUASfjzLi4t0PbjyriU9FR7d2G+PcLDVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
natsort
|
||||
piexif
|
||||
pillow
|
||||
pure-protobuf
|
||||
curl-cffi
|
||||
pygobject3
|
||||
python-magic
|
||||
rarfile
|
||||
|
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "cobang";
|
||||
version = "0.10.9";
|
||||
version = "0.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hongquan";
|
||||
repo = "CoBang";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xOP2XkmHOGMe50dn4StX/9veTdloLHq76ENWEUK4Keo=";
|
||||
hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.29.6.2";
|
||||
version = "3.29.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "qcad-${version}-src";
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NKWuvhVGtlhWOfV0MWyViTgk0luA8mvnwQS0TZj7Ulc=";
|
||||
hash = "sha256-/Tz3brcny9wp8DnCvO7GpPczglJpJD0kWzBR6exRlPA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "124.0.2478.67";
|
||||
version = "125.0.2535.13";
|
||||
revision = "1";
|
||||
hash = "sha256-EywgM3G0Yph3dofullSVZpXSvT2MHc4uPyGAoaXCgN8=";
|
||||
hash = "sha256-vO7crYX/QW+S1fjT37JtyRJyziauG+H3LWOasX4VaKM=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "125.0.2535.6";
|
||||
version = "126.0.2552.0";
|
||||
revision = "1";
|
||||
hash = "sha256-iD/e7AuPG0uNZY20wFQRbvAaKmaUw2RKeRJADU1MFRI=";
|
||||
hash = "sha256-TQHTqCweP0mEkEYRxlU7YtYS6Y6ooZ4V6peCsVvcIjg=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "124.0.2478.67";
|
||||
version = "124.0.2478.80";
|
||||
revision = "1";
|
||||
hash = "sha256-PRL2aiebCoK0eGJWlvI+Gsk14FltV+GaQdojLuDFimU=";
|
||||
hash = "sha256-p+t12VcwxSDuyZj3VfzEJ6m0rGoVC7smeyHoODttwQU=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.32";
|
||||
version = "0.6.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-mXHDxmjQdfO6uZ1ROcxwtDaPvbv2kFV+qLbejn3Kycs=";
|
||||
hash = "sha256-f8EYiTXS9ByELWWV2EF4jrDamoKRGejKhYVyNscHZvo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeconform";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yannh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PUZ3zwgOQ362ikoX1D7SLThiaFpXJh9TKOdjZqZDtSg=";
|
||||
sha256 = "sha256-4rHEkzoO0AuuFB6G/z1WjGqfYMaHF3Z1YDAhIbBVCts=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u5lzCIbSIOrhI2OE2PprvNZv7KetYGntyADVftSJrkY=";
|
||||
hash = "sha256-iQ+9CN6De2jz3+dZ26jgqbXAx9Fef8ROgVX8kKYMAG0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZsSzLIVVoKZZEZOIYJTNl0DGere3sKfXsjXbRVmeYC4=";
|
||||
vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE=";
|
||||
hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
|
||||
|
|
|
@ -166,8 +166,8 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.8.2";
|
||||
hash = "sha256-c9RzdmaTXMOi4oP++asoysDpt/BSvBK/GmEDDGViSl0=";
|
||||
version = "1.8.3";
|
||||
hash = "sha256-4W1Cs3PAGn43eGDK15qSvN+gLdkkoFIwhejcJsCqcYA=";
|
||||
vendorHash = "sha256-2+ctm1lJjCHITWV7BqoqgBlXKjNT4lueAt4F3UtoL9Q=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yor";
|
||||
version = "0.1.193";
|
||||
version = "0.1.194";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6IdCnuW49DVeOJKBD6AYxr2kbv7CmpFReja3PweDSmU=";
|
||||
hash = "sha256-8JkxCkDYalu3IMoGbyNOEJ28CgU87gTq0bX+o+5sV2Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc=";
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.33.1";
|
||||
version = "0.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JmUJUZn4mnTKdAVzYaCGZXDJmIeGfyn8Z+OfLfXp/S0=";
|
||||
hash = "sha256-BafS+++8iTVT38pneqCfAQFg15PpXOW/Bv8anmdHZTg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fpseCFQjLhUbhisjOYmLfznKGea5+E8CzjtbE7CEsk8=";
|
||||
vendorHash = "sha256-4AN/0OgFX+5uymN/QfOr0sZipTmszhieOPmReKciFtg=";
|
||||
proxyVendor = true;
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "3.103.36";
|
||||
version = "3.104.7";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.103.36-build-240411hw9xbpc7s-x86_64.AppImage";
|
||||
hash = "sha256-qxu/a8eeWeOKCsno51J2IHUXTXH82KXBNajfoEkkid8=";
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.104.7-build-2405024h1b4qoap-x86_64.AppImage";
|
||||
hash = "sha256-VjN9bKxFokExEjMGz42d/VVwVWJzowI42ONsNyXEbnc=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240504";
|
||||
version = "20240506";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ojV/taYV5J4nHfDg//lJ78ltJv7nIG1H9iXo95nA/n8=";
|
||||
hash = "sha256-rPM5Qz1n9bTOF//sqpT+LvEjBSCT2BjyQBIxjV6CkGU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -13,13 +13,13 @@ let
|
|||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.27.6";
|
||||
version = "1.27.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BZAje6dA3wmJ6feHWIYPPYTA3sp1WGwl4MjUJS7iZCo=";
|
||||
hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E=";
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-sDA//ARuzU0q2V3jhFXGhaQaeF0jsDRbtdHCBTgIL8U=";
|
||||
hash = "sha256-6eolLBWVpnEvjA+C6R5gpkxG/G59atrkwOP7CWhs7oI=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, callPackage
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
|
@ -68,6 +69,12 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw=";
|
||||
};
|
||||
|
||||
clad_src = fetchgit {
|
||||
url = "https://github.com/vgvassilev/clad";
|
||||
rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files!
|
||||
hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
propagatedBuildInputs = [
|
||||
nlohmann_json
|
||||
|
@ -131,6 +138,23 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
|
||||
--replace 'set(lcgpackages ' '#set(lcgpackages '
|
||||
|
||||
# We have to bypass the connection check, because it would disable clad.
|
||||
# This should probably be fixed upstream with a flag to disable the
|
||||
# connectivity check!
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'if(NO_CONNECTION)' 'if(FALSE)'
|
||||
substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \
|
||||
--replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)'
|
||||
# Make sure that clad is not downloaded when building
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
|
||||
# Make sure that clad is finding the right llvm version
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm'
|
||||
# Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})'
|
||||
|
||||
substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
|
||||
--replace 'add_clang_symlink(''${link} clang)' ""
|
||||
|
||||
|
@ -151,40 +175,18 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-Drpath=ON"
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-Dbuiltin_llvm=OFF"
|
||||
"-Dbuiltin_freetype=OFF"
|
||||
"-Dbuiltin_gtest=OFF"
|
||||
"-Dbuiltin_nlohmannjson=OFF"
|
||||
"-Dbuiltin_openui5=ON"
|
||||
"-Dclad=OFF"
|
||||
"-Ddavix=ON"
|
||||
"-Ddcache=OFF"
|
||||
"-Dfail-on-missing=ON"
|
||||
"-Dfftw3=OFF"
|
||||
"-Dfitsio=OFF"
|
||||
"-Dfortran=OFF"
|
||||
"-Dgnuinstall=ON"
|
||||
"-Dimt=ON"
|
||||
"-Dgviz=OFF"
|
||||
"-Dhttp=ON"
|
||||
"-Dmysql=OFF"
|
||||
"-Dodbc=OFF"
|
||||
"-Dopengl=ON"
|
||||
"-Dpgsql=OFF"
|
||||
"-Dpythia8=OFF"
|
||||
"-Droot7=ON"
|
||||
"-Dsqlite=OFF"
|
||||
"-Dssl=ON"
|
||||
"-Dtmva=ON"
|
||||
"-Dtmva-pymva=OFF"
|
||||
"-Dvdt=OFF"
|
||||
"-Dwebgui=ON"
|
||||
"-Dxml=ON"
|
||||
"-Dxrootd=ON"
|
||||
]
|
||||
++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
@ -195,6 +197,9 @@ stdenv.mkDerivation rec {
|
|||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ];
|
||||
|
||||
postInstall = ''
|
||||
for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
|
||||
wrapProgram "$out/bin/$prog" \
|
||||
|
@ -251,7 +256,7 @@ stdenv.mkDerivation rec {
|
|||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://root.cern.ch/";
|
||||
homepage = "https://root.cern/";
|
||||
description = "A data analysis framework";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.guitargeek maintainers.veprbl ];
|
||||
|
|
|
@ -12,8 +12,8 @@ thisroot () {
|
|||
|
||||
postHooks+=(thisroot)
|
||||
|
||||
addRootInludePath() {
|
||||
addRootIncludePath() {
|
||||
addToSearchPath ROOT_INCLUDE_PATH $1/include
|
||||
}
|
||||
|
||||
addEnvHooks "$targetOffset" addRootInludePath
|
||||
addEnvHooks "$targetOffset" addRootIncludePath
|
||||
|
|
|
@ -48,7 +48,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
|
|||
#---Set Linker flags----------------------------------------------------------------------
|
||||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
|
||||
else (CMAKE_SYSTEM_NAME MATCHES Darwin)
|
||||
MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
|
||||
MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.")
|
||||
endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
|
||||
diff a/config/root-config.in b/config/root-config.in
|
||||
--- a/config/root-config.in
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.49.0";
|
||||
version = "2.49.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4aT8ThZt2Dlp2RjaGBiTgw2IPantSnTJPhP5Tel755Q=";
|
||||
hash = "sha256-9Qr1goFmHV4rNEB849dF9+qEEMOWanCyAcNpXwuQxOo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p+1Knx+z1M3m8VjsvBfY6D1Gs5va5Z8QFExv5397wHU=";
|
||||
vendorHash = "sha256-FztCYs6db6f3niAru/vPpcze84nqwzspoJsdqmdkJmk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "16.10.4",
|
||||
"repo_hash": "sha256-ieS2MO5jBNBK0hmuWLfaDjRNhn98927hlTFrDbV0zCQ=",
|
||||
"version": "16.10.5",
|
||||
"repo_hash": "sha256-w2cXFIm588Q/SB1kO9dGCmxO3+Xee7BaCCipuVcnfXg=",
|
||||
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v16.10.4-ee",
|
||||
"rev": "v16.10.5-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "16.10.4",
|
||||
"GITLAB_PAGES_VERSION": "16.10.4",
|
||||
"GITALY_SERVER_VERSION": "16.10.5",
|
||||
"GITLAB_PAGES_VERSION": "16.10.5",
|
||||
"GITLAB_SHELL_VERSION": "14.34.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "16.10.4"
|
||||
"GITLAB_WORKHORSE_VERSION": "16.10.5"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "16.10.4";
|
||||
version = "16.10.5";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
@ -18,10 +18,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dzHGnZwXomCUrlup9VD/0l084Swp9CVi4nJi6MtOwi8=";
|
||||
hash = "sha256-ctJfw4aU5qsv+I3rR9xZPGssYQpTnbn4MdTVOYapHqQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mPoz+y1LWpGr+zYqAhxzznMyKIPehsDW+WFxklYSC10=";
|
||||
vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas=";
|
||||
|
||||
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "3.93.0";
|
||||
version = "4.1.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-4jsnfkHXs9FSnyQ6JP/zmW51x8fHyQ0n+B8EPOoTSAA=";
|
||||
hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4=";
|
||||
vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable flaky inmemory storage driver test
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "16.10.4";
|
||||
version = "16.10.5";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jdg1cxHra4lHvf8+cojaE9OXR40w24OiwMhDYvmUBkI=";
|
||||
hash = "sha256-wuEYcwAKYO7YZs88NvE0AI5+aZ9JeLBAeXITc2jLGVo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "16.10.4";
|
||||
version = "16.10.5";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
|
|
@ -69,7 +69,7 @@ let
|
|||
patches = (oldAttrs.patches or []) ++ [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch";
|
||||
hash = "sha256-H45/YF9zaOUg6UqEEus4uBeGA/TjynuJZcRyc6BHQ30=";
|
||||
hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go2tv" + lib.optionalString (!withGui) "-lite";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexballas";
|
||||
repo = "go2tv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5GOhTDlUpzInMm8hVcBjbf1CXRw2GQITRtj6UaxYHtE=";
|
||||
sha256 = "sha256-ZP4ZpNc5l4Acw83Q4rSvPYByvgiKpkbxxu0bseivW58=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "0xpropo";
|
||||
version = "1.000";
|
||||
version = "1.100";
|
||||
|
||||
src = let
|
||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://github.com/0xType/0xPropo/releases/download/${version}/0xPropo_${underscoreVersion}.zip";
|
||||
hash = "sha256-yIhabwHjBipkcmsSRaokBXCbawQkUNOU8v+fbn2iiY4=";
|
||||
hash = "sha256-ZlZNvn9xiOxS+dfGI1rGbh6XlXo3/puAm2vhKh63sK4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
telegram-desktop.overrideAttrs (old: rec {
|
||||
pname = "64gram";
|
||||
version = "1.1.19";
|
||||
version = "1.1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
|
@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec {
|
|||
rev = "v${version}";
|
||||
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-9QCh7/eNPWqsOF+cjO61EnqqhAdy6+4UxZhWjfJc5gQ=";
|
||||
hash = "sha256-Fhix+kCqUTr9qGMzDc2undxmhjmM6fPorZebeqXNHHE=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
|
|
@ -1,40 +1,40 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, gjs
|
||||
, glib-networking
|
||||
, gnome
|
||||
, gtk-layer-shell
|
||||
, libpulseaudio
|
||||
, libsoup_3
|
||||
, networkmanager
|
||||
, upower
|
||||
, typescript
|
||||
, wrapGAppsHook3
|
||||
, linux-pam
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
gjs,
|
||||
glib-networking,
|
||||
gnome,
|
||||
gtk-layer-shell,
|
||||
libpulseaudio,
|
||||
libsoup_3,
|
||||
networkmanager,
|
||||
upower,
|
||||
typescript,
|
||||
wrapGAppsHook3,
|
||||
linux-pam,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ags";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aylur";
|
||||
repo = "ags";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo=";
|
||||
hash = "sha256-ebnkUaee/pnfmw1KmOZj+MP1g5wA+8BT/TPKmn4Dkwc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20=";
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "build_types" true)
|
||||
];
|
||||
mesonFlags = [ (lib.mesonBool "build_types" true) ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
|
@ -63,12 +63,18 @@ buildNpmPackage rec {
|
|||
chmod u+x ./post_install.sh && patchShebangs ./post_install.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Aylur/ags";
|
||||
description = "A EWW-inspired widget system as a GJS library";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
changelog = "https://github.com/Aylur/ags/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
foo-dogsquared
|
||||
johnrtitor
|
||||
];
|
||||
mainProgram = "ags";
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "antares";
|
||||
version = "0.7.23";
|
||||
version = "0.7.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antares-sql";
|
||||
repo = "antares";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7bj0f7JrUgHr2g489ABjNLfRERQFx0foDP0YqBTNkzI=";
|
||||
hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-pRrg7fY5P2awds1ncsnD/lDvKmiOKhzjNcKXKy70bcs=";
|
||||
npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg=";
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
||||
|
|
46
pkgs/by-name/as/async-profiler/package.nix
Normal file
46
pkgs/by-name/as/async-profiler/package.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
jdk,
|
||||
makeWrapper,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "async-profiler";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jvm-profiling-tools";
|
||||
repo = "async-profiler";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
install -D build/bin/asprof "$out/bin/async-profiler"
|
||||
install -D build/lib/libasyncProfiler${ext} "$out/lib/libasyncProfiler${ext}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
|
||||
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mschuwalow ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "async-profiler";
|
||||
};
|
||||
}
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "autosuspend";
|
||||
version = "6.1.1";
|
||||
version = "7.0.0";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
disabled = python3.pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y=";
|
||||
hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -30,7 +30,7 @@ buildGoModule rec {
|
|||
'';
|
||||
homepage = "https://bitmagnet.io/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant viraptor ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
mainProgram = "bitmagnet";
|
||||
};
|
||||
}
|
||||
|
|
82
pkgs/by-name/cd/cdecl/package.nix
Normal file
82
pkgs/by-name/cd/cdecl/package.nix
Normal file
|
@ -0,0 +1,82 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bison,
|
||||
flex,
|
||||
readline,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cdecl";
|
||||
version = "2.5-unstable-2024-05-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ridiculousfish";
|
||||
repo = "cdecl-blocks";
|
||||
rev = "1e6e1596771183d9bb90bcf152d6bc2055219a7e";
|
||||
hash = "sha256-5XuiYkFe+QvVBRIXRieKoE0zbISMvU1iLgEfkw6GnlE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cdecl-2.5-lex.patch
|
||||
# when `USE_READLINE` is enabled, this option will not be present
|
||||
./test_remove_interactive_line.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace cdecl.c \
|
||||
--replace 'getline' 'cdecl_getline'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
ncurses
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
[
|
||||
"-DBSD"
|
||||
"-DUSE_READLINE"
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=int-conversion"
|
||||
"-Wno-error=incompatible-function-pointer-types"
|
||||
]
|
||||
);
|
||||
NIX_LDFLAGS = "-lreadline";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"BINDIR=${placeholder "out"}/bin"
|
||||
"MANDIR=${placeholder "out"}/man1"
|
||||
"CATDIR=${placeholder "out"}/cat1"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin;
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Translator English -- C/C++ declarations";
|
||||
homepage = "https://cdecl.org";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "cdecl";
|
||||
};
|
||||
}
|
10
pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch
Normal file
10
pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- a/test_expected_output.txt 2024-05-07 05:47:13.184419240 +0200
|
||||
+++ b/test_expected_output.txt 2024-05-07 05:48:38.980122345 +0200
|
||||
@@ -26,7 +26,6 @@
|
||||
options
|
||||
create (-c), nocreate
|
||||
prompt, noprompt (-q)
|
||||
- interactive (-i), nointeractive
|
||||
ritchie (-r), preansi (-p), ansi (-a) or cplusplus (-+)
|
||||
|
||||
Current set values are:
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "centrifugo";
|
||||
version = "5.3.1";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QKHRIH61xNpQaelrupO9fzmN6XESPU1d/aXCbqYgJXs=";
|
||||
hash = "sha256-h1aI+dAVL/ToHeSdI41i74Kq2JnvGgv2fI5ffhBIfRM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fceoOYrDk5puImSckTkEo3hPCpbQE5t8b81sXnLid/Q=";
|
||||
vendorHash = "sha256-mtIRbW8aN1PJs/43aaAa141l2VmVdVHY8bnvfV+r0e8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -13,10 +13,10 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-GAYwn2Epa5sT963e1Q7uOEBznSuE+5TV+Afr5ogCkSI=";
|
||||
aarch64-linux = "sha256-EU++TsPV8kljhHv2e4NxhYThkLeSFK+xPqO0j+eM0Pw=";
|
||||
x86_64-darwin = "sha256-/KlEyyC1jsQMQbO5xCO/6ONCTa/atwEnU71zUcroPIk=";
|
||||
aarch64-darwin = "sha256-YQ5vNboYNT+uJa/8KiI812lGDfzuWJbA3ZzlzLpDqHY=";
|
||||
x86_64-linux = "sha256-60wg6DspTyYFVuGjNld5Wb9if51EEXNPNR1wHbomKmY=";
|
||||
aarch64-linux = "sha256-F8MQEoRJ3xYq6sEQNWx9DpLbbxT3lBd/PufPt7l5Bi4=";
|
||||
x86_64-darwin = "sha256-Sz4AT5yGPTIQyzNF6+Ku4pSmMkbHMtCRDRHn9Q5EQ28=";
|
||||
aarch64-darwin = "sha256-4Xatp0ZvRfgCxMME9CrhkZiTwrH4OjF8+E7IV95QH70=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
|
@ -24,7 +24,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.8.30";
|
||||
version = "1.8.32";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dmarc-report-converter";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tierpod";
|
||||
repo = "dmarc-report-converter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-93sNEBV7MxZr6tqPaFKgY0KA1J3W0HoCiIDZg268Smc=";
|
||||
hash = "sha256-TqvAqMZEXhMO3/0VNY3Mr/E15QQbucuKyG95j2jWU5g=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -17,16 +17,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.18.14";
|
||||
version = "0.18.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rbaKDOxHttE4SgQdExO8mlgzM0+xpWl/fL39nPinK/o=";
|
||||
hash = "sha256-8Kv2jDWb1HDjxeGZ36btQM/b+lx3yKkkvMxDyzmMUvw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-D0h39p8vV9Vm/UgjtgpRnqaxq4l0OrGxN/1MRpUds2g=";
|
||||
cargoHash = "sha256-xV1pa2vQwB9u7KUMiTawuVSgg7fmxOUxz6tFsyXak8o=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
|
39
pkgs/by-name/fl/flac123/package.nix
Normal file
39
pkgs/by-name/fl/flac123/package.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
flac,
|
||||
libao,
|
||||
libogg,
|
||||
popt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flac123";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flac123";
|
||||
repo = "flac123";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LtL69t2r9TlIkpQWZLge8ib7NZ5rvLW6JllG2UM16Kw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
flac
|
||||
libao
|
||||
libogg
|
||||
popt
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/flac123/flac123";
|
||||
description = "A command-line program for playing FLAC audio files";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ kiike ];
|
||||
mainProgram = "flac123";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gittuf";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gittuf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lECvgagcqBS+BVD296e6WjjSCA3vI0nfLzpLTi/7N0I=";
|
||||
hash = "sha256-BXqxVtdxUbcl2cK4kYEBZIbMCKOjPvuoTnDh8L6+mO8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UKhXbZXKNtMnQe7sHBOmzzXGBHuDTYeZGKnteZirskA=";
|
||||
vendorHash = "sha256-yRUgtUeoTthxSGZ6VX/MOVeY0NUXq0Nf+XlysHqcpWw=";
|
||||
|
||||
ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ];
|
||||
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitu";
|
||||
version = "0.19.2";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altsem";
|
||||
repo = "gitu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6gjXsuxKGv8OrbBg8NDOj5ITpLI3S33VsjpCbK5SaIk=";
|
||||
hash = "sha256-H1REl6DkWYwZ1s8FLyHlsFi1DQY0C3Zizz/o9KUO7XQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-W73sSZ/OjeRcI2NNTp2gkabtC6krXOnv8nRAbNbXOp4=";
|
||||
cargoHash = "sha256-/u6VmcaQpVagz7W/eAFql9sKF+9dn/o1VGvFGJAJkaA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.125.5";
|
||||
version = "0.125.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vvADd4S4AURkIODGvDf4J9omZjKcZeQKQ6ZSKDu1gog=";
|
||||
hash = "sha256-rOkvt+U8iju+oIb/BfPMHSqhZYM6XSUS2B8Oxd46cF8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L8+e6rZvFaNV9gyWJtXv9NnzoigVDSyNKTuxGrRwb44=";
|
||||
vendorHash = "sha256-UJoK73oQ1gH4Y1hxjE66Ou8o9jAeJpA4njgP3VHu68s=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Hyprland's GPU-accelerated screen locking utility";
|
||||
homepage = "https://github.com/hyprwm/hyprlock";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "hyprlock";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "i2p";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"https://files.i2p-projekt.de/"
|
||||
"https://download.i2p2.no/releases/"
|
||||
]);
|
||||
hash = "sha256-mGBt2BrHU2ETV3jRay5tEpMJEO3b3K6BlBjYZNedtEA=";
|
||||
hash = "sha256-38kG0UyU1ngVdUb/H5tIuG3p+bsvJznjervDh3TWoGo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
34
pkgs/by-name/im/imposm/package.nix
Normal file
34
pkgs/by-name/im/imposm/package.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, leveldb, geos }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imposm";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omniscale";
|
||||
repo = "imposm3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xX4cV/iU7u/g9n7dtkkkCtNOPZK5oyprNHGDUuW+ees=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
buildInputs = [ leveldb geos ];
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
"-X github.com/omniscale/imposm3.Version=${version}"
|
||||
];
|
||||
|
||||
# requires network access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Imposm imports OpenStreetMap data into PostGIS";
|
||||
homepage = "https://imposm.org/";
|
||||
changelog = "https://github.com/omniscale/imposm3/releases/tag/${src.rev}";
|
||||
license = licenses.apsl20;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
mainProgram = "imposm";
|
||||
};
|
||||
}
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "7.4.1";
|
||||
version = "7.5.0";
|
||||
in
|
||||
# The output of the derivation is a tool to create bootable images using Limine
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
|
||||
sha256 = "sha256-0SCy5msjWG9c1UHJka1typCTGh21VzHLfH5pMPMdEH0=";
|
||||
sha256 = "sha256-4mUoBl+MG+rkRd/fBJuTTGGdPcncuhnumfi5s2yh7yI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "meli";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
|
@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec {
|
|||
"https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
|
||||
"https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs=";
|
||||
hash = "sha256-xfc4DZGKQi/n87JcjTl+s2UFJ20v+6JmzSL36pZlSc0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM=";
|
||||
cargoHash = "sha256-7ax3VQ+McmzxdG8TeKnMnD0uJmM0pi9Sskfdl2SZkz4=";
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config
|
||||
OPENSSL_NO_VENDOR=1;
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nezha-agent";
|
||||
version = "0.16.5";
|
||||
version = "0.16.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WRHYI3/6qrVZRa4ANA6VBBJCaINP1N8Xjy0GWO4LqgA=";
|
||||
hash = "sha256-+78WrkFMY2dfqU3ShmzQgR1ZgEKyb9COUjlIf695OM8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AtcRfvYBgTZJz9dpsMgacnV8RNi2Ph7QgUrcE6zzTo8=";
|
||||
vendorHash = "sha256-kqu3+hO0juxI5qbczVFg0GF+pljmePFbKd59a14U7Pg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
ps.buildPythonApplication rec {
|
||||
pname = "normcap";
|
||||
version = "0.5.4";
|
||||
version = "0.5.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = ps.pythonOlder "3.9";
|
||||
|
@ -34,7 +34,7 @@ ps.buildPythonApplication rec {
|
|||
owner = "dynobo";
|
||||
repo = "normcap";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bYja05U/JBwSij1J2LxN+c5Syrb4qzWSZY5+HNmC9Zo=";
|
||||
hash = "sha256-pvctgJCst536D3yLlel70hCwe1T3lxA8F6L3KKbfiEA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "offat";
|
||||
version = "0.17.3";
|
||||
version = "0.17.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OWASP";
|
||||
repo = "OFFAT";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q9xqtJJ9R81tNvd5Z6S4OWMqDwVoijntw2LOXldVy0E=";
|
||||
hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
|
|
@ -12,18 +12,18 @@
|
|||
, vulkan-loader
|
||||
, xorg
|
||||
|
||||
, nix-update-script
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opencomposite";
|
||||
version = "unstable-2024-03-04";
|
||||
version = "0-unstable-2024-05-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "znixian";
|
||||
repo = "OpenOVR";
|
||||
rev = "1bfdf67358add5f573efedbec1fa65d18b790e0e";
|
||||
hash = "sha256-qF5oMI9B5a1oE2gQb/scbom/39Efccja0pTPHHaHMA8=";
|
||||
rev = "5ddd6024efafa82c7a432c9dd8a67e3d5c3f9b38";
|
||||
hash = "sha256-m6Xhi6xlDWiVqtYyxpQP2vp5JsB2EKsoXkmd0IYtPQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -52,8 +52,9 @@ stdenv.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch=openxr" ];
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
hardcodeZeroVersion = true;
|
||||
branch = "openxr";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -7,17 +7,18 @@
|
|||
, lib
|
||||
, libGL
|
||||
, stdenv
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvr";
|
||||
version = "2.2.3";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "openvr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Dpl88Te+EoVasoCtwERGrYt3xK8o03h15r8IVxxPPCw=";
|
||||
hash = "sha256-bIKjZ7DvJVmDK386WgXaAFQrS0E1TNEUMhfQp7FNnvk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -56,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "2.2.16";
|
||||
version = "2.2.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
|
@ -14,8 +14,8 @@ python3Packages.buildPythonApplication rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
rev = version;
|
||||
hash = "sha256-zT+ixOM+by13iM78CHkQqTS9LCLFspHNyEjd7P2psUE=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S1bIIazrBWyjF8tOcIk0AwwWq9gbpTKNsjr9iYA5lKk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
|
|
@ -48,14 +48,14 @@ let
|
|||
]);
|
||||
path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA=";
|
||||
sha256 = "sha256-OlACGAYP4nMZZAVJduzj0AGTzSwM+lE7+H2xgmQVSWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
darwin,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slumber";
|
||||
version = "1.1.0";
|
||||
|
@ -14,12 +20,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-AK/+1tCdvNucIbxwyqOt/TbOaJPVDOKFEx5NqW2Yd4U=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal-based HTTP/REST client";
|
||||
homepage = "https://slumber.lucaspickering.me";
|
||||
license = licenses.mit;
|
||||
mainProgram = "slumber";
|
||||
maintainers = with maintainers; [ javaes ];
|
||||
broken = stdenv.isDarwin || stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
1129
pkgs/by-name/ta/tabby/Cargo.lock
generated
1129
pkgs/by-name/ta/tabby/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, stdenv
|
||||
|
||||
, git
|
||||
|
@ -31,7 +32,7 @@ let
|
|||
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
|
||||
|
||||
pname = "tabby";
|
||||
version = "0.8.3";
|
||||
version = "0.10.0";
|
||||
|
||||
|
||||
availableAccelerations = flatten [
|
||||
|
@ -77,7 +78,7 @@ let
|
|||
# to use a specific device type as it is relying on llama-cpp only being
|
||||
# built to use one type of device.
|
||||
#
|
||||
# See: https://github.com/TabbyML/tabby/blob/v0.8.3/crates/llama-cpp-bindings/include/engine.h#L20
|
||||
# See: https://github.com/TabbyML/tabby/blob/v0.10.0/crates/llama-cpp-bindings/include/engine.h#L20
|
||||
#
|
||||
llamaccpPackage = llama-cpp.override {
|
||||
rocmSupport = enableRocm;
|
||||
|
@ -107,7 +108,7 @@ rustPlatform.buildRustPackage {
|
|||
owner = "TabbyML";
|
||||
repo = "tabby";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+5Q5XKfh7+g24y2hBqJC/jNEoRytDdcRdn838xc7c8w=";
|
||||
hash = "sha256-Oi4KY2H6/dSBydjvPmycdinXUWCdbbhV32wKRvjjnuo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -116,6 +117,7 @@ rustPlatform.buildRustPackage {
|
|||
outputHashes = {
|
||||
"tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4=";
|
||||
"tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA=";
|
||||
"tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -152,6 +154,8 @@ rustPlatform.buildRustPackage {
|
|||
# file cannot create directory: /var/empty/local/lib64/cmake/Llama
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/TabbyML/tabby";
|
||||
changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}";
|
||||
|
|
|
@ -4,16 +4,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tenki";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckaznable";
|
||||
repo = "tenki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FItq/rnxJsEnKFPUR59Wo3eQvaykaIyCohCcOlPrdAE=";
|
||||
hash = "sha256-b9tByEuZ7mdPJVGgyvCnf+pyBKhO7I/B/Ak8MtM5qhU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PhilKt7gLWoOOpkpSPa1/E33rmHvX466hSCGoNfezq0=";
|
||||
cargoHash = "sha256-WvxO5muh0IGHoZr/ahE9rHs+MiXLGnQq3dgz63TwFRc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "tty-clock with weather effect";
|
||||
|
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/themix-project/themix-gui";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "themix-gui";
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -59,11 +59,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uclibc-ng";
|
||||
version = "1.0.47";
|
||||
version = "1.0.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-KaTWhKBto0TuPuCazCynZJ1ZKuP/hI9pgUXEbe8F78s=";
|
||||
hash = "sha256-O/X8bMXLxFS2xHhCR1XG9x58FVeKLJZvAmBqpcVZbiE=";
|
||||
};
|
||||
|
||||
# 'ftw' needed to build acl, a coreutils dependency
|
||||
|
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.11.9";
|
||||
version = "4.11.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-fAosJmEAQGA1QAyabcmqwuDeqUM+t3mNIfSOrAwc5hg=";
|
||||
hash = "sha256-RBdMgxJRVM8dj4eDh/ZAzJkyWoAJnpge3Vg25H9+Eak=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison";
|
||||
version = "2.53.4";
|
||||
version = "2.53.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bcpierce00";
|
||||
repo = "unison";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0=";
|
||||
hash = "sha256-XCdK38jG7tRI+/Zk72JVY8a/pPJF6KVaf8l2s3hgxLs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -14,12 +14,12 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "weasis";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
|
||||
# Their build instructions indicate to use the packaging script
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip";
|
||||
hash = "sha256-4Ew7RG8eM8pa6AiblREgt03fGOQVKVzkQMR87GIJIVM=";
|
||||
hash = "sha256-+Bi9rTuM9osKzbKVA4exqsFm8p9+1OHgJqRSNnCC6QQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,15 @@
|
|||
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
|
||||
, boost, curl, openssl, log4shib, xercesc, xml-security-c
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
boost,
|
||||
curl,
|
||||
openssl,
|
||||
log4shib,
|
||||
xercesc,
|
||||
xml-security-c,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -12,17 +22,28 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU=";
|
||||
};
|
||||
|
||||
buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
openssl
|
||||
log4shib
|
||||
xercesc
|
||||
xml-security-c
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.sigmanificient ];
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "scheme-manpages";
|
||||
version = "unstable-2024-02-11";
|
||||
version = "0-unstable-2024-02-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schemedoc";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cozette";
|
||||
version = "1.23.2";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip";
|
||||
hash = "sha256-v1UWrVx1PnNPiFtMMy4kOkIe//iHxx0LOA4nHo95Zws=";
|
||||
hash = "sha256-BA3pVcqZnakoYhF00OqDzo4GwRB5txGKN/ou2EvadWo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2024.01.23";
|
||||
version = "2024.05.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU=";
|
||||
hash = "sha256-mu4dhuvrs2O3FL7JQbKCDzHjt/Gkhd3J/L2ZhcfT58Q=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "unstable-2024-04-24";
|
||||
version = "4.0.0-unstable-2024-04-24";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
|
@ -38,7 +38,9 @@ stdenvNoCC.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
tagPrefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dracula variant of the Ant theme";
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "material-kwin-decoration";
|
||||
version = "unstable-2023-01-15";
|
||||
version = "7-unstable-2023-01-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zren";
|
||||
|
@ -47,7 +47,9 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
updateScript = unstableGitUpdater {
|
||||
tagPrefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
name = "nixos-bgrt-plymouth";
|
||||
version = "unstable-2023-03-10";
|
||||
version = "0-unstable-2023-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "plymouth-theme-nixos-bgrt";
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "file-roller-contract";
|
||||
version = "unstable-2021-02-22";
|
||||
version = "0-unstable-2021-02-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-ayatana";
|
||||
version = "unstable-2023-04-18";
|
||||
version = "2.0.7-unstable-2023-04-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lafydev";
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "c0";
|
||||
version = "unstable-2023-09-05";
|
||||
version = "0-unstable-2023-09-05";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "c0-lang";
|
||||
|
|
|
@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "VHDL 2008/93/87 simulator";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "ghdl";
|
||||
maintainers = with lib.maintainers; [ eclairevoyant lucus16 thoughtpolice ];
|
||||
maintainers = with lib.maintainers; [ lucus16 thoughtpolice ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue