Merge branch 'staging-next' into perl-updates
This commit is contained in:
Stig Palmquist
commit
d78c69f7d4
@ -27,6 +27,6 @@ with lib;
|
||||
"opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium";
|
||||
"opt/brave/policies/managed/${appId}".source = source "policies/chromium";
|
||||
};
|
||||
programs.firefox.wrapperConfig.enableBrowserpass = true;
|
||||
programs.firefox.nativeMessagingHosts.packages = [ pkgs.browserpass ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,8 +5,6 @@ with lib;
|
||||
let
|
||||
cfg = config.programs.firefox;
|
||||
|
||||
nmh = cfg.nativeMessagingHosts;
|
||||
|
||||
policyFormat = pkgs.formats.json { };
|
||||
|
||||
organisationInfo = ''
|
||||
@ -17,6 +15,50 @@ let
|
||||
given control of your browser, unless of course they also control your
|
||||
NixOS configuration.
|
||||
'';
|
||||
|
||||
# deprecated per-native-messaging-host options
|
||||
nmhOptions = {
|
||||
browserpass = {
|
||||
name = "Browserpass";
|
||||
package = pkgs.browserpass;
|
||||
};
|
||||
bukubrow = {
|
||||
name = "Bukubrow";
|
||||
package = pkgs.bukubrow;
|
||||
};
|
||||
euwebid = {
|
||||
name = "Web eID";
|
||||
package = pkgs.web-eid-app;
|
||||
};
|
||||
ff2mpv = {
|
||||
name = "ff2mpv";
|
||||
package = pkgs.ff2mpv;
|
||||
};
|
||||
fxCast = {
|
||||
name = "fx_cast";
|
||||
package = pkgs.fx-cast-bridge;
|
||||
};
|
||||
gsconnect = {
|
||||
name = "GSConnect";
|
||||
package = pkgs.gnomeExtensions.gsconnect;
|
||||
};
|
||||
jabref = {
|
||||
name = "JabRef";
|
||||
package = pkgs.jabref;
|
||||
};
|
||||
passff = {
|
||||
name = "PassFF";
|
||||
package = pkgs.passff-host;
|
||||
};
|
||||
tridactyl = {
|
||||
name = "Tridactyl";
|
||||
package = pkgs.tridactyl-native;
|
||||
};
|
||||
ugetIntegrator = {
|
||||
name = "Uget Integrator";
|
||||
package = pkgs.uget-integrator;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
options.programs.firefox = {
|
||||
@ -204,46 +246,31 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) {
|
||||
browserpass = "Browserpass support";
|
||||
bukubrow = "Bukubrow support";
|
||||
euwebid = "Web eID support";
|
||||
ff2mpv = "ff2mpv support";
|
||||
fxCast = "fx_cast support";
|
||||
gsconnect = "GSConnect support";
|
||||
jabref = "JabRef support";
|
||||
passff = "PassFF support";
|
||||
tridactyl = "Tridactyl support";
|
||||
ugetIntegrator = "Uget Integrator support";
|
||||
};
|
||||
nativeMessagingHosts = ({
|
||||
packages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
description = mdDoc ''
|
||||
Additional packages containing native messaging hosts that should be made available to Firefox extensions.
|
||||
'';
|
||||
};
|
||||
}) // (mapAttrs (k: v: mkEnableOption (mdDoc "${v.name} support")) nmhOptions);
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = let
|
||||
forEachEnabledNmh = fn: flatten (mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions);
|
||||
in mkIf cfg.enable {
|
||||
warnings = forEachEnabledNmh (k: v:
|
||||
"The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " +
|
||||
"please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead."
|
||||
);
|
||||
programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package);
|
||||
|
||||
environment.systemPackages = [
|
||||
(cfg.package.override (old: {
|
||||
extraPrefs = cfg.autoConfig;
|
||||
extraNativeMessagingHosts =
|
||||
old.extraNativeMessagingHosts or []
|
||||
++ optional nmh.ff2mpv pkgs.ff2mpv
|
||||
++ optional nmh.euwebid pkgs.web-eid-app
|
||||
++ optional nmh.gsconnect pkgs.gnomeExtensions.gsconnect
|
||||
++ optional nmh.jabref pkgs.jabref
|
||||
++ optional nmh.passff pkgs.passff-host;
|
||||
cfg = let
|
||||
# copy-pasted from the wrapper; TODO: figure out fix
|
||||
applicationName = cfg.package.binaryName or (lib.getName cfg.package);
|
||||
|
||||
oldCfg = old.cfg or {};
|
||||
nixpkgsConfig = pkgs.config.${applicationName} or {};
|
||||
optionConfig = cfg.wrapperConfig;
|
||||
nmhConfig = {
|
||||
enableBrowserpass = nmh.browserpass;
|
||||
enableBukubrow = nmh.bukubrow;
|
||||
enableTridactylNative = nmh.tridactyl;
|
||||
enableUgetIntegrator = nmh.ugetIntegrator;
|
||||
enableFXCastBridge = nmh.fxCast;
|
||||
};
|
||||
in oldCfg // nixpkgsConfig // optionConfig // nmhConfig;
|
||||
extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig)];
|
||||
nativeMessagingHosts = old.nativeMessagingHosts or [] ++ cfg.nativeMessagingHosts.packages;
|
||||
cfg = (old.cfg or {}) // cfg.wrapperConfig;
|
||||
}))
|
||||
];
|
||||
|
||||
|
||||
@ -42,6 +42,6 @@ in
|
||||
|
||||
services.dbus.packages = [ pkgs.gnome-browser-connector ];
|
||||
|
||||
programs.firefox.wrapperConfig.enableGnomeExtensions = true;
|
||||
programs.firefox.nativeMessagingHosts.packages = [ pkgs.gnome-browser-connector ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -60,7 +60,6 @@ let
|
||||
++ lib.optional (cfg.settings ? oidc_providers) "oidc"
|
||||
++ lib.optional (cfg.settings ? jwt_config) "jwt"
|
||||
++ lib.optional (cfg.settings ? saml2_config) "saml2"
|
||||
++ lib.optional (cfg.settings ? opentracing) "opentracing"
|
||||
++ lib.optional (cfg.settings ? redis) "redis"
|
||||
++ lib.optional (cfg.settings ? sentry) "sentry"
|
||||
++ lib.optional (cfg.settings ? user_directory) "user-search"
|
||||
@ -334,7 +333,6 @@ in {
|
||||
[
|
||||
"cache-memory" # Provide statistics about caching memory consumption
|
||||
"jwt" # JSON Web Token authentication
|
||||
"opentracing" # End-to-end tracing support using Jaeger
|
||||
"oidc" # OpenID Connect authentication
|
||||
"postgres" # PostgreSQL database backend
|
||||
"redis" # Redis support for the replication stream between worker processes
|
||||
|
||||
@ -35,7 +35,10 @@ with lib;
|
||||
};
|
||||
port = mkOption {
|
||||
type = types.nullOr port;
|
||||
description = lib.mdDoc "Port number.";
|
||||
description = lib.mdDoc ''
|
||||
Port number to listen on.
|
||||
If unset and the listen address is not a socket then nginx defaults to 80.
|
||||
'';
|
||||
default = null;
|
||||
};
|
||||
ssl = mkOption {
|
||||
|
||||
@ -379,7 +379,7 @@ in
|
||||
# Update the start menu for each user that is currently logged in
|
||||
system.userActivationScripts.plasmaSetup = activationScript;
|
||||
|
||||
programs.firefox.wrapperConfig.enablePlasmaBrowserIntegration = true;
|
||||
programs.firefox.nativeMessagingHosts.packages = [ pkgs.plasma5Packages.plasma-browser-integration ];
|
||||
})
|
||||
|
||||
(mkIf (cfg.kwinrc != {}) {
|
||||
|
||||
@ -49,7 +49,7 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
checkedSystemdBootBuilder = pkgs.runCommandLocal "systemd-boot" {
|
||||
checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {
|
||||
nativeBuildInputs = [ pkgs.mypy ];
|
||||
} ''
|
||||
install -m755 ${systemdBootBuilder} $out
|
||||
|
||||
@ -198,6 +198,39 @@ let
|
||||
fi
|
||||
''}
|
||||
|
||||
${lib.optionalString cfg.tpm.enable ''
|
||||
NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}")
|
||||
mkdir -p "$NIX_SWTPM_DIR"
|
||||
${lib.getExe cfg.tpm.package} \
|
||||
socket \
|
||||
--tpmstate dir="$NIX_SWTPM_DIR" \
|
||||
--ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \
|
||||
--pid file="$NIX_SWTPM_DIR"/pid --daemon \
|
||||
--tpm2 \
|
||||
--log file="$NIX_SWTPM_DIR"/stdout,level=6
|
||||
|
||||
# Enable `fdflags` builtin in Bash
|
||||
# We will need it to perform surgical modification of the file descriptor
|
||||
# passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor
|
||||
# on exec.
|
||||
# If let alone, it will trigger the coprocess to read EOF when QEMU is `exec`
|
||||
# at the end of this script. To work around that, we will just clear
|
||||
# the `FD_CLOEXEC` bits as a first step.
|
||||
enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags
|
||||
# leave a dangling subprocess because the swtpm ctrl socket has
|
||||
# "terminate" when the last connection disconnects, it stops swtpm.
|
||||
# When qemu stops, or if the main shell process ends, the coproc will
|
||||
# get signaled by virtue of the pipe between main and coproc ending.
|
||||
# Which in turns triggers a socat connect-disconnect to swtpm which
|
||||
# will stop it.
|
||||
coproc waitingswtpm {
|
||||
read || :
|
||||
echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket
|
||||
}
|
||||
# Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin.
|
||||
fdflags -s-cloexec ''${waitingswtpm[1]}
|
||||
''}
|
||||
|
||||
cd "$TMPDIR"
|
||||
|
||||
${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"}
|
||||
@ -863,6 +896,32 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.tpm = {
|
||||
enable = mkEnableOption "a TPM device in the virtual machine with a driver, using swtpm.";
|
||||
|
||||
package = mkPackageOptionMD cfg.host.pkgs "swtpm" { };
|
||||
|
||||
deviceModel = mkOption {
|
||||
type = types.str;
|
||||
default = ({
|
||||
"i686-linux" = "tpm-tis";
|
||||
"x86_64-linux" = "tpm-tis";
|
||||
"ppc64-linux" = "tpm-spapr";
|
||||
"armv7-linux" = "tpm-tis-device";
|
||||
"aarch64-linux" = "tpm-tis-device";
|
||||
}.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
|
||||
defaultText = ''
|
||||
Based on the guest platform Linux system:
|
||||
|
||||
- `tpm-tis` for (i686, x86_64)
|
||||
- `tpm-spapr` for ppc64
|
||||
- `tpm-tis-device` for (armv7, aarch64)
|
||||
'';
|
||||
example = "tpm-tis-device";
|
||||
description = lib.mdDoc "QEMU device model for the TPM, uses the appropriate default based on th guest platform system and the package passed.";
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.useDefaultFilesystems =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
@ -1028,7 +1087,8 @@ in
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
optional cfg.writableStore "overlay"
|
||||
++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
|
||||
++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
|
||||
++ optional (cfg.tpm.enable) "tpm_tis";
|
||||
|
||||
virtualisation.additionalPaths = [ config.system.build.toplevel ];
|
||||
|
||||
@ -1099,6 +1159,11 @@ in
|
||||
(mkIf (!cfg.graphics) [
|
||||
"-nographic"
|
||||
])
|
||||
(mkIf (cfg.tpm.enable) [
|
||||
"-chardev socket,id=chrtpm,path=\"$NIX_SWTPM_DIR\"/socket"
|
||||
"-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm"
|
||||
"-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0"
|
||||
])
|
||||
];
|
||||
|
||||
virtualisation.qemu.drives = mkMerge [
|
||||
|
||||
@ -1,14 +1,7 @@
|
||||
import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }:
|
||||
let firefoxPackage' = firefoxPackage.override (args: {
|
||||
extraPrefsFiles = (args.extraPrefsFiles or []) ++ [
|
||||
# make sure that autoplay is enabled by default for the audio test
|
||||
(builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);''))
|
||||
];
|
||||
});
|
||||
|
||||
in
|
||||
{
|
||||
name = firefoxPackage'.unwrapped.pname;
|
||||
name = firefoxPackage.pname;
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ eelco shlevy ];
|
||||
};
|
||||
@ -17,10 +10,13 @@ in
|
||||
{ pkgs, ... }:
|
||||
|
||||
{ imports = [ ./common/x11.nix ];
|
||||
environment.systemPackages = [
|
||||
firefoxPackage'
|
||||
pkgs.xdotool
|
||||
];
|
||||
environment.systemPackages = [ pkgs.xdotool ];
|
||||
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
preferences."media.autoplay.default" = 0;
|
||||
package = firefoxPackage;
|
||||
};
|
||||
|
||||
# Create a virtual sound device, with mixing
|
||||
# and all, for recording audio.
|
||||
@ -58,7 +54,9 @@ in
|
||||
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
testScript = let
|
||||
exe = firefoxPackage.unwrapped.binaryName;
|
||||
in ''
|
||||
from contextlib import contextmanager
|
||||
|
||||
|
||||
@ -97,7 +95,7 @@ in
|
||||
|
||||
with subtest("Wait until Firefox has finished loading the Valgrind docs page"):
|
||||
machine.execute(
|
||||
"xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &"
|
||||
"xterm -e '${exe} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &"
|
||||
)
|
||||
machine.wait_for_window("Valgrind")
|
||||
machine.sleep(40)
|
||||
@ -105,7 +103,7 @@ in
|
||||
with subtest("Check whether Firefox can play sound"):
|
||||
with record_audio(machine):
|
||||
machine.succeed(
|
||||
"${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
|
||||
"${exe} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
|
||||
)
|
||||
wait_for_sound(machine)
|
||||
machine.copy_from_vm("/tmp/record.wav")
|
||||
|
||||
@ -1,13 +1,4 @@
|
||||
import ./make-test-python.nix ({ lib, pkgs, system, ... }:
|
||||
|
||||
let
|
||||
tpmSocketPath = "/tmp/swtpm-sock";
|
||||
tpmDeviceModels = {
|
||||
x86_64-linux = "tpm-tis";
|
||||
aarch64-linux = "tpm-tis-device";
|
||||
};
|
||||
in
|
||||
|
||||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
{
|
||||
name = "systemd-credentials-tpm2";
|
||||
|
||||
@ -16,51 +7,11 @@ in
|
||||
};
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
virtualisation = {
|
||||
qemu.options = [
|
||||
"-chardev socket,id=chrtpm,path=${tpmSocketPath}"
|
||||
"-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm"
|
||||
"-device ${tpmDeviceModels.${system}},tpmdev=tpm_dev_0"
|
||||
];
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = [ "tpm_tis" ];
|
||||
|
||||
virtualisation.tpm.enable = true;
|
||||
environment.systemPackages = with pkgs; [ diffutils ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import subprocess
|
||||
from tempfile import TemporaryDirectory
|
||||
|
||||
# From systemd-initrd-luks-tpm2.nix
|
||||
class Tpm:
|
||||
def __init__(self):
|
||||
self.state_dir = TemporaryDirectory()
|
||||
self.start()
|
||||
|
||||
def start(self):
|
||||
self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm",
|
||||
"socket",
|
||||
"--tpmstate", f"dir={self.state_dir.name}",
|
||||
"--ctrl", "type=unixio,path=${tpmSocketPath}",
|
||||
"--tpm2",
|
||||
])
|
||||
|
||||
# Check whether starting swtpm failed
|
||||
try:
|
||||
exit_code = self.proc.wait(timeout=0.2)
|
||||
if exit_code is not None and exit_code != 0:
|
||||
raise Exception("failed to start swtpm")
|
||||
except subprocess.TimeoutExpired:
|
||||
pass
|
||||
|
||||
"""Check whether the swtpm process exited due to an error"""
|
||||
def check(self):
|
||||
exit_code = self.proc.poll()
|
||||
if exit_code is not None and exit_code != 0:
|
||||
raise Exception("swtpm process died")
|
||||
|
||||
CRED_NAME = "testkey"
|
||||
CRED_RAW_FILE = f"/root/{CRED_NAME}"
|
||||
CRED_FILE = f"/root/{CRED_NAME}.cred"
|
||||
@ -85,12 +36,6 @@ in
|
||||
|
||||
machine.log("systemd-run finished successfully")
|
||||
|
||||
tpm = Tpm()
|
||||
|
||||
@polling_condition
|
||||
def swtpm_running():
|
||||
tpm.check()
|
||||
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("Check whether TPM device exists"):
|
||||
|
||||
@ -8,47 +8,34 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 512 ];
|
||||
qemu.options = [
|
||||
"-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"
|
||||
"-tpmdev emulator,id=tpm0,chardev=chrtpm"
|
||||
"-device tpm-tis,tpmdev=tpm0"
|
||||
];
|
||||
tpm.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import subprocess
|
||||
import tempfile
|
||||
machine.start()
|
||||
|
||||
def start_swtpm(tpmstate):
|
||||
subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir="+tpmstate, "--ctrl", "type=unixio,path=/tmp/swtpm-sock", "--log", "level=0", "--tpm2"])
|
||||
# Verify the TPM device is available and accessible by systemd-cryptenroll
|
||||
machine.succeed("test -e /dev/tpm0")
|
||||
machine.succeed("test -e /dev/tpmrm0")
|
||||
machine.succeed("systemd-cryptenroll --tpm2-device=list")
|
||||
|
||||
with tempfile.TemporaryDirectory() as tpmstate:
|
||||
start_swtpm(tpmstate)
|
||||
machine.start()
|
||||
# Create LUKS partition
|
||||
machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -")
|
||||
# Enroll new LUKS key and bind it to Secure Boot state
|
||||
# For more details on PASSWORD variable, check the following issue:
|
||||
# https://github.com/systemd/systemd/issues/20955
|
||||
machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb")
|
||||
# Add LUKS partition to /etc/crypttab to test auto unlock
|
||||
machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab")
|
||||
|
||||
# Verify the TPM device is available and accessible by systemd-cryptenroll
|
||||
machine.succeed("test -e /dev/tpm0")
|
||||
machine.succeed("test -e /dev/tpmrm0")
|
||||
machine.succeed("systemd-cryptenroll --tpm2-device=list")
|
||||
machine.shutdown()
|
||||
machine.start()
|
||||
|
||||
# Create LUKS partition
|
||||
machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -")
|
||||
# Enroll new LUKS key and bind it to Secure Boot state
|
||||
# For more details on PASSWORD variable, check the following issue:
|
||||
# https://github.com/systemd/systemd/issues/20955
|
||||
machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb")
|
||||
# Add LUKS partition to /etc/crypttab to test auto unlock
|
||||
machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab")
|
||||
machine.shutdown()
|
||||
|
||||
start_swtpm(tpmstate)
|
||||
machine.start()
|
||||
|
||||
# Test LUKS partition automatic unlock on boot
|
||||
machine.wait_for_unit("systemd-cryptsetup@luks.service")
|
||||
# Wipe TPM2 slot
|
||||
machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb")
|
||||
# Test LUKS partition automatic unlock on boot
|
||||
machine.wait_for_unit("systemd-cryptsetup@luks.service")
|
||||
# Wipe TPM2 slot
|
||||
machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb")
|
||||
'';
|
||||
})
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
# Booting off the TPM2-encrypted device requires an available init script
|
||||
mountHostNixStore = true;
|
||||
useEFIBoot = true;
|
||||
qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"];
|
||||
tpm.enable = true;
|
||||
};
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
@ -33,29 +33,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import subprocess
|
||||
import os
|
||||
import time
|
||||
|
||||
|
||||
class Tpm:
|
||||
def __init__(self):
|
||||
os.mkdir("/tmp/mytpm1")
|
||||
self.start()
|
||||
|
||||
def start(self):
|
||||
self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir=/tmp/mytpm1", "--ctrl", "type=unixio,path=/tmp/mytpm1/swtpm-sock", "--log", "level=20", "--tpm2"])
|
||||
|
||||
def wait_for_death_then_restart(self):
|
||||
while self.proc.poll() is None:
|
||||
print("waiting for tpm to die")
|
||||
time.sleep(1)
|
||||
assert self.proc.returncode == 0
|
||||
self.start()
|
||||
|
||||
tpm = Tpm()
|
||||
|
||||
|
||||
# Create encrypted volume
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
|
||||
@ -66,8 +43,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
machine.succeed("sync")
|
||||
machine.crash()
|
||||
|
||||
tpm.wait_for_death_then_restart()
|
||||
|
||||
# Boot and decrypt the disk
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
|
||||
|
||||
@ -45,7 +45,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "touchosc";
|
||||
version = "1.2.1.171";
|
||||
version = "1.2.4.180";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "linux-arm64";
|
||||
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-lIm+X+znIp80cbVb8KEkeZwiMkTsqdRLAfI+3a9BgfY=";
|
||||
armv7l-linux = "sha256-kghoaLQ3aEIytdmxlmVXPuZWBwg/A3Y3NL2WSmHKxMM=";
|
||||
x86_64-linux = "sha256-iRab2H+TYpGcUBB/x2/M4NuupWLjvt4EvyMc5cfWyeo=";
|
||||
aarch64-linux = "sha256-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM=";
|
||||
armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko=";
|
||||
x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -190,10 +190,10 @@
|
||||
elpaBuild {
|
||||
pname = "altcaps";
|
||||
ename = "altcaps";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/altcaps-1.1.0.tar";
|
||||
sha256 = "15jfhn9v74zi779a0m0v5dx8h135pbsxx0rh472sl13q2ark97bk";
|
||||
url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar";
|
||||
sha256 = "0pfd3j8x2ayqnvg418qcm4rkxjvm5qm2ks9xsw4irv04452zhahc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -265,10 +265,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.2.1";
|
||||
version = "13.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.2.1.tar";
|
||||
sha256 = "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.2.2.tar";
|
||||
sha256 = "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -535,10 +535,10 @@
|
||||
elpaBuild {
|
||||
pname = "buffer-env";
|
||||
ename = "buffer-env";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.4.tar";
|
||||
sha256 = "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z";
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.5.tar";
|
||||
sha256 = "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -794,10 +794,10 @@
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.9.13";
|
||||
version = "0.10.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
|
||||
sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
|
||||
url = "https://elpa.gnu.org/packages/company-0.10.2.tar";
|
||||
sha256 = "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1132,10 +1132,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.36";
|
||||
version = "0.37";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.36.tar";
|
||||
sha256 = "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.37.tar";
|
||||
sha256 = "0xj0sv5d3y88fsbm7yhm0v59mzj1srxayng1hr418v89ky43rxpr";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
@ -1177,10 +1177,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote-menu";
|
||||
ename = "denote-menu";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-menu-1.1.1.tar";
|
||||
sha256 = "12ry0rv45hv1vrwx9wih72s9h0f3r18xssnkzfa9ilp77kgbas5q";
|
||||
url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar";
|
||||
sha256 = "1zm68bz6hya360g5zvs4r5naznykamgzqxhvfhpfyxb70hsnmx5w";
|
||||
};
|
||||
packageRequires = [ denote emacs ];
|
||||
meta = {
|
||||
@ -1218,16 +1218,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
|
||||
dict-tree = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, heap
|
||||
, lib
|
||||
, tNFA
|
||||
, trie }:
|
||||
elpaBuild {
|
||||
pname = "dict-tree";
|
||||
ename = "dict-tree";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar";
|
||||
sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300";
|
||||
url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar";
|
||||
sha256 = "0f9vj6kr8q9mfd522svwy3wmzsl5lc4y2p8ggwmckn88dpz79w02";
|
||||
};
|
||||
packageRequires = [ heap tNFA trie ];
|
||||
packageRequires = [ emacs heap tNFA trie ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dict-tree.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1372,10 +1378,10 @@
|
||||
elpaBuild {
|
||||
pname = "do-at-point";
|
||||
ename = "do-at-point";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/do-at-point-0.1.0.tar";
|
||||
sha256 = "01xr3fn10z3986ibhglkx7gbcly0wklagk5yhx7cln1sc5dihkv1";
|
||||
url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar";
|
||||
sha256 = "0y58a0x0pfk52h1cz930sbwr9y6nzy9g8f3935pk34dj2jf92rsj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1617,21 +1623,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "eldoc-eval";
|
||||
ename = "eldoc-eval";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar";
|
||||
sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/eldoc-eval.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "electric-spacing";
|
||||
@ -1681,10 +1672,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark";
|
||||
ename = "embark";
|
||||
version = "0.22.1";
|
||||
version = "0.23";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-0.22.1.tar";
|
||||
sha256 = "0dxbvrp057a0kyydnf8vfwnf4m3q3jy4180agcmizlr64lm2pmh1";
|
||||
url = "https://elpa.gnu.org/packages/embark-0.23.tar";
|
||||
sha256 = "03qmhi5wlx4wpj8fnqx352cwnx0czrj6majr18hyavx5cih8i8v6";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -1701,10 +1692,10 @@
|
||||
elpaBuild {
|
||||
pname = "embark-consult";
|
||||
ename = "embark-consult";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.7.tar";
|
||||
sha256 = "12b8p2f1bpy43jzjz3ask9h38z23hq4nxkid5dljnpmvf31d8x9c";
|
||||
url = "https://elpa.gnu.org/packages/embark-consult-0.8.tar";
|
||||
sha256 = "1l6fcrf9hx7ll6zrm3igh80nkcig6i7fqwicm3dy9rwsjyjlmy2f";
|
||||
};
|
||||
packageRequires = [ consult emacs embark ];
|
||||
meta = {
|
||||
@ -1726,10 +1717,10 @@
|
||||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ement-0.12.tar";
|
||||
sha256 = "0v63xfvkdijf8wfy7kafqrqxclq2jvk4amp69kzxx9i0gnp90hzi";
|
||||
url = "https://elpa.gnu.org/packages/ement-0.13.tar";
|
||||
sha256 = "15pi9d5nxg3d7xnh36xpd0fa94fv3yra5imqpwbzz98d4wyacrv8";
|
||||
};
|
||||
packageRequires = [
|
||||
emacs
|
||||
@ -1878,16 +1869,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
expand-region = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
expand-region = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "expand-region";
|
||||
ename = "expand-region";
|
||||
version = "0.11.0";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar";
|
||||
sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i";
|
||||
url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar";
|
||||
sha256 = "04xwdcxahymppcyvkfh2bn2f4fs4f8z27kycva67i6qldhashq7y";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/expand-region.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1897,10 +1888,10 @@
|
||||
elpaBuild {
|
||||
pname = "expreg";
|
||||
ename = "expreg";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/expreg-1.2.1.tar";
|
||||
sha256 = "13m08my5pl8k5gj78lpkh0lh05mrbkphg0k0bb40aw4rbnv7yr7v";
|
||||
url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar";
|
||||
sha256 = "13s3hq6nfnv4md2z704ad1axqnir0drz9vvhvisrlp2lis16xzik";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1927,10 +1918,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.27";
|
||||
version = "0.28";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.27.tar";
|
||||
sha256 = "094k33clmxhnab0wniyrs48sdz28kna2g6fmkhsd7n20nmhhc4sn";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.28.tar";
|
||||
sha256 = "00h5awqazk807zxvb02a9dp8gd5ifi3y1kcwmr1czk6kdmkjx32l";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -2020,10 +2011,10 @@
|
||||
elpaBuild {
|
||||
pname = "flymake";
|
||||
ename = "flymake";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.3.4.tar";
|
||||
sha256 = "0gm08rj83if9cs0jz7zig363zfqp809j6lgaqdb0apzh48fbznkd";
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.3.6.tar";
|
||||
sha256 = "1ihv8gh77849rrdc6qpbpjdw7ikr4biaibw6aggv3hzjf508dzi8";
|
||||
};
|
||||
packageRequires = [ eldoc emacs project ];
|
||||
meta = {
|
||||
@ -2367,10 +2358,10 @@
|
||||
elpaBuild {
|
||||
pname = "greader";
|
||||
ename = "greader";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/greader-0.3.0.tar";
|
||||
sha256 = "1g0djxa8zplw9dmlpg5263wbhp80nkj4wispyikh09cc2lppidw8";
|
||||
url = "https://elpa.gnu.org/packages/greader-0.5.0.tar";
|
||||
sha256 = "11rcppg3850dbrvwsp3y814bibkv0h35rc5sf4w9qlmd5rc5ilxj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2569,10 +2560,10 @@
|
||||
elpaBuild {
|
||||
pname = "inspector";
|
||||
ename = "inspector";
|
||||
version = "0.34";
|
||||
version = "0.36";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/inspector-0.34.tar";
|
||||
sha256 = "1r1gcrhcxixm15ygi4i8brxdpic5a1i2248m7fgwvzij4bvhcg5h";
|
||||
url = "https://elpa.gnu.org/packages/inspector-0.36.tar";
|
||||
sha256 = "139w0qc99grd6yzxkpfblgddnbza02mh4hhcpbjgsm4bwdxq8az0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2709,10 +2700,10 @@
|
||||
elpaBuild {
|
||||
pname = "jarchive";
|
||||
ename = "jarchive";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jarchive-0.10.0.tar";
|
||||
sha256 = "0hgxfz6kqammgbr6cx7l8bg9hmakamrkbzbsjycb4k0gbi4r567b";
|
||||
url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
|
||||
sha256 = "1hn0lyszm667a54j95v2ppddz4g89cp8byj9pd3k1gha2rplm9d8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2829,10 +2820,10 @@
|
||||
elpaBuild {
|
||||
pname = "jumpc";
|
||||
ename = "jumpc";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jumpc-3.0.el";
|
||||
sha256 = "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a";
|
||||
url = "https://elpa.gnu.org/packages/jumpc-3.1.tar";
|
||||
sha256 = "04wqajw4i7sslsw8cwqbw30kbwwf9qlqxjm17v0bsxh5sp27y1jc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2980,6 +2971,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/llm-0.4.0.tar";
|
||||
sha256 = "0jq1q9gmm3nbdsycca2qkjpf04qpp9j615z6l41plmfv7bc0p0x6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/llm.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "lmc";
|
||||
@ -3164,10 +3170,10 @@
|
||||
elpaBuild {
|
||||
pname = "mct";
|
||||
ename = "mct";
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mct-0.5.0.tar";
|
||||
sha256 = "0yv0hqkyh5vpmf5i50fdc2rw3ssvrd9pn3n65v3gmb195gzmn6r9";
|
||||
url = "https://elpa.gnu.org/packages/mct-1.0.0.tar";
|
||||
sha256 = "1gzk0bjvry8wzi35yvghz003rbkz7ky4zd9vafg328b809n9ggff";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3284,10 +3290,10 @@
|
||||
elpaBuild {
|
||||
pname = "mmm-mode";
|
||||
ename = "mmm-mode";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.9.tar";
|
||||
sha256 = "12fss1ccb66xc87m5wpr3vg7bfrzz5m0q6s7pa0avvhsm2f8r2yh";
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.10.tar";
|
||||
sha256 = "1ny9gm87qah4qy0iphw2nlhz2pfc87hzzsv58lrxl18gr69qhndi";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -3299,10 +3305,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-4.2.0.tar";
|
||||
sha256 = "0bki4h3rs1ch47sygb4nib8960lyvvgs7yxgsy009il3hfxzdgsq";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-4.3.0.tar";
|
||||
sha256 = "0zsglzqc36bw9r7fgvxjdcrdjar6xwad29kwyqd2k36bq3pivzq3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3533,10 +3539,10 @@
|
||||
elpaBuild {
|
||||
pname = "notmuch-indicator";
|
||||
ename = "notmuch-indicator";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-1.0.1.tar";
|
||||
sha256 = "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x";
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-1.1.0.tar";
|
||||
sha256 = "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3589,6 +3595,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ob-asymptote = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ob-asymptote";
|
||||
ename = "ob-asymptote";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar";
|
||||
sha256 = "0m9i21zailg7drglm19v9ysyigzvz3p2r3q069a3n04di56d4629";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ob-haxe";
|
||||
@ -3683,10 +3704,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.6.9";
|
||||
version = "9.6.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.9.tar";
|
||||
sha256 = "1ixn20gb2mv3bg9h4p0kyqjqr74dsbv9c7n7s2646ff2b9i6l9bv";
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.10.tar";
|
||||
sha256 = "1lv503jf556hrv9s85q8sk6lg0rwxkchp2sn0sgdki208l0im8wj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3743,10 +3764,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-notify";
|
||||
ename = "org-notify";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-notify-0.1.0.tar";
|
||||
sha256 = "1ijwlv8493g19cascv7fl23sjljvdcak6pg4y1wbs595mmsmh409";
|
||||
url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar";
|
||||
sha256 = "0y0zj7sri7m0q3nibwv0m1snkwhma403hbxpcd346xk3s3ljiz2k";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3848,10 +3869,10 @@
|
||||
elpaBuild {
|
||||
pname = "osm";
|
||||
ename = "osm";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/osm-0.13.tar";
|
||||
sha256 = "13bdp8cz1w396vdfxvv8ygla7cbln178rjliknhfl3kqggg32kqx";
|
||||
url = "https://elpa.gnu.org/packages/osm-0.14.tar";
|
||||
sha256 = "03zzdz7l76006x5540121ckbyd5gm10x30k9r43dlj7myd359i90";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -4058,10 +4079,10 @@
|
||||
elpaBuild {
|
||||
pname = "poke-mode";
|
||||
ename = "poke-mode";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/poke-mode-3.0.tar";
|
||||
sha256 = "0xw50x3fx3ai3rsykh371hwlgkmyx4h37ps2583l69f7id7h2103";
|
||||
url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar";
|
||||
sha256 = "1lirhws5d8l16qs5ddrvvz0f9xfl004q9yp333pdgsmcpk3ww7sr";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4508,10 +4529,10 @@
|
||||
elpaBuild {
|
||||
pname = "relint";
|
||||
ename = "relint";
|
||||
version = "1.23";
|
||||
version = "1.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/relint-1.23.tar";
|
||||
sha256 = "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9";
|
||||
url = "https://elpa.gnu.org/packages/relint-1.24.tar";
|
||||
sha256 = "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm";
|
||||
};
|
||||
packageRequires = [ emacs xr ];
|
||||
meta = {
|
||||
@ -4769,10 +4790,10 @@
|
||||
elpaBuild {
|
||||
pname = "site-lisp";
|
||||
ename = "site-lisp";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/site-lisp-0.1.1.tar";
|
||||
sha256 = "05fdh7hv3dwm8li4qsyrm9j6zdj43k82al1p5z9ir6xmy1r5b571";
|
||||
url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar";
|
||||
sha256 = "07704nz5rrzixmvw65h79rf4fpnf58jrrgbp1brvknidp6j95r0n";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4998,10 +5019,10 @@
|
||||
elpaBuild {
|
||||
pname = "sql-indent";
|
||||
ename = "sql-indent";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sql-indent-1.6.tar";
|
||||
sha256 = "000pimlg0k4mrv2wpqq8w8l51wpr1lzlaq6ai8iaximm2a92ap5b";
|
||||
url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar";
|
||||
sha256 = "043qcy97a5hx68w0ac7xsk380l2i7bphgrdz6aby2zfpp90vrjpn";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -5219,6 +5240,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tam = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
|
||||
elpaBuild {
|
||||
pname = "tam";
|
||||
ename = "tam";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tam-0.1.tar";
|
||||
sha256 = "1f66la9mmw1frpy2k9vr9k1q2x3b1y9018z43rdhrp50zx1b2vsg";
|
||||
};
|
||||
packageRequires = [ emacs queue ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tam.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "taxy";
|
||||
@ -5382,10 +5418,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.1.2";
|
||||
version = "2.6.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.1.2.tar";
|
||||
sha256 = "0nazcrpkwy59dxbyzarj75zvz7vh4pgq4yzqgf6zfbvqp7q73wbn";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.1.3.tar";
|
||||
sha256 = "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5472,10 +5508,10 @@
|
||||
elpaBuild {
|
||||
pname = "tree-inspector";
|
||||
ename = "tree-inspector";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tree-inspector-0.3.tar";
|
||||
sha256 = "1hns99rfga8p85ylbr4ri14wyfcxf0bcni0fyr09awipxrpn6ikq";
|
||||
url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar";
|
||||
sha256 = "0jsd32qk9rap8mhmm6qkyafvb6c2gyaa0adzdsh3bh03byi3sj6c";
|
||||
};
|
||||
packageRequires = [ emacs treeview ];
|
||||
meta = {
|
||||
@ -5487,10 +5523,10 @@
|
||||
elpaBuild {
|
||||
pname = "trie";
|
||||
ename = "trie";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/trie-0.5.tar";
|
||||
sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p";
|
||||
url = "https://elpa.gnu.org/packages/trie-0.6.tar";
|
||||
sha256 = "0vh0cizpbdiaq0y018rkrzjyv6lq0jwv9pwlvggbjfsz34kd10a4";
|
||||
};
|
||||
packageRequires = [ heap tNFA ];
|
||||
meta = {
|
||||
@ -6107,6 +6143,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
wrap-search = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "wrap-search";
|
||||
ename = "wrap-search";
|
||||
version = "4.12.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wrap-search-4.12.10.tar";
|
||||
sha256 = "0r1ggggpm7x201r5yp0nhnc9146nrqzb5df1bjg7z2am2150r1i9";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/wrap-search.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xclip = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xclip";
|
||||
@ -6171,10 +6222,10 @@
|
||||
elpaBuild {
|
||||
pname = "xr";
|
||||
ename = "xr";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xr-1.24.tar";
|
||||
sha256 = "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214";
|
||||
url = "https://elpa.gnu.org/packages/xr-1.25.tar";
|
||||
sha256 = "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -6249,10 +6300,10 @@
|
||||
elpaBuild {
|
||||
pname = "zones";
|
||||
ename = "zones";
|
||||
version = "2019.7.13";
|
||||
version = "2023.6.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/zones-2019.7.13.el";
|
||||
sha256 = "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1";
|
||||
url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar";
|
||||
sha256 = "1znz720s9pchc7r9g1mpz9jcnz122bppimmh09g1rn94fh3m6vm3";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -64,10 +64,10 @@
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.2.tar";
|
||||
sha256 = "03iigyh9s378jif2vaaii8d31nag6mzairmgl9ffhmryz08jkig1";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.3.tar";
|
||||
sha256 = "1kq195nmspysb1kiqcfh0kwxzp40ij9ccw1c204ayr40a0wp7ilc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -257,6 +257,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
blueprint-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "blueprint-ts-mode";
|
||||
ename = "blueprint-ts-mode";
|
||||
version = "0.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.2.tar";
|
||||
sha256 = "0fyvff2zh6iiswhxcvqgnxdhq3yk5f0w4a2w0jp126fvd3ryspym";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "boxquote";
|
||||
@ -276,10 +291,10 @@
|
||||
elpaBuild {
|
||||
pname = "buttercup";
|
||||
ename = "buttercup";
|
||||
version = "1.31";
|
||||
version = "1.32";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.31.tar";
|
||||
sha256 = "1aw9k3dfscqpq2jkk1yqh6i3682yjs85fnm7rzc5i9qawrl9db6h";
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.32.tar";
|
||||
sha256 = "07vxs1iq38m7ng9wia8h6q2sy4cdykv03jksqjqyqaab4cl7yl27";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -321,10 +336,10 @@
|
||||
elpaBuild {
|
||||
pname = "cdlatex";
|
||||
ename = "cdlatex";
|
||||
version = "4.18.2";
|
||||
version = "4.18.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.2.tar";
|
||||
sha256 = "1sqmb7qcvdphkrak9bxw3xs0fdlv5vn36ckcqiannpm870s7ajnk";
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.3.tar";
|
||||
sha256 = "0zz73csyjagq4vfv1fdnzwg4jhscggg3vk75kjdl78dg1ly191iz";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -341,14 +356,15 @@
|
||||
, queue
|
||||
, seq
|
||||
, sesman
|
||||
, spinner }:
|
||||
, spinner
|
||||
, transient }:
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.7.0";
|
||||
version = "1.8.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.7.0.tar";
|
||||
sha256 = "0x0acszamylmmly6h8s56lskd5l7lm8hdnf8rbvjd89v0j2anb0l";
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.8.3.tar";
|
||||
sha256 = "0c77rlpyda4x05fj3d10cpww0pkbsjcbrvwcwy4gh74c9m9xmq1d";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
@ -358,6 +374,7 @@
|
||||
seq
|
||||
sesman
|
||||
spinner
|
||||
transient
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cider.html";
|
||||
@ -368,10 +385,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
ename = "clojure-mode";
|
||||
version = "5.17.0";
|
||||
version = "5.18.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.17.0.tar";
|
||||
sha256 = "189kyj57q4v8m9r9cd9q2x9db42vl5vb1qvww401lxlappc58fmw";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.0.tar";
|
||||
sha256 = "1wh1r3kdjya7aqnnm6ask9q93pxm7h6ff4b7p6lrhwg4iyn2njss";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -383,10 +400,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-ts-mode";
|
||||
ename = "clojure-ts-mode";
|
||||
version = "0.1.5";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.1.5.tar";
|
||||
sha256 = "1py4kxw2w9ggkl8ljchbcry14v9anxn9zinbdfls9x120y1cljsa";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.0.tar";
|
||||
sha256 = "1jb6n84pk2ybrihh1s472q77pmnn288p4bzvhga0sxxqg88ial2p";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -620,10 +637,10 @@
|
||||
elpaBuild {
|
||||
pname = "dracula-theme";
|
||||
ename = "dracula-theme";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.1.tar";
|
||||
sha256 = "0j7m9z4y6jh0wlbi8xrg5syjaybhxs4karwshh1919ajzjs0f8ql";
|
||||
url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar";
|
||||
sha256 = "17szqyl63nn66sxdz403kcd2diif5afvgv6abgqkw6x01bsr11i0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -646,16 +663,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eat = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "eat";
|
||||
ename = "eat";
|
||||
version = "0.8";
|
||||
version = "0.9.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/eat-0.8.tar";
|
||||
sha256 = "1nvwd8iryjdcbm3v2xjgnf4ifcbs4d8hxn7xydxw6i7c5l8vya9f";
|
||||
url = "https://elpa.nongnu.org/nongnu/eat-0.9.3.tar";
|
||||
sha256 = "1dck6vvyn1y94z18p1b0kh3x4i587x8x5pk5bin56vwpkw05s40d";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/eat.html";
|
||||
license = lib.licenses.free;
|
||||
@ -725,10 +742,10 @@
|
||||
elpaBuild {
|
||||
pname = "engine-mode";
|
||||
ename = "engine-mode";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.3.tar";
|
||||
sha256 = "07r5g2xrss175m622npna7c51ra4im7l69mkqp6689m2954g23wk";
|
||||
url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar";
|
||||
sha256 = "0azc1l9dbalbsd5mcfg1adbkyyy1n4195grzr96w9d7cs7ds23ya";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -914,6 +931,40 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-surround = callPackage ({ elpaBuild, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-surround";
|
||||
ename = "evil-surround";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar";
|
||||
sha256 = "1cc6n05j7a3q3n8hzxrhgjwk2a79h0llidh0sqhq5bc9d8ygrl2s";
|
||||
};
|
||||
packageRequires = [ evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-surround.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-visual-mark-mode = callPackage ({ dash
|
||||
, elpaBuild
|
||||
, evil
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-visual-mark-mode";
|
||||
ename = "evil-visual-mark-mode";
|
||||
version = "0.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar";
|
||||
sha256 = "1k7slwf6m1brwy40j7j4j6qw4jna4sh0llbywsimdj63zral3fki";
|
||||
};
|
||||
packageRequires = [ dash evil ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-visualstar = callPackage ({ elpaBuild, evil, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "evil-visualstar";
|
||||
@ -1609,16 +1660,17 @@
|
||||
, lib
|
||||
, map
|
||||
, persist
|
||||
, plz }:
|
||||
, plz
|
||||
, transient }:
|
||||
elpaBuild {
|
||||
pname = "hyperdrive";
|
||||
ename = "hyperdrive";
|
||||
version = "0.1.0";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.1.0.tar";
|
||||
sha256 = "1dawm6wxwik7jks0xc2ina2nikdg9x4cnnws4srcf15vwh40van4";
|
||||
url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.2.tar";
|
||||
sha256 = "1cvsl7caprdms83mvhlv3crk4ylka1g0swg0klqld04hayzikq0z";
|
||||
};
|
||||
packageRequires = [ compat emacs map persist plz ];
|
||||
packageRequires = [ compat emacs map persist plz transient ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hyperdrive.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1697,10 +1749,10 @@
|
||||
elpaBuild {
|
||||
pname = "inf-ruby";
|
||||
ename = "inf-ruby";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.7.0.tar";
|
||||
sha256 = "0wzzhr10q8mnai024g5nprsnl0bcdlqfrh4nxf8qq43paah28i6f";
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.0.tar";
|
||||
sha256 = "1ax2sab4rm5alg12n2k6bz1xwv0mi0jvxx5xmjzavjxl4x6qckxy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1727,10 +1779,10 @@
|
||||
elpaBuild {
|
||||
pname = "iwindow";
|
||||
ename = "iwindow";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/iwindow-1.0.tar";
|
||||
sha256 = "076i0p9kq48hxkkwzzapnni6cpdr25hdrw9bs2cly8w4v5rmd6rj";
|
||||
url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar";
|
||||
sha256 = "1sx0dqm7wwq05qaxqyrsg8v57i5ghzaq2hcdrywjq5x3cl5rmw17";
|
||||
};
|
||||
packageRequires = [ compat emacs seq ];
|
||||
meta = {
|
||||
@ -1942,10 +1994,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "1.0.1";
|
||||
version = "1.0.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.1.tar";
|
||||
sha256 = "0xj5zsmacj68amcq9kshin5ddjhpyjyfhkc7nafzbjk63fnscjnb";
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.12.tar";
|
||||
sha256 = "1raq11350y5cpfzq7c8xmrsnl728fw0796bn1prbrrlly20rqxc2";
|
||||
};
|
||||
packageRequires = [ emacs persist request ];
|
||||
meta = {
|
||||
@ -2397,10 +2449,10 @@
|
||||
elpaBuild {
|
||||
pname = "parseedn";
|
||||
ename = "parseedn";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/parseedn-1.1.0.tar";
|
||||
sha256 = "1by9cy7pn12124vbg59c9qmn2k8v5dbqq4c8if81fclrccjqhrz4";
|
||||
url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.0.tar";
|
||||
sha256 = "10y6mpjzxpmg029j0kysyxqqxdc82wwhkxh79sf8hz1ffks2ysmm";
|
||||
};
|
||||
packageRequires = [ emacs map parseclj ];
|
||||
meta = {
|
||||
@ -2507,10 +2559,10 @@
|
||||
elpaBuild {
|
||||
pname = "projectile";
|
||||
ename = "projectile";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/projectile-2.7.0.tar";
|
||||
sha256 = "1ibxsa1lv9aiplkfplamyn2wc2c6vfwfszyaicfx79aq2w9427bg";
|
||||
url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar";
|
||||
sha256 = "0j3zd1i6c0vinizg6ini0wqgkczqm48g7m5ihp1njq34c6pgpx7y";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2555,10 +2607,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20230905.102118";
|
||||
version = "1.0.20230919.113921";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230905.102118.tar";
|
||||
sha256 = "1109aq0q81r6r79vpazrn2r1dwpzpxgashrz1p4lbjh4mk8a16ka";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230919.113921.tar";
|
||||
sha256 = "00b4bw4cqm9yc8fxz14da5ahrjrmshf3497l8p65ss0s6qby5ag3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2645,10 +2697,10 @@
|
||||
elpaBuild {
|
||||
pname = "rfc-mode";
|
||||
ename = "rfc-mode";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.0.tar";
|
||||
sha256 = "0036ypsjm35x8vwrlm346wcqmh85kbjmw0813q65z6k0gvmnwldj";
|
||||
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar";
|
||||
sha256 = "1b2n52qn7s0zc2xxi45xp9zvlws963l3b45v9q0r1yr8mpbvcb9l";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2934,10 +2986,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.4.tar";
|
||||
sha256 = "05pnjdrf9gq32bayvbd0yvp1lxpwj2xsarcy3s2jjb6zcgm6djyb";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.5.tar";
|
||||
sha256 = "0qaliyn79zkpy3ppqb0s61i5hfbbcj8climj7x9c6vpq86s57mv1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2949,10 +3001,10 @@
|
||||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.24.1";
|
||||
version = "0.25.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.24.1.tar";
|
||||
sha256 = "0aw8xzh72zwam0f91d9w1x43hi477xgh0qk4rv732j3hs3fbxb4z";
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.25.5.tar";
|
||||
sha256 = "1gxy68a26h65rzf8815iifcnr67rpw69ll14d4cbq9qsxvrmy50h";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -2964,10 +3016,10 @@
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-9.0.0.tar";
|
||||
sha256 = "1s69mm7yhz1dhxz118ik7nxqw6gliivbwv1qvylk8nz2lhr8sf9n";
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
|
||||
sha256 = "1zx25g2jdkc78pjhl36gwrc3kj5wxayfl8vgkl3k5gqsa7bjjbjm";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -3120,10 +3172,10 @@
|
||||
elpaBuild {
|
||||
pname = "treeview";
|
||||
ename = "treeview";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/treeview-1.1.1.tar";
|
||||
sha256 = "0ryycz2n1kam3ji0ibpy99ll5l6xnx1mx9i9bgfvma61f0ppcppd";
|
||||
url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
|
||||
sha256 = "1vwkqnjj380w13xxj670da4kyqsxmjcsivaqd8k6w7bs59yrljkr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3370,10 +3422,10 @@
|
||||
elpaBuild {
|
||||
pname = "workroom";
|
||||
ename = "workroom";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/workroom-2.3.tar";
|
||||
sha256 = "0c05pbxkrcgsjk7zcyxiacxrpxyvf85rf38nhaqhxbywh4j071fg";
|
||||
url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar";
|
||||
sha256 = "1rwixacz8dwws54dvm9dbrwnjh8xpqp1j594hwd4xfq9z1kfzz4f";
|
||||
};
|
||||
packageRequires = [ compat emacs project ];
|
||||
meta = {
|
||||
@ -3418,10 +3470,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "24.10.20230911080522";
|
||||
version = "24.13.20231009115302";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.10.20230911080522.tar";
|
||||
sha256 = "07k3v9gf7hbnicrggspd8xx2qwmd5x0vrfmy0x8fx21d61fylqvh";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231009115302.tar";
|
||||
sha256 = "0k530ihjjwcvl24f815nk9jqfnbhzb95xlfm8721dlsbrsmsaiwc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3444,16 +3496,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
xml-rpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xml-rpc";
|
||||
ename = "xml-rpc";
|
||||
version = "1.6.16";
|
||||
version = "1.6.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.16.tar";
|
||||
sha256 = "0gglrrnicbsf1lrk4pwmif5658yrhx80ixgi5hm85p8yxarn3ynm";
|
||||
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar";
|
||||
sha256 = "0k029lsyz1gpx88pprx5nj2qzkgk6dfc9kvna6a94r6m14brrgyc";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
|
||||
license = lib.licenses.free;
|
||||
@ -3463,10 +3515,10 @@
|
||||
elpaBuild {
|
||||
pname = "yaml-mode";
|
||||
ename = "yaml-mode";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.15.tar";
|
||||
sha256 = "19r2kc894dd59f0r3q4gx52iw5cwj5gi1jjkmi8r9y0dya50rzfx";
|
||||
url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar";
|
||||
sha256 = "19j90sss45gvs76nl1fxi0xahbygy2v639ziwcj93d9vs2p9axs0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tesseract";
|
||||
version = "5.3.2";
|
||||
version = "5.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = version;
|
||||
sha256 = "sha256-49pTs9r9ebERC0S663+h/f70s693zDseKRziafCIaTo=";
|
||||
sha256 = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -34,6 +34,7 @@ let
|
||||
, nameSuffix ? ""
|
||||
, icon ? applicationName
|
||||
, wmClass ? applicationName
|
||||
, nativeMessagingHosts ? []
|
||||
, extraNativeMessagingHosts ? []
|
||||
, pkcs11Modules ? []
|
||||
, useGlvnd ? true
|
||||
@ -62,18 +63,28 @@ let
|
||||
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
|
||||
smartcardSupport = cfg.smartcardSupport or false;
|
||||
|
||||
nativeMessagingHosts =
|
||||
[ ]
|
||||
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
|
||||
++ lib.optional (cfg.enableBukubrow or false) bukubrow
|
||||
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector
|
||||
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration
|
||||
++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge
|
||||
++ lib.optional (cfg.enableKeePassXC or false) keepassxc
|
||||
++ extraNativeMessagingHosts
|
||||
;
|
||||
deprecatedNativeMessagingHost = option: pkg:
|
||||
if (cfg.${option} or false)
|
||||
then
|
||||
lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead"
|
||||
[pkg]
|
||||
else [];
|
||||
|
||||
allNativeMessagingHosts = builtins.map lib.getBin (
|
||||
nativeMessagingHosts
|
||||
++ deprecatedNativeMessagingHost "enableBrowserpass" browserpass
|
||||
++ deprecatedNativeMessagingHost "enableBukubrow" bukubrow
|
||||
++ deprecatedNativeMessagingHost "enableTridactylNative" tridactyl-native
|
||||
++ deprecatedNativeMessagingHost "enableGnomeExtensions" gnome-browser-connector
|
||||
++ deprecatedNativeMessagingHost "enableUgetIntegrator" uget-integrator
|
||||
++ deprecatedNativeMessagingHost "enablePlasmaBrowserIntegration" plasma5Packages.plasma-browser-integration
|
||||
++ deprecatedNativeMessagingHost "enableFXCastBridge" fx-cast-bridge
|
||||
++ deprecatedNativeMessagingHost "enableKeePassXC" keepassxc
|
||||
++ (if extraNativeMessagingHosts != []
|
||||
then lib.warn "The extraNativeMessagingHosts argument for the Firefox wrapper is deprecated, please use `nativeMessagingHosts`" extraNativeMessagingHosts
|
||||
else [])
|
||||
);
|
||||
|
||||
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]
|
||||
++ lib.optional pipewireSupport pipewire
|
||||
++ lib.optional ffmpegSupport ffmpeg_5
|
||||
@ -338,7 +349,7 @@ let
|
||||
install -D -t $out/share/applications $desktopItem/share/applications/*
|
||||
|
||||
mkdir -p $out/lib/mozilla/native-messaging-hosts
|
||||
for ext in ${toString nativeMessagingHosts}; do
|
||||
for ext in ${toString allNativeMessagingHosts}; do
|
||||
ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
|
||||
done
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, groff, pkg-config, guile, gtk2, flex, gawk, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geda";
|
||||
@ -9,12 +9,20 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "geda-1.10.2-drop-xorn.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch?id=5589cc7bc6c4f18f75c40725a550b8d76e7f5ca1";
|
||||
hash = "sha256-jPQaHjEDwCEfZqDGku+xyIMl5WlWlVcpPv1W6Xf8Grs=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-update-xdg-database"
|
||||
"--without-libfam"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ groff pkg-config python2 ];
|
||||
nativeBuildInputs = [ autoreconfHook groff pkg-config ];
|
||||
buildInputs = [ guile gtk2 flex gawk perl ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "5.012";
|
||||
version = "5.016";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y6GkIgkauayJmGhOQg2kWjbcxYVIob6InMopv555Lb8=";
|
||||
hash = "sha256-MVQbAZXSIdzX7+yKbSrFLLd0j6dfLSXpES3uu6bcPt8=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://mediathekview.de/";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "mediathek";
|
||||
maintainers = with maintainers; [ moredread ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -110,7 +110,20 @@ let
|
||||
gccForLibs_solib = getLib gccForLibs
|
||||
+ optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
|
||||
|
||||
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
|
||||
# The following two functions, `isGccArchSupported` and
|
||||
# `isGccTuneSupported`, only handle those situations where a flag
|
||||
# (`-march` or `-mtune`) is accepted by one compiler but rejected
|
||||
# by another, and both compilers are relevant to nixpkgs. We are
|
||||
# not trying to maintain a complete list of all flags accepted by
|
||||
# all versions of all compilers ever in nixpkgs.
|
||||
#
|
||||
# The two main cases of interest are:
|
||||
#
|
||||
# - One compiler is gcc and the other is clang
|
||||
# - One compiler is pkgs.gcc and the other is bootstrap-files.gcc
|
||||
# -- older compilers (for example bootstrap's GCC 5) fail with
|
||||
# -march=too-modern-cpu
|
||||
|
||||
isGccArchSupported = arch:
|
||||
if targetPlatform.isPower then false else # powerpc does not allow -march=
|
||||
if isGNU then
|
||||
@ -159,6 +172,51 @@ let
|
||||
else
|
||||
false;
|
||||
|
||||
isGccTuneSupported = tune:
|
||||
# for x86 -mtune= takes the same values as -march, plus two more:
|
||||
if targetPlatform.isx86 then
|
||||
{
|
||||
generic = true;
|
||||
intel = true;
|
||||
}.${tune} or (isGccArchSupported tune)
|
||||
# on arm64, the -mtune= values are specific processors
|
||||
else if targetPlatform.isAarch64 then
|
||||
(if isGNU then
|
||||
{
|
||||
cortex-a53 = versionAtLeast ccVersion "4.8"; # gcc 8c075f
|
||||
cortex-a72 = versionAtLeast ccVersion "5.1"; # gcc d8f70d
|
||||
"cortex-a72.cortex-a53" = versionAtLeast ccVersion "5.1"; # gcc d8f70d
|
||||
}.${tune} or false
|
||||
else if isClang then
|
||||
{
|
||||
cortex-a53 = versionAtLeast ccVersion "3.9"; # llvm dfc5d1
|
||||
}.${tune} or false
|
||||
else false)
|
||||
else if targetPlatform.isPower then
|
||||
# powerpc does not support -march
|
||||
true
|
||||
else if targetPlatform.isMips then
|
||||
# for mips -mtune= takes the same values as -march
|
||||
isGccArchSupported tune
|
||||
else
|
||||
false;
|
||||
|
||||
# Clang does not support as many `-mtune=` values as gcc does;
|
||||
# this function will return the best possible approximation of the
|
||||
# provided `-mtune=` value, or `null` if none exists.
|
||||
#
|
||||
# Note: this function can make use of ccVersion; for example, `if
|
||||
# versionOlder ccVersion "12" then ...`
|
||||
findBestTuneApproximation = tune:
|
||||
let guess = if isClang
|
||||
then {
|
||||
# clang does not tune for big.LITTLE chips
|
||||
"cortex-a72.cortex-a53" = "cortex-a72";
|
||||
}.${tune} or tune
|
||||
else tune;
|
||||
in if isGccTuneSupported guess
|
||||
then guess
|
||||
else null;
|
||||
|
||||
darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin (
|
||||
if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx"
|
||||
@ -559,10 +617,12 @@ stdenv.mkDerivation {
|
||||
+ optionalString (targetPlatform ? gcc.thumb) ''
|
||||
echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ optionalString (targetPlatform ? gcc.tune &&
|
||||
isGccArchSupported targetPlatform.gcc.tune) ''
|
||||
echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ (let tune = if targetPlatform ? gcc.tune
|
||||
then findBestTuneApproximation targetPlatform.gcc.tune
|
||||
else null;
|
||||
in optionalString (tune != null) ''
|
||||
echo "-mtune=${tune}" >> $out/nix-support/cc-cflags-before
|
||||
'')
|
||||
|
||||
# TODO: categorize these and figure out a better place for them
|
||||
+ optionalString targetPlatform.isWindows ''
|
||||
|
||||
@ -366,6 +366,10 @@ crate_: lib.makeOverridable
|
||||
|
||||
meta = {
|
||||
mainProgram = crateName;
|
||||
badPlatforms = [
|
||||
# Rust is currently unable to target the n32 ABI
|
||||
lib.systems.inspect.patterns.isMips64n32
|
||||
];
|
||||
};
|
||||
} // extraDerivationAttrs
|
||||
)
|
||||
|
||||
@ -161,5 +161,9 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
|
||||
"x86_64-redox"
|
||||
"wasm32-wasi"
|
||||
];
|
||||
badPlatforms = [
|
||||
# Rust is currently unable to target the n32 ABI
|
||||
lib.systems.inspect.patterns.isMips64n32
|
||||
];
|
||||
} // meta;
|
||||
})
|
||||
|
||||
42
pkgs/by-name/ri/river-bnf/package.nix
Normal file
42
pkgs/by-name/ri/river-bnf/package.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river-bnf";
|
||||
version = "unstable-2023-10-10";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~leon_plickat";
|
||||
repo = pname;
|
||||
rev = "bb8ded380ed5d539777533065b4fd33646ad5603";
|
||||
hash = "sha256-rm9Nt3WLgq9QOXzrkYBGp45EALNYFTQGInxfYIN0XcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland.dev
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace '/usr/local' $out
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Switch back'n'forth between river tags";
|
||||
homepage = "https://git.sr.ht/~leon_plickat/river-bnf";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ adamcstephens ];
|
||||
mainProgram = "river-bnf";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.598";
|
||||
version = "0.600";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-B3ggPrhvq1kYmclmuomi6PhXIwN8GKBzbKRLIjH0pac=";
|
||||
hash = "sha256-fu4ALQ6mpxSQAWdz6zzcHRC4Z5ykVB0G7e2QzpHt8K8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
|
||||
./patches/2.0-darwin-x11.patch
|
||||
# Fixes an incompatible function pointer conversion and implicit int errors with clang 16.
|
||||
./patches/2.0-clang.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
49
pkgs/development/libraries/gtk/patches/2.0-clang.patch
Normal file
49
pkgs/development/libraries/gtk/patches/2.0-clang.patch
Normal file
@ -0,0 +1,49 @@
|
||||
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
|
||||
index 4317523fb8..3c09cd3ae8 100644
|
||||
--- a/gtk/gtkscale.c
|
||||
+++ b/gtk/gtkscale.c
|
||||
@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale,
|
||||
mark->position = position;
|
||||
|
||||
priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
|
||||
- (GCompareFunc) compare_marks,
|
||||
+ (GCompareDataFunc) compare_marks,
|
||||
GINT_TO_POINTER (
|
||||
gtk_range_get_inverted (GTK_RANGE (scale))
|
||||
));
|
||||
diff --git a/tests/testmenubars.c b/tests/testmenubars.c
|
||||
index 416a939861..c65e82be26 100644
|
||||
--- a/tests/testmenubars.c
|
||||
+++ b/tests/testmenubars.c
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
static GtkWidget *
|
||||
-create_menu (depth)
|
||||
+create_menu (int depth, gboolean _unused)
|
||||
{
|
||||
GtkWidget *menu;
|
||||
GtkWidget *menuitem;
|
||||
@@ -35,19 +35,19 @@ create_menu (depth)
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
|
||||
gtk_widget_show (menuitem);
|
||||
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
|
||||
- create_menu (depth - 1));
|
||||
+ create_menu (depth - 1, _unused));
|
||||
|
||||
menuitem = gtk_menu_item_new_with_mnemonic ("Two");
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
|
||||
gtk_widget_show (menuitem);
|
||||
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
|
||||
- create_menu (depth - 1));
|
||||
+ create_menu (depth - 1, _unused));
|
||||
|
||||
menuitem = gtk_menu_item_new_with_mnemonic ("Three");
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
|
||||
gtk_widget_show (menuitem);
|
||||
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
|
||||
- create_menu (depth - 1));
|
||||
+ create_menu (depth - 1, _unused));
|
||||
|
||||
return menu;
|
||||
}
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/'
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
|
||||
doCheck = true;
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
{lib, stdenv, fetchurl, libxpdf, libxml2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pdf2xml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/pdf2xml.tar.gz";
|
||||
sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w";
|
||||
};
|
||||
sourceRoot = "pdf2xml/pdf2xml";
|
||||
|
||||
buildInputs = [libxml2 libxpdf];
|
||||
|
||||
patches = [./pdf2xml.patch];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preBuild = ''
|
||||
cp Makefile.linux Makefile
|
||||
|
||||
sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile
|
||||
sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile
|
||||
sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile
|
||||
|
||||
mkdir exe
|
||||
|
||||
buildFlags+=" CXX=$CXX"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp exe/* $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PDF to XML converter";
|
||||
homepage = "https://sourceforge.net/projects/pdf2xml/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux
|
||||
*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100
|
||||
--- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200
|
||||
***************
|
||||
*** 30,36 ****
|
||||
|
||||
|
||||
# Executable name
|
||||
! PDFTOXMLEXE=pdftoxml.exe
|
||||
|
||||
# Main target
|
||||
all: pdftoxmlEXE
|
||||
--- 30,36 ----
|
||||
|
||||
|
||||
# Executable name
|
||||
! PDFTOXMLEXE=pdftoxml
|
||||
|
||||
# Main target
|
||||
all: pdftoxmlEXE
|
||||
diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc
|
||||
*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200
|
||||
--- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200
|
||||
***************
|
||||
*** 11,21 ****
|
||||
//
|
||||
//===========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
- #include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
! #include <string.h>
|
||||
#include "parseargs.h"
|
||||
#include "GString.h"
|
||||
#include "gmem.h"
|
||||
--- 11,21 ----
|
||||
//
|
||||
//===========================================================================
|
||||
|
||||
+ #include <string.h>
|
||||
#include <aconf.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
! #include <cstdio>
|
||||
#include "parseargs.h"
|
||||
#include "GString.h"
|
||||
#include "gmem.h"
|
||||
@ -8,14 +8,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "carton";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";
|
||||
hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U=";
|
||||
hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowithings";
|
||||
version = "0.4.4";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "joostlek";
|
||||
repo = "python-withings";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YmTYwj3Udo1Pev25LLvY7757BR0h44aefqIe8b8FlTc=";
|
||||
hash = "sha256-3necwO/EpjWD1fAItqsZJKgv0CIBklxcM1jNRPxhSVY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, unittestCheckHook
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, fetchFromGitLab
|
||||
, substituteAll
|
||||
@ -88,9 +88,12 @@ buildPythonPackage rec {
|
||||
install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
unittestFlagsArray = [ "-v" ];
|
||||
disabledTests = [
|
||||
# Frequently fails when exiftool is updated and adds support for new metadata.
|
||||
"test_all_parametred"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A handy tool to trash your metadata";
|
||||
|
||||
@ -3,23 +3,22 @@
|
||||
, build
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, magicgui
|
||||
, napari # reverse dependency, for tests
|
||||
, psygnal
|
||||
, pydantic
|
||||
, pythonOlder
|
||||
, pytomlpp
|
||||
, pyyaml
|
||||
, rich
|
||||
, setuptools-scm
|
||||
, typer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "napari-npe2";
|
||||
version = "0.7.2";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -30,12 +29,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-PjoLocNTkcAnBNRbPi+MZqZtQ2bjWPIUVz0+k8nIn2A=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# npe2 *can* build without it,
|
||||
# but then setuptools refuses to acknowledge it when building napari
|
||||
setuptools-scm
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfibaro";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "rappenze";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hllYxPPbLu3dpjHwXfIvTMW0LWtcglTVfN7youZaXTw=";
|
||||
hash = "sha256-yE9HkAlGj1t90FwmwHDsk3ea2UOl0bG3UtYXxz/SWbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,6 +22,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-kW03swRXZdkh45I/up/FIxv0WGBRqTlDt1X71Ow/hrg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "poetry-core==1.6.1" "poetry-core"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywemo";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+AdNT7ClT8JkYLkwk+IVNWgXGS04WNtENOtqmbjv7nQ=";
|
||||
hash = "sha256-RZeg6/xAGRumd4aM/mQQnIrIXB/rUrdeQQxk2c1mJNI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qbittorrent-api";
|
||||
version = "2023.9.53";
|
||||
version = "2023.10.54";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/q0bL1WxIn6giOp9kLUCLZRpS/2d2Rdr61rRwZXQRP8=";
|
||||
hash = "sha256-xCHB/pPURc1+vje6IhBHZ6HogUsmYfBE9977Qtwoc2w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rotary-embedding-torch";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucidrains";
|
||||
repo = "rotary-embedding-torch";
|
||||
rev = version;
|
||||
hash = "sha256-EozW8J1i/2ym1hwUMciaWVtp7kSWfG+mC5RkWLJdK3g=";
|
||||
hash = "sha256-uTOKdxqbSLRJl0gnz3TvpVwhrfqflAp0wfn6d13+YrM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crate2nix";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kolloch";
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y=";
|
||||
sha256 = "sha256-nyX1lfaA0eBSB/BaxPzCsyD8p/hxCwNIvr4Ru3i/YX0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/crate2nix";
|
||||
|
||||
cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ=";
|
||||
cargoSha256 = "sha256-3+emOr3hh+DDkboJbYyJFZgkzmcdA9jdronz7wM4x28=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -32,6 +32,13 @@ rustPlatform.buildRustPackage rec {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/crate2nix \
|
||||
--suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]}
|
||||
|
||||
rm -rf $out/lib $out/bin/crate2nix.d
|
||||
mkdir -p \
|
||||
$out/share/bash-completion/completions \
|
||||
$out/share/zsh/vendor-completions
|
||||
$out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions
|
||||
$out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -40,9 +47,10 @@ rustPlatform.buildRustPackage rec {
|
||||
Crate2nix generates Nix files from Cargo.toml/lock files
|
||||
so that you can build every crate individually in a Nix sandbox.
|
||||
'';
|
||||
homepage = "https://github.com/kolloch/crate2nix";
|
||||
homepage = "https://github.com/nix-community/crate2nix";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kolloch cole-h ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -7,20 +7,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "twitch-cli";
|
||||
version = "1.1.20";
|
||||
version = "1.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twitchdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hIyZwXDI3lJQOK27RaABf7cnj7jOxKdLUdZB5fp+7kY=";
|
||||
hash = "sha256-LJWZi83AynmmGBajtk8CLmQ6Vd1IqLKNaiZMLZCLly0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./application-name.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-OhcRMXY8s+XciF+gV3cZ8fxtzo9+I76tBPZ0xG8ddHU=";
|
||||
vendorHash = "sha256-1uUokMeI0D/apDFJLq+Go5BQp1JMYxJQF8nKvw52E7o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -202,15 +202,15 @@ stdenv'.mkDerivation {
|
||||
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
||||
license = lib.licenses.cddl;
|
||||
|
||||
# The case-block for TARGET_CPU has branches for only five CPU families,
|
||||
# The case-block for TARGET_CPU has branches for only some CPU families,
|
||||
# which prevents ZFS from building on any other platform. Since the NixOS
|
||||
# `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS
|
||||
# does not build is the only way to produce a NixOS installer on such
|
||||
# platforms.
|
||||
# https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16
|
||||
# https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12
|
||||
platforms =
|
||||
with lib.systems.inspect.patterns;
|
||||
map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ];
|
||||
map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7);
|
||||
|
||||
maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ];
|
||||
mainProgram = "zfs";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.10.4";
|
||||
version = "2023.10.5";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -87,16 +87,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
faadelays = super.faadelays.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.0.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntilley905";
|
||||
repo = "faadelays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NmBijDr/6pGATvzZhCrOjdDU7DKwLFAfwSgozvBYHMo=";
|
||||
};
|
||||
});
|
||||
|
||||
geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.5.0";
|
||||
src = fetchFromGitHub {
|
||||
@ -117,16 +107,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
google-nest-sdm = super.google-nest-sdm.overridePythonAttrs (oldAtrs: rec {
|
||||
version = "2.2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis=";
|
||||
};
|
||||
});
|
||||
|
||||
holidays = super.holidays.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.28";
|
||||
src = fetchFromGitHub {
|
||||
@ -262,15 +242,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.33";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA=";
|
||||
};
|
||||
});
|
||||
|
||||
pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.8.6";
|
||||
src = fetchFromGitHub {
|
||||
@ -339,27 +310,6 @@ let
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
screenlogicpy = super.screenlogicpy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.8.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dieselrabbit";
|
||||
repo = "screenlogicpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I=";
|
||||
};
|
||||
});
|
||||
|
||||
syrupy = super.syrupy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tophat";
|
||||
repo = "syrupy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# Pinned due to API changes in 0.3.0
|
||||
tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.2.0";
|
||||
@ -371,17 +321,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
velbus-aio = super.velbus-aio.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2023.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cereal2nd";
|
||||
repo = "velbus-aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
});
|
||||
|
||||
# Pinned due to API changes ~1.0
|
||||
vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.1.2";
|
||||
@ -427,7 +366,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.10.4";
|
||||
hassVersion = "2023.10.5";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -443,7 +382,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HG8Uyk52Bj9CpQ+dn+dbsXVBKakXDlRktG4KSkVVVmE=";
|
||||
hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -451,7 +390,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-m3MjJHFq9S0dogFijIlpryqGQoHpLqkqgkWLuIxLHa8=";
|
||||
hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.10.4";
|
||||
version = "2023.10.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iehGVXom5Wjw7A0PC4wfzed+w1h1/g9SKIuCuVRtIAs=";
|
||||
hash = "sha256-QCdNvEs2LFF43lWLLFX+9VMfQFg1oWUCh/cgxdBQV8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -29,14 +29,14 @@ let
|
||||
php82-unit = php82.override phpConfig;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.31.0";
|
||||
version = "1.31.1";
|
||||
pname = "unit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nginx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-N01ANjZES8eJV/gZchyPfxUpRyfDXpebHWK79mCI3Bw=";
|
||||
sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
||||
@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sentry = [
|
||||
sentry-sdk
|
||||
];
|
||||
opentracing = [
|
||||
jaeger-client
|
||||
opentracing
|
||||
];
|
||||
jwt = [
|
||||
authlib
|
||||
];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu
|
||||
, libmad, libmikmod, mpg123, libopus, libvorbis, lame
|
||||
# Filters
|
||||
, libsamplerate
|
||||
, libsamplerate, soxr
|
||||
# Outputs
|
||||
, alsa-lib, libjack2, libpulseaudio, libshout, pipewire
|
||||
# Misc
|
||||
@ -62,6 +62,7 @@ let
|
||||
lame = [ lame ];
|
||||
# Filter plugins
|
||||
libsamplerate = [ libsamplerate ];
|
||||
soxr = [ soxr ];
|
||||
# Output plugins
|
||||
alsa = [ alsa-lib ];
|
||||
jack = [ libjack2 ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGo121Module rec {
|
||||
pname = "ferretdb";
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jasAfbE3CRlBJeyMnqKJBbmA+W/QnytGIUdyXR55EaU=";
|
||||
hash = "sha256-3fLTiI13Mm+G6EEEOzCuJ9KVebCq5O54hyH6JiCRRL8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,7 +20,7 @@ buildGo121Module rec {
|
||||
echo nixpkgs > build/version/package.txt
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-5TjKGGEX66qNr2/25zRd7UESi03g7FI1AfEsW2mBcDE=";
|
||||
vendorHash = "sha256-l45KFDpqprBWnsVRhOJkCWolZapArRvjUb52R5hc5zs=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tempo";
|
||||
@ -12,6 +12,15 @@ buildGoModule rec {
|
||||
hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport patch for Go 1.21 compatibility
|
||||
# FIXME: remove after 2.3.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/grafana/tempo/commit/0d37e8f0edd8a96876b0a5f5ab97ef79ff04608f.patch";
|
||||
hash = "sha256-YC59g5pdcrwJeQ4raS0Oq+fZvRBKFj4johZtGTAYpEs=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, cmake
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, curl
|
||||
, libarchive
|
||||
@ -12,23 +13,26 @@
|
||||
, qttools
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, xz
|
||||
, testers
|
||||
, nix-update-script
|
||||
, enableTelemetry ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rpi-imager";
|
||||
version = "1.7.5";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yB+H1zWL40KzxOrBuvg7nBC3zmWilsOgOW7ndiDWuDA=";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "sha256-drHiZ0eYYvJg6/v3oEozGAbBKm1KLpec+kYZWwpT9yM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
util-linux
|
||||
wrapQtAppsHook
|
||||
];
|
||||
@ -48,40 +52,34 @@ stdenv.mkDerivation rec {
|
||||
qttools
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
xz
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
/* By default, the builder checks for JSON support in lsblk by running "lsblk --json",
|
||||
but that throws an error, as /sys/dev doesn't exist in the sandbox.
|
||||
This patch removes the check. */
|
||||
patches = [ ./lsblkCheckFix.patch ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
# Without this, the tests fail because they cannot create the QT Window
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
$out/bin/rpi-imager --version
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "QT_QPA_PLATFORM=offscreen rpi-imager --version";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Raspberry Pi Imaging Utility";
|
||||
homepage = "https://www.raspberrypi.com/software/";
|
||||
changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}";
|
||||
changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://github.com/raspberrypi/rpi-imager/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "rpi-imager";
|
||||
maintainers = with maintainers; [ ymarkus anthonyroussel ];
|
||||
platforms = platforms.all;
|
||||
# does not build on darwin
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "topicctl";
|
||||
version = "1.10.2";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = "topicctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VyzWaoGOGDtB4fe0Wa6ldeOSEN+Ihu8xapiHcHJos0w=";
|
||||
sha256 = "sha256-vOcxgqP4M9E9PXaCvLlPuxuu4KaQCyDuw3xF3Bd74/Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UJ7U9CfQHKgK7wfb8zqLZ7na4OBBZBYiGayII3RTaiQ=";
|
||||
vendorHash = "sha256-5n1pj0xa6Eh4Azh35J/ys8cjFMUpSkS5KzidYvInvpA=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.BuildVersion=${version}"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ttyplot";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenox7";
|
||||
repo = "ttyplot";
|
||||
rev = version;
|
||||
sha256 = "19qm0hx9ljdw9qg78lydn3c627xy7xnx3knq5f7caw9lf0cdp7kf";
|
||||
sha256 = "sha256-COnqzWqah1J/q64XrOBhMOsrafAs/BptqNvrjHJ9edQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -3,26 +3,36 @@
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
pname = "nqptp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikebrady";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ppsz3hDG6sEf6LJ2WdbTdJ8Gi53f0YmvaUU8TOfVMz4=";
|
||||
hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# this patch should be removed when > 1.2.4
|
||||
./remove-setcap.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater {
|
||||
ignoredVersions = ".*(-dev|d0)";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mikebrady/nqptp";
|
||||
description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ jordanisaacs ];
|
||||
platforms = platforms.linux ++ platforms.freebsd;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ jordanisaacs adamcstephens ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
}
|
||||
|
||||
13
pkgs/tools/networking/nqptp/remove-setcap.patch
Normal file
13
pkgs/tools/networking/nqptp/remove-setcap.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 78f36d7..8dc4e4f 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -19,8 +19,6 @@ endif
|
||||
|
||||
install-exec-hook:
|
||||
if BUILD_FOR_LINUX
|
||||
-# NQPTP runs as user/group nqptp/nqptp on Linux and uses setcap to access ports 319 and 320
|
||||
- setcap 'cap_net_bind_service=+ep' $(bindir)/nqptp
|
||||
# no installer for System V
|
||||
if INSTALL_SYSTEMD_STARTUP
|
||||
getent group nqptp &>/dev/null || groupadd -r nqptp &>/dev/null
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, applyPatches
|
||||
, buildNpmPackage
|
||||
, cargo
|
||||
, copyDesktopItems
|
||||
, dbus
|
||||
, electron_24
|
||||
, electron_25
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gnome
|
||||
@ -26,36 +26,27 @@ let
|
||||
icon = "bitwarden";
|
||||
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
||||
electron = electron_24;
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "bitwarden";
|
||||
exec = "bitwarden %U";
|
||||
inherit icon;
|
||||
comment = description;
|
||||
desktopName = "Bitwarden";
|
||||
categories = [ "Utility" ];
|
||||
};
|
||||
electron = electron_25;
|
||||
in buildNpmPackage' rec {
|
||||
pname = "bitwarden";
|
||||
version = "2023.9.0";
|
||||
version = "2023.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-8rNJmDpKLzTre5c2wktle7tthp1owZK5WAQP80/2R0g=";
|
||||
hash = "sha256-NiMJmtCx+yD24BCyMgHLpRApNwoIJRps5qmmlVdB0G0=";
|
||||
};
|
||||
|
||||
makeCacheWritable = true;
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY=";
|
||||
npmDepsHash = "sha256-HQPxmATA9bUc4NTfvYsL6fGuicU9baySCmNHahs8EF4=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-YF3UHQWCSuWAg2frE8bo1XrLn44P6+1A7YUh4RZxwo0=";
|
||||
hash = "sha256-mFxvK9cmSBRVnUwEbzADUa5W5TCL51wcUHxuR5JZwLE=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
@ -63,6 +54,7 @@ in buildNpmPackage' rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
copyDesktopItems
|
||||
jq
|
||||
makeWrapper
|
||||
moreutils
|
||||
@ -128,6 +120,8 @@ in buildNpmPackage' rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
|
||||
pushd apps/desktop/dist/linux-unpacked
|
||||
@ -141,9 +135,6 @@ in buildNpmPackage' rec {
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
|
||||
pushd apps/desktop/resources/icons
|
||||
for icon in *.png; do
|
||||
dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
|
||||
@ -151,8 +142,21 @@ in buildNpmPackage' rec {
|
||||
cp "$icon" "$dir"/${icon}.png
|
||||
done
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "bitwarden";
|
||||
exec = "bitwarden %U";
|
||||
inherit icon;
|
||||
comment = description;
|
||||
desktopName = "Bitwarden";
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
|
||||
inherit description;
|
||||
|
||||
@ -652,6 +652,7 @@ mapAliases ({
|
||||
paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03
|
||||
parity = openethereum; # Added 2020-08-01
|
||||
pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16
|
||||
pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22
|
||||
peach = asouldocs; # Added 2022-08-28
|
||||
pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
|
||||
perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
|
||||
|
||||
@ -2504,9 +2504,7 @@ with pkgs;
|
||||
|
||||
labctl = callPackage ../tools/networking/labctl { };
|
||||
|
||||
lefthook = callPackage ../applications/version-management/lefthook {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
lefthook = callPackage ../applications/version-management/lefthook { };
|
||||
|
||||
legit = callPackage ../applications/version-management/legit { };
|
||||
|
||||
@ -3023,7 +3021,6 @@ with pkgs;
|
||||
iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
|
||||
|
||||
kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
|
||||
go = go_1_21;
|
||||
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
@ -4651,9 +4648,7 @@ with pkgs;
|
||||
|
||||
map-cmd = callPackage ../tools/misc/map { };
|
||||
|
||||
clash = callPackage ../tools/networking/clash {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
clash = callPackage ../tools/networking/clash { };
|
||||
|
||||
clash-geoip = callPackage ../data/misc/clash-geoip { };
|
||||
|
||||
@ -6147,9 +6142,7 @@ with pkgs;
|
||||
|
||||
onboard = callPackage ../applications/misc/onboard { };
|
||||
|
||||
oneshot = callPackage ../tools/networking/oneshot {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
oneshot = callPackage ../tools/networking/oneshot { };
|
||||
|
||||
orjail = callPackage ../tools/security/orjail { };
|
||||
|
||||
@ -7496,9 +7489,7 @@ with pkgs;
|
||||
|
||||
diction = callPackage ../tools/text/diction { };
|
||||
|
||||
diffoci = callPackage ../tools/misc/diffoci {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
diffoci = callPackage ../tools/misc/diffoci { };
|
||||
|
||||
diffoscope = callPackage ../tools/misc/diffoscope {
|
||||
jdk = jdk8;
|
||||
@ -8025,9 +8016,7 @@ with pkgs;
|
||||
|
||||
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
|
||||
|
||||
evcc = callPackage ../servers/home-automation/evcc {
|
||||
go = go_1_21;
|
||||
};
|
||||
evcc = callPackage ../servers/home-automation/evcc { };
|
||||
|
||||
eventstat = callPackage ../os-specific/linux/eventstat { };
|
||||
|
||||
@ -8974,9 +8963,7 @@ with pkgs;
|
||||
|
||||
gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { };
|
||||
|
||||
grype = callPackage ../tools/security/grype {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
grype = callPackage ../tools/security/grype { };
|
||||
|
||||
gt5 = callPackage ../tools/system/gt5 { };
|
||||
|
||||
@ -11500,9 +11487,7 @@ with pkgs;
|
||||
|
||||
openfortivpn = callPackage ../tools/networking/openfortivpn { };
|
||||
|
||||
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { };
|
||||
|
||||
opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
|
||||
|
||||
@ -12662,7 +12647,7 @@ with pkgs;
|
||||
|
||||
rewrk = callPackage ../tools/networking/rewrk { };
|
||||
|
||||
inherit (callPackage ../tools/security/rekor { buildGoModule = buildGo121Module; })
|
||||
inherit (callPackage ../tools/security/rekor { })
|
||||
rekor-cli
|
||||
rekor-server;
|
||||
|
||||
@ -13679,9 +13664,7 @@ with pkgs;
|
||||
|
||||
systrayhelper = callPackage ../tools/misc/systrayhelper { };
|
||||
|
||||
syft = callPackage ../tools/admin/syft {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
syft = callPackage ../tools/admin/syft { };
|
||||
|
||||
Sylk = callPackage ../applications/networking/Sylk { };
|
||||
|
||||
@ -13803,7 +13786,6 @@ with pkgs;
|
||||
};
|
||||
teleport_14 = callPackage ../servers/teleport/14 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
teleport = teleport_14;
|
||||
|
||||
@ -14057,6 +14039,7 @@ with pkgs;
|
||||
|
||||
trezord = callPackage ../servers/trezord {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
buildGoModule = buildGo120Module;
|
||||
};
|
||||
|
||||
trezor_agent = with python3Packages; toPythonApplication trezor_agent;
|
||||
@ -15407,9 +15390,7 @@ with pkgs;
|
||||
|
||||
undistract-me = callPackage ../shells/bash/undistract-me { };
|
||||
|
||||
carapace = callPackage ../shells/carapace {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
carapace = callPackage ../shells/carapace { };
|
||||
|
||||
dash = callPackage ../shells/dash { };
|
||||
|
||||
@ -15828,7 +15809,7 @@ with pkgs;
|
||||
|
||||
flasm = callPackage ../development/compilers/flasm { };
|
||||
|
||||
flyctl = callPackage ../development/web/flyctl { buildGoModule = buildGo121Module; };
|
||||
flyctl = callPackage ../development/web/flyctl { };
|
||||
|
||||
fluidd = callPackage ../applications/misc/fluidd { };
|
||||
|
||||
@ -19010,7 +18991,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo121Module; };
|
||||
devbox = callPackage ../development/tools/devbox { };
|
||||
|
||||
libcxx = llvmPackages.libcxx;
|
||||
libcxxabi = llvmPackages.libcxxabi;
|
||||
@ -19998,9 +19979,7 @@ with pkgs;
|
||||
withPEPatterns = true;
|
||||
};
|
||||
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog { };
|
||||
|
||||
revive = callPackage ../development/tools/revive { };
|
||||
|
||||
@ -20276,9 +20255,7 @@ with pkgs;
|
||||
terracognita = callPackage ../development/tools/misc/terracognita { };
|
||||
|
||||
terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
|
||||
terraform-ls = callPackage ../development/tools/misc/terraform-ls {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
terraform-ls = callPackage ../development/tools/misc/terraform-ls { };
|
||||
|
||||
terraformer = callPackage ../development/tools/misc/terraformer { };
|
||||
|
||||
@ -24510,8 +24487,6 @@ with pkgs;
|
||||
|
||||
pdal = callPackage ../development/libraries/pdal { };
|
||||
|
||||
pdf2xml = callPackage ../development/libraries/pdf2xml { };
|
||||
|
||||
pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
|
||||
|
||||
pe-parse = callPackage ../development/libraries/pe-parse { };
|
||||
@ -26460,9 +26435,7 @@ with pkgs;
|
||||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
|
||||
@ -27408,9 +27381,7 @@ with pkgs;
|
||||
|
||||
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
|
||||
|
||||
tailscale = callPackage ../servers/tailscale {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
tailscale = callPackage ../servers/tailscale { };
|
||||
|
||||
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
|
||||
|
||||
@ -28450,9 +28421,7 @@ with pkgs;
|
||||
|
||||
golint = callPackage ../development/tools/golint { };
|
||||
|
||||
golangci-lint = callPackage ../development/tools/golangci-lint {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
golangci-lint = callPackage ../development/tools/golangci-lint { };
|
||||
|
||||
golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { };
|
||||
|
||||
@ -29760,9 +29729,7 @@ with pkgs;
|
||||
|
||||
nuclear = callPackage ../applications/audio/nuclear { };
|
||||
|
||||
nuclei = callPackage ../tools/security/nuclei {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
nuclei = callPackage ../tools/security/nuclei { };
|
||||
|
||||
nullmailer = callPackage ../servers/mail/nullmailer {
|
||||
stdenv = gccStdenv;
|
||||
@ -41182,7 +41149,7 @@ with pkgs;
|
||||
|
||||
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { };
|
||||
|
||||
inherit (callPackage ../applications/networking/cluster/terraform { buildGoModule = buildGo121Module; })
|
||||
inherit (callPackage ../applications/networking/cluster/terraform { })
|
||||
mkTerraform
|
||||
terraform_1
|
||||
terraform_plugins_test
|
||||
@ -41262,9 +41229,7 @@ with pkgs;
|
||||
|
||||
tusk = callPackage ../applications/office/tusk { };
|
||||
|
||||
trufflehog = callPackage ../tools/security/trufflehog {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
trufflehog = callPackage ../tools/security/trufflehog { };
|
||||
|
||||
tunnelx = callPackage ../applications/gis/tunnelx { };
|
||||
|
||||
@ -41290,9 +41255,7 @@ with pkgs;
|
||||
|
||||
usb-reset = callPackage ../applications/misc/usb-reset { };
|
||||
|
||||
usql = callPackage ../applications/misc/usql {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
usql = callPackage ../applications/misc/usql { };
|
||||
|
||||
utf8cpp = callPackage ../development/libraries/utf8cpp { };
|
||||
|
||||
|
||||
@ -12913,11 +12913,11 @@ with self; {
|
||||
|
||||
ImageExifTool = buildPerlPackage rec {
|
||||
pname = "Image-ExifTool";
|
||||
version = "12.65";
|
||||
version = "12.68";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
|
||||
hash = "sha256-YWynZES+4/MkYueeN8Y3IC7vKGb0wkANUfIKgScDJDI=";
|
||||
hash = "sha256-+GM3WffmDSvDCtGcSCCw6/pqfQic9Di3Umg/i22AOYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
||||
@ -107,7 +107,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
|
||||
openssl = all;
|
||||
pan = linux;
|
||||
pciutils = linux;
|
||||
pdf2xml = all;
|
||||
perl = all;
|
||||
pkg-config = all;
|
||||
pmccabe = linux;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user