Merge master into staging-nixos
This commit is contained in:
@@ -16,7 +16,7 @@ let
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != { })) cfg.settings;
|
||||
|
||||
isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
|
||||
isUnixGui = lib.strings.hasPrefix "unix://" cfg.guiAddress;
|
||||
|
||||
# Syncthing supports serving the GUI over Unix sockets. If that happens, the
|
||||
# API is served over the Unix socket as well. This function returns the correct
|
||||
@@ -30,7 +30,7 @@ let
|
||||
# note that the dot in front of `${path}` is the hostname, which is
|
||||
# required.
|
||||
then
|
||||
"--unix-socket ${cfg.guiAddress} http://.${path}"
|
||||
"--unix-socket ${lib.strings.removePrefix "unix://" cfg.guiAddress} http://.${path}"
|
||||
# no adjustments are needed if cfg.guiAddress is a network address
|
||||
else
|
||||
"${cfg.guiAddress}${path}";
|
||||
@@ -290,7 +290,7 @@ let
|
||||
)"
|
||||
for id in ''${stale_${conf_type}_ids}; do
|
||||
>&2 echo "Deleting stale device: $id"
|
||||
curl -X DELETE "${s.baseAddress}/$id"
|
||||
curl -X DELETE ${s.baseAddress}/$id
|
||||
done
|
||||
''
|
||||
))
|
||||
@@ -774,6 +774,7 @@ in
|
||||
guiAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1:8384";
|
||||
apply = x: if lib.strings.hasPrefix "/" x then "unix://${x}" else x;
|
||||
description = ''
|
||||
The address to serve the web interface at.
|
||||
'';
|
||||
@@ -1000,7 +1001,7 @@ in
|
||||
args = lib.escapeShellArgs (
|
||||
(lib.cli.toCommandLineGNU { } {
|
||||
"no-browser" = true;
|
||||
"gui-address" = (if isUnixGui then "unix://" else "") + cfg.guiAddress;
|
||||
"gui-address" = cfg.guiAddress;
|
||||
"config" = cfg.configDir;
|
||||
"data" = cfg.databaseDir;
|
||||
})
|
||||
@@ -1008,6 +1009,7 @@ in
|
||||
);
|
||||
in
|
||||
"${lib.getExe cfg.package} ${args}";
|
||||
RuntimeDirectory = "syncthing";
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("Wait until Servo has finished loading the Valgrind docs page"):
|
||||
machine.execute("xterm -e 'servo file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
|
||||
machine.execute("xterm -e '${lib.getExe pkgs.servo} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
|
||||
machine.wait_for_window("Valgrind")
|
||||
machine.wait_for_text("Quick Start Guide")
|
||||
'';
|
||||
|
||||
@@ -26,6 +26,7 @@ in
|
||||
openDefaultPorts = true;
|
||||
cert = "${idA}/cert.pem";
|
||||
key = "${idA}/key.pem";
|
||||
guiAddress = "unix:///run/syncthing/syncthing.sock";
|
||||
settings = {
|
||||
devices.b.id = lib.fileContents "${idB}/id";
|
||||
devices.c.id = lib.fileContents "${idC}/id";
|
||||
|
||||
@@ -1,33 +1,38 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
evalConfig =
|
||||
module:
|
||||
(import ../lib/eval-config.nix {
|
||||
system = null;
|
||||
modules = [ module ];
|
||||
}).config.system.build.toplevel;
|
||||
|
||||
container =
|
||||
common =
|
||||
{ config, ... }:
|
||||
{
|
||||
# We re-use the NixOS container option ...
|
||||
boot.isNspawnContainer = true;
|
||||
# ... and revert unwanted defaults
|
||||
networking.useHostResolvConf = false;
|
||||
|
||||
# use networkd to obtain systemd network setup
|
||||
networking.useNetworkd = true;
|
||||
networking.useDHCP = false;
|
||||
|
||||
# systemd-nspawn expects /sbin/init
|
||||
boot.loader.initScript.enable = true;
|
||||
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
|
||||
system.stateVersion = config.system.nixos.release;
|
||||
|
||||
nixpkgs.pkgs = pkgs;
|
||||
|
||||
# use networkd to obtain systemd network setup
|
||||
networking.useNetworkd = true;
|
||||
};
|
||||
|
||||
containerSystem =
|
||||
(import ../lib/eval-config.nix {
|
||||
system = null;
|
||||
modules = [ container ];
|
||||
}).config.system.build.toplevel;
|
||||
container = {
|
||||
imports = [ common ];
|
||||
|
||||
# We re-use the NixOS container option ...
|
||||
boot.isNspawnContainer = true;
|
||||
# ... and revert unwanted defaults
|
||||
networking.useHostResolvConf = false;
|
||||
|
||||
# systemd-nspawn expects /sbin/init
|
||||
boot.loader.initScript.enable = true;
|
||||
};
|
||||
|
||||
containerSystem = evalConfig container;
|
||||
|
||||
containerName = "container";
|
||||
containerRoot = "/var/lib/machines/${containerName}";
|
||||
@@ -51,16 +56,52 @@ let
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
vm = {
|
||||
imports = [
|
||||
common
|
||||
../modules/profiles/qemu-guest.nix
|
||||
];
|
||||
# improvement: move following configuration to qemu-guest.nix
|
||||
boot.initrd.availableKernelModules = [
|
||||
"virtiofs"
|
||||
];
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
# root is defined by systemd-vmspawn
|
||||
boot.initrd.systemd.root = null;
|
||||
|
||||
boot.loader.grub.enable = false;
|
||||
|
||||
services.openssh.enable = true;
|
||||
};
|
||||
vmSystem = evalConfig vm;
|
||||
|
||||
vmShared = {
|
||||
imports = [ vm ];
|
||||
|
||||
fileSystems."/nix/store" = {
|
||||
device = "mnt0";
|
||||
fsType = "virtiofs";
|
||||
neededForBoot = true;
|
||||
};
|
||||
};
|
||||
vmSharedSystem = evalConfig vmShared;
|
||||
in
|
||||
{
|
||||
name = "systemd-machinectl";
|
||||
meta.maintainers = with lib.maintainers; [ ck3d ];
|
||||
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# use networkd to obtain systemd network setup
|
||||
networking.useNetworkd = true;
|
||||
networking.useDHCP = false;
|
||||
|
||||
# do not try to access cache.nixos.org
|
||||
nix.settings.substituters = lib.mkForce [ ];
|
||||
@@ -71,8 +112,12 @@ in
|
||||
virtualisation.additionalPaths = [
|
||||
containerSystem
|
||||
containerTarball
|
||||
vmSystem
|
||||
vmSharedSystem
|
||||
];
|
||||
|
||||
virtualisation.diskSize = 2048;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/machines/shared-decl 0755 root root - -"
|
||||
];
|
||||
@@ -102,22 +147,62 @@ in
|
||||
overrideStrategy = "asDropin";
|
||||
};
|
||||
|
||||
# open DHCP for container
|
||||
networking.firewall.extraCommands = ''
|
||||
# open DHCP for nspawn interfaces
|
||||
${pkgs.iptables}/bin/iptables -A nixos-fw -i ve-+ -p udp -m udp --dport 67 -j nixos-fw-accept
|
||||
# open DHCP for vmspawn interfaces
|
||||
${pkgs.iptables}/bin/iptables -A nixos-fw -i vt-+ -p udp -m udp --dport 67 -j nixos-fw-accept
|
||||
'';
|
||||
|
||||
environment.systemPackages =
|
||||
let
|
||||
# improvement: following wrapper should be moved to pkgs
|
||||
vmspawn-wrapped =
|
||||
pkgs.runCommand "systemd-vmspawn-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
|
||||
''
|
||||
makeWrapper ${config.systemd.package}/bin/systemd-vmspawn $out/bin/systemd-vmspawn-wrapped \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
pkgs.qemu
|
||||
pkgs.virtiofsd
|
||||
pkgs.openssh # ssh-keygen
|
||||
]
|
||||
} \
|
||||
--prefix XDG_CONFIG_HOME : ${pkgs.qemu}/share
|
||||
'';
|
||||
in
|
||||
[ vmspawn-wrapped ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("default.target");
|
||||
# Workaround for nixos-install
|
||||
machine.succeed("chmod o+rx /var/lib/machines");
|
||||
|
||||
with subtest("vm-shared"):
|
||||
machine.succeed("mkdir -p /var/lib/machines/vm-shared");
|
||||
# Start vm-shared
|
||||
machine.succeed("systemd-run systemd-vmspawn-wrapped --directory=/var/lib/machines/vm-shared --bind-ro=/nix/store --linux=${vmSharedSystem}/kernel --initrd=${vmSharedSystem}/initrd ${vmSharedSystem}/kernel-params init=${vmSharedSystem}/init")
|
||||
machine.wait_until_succeeds("machinectl status vm-shared");
|
||||
machine.wait_until_succeeds("eval $(machinectl show vm-shared --property=SSHPrivateKeyPath --property=SSHAddress) && ssh -i $SSHPrivateKeyPath $SSHAddress true")
|
||||
machine.succeed("machinectl stop vm-shared");
|
||||
|
||||
with subtest("vm"):
|
||||
machine.succeed("mkdir -p /var/lib/machines/vm");
|
||||
# Install vm
|
||||
machine.succeed("nixos-install --root /var/lib/machines/vm --system ${vmSystem} --no-channel-copy --no-root-passwd");
|
||||
# Start vm
|
||||
machine.succeed("systemd-run systemd-vmspawn-wrapped --directory=/var/lib/machines/vm --linux=${vmSystem}/kernel --initrd=${vmSystem}/initrd ${vmSystem}/kernel-params init=${vmSystem}/init")
|
||||
machine.wait_until_succeeds("machinectl status vm");
|
||||
machine.wait_until_succeeds("eval $(machinectl show vm --property=SSHPrivateKeyPath --property=SSHAddress) && ssh -i $SSHPrivateKeyPath $SSHAddress true")
|
||||
machine.succeed("machinectl stop vm");
|
||||
|
||||
# Test machinectl start stop of shared-decl
|
||||
machine.succeed("machinectl start shared-decl");
|
||||
machine.wait_until_succeeds("systemctl -M shared-decl is-active default.target");
|
||||
machine.succeed("machinectl stop shared-decl");
|
||||
|
||||
# create containers root
|
||||
machine.succeed("mkdir -p ${containerRoot}");
|
||||
|
||||
# start container with shared nix store by using same arguments as for systemd-nspawn@.service
|
||||
@@ -128,8 +213,6 @@ in
|
||||
machine.succeed("machinectl stop ${containerName}");
|
||||
|
||||
# Install container
|
||||
# Workaround for nixos-install
|
||||
machine.succeed("chmod o+rx /var/lib/machines");
|
||||
machine.succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd");
|
||||
|
||||
# Allow systemd-nspawn to apply user namespace on immutable files
|
||||
@@ -183,6 +266,7 @@ in
|
||||
|
||||
# Test auto-start
|
||||
machine.succeed("machinectl show ${containerName}")
|
||||
machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target");
|
||||
|
||||
# Test machinectl stop
|
||||
machine.succeed("machinectl stop ${containerName}");
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bird";
|
||||
version = "2.18";
|
||||
version = "2.18.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.nic.cz";
|
||||
owner = "labs";
|
||||
repo = "bird";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Kta8zzM/EYC3Mz3mLptaJ+pFgs1Hi7MBsWjwkR4hwL8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
domain = "gitlab.nic.cz";
|
||||
owner = "labs";
|
||||
repo = "bird";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
python3,
|
||||
xmlbird,
|
||||
autoPatchelfHook,
|
||||
cairo,
|
||||
fetchFromGitHub,
|
||||
gdk-pixbuf,
|
||||
libgee,
|
||||
glib,
|
||||
gtk3,
|
||||
webkitgtk_4_1,
|
||||
libnotify,
|
||||
sqlite,
|
||||
vala,
|
||||
gobject-introspection,
|
||||
gsettings-desktop-schemas,
|
||||
wrapGAppsHook3,
|
||||
autoPatchelfHook,
|
||||
gtk3,
|
||||
lib,
|
||||
libgee,
|
||||
libnotify,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
python3,
|
||||
sqlite,
|
||||
stdenv,
|
||||
vala,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
xmlbird,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,37 +29,40 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "johanmattssonm";
|
||||
repo = "birdfont";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw=";
|
||||
hash = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
vala
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
autoPatchelfHook
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
xmlbird
|
||||
libgee
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
webkitgtk_4_1
|
||||
libgee
|
||||
libnotify
|
||||
sqlite
|
||||
gsettings-desktop-schemas
|
||||
webkitgtk_4_1
|
||||
xmlbird
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace install.py \
|
||||
--replace 'platform.version()' '"Nix"'
|
||||
--replace-fail 'platform.version()' '"Nix"'
|
||||
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
# workaround gcc >= 14 incompatibilities
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17 -Wno-error=incompatible-pointer-types";
|
||||
|
||||
buildPhase = "./build.py";
|
||||
|
||||
installPhase = "./install.py";
|
||||
@@ -69,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format";
|
||||
homepage = "https://birdfont.org";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "birdfont";
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
})
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blackmagic-desktop-video";
|
||||
version = "15.3.1";
|
||||
version = "16.0";
|
||||
|
||||
buildInputs = [
|
||||
autoPatchelfHook
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-4Y7bmN08fZ9hRsyFKP4cfGb4fggLY9bdm32+UTIGiTs=";
|
||||
outputHash = "sha256-AdJiPG0kJBk3SH633kwLbS36LjFeFAwzYTrfEjkvup4=";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cgif";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dloebl";
|
||||
repo = "cgif";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Eoq2QPDz5YYw22Ux1H9CYFN1x+/1YTYqi/rmdwf+Hk4=";
|
||||
hash = "sha256-sZan1SLY4HGoifgGOb+uo4/q4dtxZuWAYhMbvdl/Ap8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
source 'https://rubygems.org'
|
||||
gem "chef-cli"
|
||||
|
||||
gem "syslog", "~> 0.4.0"
|
||||
@@ -1,59 +1,56 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.8.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
addressable (2.8.8)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
ast (2.4.3)
|
||||
aws-eventstream (1.4.0)
|
||||
aws-partitions (1.1110.0)
|
||||
aws-sdk-core (3.225.0)
|
||||
aws-partitions (1.1213.0)
|
||||
aws-sdk-core (3.242.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.102.0)
|
||||
aws-sdk-core (~> 3, >= 3.225.0)
|
||||
aws-sdk-kms (1.121.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.189.0)
|
||||
aws-sdk-core (~> 3, >= 3.225.0)
|
||||
aws-sdk-s3 (1.213.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-secretsmanager (1.116.0)
|
||||
aws-sdk-core (~> 3, >= 3.225.0)
|
||||
aws-sdk-secretsmanager (1.128.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.12.0)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
base64 (0.3.0)
|
||||
bigdecimal (3.2.1)
|
||||
benchmark (0.5.0)
|
||||
bigdecimal (4.0.1)
|
||||
builder (3.3.0)
|
||||
chef (18.7.10)
|
||||
chef (18.3.0)
|
||||
addressable
|
||||
aws-sdk-s3 (~> 1.91)
|
||||
aws-sdk-secretsmanager (~> 1.46)
|
||||
chef-config (= 18.7.10)
|
||||
chef-utils (= 18.7.10)
|
||||
chef-config (= 18.3.0)
|
||||
chef-utils (= 18.3.0)
|
||||
chef-vault
|
||||
chef-zero (>= 15.0.17)
|
||||
chef-zero (>= 14.0.11)
|
||||
corefoundation (~> 0.3.4)
|
||||
diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
|
||||
erubis (~> 2.7)
|
||||
ffi (>= 1.15.5, <= 1.16.3)
|
||||
ffi (>= 1.15.5)
|
||||
ffi-libarchive (~> 1.0, >= 1.0.3)
|
||||
ffi-yajl (~> 2.2)
|
||||
iniparse (~> 1.4)
|
||||
inspec-core (>= 5, < 6)
|
||||
inspec-core (>= 5)
|
||||
license-acceptance (>= 1.0.5, < 3)
|
||||
mixlib-archive (>= 0.4, < 2.0)
|
||||
mixlib-authentication (>= 2.1, < 4)
|
||||
mixlib-cli (>= 2.1.1, < 3.0)
|
||||
mixlib-log (>= 2.0.3, < 3.2)
|
||||
mixlib-log (>= 2.0.3, < 4.0)
|
||||
mixlib-shellout (>= 3.1.1, < 4.0)
|
||||
net-ftp
|
||||
net-sftp (>= 2.1.2, < 5.0)
|
||||
@@ -61,13 +58,13 @@ GEM
|
||||
plist (~> 3.2)
|
||||
proxifier2 (~> 1.1)
|
||||
syslog-logger (~> 1.6)
|
||||
train-core (~> 3.10, <= 3.12.13)
|
||||
train-core (~> 3.10)
|
||||
train-rest (>= 0.4.1)
|
||||
train-winrm (~> 0.2.17)
|
||||
unf_ext (~> 0.0.8.2)
|
||||
train-winrm (>= 0.2.5)
|
||||
unf_ext (>= 0.0.8.2)
|
||||
uuidtools (>= 2.1.5, < 3.0)
|
||||
vault (~> 0.18.2)
|
||||
chef-cli (5.6.21)
|
||||
vault (~> 0.16)
|
||||
chef-cli (5.6.23)
|
||||
addressable (>= 2.3.5, < 2.9)
|
||||
chef (~> 18.0)
|
||||
cookbook-omnifetch (~> 0.5)
|
||||
@@ -79,116 +76,136 @@ GEM
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
pastel (~> 0.7)
|
||||
solve (> 2.0, < 5.0)
|
||||
chef-config (18.7.10)
|
||||
chef-config (18.3.0)
|
||||
addressable
|
||||
chef-utils (= 18.7.10)
|
||||
chef-utils (= 18.3.0)
|
||||
fuzzyurl
|
||||
mixlib-config (>= 2.2.12, < 4.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
tomlrb (~> 1.2)
|
||||
chef-gyoku (1.4.5)
|
||||
chef-gyoku (1.5.0)
|
||||
builder (>= 2.1.2)
|
||||
rexml (~> 3.4)
|
||||
chef-licensing (1.4.0)
|
||||
chef-config (>= 15)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-http-cache
|
||||
mixlib-log (~> 3.0)
|
||||
ostruct (~> 0.6.0)
|
||||
pstore (~> 0.1.1)
|
||||
tty-prompt (~> 0.23)
|
||||
tty-spinner (~> 0.9.3)
|
||||
chef-telemetry (1.1.1)
|
||||
chef-config
|
||||
concurrent-ruby (~> 1.0)
|
||||
chef-utils (18.7.10)
|
||||
chef-utils (18.3.0)
|
||||
concurrent-ruby
|
||||
chef-vault (4.1.23)
|
||||
chef-winrm (2.3.12)
|
||||
chef-vault (4.2.5)
|
||||
syslog (~> 0.3)
|
||||
chef-winrm (2.5.0)
|
||||
builder (>= 2.1.2)
|
||||
chef-gyoku (~> 1.4.0, <= 1.4.5)
|
||||
chef-gyoku (~> 1.5)
|
||||
erubi (~> 1.8)
|
||||
ffi (>= 1.15.5, < 1.17.0)
|
||||
gssapi (~> 1.2)
|
||||
httpclient (~> 2.2, >= 2.2.0.2)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
nori (= 2.7.0)
|
||||
rexml (~> 3.3)
|
||||
nori (~> 2.7)
|
||||
rexml (>= 3.4.2, < 4.0)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.3)
|
||||
chef-winrm-elevated (1.2.5)
|
||||
chef-winrm (>= 2.3.11)
|
||||
chef-winrm-fs (>= 1.3.7)
|
||||
erubi (~> 1.8)
|
||||
chef-winrm-fs (1.3.7)
|
||||
chef-winrm (>= 2.3.11)
|
||||
chef-winrm-fs (1.4.2)
|
||||
benchmark (~> 0.5.0)
|
||||
chef-winrm (~> 2.4)
|
||||
csv (~> 3.3)
|
||||
erubi (>= 1.7)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
rubyzip (~> 2.0)
|
||||
chef-zero (15.0.17)
|
||||
activesupport (~> 7.0, < 7.1)
|
||||
ffi-yajl (~> 2.2)
|
||||
hashie (>= 2.0, < 5.0)
|
||||
chef-zero (15.1.0)
|
||||
ffi-yajl (>= 2.2, < 4.0)
|
||||
hashie (>= 2.0, < 6.0)
|
||||
mixlib-log (>= 2.0, < 4.0)
|
||||
rack (~> 3.1, >= 3.1.10)
|
||||
rack (~> 3.1, >= 3.1.16)
|
||||
rackup (~> 2.2, >= 2.2.1)
|
||||
unf_ext (~> 0.0.8)
|
||||
uuidtools (~> 2.1)
|
||||
webrick
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.3.5)
|
||||
concurrent-ruby (1.3.6)
|
||||
connection_pool (2.5.5)
|
||||
cookbook-omnifetch (0.12.2)
|
||||
mixlib-archive (>= 0.4, < 2.0)
|
||||
cookstyle (8.1.4)
|
||||
rubocop (= 1.75.8)
|
||||
cookstyle (8.5.3)
|
||||
rubocop (= 1.81.7)
|
||||
corefoundation (0.3.13)
|
||||
ffi (>= 1.15.0)
|
||||
date (3.4.1)
|
||||
csv (3.3.5)
|
||||
date (3.5.1)
|
||||
diff-lcs (1.5.1)
|
||||
domain_name (0.6.20240107)
|
||||
erubi (1.13.1)
|
||||
erubis (2.7.0)
|
||||
faraday (2.13.1)
|
||||
faraday (2.14.1)
|
||||
faraday-net_http (>= 2.0, < 3.5)
|
||||
json
|
||||
logger
|
||||
faraday-follow_redirects (0.3.0)
|
||||
faraday-follow_redirects (0.5.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-net_http (3.4.0)
|
||||
net-http (>= 0.5.0)
|
||||
ffi (1.16.3)
|
||||
faraday-http-cache (2.6.1)
|
||||
faraday (>= 0.8)
|
||||
faraday-net_http (3.4.2)
|
||||
net-http (~> 0.5)
|
||||
ffi (1.17.3)
|
||||
ffi-libarchive (1.1.14)
|
||||
ffi (~> 1.0)
|
||||
ffi-yajl (2.6.0)
|
||||
libyajl2 (>= 1.2)
|
||||
ffi-yajl (2.7.7)
|
||||
libyajl2 (>= 2.1)
|
||||
yajl
|
||||
fuzzyurl (0.9.0)
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
hashie (4.1.0)
|
||||
hashie (5.1.0)
|
||||
logger
|
||||
http-accept (1.7.0)
|
||||
http-cookie (1.0.8)
|
||||
http-cookie (1.1.0)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
i18n (1.14.7)
|
||||
concurrent-ruby (~> 1.0)
|
||||
iniparse (1.5.0)
|
||||
inspec-core (5.22.80)
|
||||
inspec-core (7.0.95)
|
||||
addressable (~> 2.4)
|
||||
chef-licensing (>= 1.2.0)
|
||||
chef-telemetry (~> 1.0, >= 1.0.8)
|
||||
cookstyle
|
||||
csv (~> 3.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-follow_redirects (~> 0.3)
|
||||
hashie (>= 3.4, < 6.0)
|
||||
license-acceptance (>= 0.2.13, < 3.0)
|
||||
method_source (>= 0.8, < 2.0)
|
||||
mixlib-log (~> 3.0, < 3.2)
|
||||
mixlib-log (~> 3.0)
|
||||
multipart-post (~> 2.0)
|
||||
ostruct (>= 0.1, < 0.7)
|
||||
parallel (~> 1.9)
|
||||
parslet (>= 1.5, < 3.0)
|
||||
pry (~> 0.13)
|
||||
rspec (>= 3.9, <= 3.12)
|
||||
rspec-its (~> 1.2)
|
||||
rubyzip (>= 1.2.2, < 3.0)
|
||||
rspec (>= 3.9, <= 3.14)
|
||||
rspec-its (>= 1.2, < 3.0)
|
||||
rubyzip (>= 1.2.2, < 4.0)
|
||||
semverse (~> 3.0)
|
||||
sslshake (~> 1.2)
|
||||
thor (>= 0.20, < 1.3.0)
|
||||
tomlrb (>= 1.2, < 2.1)
|
||||
train-core (~> 3.12.13)
|
||||
syslog (~> 0.1)
|
||||
thor (>= 0.20, < 1.5.0)
|
||||
tomlrb (>= 1.3, < 2.1)
|
||||
train-core (~> 3.13, >= 3.13.4)
|
||||
tty-prompt (~> 0.17)
|
||||
tty-table (~> 0.10)
|
||||
io-console (0.8.2)
|
||||
ipaddress (0.8.3)
|
||||
jmespath (1.6.2)
|
||||
json (2.12.2)
|
||||
json (2.18.1)
|
||||
language_server-protocol (3.17.0.5)
|
||||
libyajl2 (2.1.0)
|
||||
license-acceptance (2.1.13)
|
||||
@@ -206,28 +223,29 @@ GEM
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2025.0527)
|
||||
minitar (1.0.2)
|
||||
minitest (5.25.5)
|
||||
mixlib-archive (1.1.7)
|
||||
mime-types-data (3.2026.0203)
|
||||
minitar (1.1.0)
|
||||
mixlib-archive (1.3.3)
|
||||
mixlib-log
|
||||
mixlib-authentication (3.0.10)
|
||||
mixlib-cli (2.1.8)
|
||||
mixlib-config (3.0.27)
|
||||
tomlrb
|
||||
mixlib-log (3.1.2.1)
|
||||
ffi (< 1.17.0)
|
||||
mixlib-shellout (3.3.9)
|
||||
mixlib-log (3.2.3)
|
||||
ffi (>= 1.15.5)
|
||||
mixlib-shellout (3.4.10)
|
||||
chef-utils
|
||||
molinillo (0.8.0)
|
||||
multi_json (1.15.0)
|
||||
multi_json (1.19.1)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
net-ftp (0.3.8)
|
||||
net-ftp (0.3.9)
|
||||
net-protocol
|
||||
time
|
||||
net-http (0.6.0)
|
||||
uri
|
||||
net-http (0.9.1)
|
||||
uri (>= 0.11.1)
|
||||
net-http-persistent (4.0.8)
|
||||
connection_pool (>= 2.2.4, < 4)
|
||||
net-protocol (0.2.2)
|
||||
timeout
|
||||
net-scp (4.1.0)
|
||||
@@ -236,12 +254,12 @@ GEM
|
||||
net-ssh (>= 5.0.0, < 8.0.0)
|
||||
net-ssh (7.3.0)
|
||||
netrc (0.11.0)
|
||||
nori (2.7.0)
|
||||
nori (2.7.1)
|
||||
bigdecimal
|
||||
ohai (18.2.6)
|
||||
ohai (18.1.18)
|
||||
chef-config (>= 14.12, < 19)
|
||||
chef-utils (>= 16.0, < 19)
|
||||
ffi (~> 1.9, <= 1.17.0)
|
||||
ffi (~> 1.9)
|
||||
ffi-yajl (~> 2.2)
|
||||
ipaddress
|
||||
mixlib-cli (>= 1.7.0)
|
||||
@@ -251,49 +269,54 @@ GEM
|
||||
plist (~> 3.1)
|
||||
train-core
|
||||
wmi-lite (~> 1.0)
|
||||
ostruct (0.6.3)
|
||||
parallel (1.27.0)
|
||||
parser (3.3.8.0)
|
||||
parser (3.3.10.1)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
parslet (2.0.0)
|
||||
pastel (0.8.0)
|
||||
tty-color (~> 0.5)
|
||||
plist (3.7.2)
|
||||
prism (1.4.0)
|
||||
prism (1.9.0)
|
||||
proxifier2 (1.1.0)
|
||||
pry (0.15.2)
|
||||
pry (0.16.0)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
public_suffix (6.0.2)
|
||||
reline (>= 0.6.0)
|
||||
pstore (0.1.4)
|
||||
public_suffix (7.0.2)
|
||||
racc (1.8.1)
|
||||
rack (3.1.15)
|
||||
rackup (2.2.1)
|
||||
rack (3.2.4)
|
||||
rackup (2.3.1)
|
||||
rack (>= 3)
|
||||
rainbow (3.1.1)
|
||||
regexp_parser (2.10.0)
|
||||
regexp_parser (2.11.3)
|
||||
reline (0.6.3)
|
||||
io-console (~> 0.5)
|
||||
rest-client (2.1.0)
|
||||
http-accept (>= 1.7.0, < 2.0)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rexml (3.4.1)
|
||||
rspec (3.12.0)
|
||||
rspec-core (~> 3.12.0)
|
||||
rspec-expectations (~> 3.12.0)
|
||||
rspec-mocks (~> 3.12.0)
|
||||
rspec-core (3.12.3)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-expectations (3.12.4)
|
||||
rexml (3.4.4)
|
||||
rspec (3.13.2)
|
||||
rspec-core (~> 3.13.0)
|
||||
rspec-expectations (~> 3.13.0)
|
||||
rspec-mocks (~> 3.13.0)
|
||||
rspec-core (3.13.6)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-expectations (3.13.5)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-its (1.3.1)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.12.7)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-its (2.0.0)
|
||||
rspec-core (>= 3.13.0)
|
||||
rspec-expectations (>= 3.13.0)
|
||||
rspec-mocks (3.13.7)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.12.0)
|
||||
rspec-support (3.12.2)
|
||||
rubocop (1.75.8)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-support (3.13.7)
|
||||
rubocop (1.81.7)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
@@ -301,17 +324,18 @@ GEM
|
||||
parser (>= 3.3.0.2)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 2.9.3, < 3.0)
|
||||
rubocop-ast (>= 1.44.0, < 2.0)
|
||||
rubocop-ast (>= 1.47.1, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.45.0)
|
||||
rubocop-ast (1.49.0)
|
||||
parser (>= 3.3.7.2)
|
||||
prism (~> 1.4)
|
||||
prism (~> 1.7)
|
||||
ruby-progressbar (1.13.0)
|
||||
rubyntlm (0.6.5)
|
||||
base64
|
||||
rubyzip (2.4.1)
|
||||
semverse (3.0.2)
|
||||
socksify (1.8.1)
|
||||
solve (4.0.4)
|
||||
molinillo (~> 0.6)
|
||||
semverse (>= 1.1, < 4.0)
|
||||
@@ -321,15 +345,17 @@ GEM
|
||||
unicode-display_width (>= 1.5, < 3.0)
|
||||
unicode_utils (~> 1.4)
|
||||
strings-ansi (0.2.0)
|
||||
syslog (0.4.0)
|
||||
logger
|
||||
syslog-logger (1.6.8)
|
||||
thor (1.2.2)
|
||||
time (0.4.1)
|
||||
thor (1.4.0)
|
||||
time (0.4.2)
|
||||
date
|
||||
timeout (0.4.3)
|
||||
timeout (0.6.0)
|
||||
tomlrb (1.3.0)
|
||||
train-core (3.12.13)
|
||||
train-core (3.16.1)
|
||||
addressable (~> 2.5)
|
||||
ffi (!= 1.13.0)
|
||||
ffi (>= 1.16.0, < 1.18)
|
||||
json (>= 1.8, < 3.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
net-scp (>= 1.2, < 5.0)
|
||||
@@ -338,10 +364,11 @@ GEM
|
||||
aws-sigv4 (~> 1.5)
|
||||
rest-client (~> 2.1)
|
||||
train-core (~> 3.0)
|
||||
train-winrm (0.2.19)
|
||||
chef-winrm (~> 2.3.12)
|
||||
chef-winrm-elevated (~> 1.2.5)
|
||||
chef-winrm-fs (~> 1.3.7)
|
||||
train-winrm (0.4.3)
|
||||
chef-winrm (>= 2.4.4, < 3.0)
|
||||
chef-winrm-elevated (>= 1.2.5, < 2.0)
|
||||
chef-winrm-fs (>= 1.4.1, < 2.0)
|
||||
socksify (~> 1.8)
|
||||
tty-box (0.7.0)
|
||||
pastel (~> 0.8)
|
||||
strings (~> 0.2.0)
|
||||
@@ -356,28 +383,33 @@ GEM
|
||||
tty-screen (~> 0.8)
|
||||
wisper (~> 2.0)
|
||||
tty-screen (0.8.2)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
tty-table (0.12.0)
|
||||
pastel (~> 0.8)
|
||||
strings (~> 0.2.0)
|
||||
tty-screen (~> 0.8)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unf_ext (0.0.8.2)
|
||||
unf_ext (0.0.9.1)
|
||||
unicode-display_width (2.6.0)
|
||||
unicode_utils (1.4.0)
|
||||
uri (1.0.3)
|
||||
uri (1.1.1)
|
||||
uuidtools (2.2.0)
|
||||
vault (0.18.2)
|
||||
vault (0.20.0)
|
||||
aws-sigv4
|
||||
webrick (1.9.1)
|
||||
base64
|
||||
connection_pool (~> 2.4)
|
||||
net-http-persistent (~> 4.0, >= 4.0.2)
|
||||
webrick (1.9.2)
|
||||
wisper (2.0.1)
|
||||
wmi-lite (1.0.7)
|
||||
yajl (0.3.4)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
chef-cli
|
||||
syslog (~> 0.4.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.7.2
|
||||
File diff suppressed because it is too large
Load Diff
+3
-6
@@ -1,11 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
ply,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cxxtest";
|
||||
version = "4.4";
|
||||
format = "setuptools";
|
||||
@@ -19,7 +18,7 @@ buildPythonApplication rec {
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
nativeCheckInputs = [ ply ];
|
||||
nativeCheckInputs = [ python3Packages.ply ];
|
||||
|
||||
preCheck = ''
|
||||
cd ../
|
||||
@@ -41,8 +40,6 @@ buildPythonApplication rec {
|
||||
cp -r ../../cxxtest "$out/include"
|
||||
'';
|
||||
|
||||
dontWrapPythonPrograms = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CxxTest/cxxtest";
|
||||
description = "Unit testing framework for C++";
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "dazel";
|
||||
version = "0.0.43";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2enQRKg4CAPGHte02io+EfiW9AmuP3Qi41vNQeChg+8=";
|
||||
};
|
||||
|
||||
@@ -24,4 +25,4 @@ buildPythonApplication rec {
|
||||
malt3
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -28,13 +28,13 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "dms-shell";
|
||||
version = "1.4.4";
|
||||
version = "1.4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "DankMaterialShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rfWvWbPVrpujmBp/q9My/70fWgRLaELdrnZB3CZKlWg=";
|
||||
hash = "sha256-iYBdSBvcW7bJtc84G6k5TFJEbPHQrif9KzZyE9Lbq8M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/core";
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web-${enteApp}";
|
||||
version = "1.3.24";
|
||||
version = "1.3.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
tag = "photos-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-fM/a5V5Depkeu8hIzaYJr/0w0Mt/zM9/b+76W7ggUfw=";
|
||||
hash = "sha256-Lwa45QqqyvFgHJ4IiJm2tJy5CdPI5XO3wCzXTeNCTq4=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
@@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sourceRoot
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-ftb0h5MOHyQ2iec6iE7/WdHXgrviLCy8oIqFXv5OTq8=";
|
||||
hash = "sha256-/FkAxi9KpW/Z6sdo7gfxvCmaAe0JzjubScrcGjbLD88=";
|
||||
};
|
||||
cargoRoot = "packages/wasm";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/yarn.lock";
|
||||
hash = "sha256-NhpSwesQ9B5gEeBQVjEEAKO4A68wfmBoQ3ga/baieNE=";
|
||||
hash = "sha256-bWOwIa7SD0z2StoUg9HlQGTBq2xXltLgQ2ft8umjg/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-array";
|
||||
version = "0.9.6";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray2501";
|
||||
repo = "fcitx5-array";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YDFT/CawFiPN3kXzHMpenCzWMJSA1dFUhVe22EDfnU8=";
|
||||
hash = "sha256-IIsmldCqXgVJZXS0GcxxYiwpuqPw0GdABvk94q850pQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
ncurses,
|
||||
libcap,
|
||||
libnl,
|
||||
sensorsSupport ? stdenv.hostPlatform.isLinux,
|
||||
sensorsSupport ? (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic),
|
||||
lm_sensors,
|
||||
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
|
||||
systemdLibs,
|
||||
|
||||
@@ -55,7 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.linode-metadata
|
||||
python3Packages.pyyaml
|
||||
python3Packages.requests
|
||||
python3Packages.terminaltables
|
||||
python3Packages.rich
|
||||
python3Packages.openapi3
|
||||
python3Packages.packaging
|
||||
|
||||
@@ -15,16 +15,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mslicer";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "connorslade";
|
||||
repo = "mslicer";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-4b+LVOfV1CZVkdVHIJAhfisflRqpTO0LjWvM7qD9mSY=";
|
||||
hash = "sha256-kDpV9UlqiqV+/h0PWk6fsOWumCHben4gkQk1mEXE5wk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U+khaF+XHrZjNHtxon2QFwk1Sd2+b5CRtUBeWWHKtRY=";
|
||||
cargoHash = "sha256-o1igInyC0N8TorQ/naKbRyTTdZiaSNquVy0i0jzNcAk=";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build dist/msla_format/generate.sh
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
@@ -54,6 +58,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--pop-state"
|
||||
];
|
||||
|
||||
# Build all binaries (e.g. the cli `slicer`) -- not just the default `mslicer` GUI application:
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -8,12 +8,10 @@
|
||||
desktop-file-utils,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook4,
|
||||
pkg-config,
|
||||
libadwaita,
|
||||
libportal-gtk4,
|
||||
gnome,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "netpeek";
|
||||
version = "0.2.6";
|
||||
pyproject = false;
|
||||
@@ -21,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZingyTomato";
|
||||
repo = "NetPeek";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SFY/bUUS4AOniOGjngH/fUHrYiq+dMWxHYvoSkhfnkA=";
|
||||
};
|
||||
|
||||
@@ -32,7 +30,6 @@ python3Packages.buildPythonApplication rec {
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -55,10 +52,10 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = {
|
||||
description = "Modern network scanner for GNOME";
|
||||
homepage = "https://github.com/ZingyTomato/NetPeek";
|
||||
changelog = "https://github.com/ZingyTomato/NetPeek/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/ZingyTomato/NetPeek/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ Cameo007 ];
|
||||
mainProgram = "netpeek";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -94,7 +94,7 @@ let
|
||||
|
||||
cudaToolkit = buildEnv {
|
||||
# ollama hardcodes the major version in the Makefile to support different variants.
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.5/CMakePresets.json#L21-L47
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.6/CMakePresets.json#L21-L47
|
||||
name = "cuda-merged-${cudaMajorVersion}";
|
||||
paths = map lib.getLib cudaLibs ++ [
|
||||
(lib.getOutput "static" cudaPackages.cuda_cudart)
|
||||
@@ -140,13 +140,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.20.5";
|
||||
version = "0.20.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/H4DZ/aRB04lKSke9XsK+vb76pcy940scoTunXO4pf4=";
|
||||
hash = "sha256-ol+LsKRxOR37Rpwc9/NouwMg0GOpaeh6zmN5quIBgnA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
versionCheckHook,
|
||||
rolldown,
|
||||
installShellFiles,
|
||||
version ? "2026.4.10",
|
||||
version ? "2026.4.11",
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openclaw";
|
||||
@@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "openclaw";
|
||||
repo = "openclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uQpIdemz/x0KhknVxO4ZVd3+Gg7J+PCdU0Ycc/cLczM=";
|
||||
hash = "sha256-KDRcjb6nuJ67X7ZImjBgyWyS4YXQlv8OOAkZdZa39Ds=";
|
||||
};
|
||||
|
||||
pnpmDepsHash = "sha256-4tisW4TcCXyrFDkQ220cnVWm38L51UnIuDHnx79Eyjc=";
|
||||
pnpmDepsHash = "sha256-fVy4T/JPOX0Ts6/D8pb/2iVxYy/GXJQsdefg84pl4cc=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "seconlay";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-04-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
group = "alasca.cloud";
|
||||
owner = "scl";
|
||||
repo = "scl-management";
|
||||
rev = "635ea8b3e326680aefc4b096b14b626769d4a180";
|
||||
hash = "sha256-y1cDKneAmoyp3H0zVyWXafXjp33c3M2kaDCp8Rvh6BA=";
|
||||
rev = "3bf6a5c1a1be4d1ca8f6e38f8d5e909fd4026a29";
|
||||
hash = "sha256-bLHYNt/1aICzMFaMPZQkrLDl3nrwLz1nRj8wERb/h0Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uVccOT0DCHet52Oer3mGzFd/zs9rp4IZCvl5o/JMJgQ=";
|
||||
|
||||
@@ -69,13 +69,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "servo";
|
||||
version = "0.0.6";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "servo";
|
||||
repo = "servo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eKog8kcZJXBMJz/Lr0+ZwU95HYZRljGWByJ84vPfiEY=";
|
||||
hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc=";
|
||||
# Breaks reproducibility depending on whether the picked commit
|
||||
# has other ref-names or not, which may change over time, i.e. with
|
||||
# "ref-names: HEAD -> main" as long this commit is the branch HEAD
|
||||
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VP+hAQDfUVbOa2+Uq6hqG5YgQYRNI01+gDaR2MyYUTM=";
|
||||
cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw=";
|
||||
|
||||
# set `HOME` to a temp dir for write access
|
||||
# Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
|
||||
@@ -159,7 +159,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mkdir -p $out/resources
|
||||
cp -r ./resources $out/
|
||||
|
||||
wrapProgram $out/bin/servo \
|
||||
wrapProgram $out/bin/servoshell \
|
||||
--prefix LD_LIBRARY_PATH : ${runtimePaths}
|
||||
'';
|
||||
|
||||
@@ -178,7 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hexa
|
||||
];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
mainProgram = "servo";
|
||||
mainProgram = "servoshell";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,23 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
docopt,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "spoof-mac";
|
||||
version = "unstable-2018-01-27";
|
||||
version = "0-unstable-2018-01-27";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feross";
|
||||
repo = "SpoofMAC";
|
||||
rev = "2cfc796150ef48009e9b765fe733e37d82c901e0";
|
||||
sha256 = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8=";
|
||||
hash = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docopt ];
|
||||
propagatedBuildInputs = [ python3Packages.docopt ];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "umap";
|
||||
version = "3.7.1";
|
||||
version = "3.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "umap-project";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
hash = "sha256-Fuq2whUFwidLd2pk1c1+jumik3IO13CwGLJraGvHHIA=";
|
||||
hash = "sha256-rM1o83/udkqiVD0nSiAjNVAzriJr2ztvSXh45wxmYzU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
nodejs_22,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
python3,
|
||||
@@ -11,19 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
version = "2026.1.1+0";
|
||||
|
||||
# doesn't build with newer versions
|
||||
nodejs = nodejs_22;
|
||||
version = "2026.2.0+0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vaultwarden";
|
||||
repo = "vw_web_builds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ehL3DDjCav20XJgUR+ED2x0lax4fm1jMZ0rRiqR78a4=";
|
||||
hash = "sha256-rXBDv8ecImA6qdM5JVYy5QJHRj0jP7zinj/8gWRREtQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/S0itw2m2k7GiiwBEzeqFQ8oUYD4yIO4knTTn37qkfA=";
|
||||
npmDepsHash = "sha256-PATpmxIHYSgmuOj8dOoa7ynzkGw5l7z62DiulJmufJY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
@@ -68,8 +64,7 @@ buildNpmPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Integrates the web vault into vaultwarden";
|
||||
homepage = "https://github.com/dani-garcia/bw_web_builds";
|
||||
changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${lib.concatStringsSep "." (lib.take 3 (lib.versions.splitVersion version))}";
|
||||
homepage = "https://github.com/vaultwarden/vw_web_builds";
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
inherit (vaultwarden.meta) maintainers;
|
||||
|
||||
@@ -1,38 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
python3,
|
||||
pkg-config,
|
||||
vala,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
lib,
|
||||
pkg-config,
|
||||
python3,
|
||||
stdenv,
|
||||
vala,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xmlbird";
|
||||
version = "1.2.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-8GX4ijF+AxaGGFlSxRPOAoUezRG6592jOrifz/mWTRM=";
|
||||
url = "https://birdfont.org/xmlbird-releases/libxmlbird-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-8GX4ijF+AxaGGFlSxRPOAoUezRG6592jOrifz/mWTRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
vala
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [ glib ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure \
|
||||
--replace 'platform.dist()[0]' '"nix"'
|
||||
--replace-fail 'platform.version()' '"Nix"'
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
configureFlags = [ "--cc=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
buildPhase = "./build.py";
|
||||
|
||||
installPhase = "./install.py";
|
||||
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "XML parser for Vala and C programs";
|
||||
homepage = "https://birdfont.org/xmlbird.php";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodukeenergy";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hunterjm";
|
||||
repo = "aiodukeenergy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tHtuQFOw9CPqWJ6QzdqcN3W8uzjgZFh5z8DqAc+5jLo=";
|
||||
hash = "sha256-v8rWRjAlTGu7d0bQaAQ1A7Qm4oP3STkIzHcKLa8+/OY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mhcgnomes";
|
||||
version = "3.19.0";
|
||||
version = "3.31.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pirl-unc";
|
||||
repo = "mhcgnomes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z5Xmo3yXsFr2u2BUVc5YJZc7gjcBSkpfWy2VuXK8qEc=";
|
||||
hash = "sha256-SP7hE0tJXBeJ8+NJbz1e8ZpPgVimIE25BgEPyKZ1nLg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -4,24 +4,30 @@
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
regex,
|
||||
setuptools,
|
||||
typer,
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-obfuscator";
|
||||
version = "0.0.2";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidteather";
|
||||
repo = "python-obfuscator";
|
||||
tag = "V${version}";
|
||||
hash = "sha256-LUD+9vNd1sdigbKG2tm5hE3zLtmor/2LqsIarUWS2Ek=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ddFmlNBtITMPJszLjD2FNjSFF8TrawOv0q7iB3EIdAY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
pythonRelaxDeps = [ "typer" ];
|
||||
|
||||
dependencies = [ regex ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
regex
|
||||
typer
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -30,8 +36,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module to obfuscate code";
|
||||
homepage = "https://github.com/davidteather/python-obfuscator";
|
||||
changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/v${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
requests,
|
||||
}:
|
||||
let
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RapidAI";
|
||||
repo = "RapidOCR";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wFAW0KRNC31cqJ8f1/dBZDLSkOBdB5AFpPzO85g3rHA=";
|
||||
hash = "sha256-KOnZbbNgv6Ca9tAFSZ0AZbugG28U0tZKeIw3/ML3eAc=";
|
||||
};
|
||||
|
||||
models =
|
||||
|
||||
@@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy";
|
||||
version = "1.4.54";
|
||||
version = "1.4.54-unstable-2025-08-16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlalchemy";
|
||||
repo = "sqlalchemy";
|
||||
rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo=";
|
||||
rev = "1712b81a5b8d9d3abd5a85fbb089470f0bc38cdd";
|
||||
hash = "sha256-BqhH6CqvWQvUllCh0JAIM/K+W3KtLIRe30WGJrqafoI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
hipify,
|
||||
gitMinimal,
|
||||
gtest,
|
||||
jemalloc,
|
||||
zstd,
|
||||
buildTests ? false,
|
||||
buildExamples ? false,
|
||||
@@ -87,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
env.ROCM_PATH = clr;
|
||||
# Speed up build by ~7% with jemalloc (template torture test workload means allocation heavy clang invocations)
|
||||
env.LD_PRELOAD = "${jemalloc}/lib/libjemalloc.so";
|
||||
env.MALLOC_CONF = "background_thread:true,metadata_thp:auto,dirty_decay_ms:10000,muzzy_decay_ms:10000";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "MIOPEN_REQ_LIBS_ONLY" miOpenReqLibsOnly)
|
||||
|
||||
@@ -375,8 +375,6 @@ with pkgs;
|
||||
practiceMod = true;
|
||||
};
|
||||
|
||||
chef-cli = callPackage ../tools/misc/chef-cli { };
|
||||
|
||||
coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
|
||||
|
||||
dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
|
||||
@@ -1495,8 +1493,6 @@ with pkgs;
|
||||
|
||||
inherit (cue) writeCueValidator;
|
||||
|
||||
dazel = python3Packages.callPackage ../development/tools/dazel { };
|
||||
|
||||
detect-secrets = with python3Packages; toPythonApplication detect-secrets;
|
||||
|
||||
deterministic-host-uname = deterministic-uname.override {
|
||||
@@ -1950,9 +1946,6 @@ with pkgs;
|
||||
|
||||
binlore = callPackage ../development/tools/analysis/binlore { };
|
||||
|
||||
birdfont = callPackage ../tools/misc/birdfont { };
|
||||
xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
|
||||
|
||||
bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
|
||||
|
||||
anystyle-cli = callPackage ../tools/misc/anystyle-cli { };
|
||||
@@ -3381,8 +3374,6 @@ with pkgs;
|
||||
spire-agent = spire.agent;
|
||||
spire-server = spire.server;
|
||||
|
||||
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
|
||||
|
||||
stirling-pdf-desktop = callPackage ../by-name/st/stirling-pdf/package.nix {
|
||||
isDesktopVariant = true;
|
||||
};
|
||||
@@ -6195,8 +6186,6 @@ with pkgs;
|
||||
ssl_implementation = mbedtls_2;
|
||||
};
|
||||
|
||||
cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
|
||||
|
||||
# Make bdb5 the default as it is the last release under the custom
|
||||
# bsd-like license
|
||||
db = db5;
|
||||
|
||||
Reference in New Issue
Block a user