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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-10 18:01:34 +00:00 committed by GitHub
commit e8096ee1e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
258 changed files with 5049 additions and 2587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -14841,6 +14841,12 @@
githubId = 145816;
name = "David McKay";
};
rayslash = {
email = "stevemathewjoy@tutanota.com";
github = "rayslash";
githubId = 45141270;
name = "Steve Mathew Joy";
};
razvan = {
email = "razvan.panda@gmail.com";
github = "freeman42x";

19
maintainers/scripts/haskell/hydra-report.hs
View File

@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do
getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build)
getEvalBuilds NoHydraSlownessWorkaround id =
hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"]
hydraJSONQuery mempty ["eval", showT id, "builds"]
getEvalBuilds HydraSlownessWorkaround id = do
Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ]
forM builds $ \buildId -> do
@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do
hydraJSONQuery mempty [ "build", showT buildId ]
hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a)
hydraQuery responseType option query =
responseBody
<$> req
GET
(foldl' (/:) (https "hydra.nixos.org") query)
NoReqBody
responseType
(header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option)
hydraQuery responseType option query = do
let customHeaderOpt =
header
"User-Agent"
"hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270"
customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes
opts = customHeaderOpt <> customTimeoutOpt <> option
url = foldl' (/:) (https "hydra.nixos.org") query
responseBody <$> req GET url NoReqBody responseType opts
hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a
hydraJSONQuery = hydraQuery jsonResponse

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -568,3 +568,5 @@ The module update takes care of the new config syntax and the data itself (user
- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14).
- The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`.
- There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2.

16
nixos/lib/test-driver/test_driver/machine.py
View File

@ -1278,3 +1278,19 @@ class Machine:
def run_callbacks(self) -> None:
for callback in self.callbacks:
callback()
def switch_root(self) -> None:
"""
Transition from stage 1 to stage 2. This requires the
machine to be configured with `testing.initrdBackdoor = true`
and `boot.initrd.systemd.enable = true`.
"""
self.wait_for_unit("initrd.target")
self.execute(
"systemctl isolate --no-block initrd-switch-root.target 2>/dev/null >/dev/null",
check_return=False,
check_output=False,
)
self.wait_for_console_text(r"systemd\[1\]:.*Switching root\.")
self.connected = False
self.connect()

1
nixos/modules/installer/tools/nixos-option/default.nix
View File

@ -1 +0,0 @@
{ pkgs, ... }: pkgs.nixos-option

8
nixos/modules/services/backup/restic.nix
View File

@ -133,13 +133,15 @@ in
};
timerConfig = mkOption {
type = types.attrsOf unitOption;
type = types.nullOr (types.attrsOf unitOption);
default = {
OnCalendar = "daily";
Persistent = true;
};
description = lib.mdDoc ''
When to run the backup. See {manpage}`systemd.timer(5)` for details.
When to run the backup. See {manpage}`systemd.timer(5)` for
details. If null no timer is created and the backup will only
run when explicitly started.
'';
example = {
OnCalendar = "00:05";
@ -378,7 +380,7 @@ in
wantedBy = [ "timers.target" ];
timerConfig = backup.timerConfig;
})
config.services.restic.backups;
(filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups);
# generate wrapper scripts, as described in the createWrapper option
environment.systemPackages = lib.mapAttrsToList (name: backup: let

134
nixos/modules/testing/test-instrumentation.nix
View File

@ -6,49 +6,109 @@
with lib;
let
cfg = config.testing;
qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; };
backdoorService = {
wantedBy = [ "sysinit.target" ];
unitConfig.DefaultDependencies = false;
conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
before = [ "shutdown.target" "initrd-switch-root.target" ];
requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
script =
''
export USER=root
export HOME=/root
export DISPLAY=:0.0
if [[ -e /etc/profile ]]; then
source /etc/profile
fi
# Don't use a pager when executing backdoor
# actions. Because we use a tty, commands like systemctl
# or nix-store get confused into thinking they're running
# interactively.
export PAGER=
cd /tmp
exec < /dev/hvc0 > /dev/hvc0
while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done
echo "connecting to host..." >&2
stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
# The following line is essential since it signals to
# the test driver that the shell is ready.
# See: the connect method in the Machine class.
echo "Spawning backdoor root shell..."
# Passing the terminal device makes bash run non-interactively.
# Otherwise we get errors on the terminal because bash tries to
# setup things like job control.
# Note: calling bash explicitly here instead of sh makes sure that
# we can also run non-NixOS guests during tests.
PS1= exec /usr/bin/env bash --norc /dev/hvc0
'';
serviceConfig.KillSignal = "SIGHUP";
};
in
{
options.testing = {
initrdBackdoor = lib.mkEnableOption (lib.mdDoc ''
enable backdoor.service in initrd. Requires
boot.initrd.systemd.enable to be enabled. Boot will pause in
stage 1 at initrd.target, and will listen for commands from the
Machine python interface, just like stage 2 normally does. This
enables commands to be sent to test and debug stage 1. Use
machine.switch_root() to leave stage 1 and proceed to stage 2.
'');
};
config = {
systemd.services.backdoor =
{ wantedBy = [ "multi-user.target" ];
requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
script =
''
export USER=root
export HOME=/root
export DISPLAY=:0.0
assertions = [
{
assertion = cfg.initrdBackdoor -> config.boot.initrd.systemd.enable;
message = ''
testing.initrdBackdoor requires boot.initrd.systemd.enable to be enabled.
'';
}
];
source /etc/profile
systemd.services.backdoor = backdoorService;
# Don't use a pager when executing backdoor
# actions. Because we use a tty, commands like systemctl
# or nix-store get confused into thinking they're running
# interactively.
export PAGER=
boot.initrd.systemd = lib.mkMerge [
{
contents."/etc/systemd/journald.conf".text = ''
[Journal]
ForwardToConsole=yes
MaxLevelConsole=debug
'';
cd /tmp
exec < /dev/hvc0 > /dev/hvc0
while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done
echo "connecting to host..." >&2
stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
# The following line is essential since it signals to
# the test driver that the shell is ready.
# See: the connect method in the Machine class.
echo "Spawning backdoor root shell..."
# Passing the terminal device makes bash run non-interactively.
# Otherwise we get errors on the terminal because bash tries to
# setup things like job control.
# Note: calling bash explicitly here instead of sh makes sure that
# we can also run non-NixOS guests during tests.
PS1= exec /usr/bin/env bash --norc /dev/hvc0
'';
serviceConfig.KillSignal = "SIGHUP";
};
extraConfig = config.systemd.extraConfig;
}
(lib.mkIf cfg.initrdBackdoor {
# Implemented in machine.switch_root(). Suppress the unit by
# making it a noop without removing it, which would break
# initrd-parse-etc.service
services.initrd-cleanup.serviceConfig.ExecStart = [
# Reset
""
# noop
"/bin/true"
];
services.backdoor = backdoorService;
contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env";
})
];
# Prevent agetty from being instantiated on the serial device, since it
# interferes with the backdoor (writes to it will randomly fail
@ -104,12 +164,6 @@ in
MaxLevelConsole=debug
'';
boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = ''
[Journal]
ForwardToConsole=yes
MaxLevelConsole=debug
'';
systemd.extraConfig = ''
# Don't clobber the console with duplicate systemd messages.
ShowStatus=no
@ -123,8 +177,6 @@ in
DefaultDeviceTimeoutSec=300
'';
boot.initrd.systemd.extraConfig = config.systemd.extraConfig;
boot.consoleLogLevel = 7;
# Prevent tests from accessing the Internet.

1
nixos/tests/restic.nix
View File

@ -55,6 +55,7 @@ import ./make-test-python.nix (
inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand;
repository = remoteRepository;
initialize = true;
timerConfig = null; # has no effect here, just checking that it doesn't break the service
};
remote-from-file-backup = {
inherit passwordFile exclude pruneOpts;

7
nixos/tests/systemd-initrd-modprobe.nix
View File

@ -2,6 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "systemd-initrd-modprobe";
nodes.machine = { pkgs, ... }: {
testing.initrdBackdoor = true;
boot.initrd.systemd.enable = true;
boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd.
boot.extraModprobeConfig = ''
@ -10,6 +11,12 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
};
testScript = ''
machine.wait_for_unit("initrd.target")
max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop")
assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules"
# Make sure it sticks in stage 2
machine.switch_root()
machine.wait_for_unit("multi-user.target")
max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop")
assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules"

52
nixos/tests/systemd-initrd-networkd-ssh.nix
View File

@ -4,34 +4,16 @@ import ./make-test-python.nix ({ lib, ... }: {
nodes = {
server = { config, pkgs, ... }: {
environment.systemPackages = [ pkgs.cryptsetup ];
boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 0;
virtualisation = {
emptyDiskImages = [ 4096 ];
useBootLoader = true;
# Booting off the encrypted disk requires an available init script from
# the Nix store
mountHostNixStore = true;
useEFIBoot = true;
};
specialisation.encrypted-root.configuration = {
virtualisation.rootDevice = "/dev/mapper/root";
virtualisation.fileSystems."/".autoFormat = true;
boot.initrd.luks.devices = lib.mkVMOverride {
root.device = "/dev/vdb";
};
boot.initrd.systemd.enable = true;
boot.initrd.network = {
testing.initrdBackdoor = true;
boot.initrd.systemd.enable = true;
boot.initrd.systemd.contents."/etc/msg".text = "foo";
boot.initrd.network = {
enable = true;
ssh = {
enable = true;
ssh = {
enable = true;
authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ];
port = 22;
# Terrible hack so it works with useBootLoader
hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ];
};
authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ];
port = 22;
hostKeys = [ ./initrd-network-ssh/ssh_host_ed25519_key ];
};
};
};
@ -63,24 +45,16 @@ import ./make-test-python.nix ({ lib, ... }: {
status, _ = client.execute("nc -z server 22")
return status == 0
server.wait_for_unit("multi-user.target")
server.succeed(
"echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb",
"bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
"sync",
)
server.shutdown()
server.start()
client.wait_for_unit("network.target")
with client.nested("waiting for SSH server to come up"):
retry(ssh_is_up)
client.succeed(
"echo somepass | ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'systemd-tty-ask-password-agent' & exit"
msg = client.succeed(
"ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'cat /etc/msg'"
)
assert "foo" in msg
server.switch_root()
server.wait_for_unit("multi-user.target")
server.succeed("mount | grep '/dev/mapper/root on /'")
'';
})

134
nixos/tests/systemd-initrd-networkd.nix
View File

@ -1,14 +1,36 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "systemd-initrd-network";
meta.maintainers = [ lib.maintainers.elvishjerricco ];
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../.. { inherit system config; }
, lib ? pkgs.lib
}:
nodes = let
mkFlushTest = flush: script: { ... }: {
boot.initrd.systemd.enable = true;
boot.initrd.network = {
enable = true;
flushBeforeStage2 = flush;
};
with import ../lib/testing-python.nix { inherit system pkgs; };
let
inherit (lib.maintainers) elvishjerricco;
common = {
boot.initrd.systemd = {
enable = true;
network.wait-online.timeout = 10;
network.wait-online.anyInterface = true;
targets.network-online.requiredBy = [ "initrd.target" ];
services.systemd-networkd-wait-online.requiredBy =
[ "network-online.target" ];
initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
};
testing.initrdBackdoor = true;
boot.initrd.network.enable = true;
};
mkFlushTest = flush: script: makeTest {
name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush";
meta.maintainers = [ elvishjerricco ];
nodes.machine = {
imports = [ common ];
boot.initrd.network.flushBeforeStage2 = flush;
systemd.services.check-flush = {
requiredBy = ["multi-user.target"];
before = ["network-pre.target" "multi-user.target"];
@ -19,57 +41,53 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
inherit script;
};
};
in {
basic = { ... }: {
boot.initrd.network.enable = true;
boot.initrd.systemd = {
enable = true;
# Enable network-online to fail the test in case of timeout
network.wait-online.timeout = 10;
network.wait-online.anyInterface = true;
targets.network-online.requiredBy = [ "initrd.target" ];
services.systemd-networkd-wait-online.requiredBy =
[ "network-online.target" ];
testScript = ''
machine.wait_for_unit("network-online.target")
machine.succeed(
"ip addr | grep 10.0.2.15",
"ping -c1 10.0.2.2",
)
machine.switch_root()
initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
services.check = {
requiredBy = [ "initrd.target" ];
before = [ "initrd.target" ];
after = [ "network-online.target" ];
serviceConfig.Type = "oneshot";
path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
script = ''
ip addr | grep 10.0.2.15 || exit 1
ping -c1 10.0.2.2 || exit 1
'';
};
};
};
doFlush = mkFlushTest true ''
if ip addr | grep 10.0.2.15; then
echo "Network configuration survived switch-root; flushBeforeStage2 failed"
exit 1
fi
'';
dontFlush = mkFlushTest false ''
if ! (ip addr | grep 10.0.2.15); then
echo "Network configuration didn't survive switch-root"
exit 1
fi
machine.wait_for_unit("multi-user.target")
'';
};
testScript = ''
start_all()
basic.wait_for_unit("multi-user.target")
doFlush.wait_for_unit("multi-user.target")
dontFlush.wait_for_unit("multi-user.target")
# Make sure the systemd-network user was set correctly in initrd
basic.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]")
basic.succeed("ip addr show >&2")
basic.succeed("ip route show >&2")
in {
basic = makeTest {
name = "systemd-initrd-network";
meta.maintainers = [ elvishjerricco ];
nodes.machine = common;
testScript = ''
machine.wait_for_unit("network-online.target")
machine.succeed(
"ip addr | grep 10.0.2.15",
"ping -c1 10.0.2.2",
)
machine.switch_root()
# Make sure the systemd-network user was set correctly in initrd
machine.wait_for_unit("multi-user.target")
machine.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]")
machine.succeed("ip addr show >&2")
machine.succeed("ip route show >&2")
'';
};
doFlush = mkFlushTest true ''
if ip addr | grep 10.0.2.15; then
echo "Network configuration survived switch-root; flushBeforeStage2 failed"
exit 1
fi
'';
})
dontFlush = mkFlushTest false ''
if ! (ip addr | grep 10.0.2.15); then
echo "Network configuration didn't survive switch-root"
exit 1
fi
'';
}

12
nixos/tests/systemd-initrd-simple.nix
View File

@ -2,16 +2,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "systemd-initrd-simple";
nodes.machine = { pkgs, ... }: {
boot.initrd.systemd = {
enable = true;
emergencyAccess = true;
};
testing.initrdBackdoor = true;
boot.initrd.systemd.enable = true;
virtualisation.fileSystems."/".autoResize = true;
};
testScript = ''
import subprocess
with subtest("testing initrd backdoor"):
machine.wait_for_unit("initrd.target")
machine.succeed("systemctl status initrd-fs.target")
machine.switch_root()
with subtest("handover to stage-2 systemd works"):
machine.wait_for_unit("multi-user.target")
machine.succeed("systemd-analyze | grep -q '(initrd)'") # direct handover
@ -37,6 +40,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"])
machine.start()
machine.switch_root()
newAvail = machine.succeed("df --output=avail / | sed 1d")
assert int(oldAvail) < int(newAvail), "File system did not grow"

2
pkgs/applications/audio/feishin/darwin.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
hash = "sha256-6GYp9uzlR1eVRYhNU3kOmcUOPFY3J9eJPqN+TucNavA=";
hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs=";
};
nativeBuildInputs = [ makeWrapper unzip ];

2
pkgs/applications/audio/feishin/default.nix
View File

@ -8,7 +8,7 @@ let
extraArgs = removeAttrs args [ "callPackage" ];
pname = "feishin";
version = "0.4.1";
version = "0.5.1";
appname = "Feishin";
meta = with lib; {

2
pkgs/applications/audio/feishin/linux.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
hash = "sha256-Y8r329rO7z8V2xP/uRsjTFJfvTn+zyeAYzq6fKDxXs4=";
hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ=";
};

4
pkgs/applications/audio/ocenaudio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.13.1";
version = "3.13.2";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-h5t5DpZD9zmmyGRueXBG5Pn+vZstm5yCUr6Mx3eyvsc=";
sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE=";
};
nativeBuildInputs = [

4
pkgs/applications/audio/praat/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "praat";
version = "6.3.17";
version = "6.3.20";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${finalAttrs.version}";
hash = "sha256-HArWXUYoIjJmvh0GOcdGyBHfqC5r4ZEuvXyQ1x5iOt0=";
hash = "sha256-hVQPLRyDXrqpheAqzC/hQ/ZaFxP1c7ClAJQs3wlEcGc=";
};
nativeBuildInputs = [

6
pkgs/applications/audio/spectmorph/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "spectmorph";
version = "0.5.2";
version = "0.6.1";
src = fetchurl {
url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f";
url = "https://github.com/swesterfeld/spectmorph/releases/download/${version}/${pname}-${version}.tar.bz2";
hash = "sha256-H/PaczAkjxeu2Q6S/jazZ0PU9oCmhBzsLgbGLusxXm8=";
};
buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.69.0";
version = "2.71.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI=";
hash = "sha256-boZ28o8bg2TXZcc1mx4ZlPIPRFK9wy4+MTbYLT5XCQU=";
};
appimageContents = appimageTools.extractType2 {

3
pkgs/applications/editors/lifeograph/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://git.launchpad.net/lifeograph";
rev = "v${version}";
sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM=";
hash = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM=";
};
nativeBuildInputs = [
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
description = "Lifeograph is an off-line and private journal and note taking application";
license = licenses.gpl3Only;
maintainers = with maintainers; [ wolfangaukang ];
mainProgram = "lifeograph";
platforms = platforms.linux;
};
}

4
pkgs/applications/editors/pinegrow/default.nix
View File

@ -24,10 +24,10 @@ let
};
};
"7" = {
version = "7.05.2";
version = "7.8";
src = fetchurl {
url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip";
hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8=";
hash = "sha256-tYQfPfzKRwClNwgSoJfMwG3LHhi3O/iFuuwIVHS8OXk=";
};
};
};

10
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@ -67,6 +67,14 @@ mkDerivation rec {
hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM=";
};
# Fix build against exiv2 0.28.1
patches = [
(fetchpatch {
url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch";
hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg=";
})
];
nativeBuildInputs = [
cmake
doxygen

9
pkgs/applications/graphics/kphotoalbum/default.nix
View File

@ -1,4 +1,5 @@
{ mkDerivation
, fetchpatch
, fetchurl
, lib
, extra-cmake-modules
@ -25,6 +26,14 @@ mkDerivation rec {
hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4=";
};
# Fix build against exiv2 0.28.1
patches = [
(fetchpatch {
url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch";
hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c=";
})
];
# not sure if we really need phonon when we have vlc, but on KDE it's bound to
# be on the system anyway, so there is no real harm including it
buildInputs = [ exiv2 phonon libvlc ];

7
pkgs/applications/graphics/photoqt/default.nix
View File

@ -30,8 +30,13 @@ stdenv.mkDerivation rec {
hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas=";
};
postPatch = ''
# exiv2 0.28.1
substituteInPlace CMakeLists.txt \
--replace "exiv2lib" "exiv2"
''
# error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'?
postPatch = lib.optionalString stdenv.isDarwin ''
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace cplusplus/main.cpp \
--replace "std::setlocale" "setlocale"
'';

8
pkgs/applications/misc/hovercraft/default.nix
View File

@ -9,6 +9,7 @@
, svg-path
, pygments
, watchdog
, fetchpatch
}:
buildPythonApplication rec {
@ -25,6 +26,13 @@ buildPythonApplication rec {
nativeCheckInputs = [ manuel ];
propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ];
patches = [
(fetchpatch {
name = "fix tests with pygments 2.14";
url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch";
sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc=";
})
];
meta = with lib; {
description = "Makes impress.js presentations from reStructuredText";

4
pkgs/applications/misc/moonlight-embedded/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "moonlight-embedded";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = "moonlight-embedded";
rev = "v${version}";
sha256 = "sha256-/gRm3fViTpoTOkIEu6+mrGTVTAFTmwdWV0MKoFF5vkc=";
sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8=";
fetchSubmodules = true;
};

4
pkgs/applications/misc/pwsafe/default.nix
View File

@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation rec {
pname = "pwsafe";
version = "1.17.0"; # do NOT update to 3.x Windows releases
version = "1.18.0"; # do NOT update to 3.x Windows releases
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-C1mt9MklZoQNzs6zhk9CskeA4FfDsBVHNx/LRaqxWiI=";
hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8=";
};
strictDeps = true;

59
pkgs/applications/misc/todoist-electron/default.nix
View File

@ -1,45 +1,38 @@
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25, libsecret }:
stdenv.mkDerivation rec {
{ lib, appimageTools, fetchurl, asar }: let
pname = "todoist-electron";
version = "8.6.0";
version = "8.9.3";
src = fetchurl {
url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage";
hash = "sha256-LjztKgpPm4RN1Pn5gIiPg8UCO095kzTQ9BTEG5Rlv10=";
hash = "sha256-L1uH5bnJ66QxAXs7yywG4H/FaunwTX1l+tVtRe2nxdc=";
};
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
};
appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
buildCommand = ''
${oA.buildCommand}
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
# Get rid of the autoupdater
${asar}/bin/asar extract $out/resources/app.asar app
sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js
${asar}/bin/asar pack app $out/resources/app.asar
'';
});
nativeBuildInputs = [ makeWrapper ];
in appimageTools.wrapAppImage {
inherit pname version;
src = appimageContents;
installPhase = ''
runHook preInstall
extraPkgs = { pkgs, ... }@args: [
pkgs.hidapi
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
runHook postInstall
'';
postFixup = ''
makeWrapper ${electron_25}/bin/electron $out/bin/todoist-electron \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
extraInstallCommands = ''
# Add desktop convencience stuff
mv $out/bin/{${pname}-*,${pname}}
install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/todoist.desktop \
--replace 'Exec=AppRun' "Exec=$out/bin/${pname} --"
'';
meta = with lib; {
@ -47,6 +40,6 @@ stdenv.mkDerivation rec {
description = "The official Todoist electron app";
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
maintainers = with maintainers; [ i077 kylesferrazza ];
maintainers = with maintainers; [ kylesferrazza pokon548 ];
};
}

14
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,15 +1,15 @@
{
"packageVersion": "119.0-5",
"packageVersion": "119.0.1-1",
"source": {
"rev": "119.0-5",
"sha256": "0ql4i6b4fvydiyscj8ki2pnzr67bmb3azpdm6kk5y8yyw2697230"
"rev": "119.0.1-1",
"sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7"
},
"settings": {
"rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6",
"sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb"
"rev": "095f50ed91aa7db2de9c67763cf46bae09146a58",
"sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi"
},
"firefox": {
"version": "119.0",
"sha512": "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c"
"version": "119.0.1",
"sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a"
}
}

4
pkgs/applications/networking/browsers/polypane/default.nix
View File

@ -2,12 +2,12 @@
let
pname = "polypane";
version = "15.0.1";
version = "16.0.0";
src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-CU5PI+9iBcxZdhhs2QjfZTViU2xQ3i+T+4Wzp+yeKEE=";
sha256 = "sha256-bxzLduesbeVhLuPcnIJmZaVi861gv44Oos9VB8m3TCs=";
};
appimageContents = appimageTools.extractType2 {

4
pkgs/applications/networking/flexget/default.nix
View File

@ -24,7 +24,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.9.16";
version = "3.9.18";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-p92wiQ01NBFs5910wngkNHnE/mOfs9XnOLUEOyk9VpA=";
hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4=";
};
postPatch = ''

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -21,11 +21,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.8.2";
version = "1.8.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
hash = "sha256-2GaBxY2o9qxpJbiPpl3PcPUPta4eEOp6rTteK4Xb95k=";
hash = "sha256-yyIs8TT6tNrqycgmYJVHdCQwUX5NlR2IHTW+Q+J9CIQ=";
};
format = "pyproject";

6
pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
View File

@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool ];
buildInputs = [ pidgin gmime libxml2 nss ];
configureFlags = [ "--without-dbus" ];
configureFlags = [
"--without-dbus"
"--enable-quality-check=no"
];
enableParallelBuilding = true;
postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";

4
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View File

@ -103,14 +103,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.11.5";
version = "4.11.6";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-NkUm05bR5y5TAI5SL0en029n9903PzarQ6HC2vot27o=";
hash = "sha256-GV5jaC1chm4cq097/aP18Z4QemTO4tt8SBrdxCQYaS8=";
};
patches = [

12
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.16.2.23409";
versions.x86_64-darwin = "5.16.2.23409";
versions.x86_64-linux = "5.16.5.303";
versions.aarch64-darwin = "5.16.6.24664";
versions.x86_64-darwin = "5.16.6.24664";
versions.x86_64-linux = "5.16.6.382";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-MUkxEj4G6MCCXcqyFquCrHhnu+sVw5H4HSk+sP5H+gY=";
hash = "sha256-5xccYYisVRZw7tJ6uri52BuaeURadaHypse4vjwPQIY=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-niR/WbMq7T1PBCJMK1DdhbFc4eJDgub8LIv3X4i8S5c=";
hash = "sha256-N3jzvxoRY3W5fw1Fs0qevgHC+7cLLYvoGA/ZYiE71JA=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-M+76HzqhPVxsP0nZOG4Oe8lnRJ9MJ2mE4+1hGvRkSUg=";
hash = "sha256-2O8jGQHGyF5XLQUxHUWA3h9K792lRQmOC2mS0rTukSw=";
};
};

3
pkgs/applications/office/qnotero/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
python3Packages.buildPythonPackage rec {
pname = "qnotero";
@ -46,6 +46,7 @@ python3Packages.buildPythonPackage rec {
homepage = "https://www.cogsci.nl/software/qnotero";
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs`
maintainers = [ lib.maintainers.nico202 ];
};
}

4
pkgs/applications/science/math/R/default.nix
View File

@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation (finalAttrs: {
pname = "R";
version = "4.3.1";
version = "4.3.2";
src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-jdC/JPECPG9hjDsxc4PSkbSklPQNc7mDrCL/6pnkupk=";
sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo=";
};
outputs = [ "out" "tex" ];

7
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "7.29.0";
version = "7.32.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UfUzvDo5OE1LGCBBGoDpxG96RKOaShbqu5TOOILG3AY=";
hash = "sha256-9KuMPqvM8ZCTuomc0R9MBxsK3KIpukDTrlwU6MHysK0=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec {
pandas
pytestCheckHook
requests-mock
pillow
];
disabledTestPaths = [
@ -56,6 +57,8 @@ python3.pkgs.buildPythonApplication rec {
"tests/test_tes.py"
"tests/test_tibanna.py"
"tests/test_linting.py"
"tests/test_google_lifesciences.py"
"tests/test_conda_python_script/test_script.py"
];
disabledTests = [

10
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -7,6 +7,7 @@
, openssl
, installShellFiles
, dbus
, sudo
, Libsystem
, Cocoa
, Kernel
@ -29,20 +30,20 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.30.1";
version = "0.31.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0=";
hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g=";
};
goModules = (buildGoModule {
pname = "kitty-go-modules";
inherit src version;
vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc=";
vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU=";
}).goModules;
buildInputs = [
@ -150,6 +151,9 @@ buildPythonApplication rec {
bashInteractive
zsh
fish
] ++ lib.optionals (!stdenv.isDarwin) [
# integration tests need sudo
sudo
];
# skip failing tests due to darwin sandbox

6
pkgs/applications/version-management/gitsign/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "gitsign";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao=";
hash = "sha256-COgoj5MrX7VBwjgfH+Ud7gp0gE7gpsYoyd0Jv4uXoec=";
};
vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ=";
vendorHash = "sha256-btvFro0K0+9potwForIj/7h41l+LbUE0Gym9aHaWtEE=";
subPackages = [
"."

4
pkgs/applications/video/media-downloader/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "3.4.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-FTfkVD2uBfCBbP7fjjfG21bOGDVd2j6bhPLHGPm3xh4=";
hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q=";
};
nativeBuildInputs = [

8
pkgs/applications/video/mpv/default.nix
View File

@ -19,6 +19,7 @@
, libuchardet
, libiconv
, xcbuild
, sigtool
, waylandSupport ? stdenv.isLinux
, wayland
@ -154,7 +155,7 @@ in stdenv'.mkDerivation (finalAttrs: {
pkg-config
python3
]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]
++ lib.optionals swiftSupport [ swift ]
++ lib.optionals waylandSupport [ wayland-scanner ];
@ -203,6 +204,11 @@ in stdenv'.mkDerivation (finalAttrs: {
postBuild = lib.optionalString stdenv.isDarwin ''
pushd .. # Must be run from the source dir because it uses relative paths
python3 TOOLS/osxbundle.py -s build/mpv
# Swap binary and bundle symlink to sign bundle executable as symlinks cannot be signed
rm build/mpv.app/Contents/MacOS/mpv-bundle
mv build/mpv.app/Contents/MacOS/mpv build/mpv.app/Contents/MacOS/mpv-bundle
ln -s mpv-bundle build/mpv.app/Contents/MacOS/mpv
codesign --force --sign - build/mpv.app/Contents/MacOS/mpv-bundle
popd
'';

2
pkgs/applications/video/mpv/wrapper.nix
View File

@ -97,7 +97,7 @@ let
'' + lib.optionalString stdenv.isDarwin ''
# wrapProgram can't operate on symlinks
rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv-bundle" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
'';
meta = {

4
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
'' + lib.optionalString stdenv.isDarwin ''
# Darwin requires both Magick++ and MagickCore or it will fail to link.
substituteInPlace src/CMakeLists.txt \
--replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)'
'';
nativeBuildInputs = lib.optionals stdenv.isLinux [

14
pkgs/applications/window-managers/cosmic/settings/default.nix
View File

@ -3,8 +3,9 @@
, fetchFromGitHub
, rust
, rustPlatform
, cargo
, cmake
, makeWrapper
, cosmic-icons
, just
, pkg-config
, libxkbcommon
@ -19,13 +20,13 @@
, util-linuxMinimal
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "cosmic-settings";
version = "unstable-2023-10-26";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
repo = pname;
rev = "d15ebbd340dee7adf184831311b5da73faaa80f5";
hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI=";
};
@ -50,7 +51,7 @@ rustPlatform.buildRustPackage {
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal ];
nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ];
buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ];
dontUseJustBuild = true;
@ -64,6 +65,11 @@ rustPlatform.buildRustPackage {
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
];
postInstall = ''
wrapProgram "$out/bin/cosmic-settings" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
'';
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-settings";
description = "Settings for the COSMIC Desktop Environment";

1
pkgs/build-support/agda/default.nix
View File

@ -47,6 +47,7 @@ let
"lagda.org"
"lagda.rst"
"lagda.tex"
"lagda.typ"
];
defaults =

2
pkgs/build-support/agda/lib.nix
View File

@ -6,7 +6,7 @@
* interfaceFile "Everything.agda" == "Everything.agdai"
* interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai"
*/
interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai";
interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai";
/* Takes an arbitrary derivation and says whether it is an agda library package
* that is not marked as broken.

30
pkgs/by-name/dt/dtcmp/package.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mpi, lwgrp }:
stdenv.mkDerivation rec {
pname = "dtcmp";
version = "1.1.5";
src = fetchFromGitHub {
owner = "LLNL";
repo = "dtcmp";
rev = "v${version}";
hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ lwgrp ];
configureFlags = [ "--with-lwgrp=${lib.getDev lwgrp}" ];
propagatedBuildInputs = [ mpi ];
meta = with lib; {
description = "MPI datatype comparison library";
homepage = "https://github.com/LLNL/dtcmp";
platforms = platforms.linux;
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
};
}

34
pkgs/by-name/li/libcircle/package.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, mpi
, lwgrp
}:
stdenv.mkDerivation rec {
pname = "libcircle";
version = "0.3";
src = fetchFromGitHub {
owner = "hpc";
repo = "libcircle";
rev = "v${version}";
hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ mpi ];
meta = with lib; {
description = "API for distributing embarrassingly parallel workloads using self-stabilization";
homepage = "http://hpc.github.io/libcircle/";
platforms = platforms.linux;
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
};
}

4
pkgs/by-name/ll/llama-cpp/package.nix
View File

@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "1469";
version = "1483";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-budBvpX2SnKekGTWHomvhW+4grB8EPd9OJbufNynHsc=";
hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso=";
};
postPatch = ''

27
pkgs/by-name/lw/lwgrp/package.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, stdenv, fetchFromGitHub, mpi, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "lwgrp";
version = "1.0.5";
src = fetchFromGitHub {
owner = "LLNL";
repo = "lwgrp";
rev = "v${version}";
hash = "sha256-f0tYn9FbrOz8iMoG8Is8vYDNfYHTfxLKNnyxJA+Msdk=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ mpi ];
meta = with lib; {
description = "Data structures and operations to group MPI processes as an ordered set";
homepage = "https://github.com/LLNL/lwgrp";
platforms = platforms.linux;
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
};
}

56
pkgs/by-name/mo/monaspace/package.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, stdenvNoCC
, fetchzip
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "monaspace";
version = "1.000";
src = fetchzip {
url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip";
stripRoot = false;
hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A=";
};
outputs = [ "out" "woff" ];
installPhase = ''
runHook preInstall
pushd monaspace-v${finalAttrs.version}/fonts/
install -Dm644 otf/*.otf -t $out/share/fonts/opentype
install -Dm644 variable/*.ttf -t $out/share/fonts/truetype
install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff
popd
runHook postInstall
'';
meta = {
description = "An innovative superfamily of fonts for code";
longDescription = ''
Since the earliest days of the teletype machine, code has been set in
monospaced type — letters, on a grid. Monaspace is a new type system that
advances the state of the art for the display of code on screen.
Every advancement in the technology of computing has been accompanied by
advancements to the display and editing of code. CRTs made screen editors
possible. The advent of graphical user interfaces gave rise to integrated
development environments.
Even today, we still have limited options when we want to layer additional
meaning on top of code. Syntax highlighting was invented in 1982 to help
children to code in BASIC. But beyond colors, most editors must
communicate with developers through their interfaces — hovers, underlines,
and other graphical decorations.
Monaspace offers a more expressive palette for code and the tools we use
to work with it.
'';
homepage = "https://monaspace.githubnext.com/";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})

47
pkgs/by-name/mp/mpifileutils/package.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, mpi
, attr
, dtcmp
, libarchive
, libcircle
, bzip2
, openssl
}:
stdenv.mkDerivation rec {
pname = "mpifileutils";
version = "0.11.1";
src = fetchFromGitHub {
owner = "hpc";
repo = "mpifileutils";
rev = "v${version}";
hash = "sha256-3nls82awMMCwlfafsOy3AY8OvT9sE+BvvsDOY14YvQc=";
};
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
attr
dtcmp
libarchive
libcircle
bzip2
openssl
];
propagatedBuildInputs = [ mpi ];
meta = with lib; {
description = "Suite of MPI-based tools to manage large datasets";
homepage = "https://hpc.github.io/mpifileutils";
platforms = platforms.linux;
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
};
}

4
pkgs/tools/misc/nncp/default.nix → pkgs/by-name/nn/nncp/package.nix
View File

@ -11,12 +11,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nncp";
version = "8.9.0";
version = "8.10.0";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz";
hash = "sha256-JZ+svDNU7cwW58ZOJ4qszbR/+j7Cr+oLNig/RqqCS10=";
sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/openai-triton/llvm.nix → pkgs/by-name/op/openai-triton-llvm/package.nix
View File

@ -22,7 +22,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "triton-llvm";
pname = "openai-triton-llvm";
version = "14.0.6-f28c006a5895";
outputs = [

42
pkgs/by-name/we/websecprobe/package.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, python3
, fetchPypi
}:
python3.pkgs.buildPythonApplication rec {
pname = "websecprobe";
version = "0.0.10";
pyproject = true;
src = fetchPypi {
pname = "WebSecProbe";
inherit version;
hash = "sha256-QvXOyQUptMyim/bgvhihjgGs7vX0qX8MqK2ol8q9ePc=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
];
propagatedBuildInputs = with python3.pkgs; [
requests
tabulate
];
postInstall = ''
mv $out/bin/WebSecProbe $out/bin/$pname
'';
pythonImportsCheck = [
"WebSecProbe"
];
meta = with lib; {
description = "Web Security Assessment Tool";
homepage = "https://github.com/spyboy-productions/WebSecProbe/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "websecprobe";
};
}

77
pkgs/data/icons/reversal-icon-theme/default.nix Normal file
View File

@ -0,0 +1,77 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, gtk3
, jdupes
, adwaita-icon-theme
, hicolor-icon-theme
, numix-icon-theme-circle
, gitUpdater
, allColorVariants ? false
, colorVariants ? []
}:
let
pname = "reversal-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "unstable-2023-05-13";
src = fetchFromGitHub {
owner = "yeyushengfan258";
repo = pname;
rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2";
hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE=";
};
nativeBuildInputs = [
gtk3
jdupes
];
propagatedBuildInputs = [
adwaita-icon-theme
hicolor-icon-theme
numix-icon-theme-circle
];
dontDropIconThemeCache = true;
# These fixup steps are slow and unnecessary for this package.
# Package may install many small files.
dontPatchELF = true;
dontRewriteSymlinks = true;
postPatch = ''
patchShebangs install.sh
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
name= ./install.sh \
${if allColorVariants then "-a" else builtins.toString colorVariants} \
-d $out/share/icons
rm $out/share/icons/*/{AUTHORS,COPYING}
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A colorful Design Rectangle icon theme";
homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ romildo ];
};
}

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz",
"sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v",
"msg": "Update from Hackage at 2023-10-04T18:27:12Z"
"commit": "49d09494dd24eae895fe1260e2c26157f740e451",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz",
"sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba",
"msg": "Update from Hackage at 2023-10-21T19:49:07Z"
}

4
pkgs/desktops/lxqt/compton-conf/default.nix
View File

@ -19,18 +19,18 @@ mkDerivation rec {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q";
hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt.lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
libconfig
];

7
pkgs/desktops/lxqt/default.nix
View File

@ -18,6 +18,7 @@ let
lxqt-admin = callPackage ./lxqt-admin {};
lxqt-config = callPackage ./lxqt-config {};
lxqt-globalkeys = callPackage ./lxqt-globalkeys {};
lxqt-menu-data = callPackage ./lxqt-menu-data {};
lxqt-notificationd = callPackage ./lxqt-notificationd {};
lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {};
lxqt-policykit = callPackage ./lxqt-policykit {};
@ -26,7 +27,7 @@ let
lxqt-session = callPackage ./lxqt-session {};
lxqt-sudo = callPackage ./lxqt-sudo {};
lxqt-themes = callPackage ./lxqt-themes {};
pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {};
pavucontrol-qt = callPackage ./pavucontrol-qt {};
qtermwidget = callPackage ./qtermwidget {};
### CORE 2
@ -36,7 +37,7 @@ let
### OPTIONAL
qterminal = callPackage ./qterminal {};
compton-conf = qt5.callPackage ./compton-conf {};
compton-conf = callPackage ./compton-conf {};
obconf-qt = callPackage ./obconf-qt {};
lximage-qt = callPackage ./lximage-qt {};
qps = callPackage ./qps {};
@ -50,7 +51,6 @@ let
libsForQt5.libkscreen # provides plugins for screen management software
pkgs.libfm
pkgs.libfm-extra
pkgs.lxmenu-data
pkgs.menu-cache
pkgs.openbox # default window manager
qt5.qtsvg # provides QT5 plugins for svg icons
@ -68,6 +68,7 @@ let
lxqt-admin
lxqt-config
lxqt-globalkeys
lxqt-menu-data
lxqt-notificationd
lxqt-openssh-askpass
lxqt-policykit

8
pkgs/desktops/lxqt/libfm-qt/default.nix
View File

@ -4,6 +4,7 @@
, cmake
, pkg-config
, lxqt-build-tools
, lxqt-menu-data
, pcre
, libexif
, xorg
@ -16,29 +17,30 @@
mkDerivation rec {
pname = "libfm-qt";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg=";
hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
lxqt-menu-data
pcre
libexif
xorg.libpthreadstubs
xorg.libxcb
xorg.libXdmcp
qtx11extras
qttools
libfm
menu-cache
];

6
pkgs/desktops/lxqt/liblxqt/default.nix
View File

@ -15,23 +15,23 @@
mkDerivation rec {
pname = "liblxqt";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms=";
hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtx11extras
qttools
qtsvg
polkit-qt
kwindowsystem

4
pkgs/desktops/lxqt/libqtxdg/default.nix
View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libqtxdg";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc=";
hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
};
nativeBuildInputs = [

2
pkgs/desktops/lxqt/libsysstat/default.nix
View File

@ -16,7 +16,7 @@ mkDerivation rec {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0z2r8041vqssm59lkb3ka7qis9br4wvavxzd45m3pnqlp7wwhkbn";
hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw=";
};
nativeBuildInputs = [

6
pkgs/desktops/lxqt/lximage-qt/default.nix
View File

@ -18,24 +18,24 @@
mkDerivation rec {
pname = "lximage-qt";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E=";
hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
qtimageformats # add-on module to support more image file formats

6
pkgs/desktops/lxqt/lxqt-about/default.nix
View File

@ -14,23 +14,23 @@
mkDerivation rec {
pname = "lxqt-about";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o=";
hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtx11extras
qttools
qtsvg
kwindowsystem
liblxqt

6
pkgs/desktops/lxqt/lxqt-admin/default.nix
View File

@ -15,23 +15,23 @@
mkDerivation rec {
pname = "lxqt-admin";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY=";
hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtx11extras
qttools
qtsvg
kwindowsystem
liblxqt

6
pkgs/desktops/lxqt/lxqt-archiver/default.nix
View File

@ -16,19 +16,20 @@
mkDerivation rec {
pname = "lxqt-archiver";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU=";
hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
@ -37,7 +38,6 @@ mkDerivation rec {
libfm-qt
menu-cache
qtbase
qttools
qtx11extras
];

2
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
View File

@ -18,7 +18,7 @@ mkDerivation rec {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
};
postPatch = ''

9
pkgs/desktops/lxqt/lxqt-config/default.nix
View File

@ -1,11 +1,11 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, glib
, lxqt-build-tools
, lxqt-menu-data
, qtbase
, qtx11extras
, qttools
@ -21,31 +21,32 @@
mkDerivation rec {
pname = "lxqt-config";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk=";
hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
glib.bin
qtbase
qtx11extras
qttools
qtsvg
kwindowsystem
libkscreen
liblxqt
libqtxdg
lxqt-menu-data
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXScrnSaver

6
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
View File

@ -15,23 +15,23 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo=";
hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem

36
pkgs/desktops/lxqt/lxqt-menu-data/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qttools
, gitUpdater
}:
mkDerivation rec {
pname = "lxqt-menu-data";
version = "1.4.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
passthru.updateScript = gitUpdater { };
meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-menu-data";
description = "Menu files for LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.lxqt.members;
};
}

6
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
View File

@ -15,23 +15,23 @@
mkDerivation rec {
pname = "lxqt-notificationd";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw=";
hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtsvg
kwindowsystem
liblxqt

6
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
View File

@ -15,23 +15,23 @@
mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM=";
hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem

10
pkgs/desktops/lxqt/lxqt-panel/default.nix
View File

@ -14,9 +14,9 @@
, libstatgrab
, libsysstat
, lm_sensors
, lxmenu-data
, lxqt-build-tools
, lxqt-globalkeys
, lxqt-menu-data
, gitUpdater
, menu-cache
, pcre
@ -30,19 +30,20 @@
mkDerivation rec {
pname = "lxqt-panel";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0=";
hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
@ -57,13 +58,12 @@ mkDerivation rec {
libstatgrab
libsysstat
lm_sensors
lxmenu-data
lxqt-globalkeys
lxqt-menu-data
menu-cache
pcre
qtbase
qtsvg
qttools
qtx11extras
solid
xorg.libXdmcp

6
pkgs/desktops/lxqt/lxqt-policykit/default.nix
View File

@ -19,24 +19,24 @@
mkDerivation rec {
pname = "lxqt-policykit";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg=";
hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
polkit

6
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
View File

@ -18,23 +18,23 @@
mkDerivation rec {
pname = "lxqt-powermanagement";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE=";
hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem

6
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
View File

@ -15,18 +15,19 @@
mkDerivation rec {
pname = "lxqt-qtplugin";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg=";
hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
@ -35,7 +36,6 @@ mkDerivation rec {
libqtxdg
qtbase
qtsvg
qttools
qtx11extras
];

6
pkgs/desktops/lxqt/lxqt-runner/default.nix
View File

@ -20,24 +20,24 @@
mkDerivation rec {
pname = "lxqt-runner";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4=";
hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtsvg
qtx11extras
kwindowsystem

6
pkgs/desktops/lxqt/lxqt-session/default.nix
View File

@ -20,24 +20,24 @@
mkDerivation rec {
pname = "lxqt-session";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk=";
hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtsvg
qtx11extras
kwindowsystem

6
pkgs/desktops/lxqt/lxqt-sudo/default.nix
View File

@ -16,23 +16,23 @@
mkDerivation rec {
pname = "lxqt-sudo";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs=";
hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem

2
pkgs/desktops/lxqt/lxqt-themes/default.nix
View File

@ -14,7 +14,7 @@ mkDerivation rec {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ=";
hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ=";
};
nativeBuildInputs = [

6
pkgs/desktops/lxqt/obconf-qt/default.nix
View File

@ -15,25 +15,25 @@
mkDerivation rec {
pname = "obconf-qt";
version = "0.16.2";
version = "0.16.3";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "zxwQfKowgpLjfxSV2t7Ly8o7DFqoIxi60zIVCcKDQWo=";
hash = "sha256-ExBcP+j1uf9Y8f6YfZsqyD6YTx1PriS3w8I6qdqQGeE=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt-build-tools
qttools
];
buildInputs = [
pcre
qtbase
qttools
qtx11extras
xorg.libpthreadstubs
xorg.libXdmcp

14
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
View File

@ -3,38 +3,34 @@
, fetchFromGitHub
, cmake
, pkg-config
, lxqt
, lxqt-build-tools
, libpulseaudio
, pcre
, qtbase
, qttools
, qtx11extras
, gitUpdater
}:
mkDerivation rec {
pname = "pavucontrol-qt";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ=";
hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt.lxqt-build-tools
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
libpulseaudio
pcre
];
passthru.updateScript = gitUpdater { };

14
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View File

@ -4,43 +4,43 @@
, cmake
, pkg-config
, libexif
, lxqt
, lxqt-build-tools
, lxqt-menu-data
, qtbase
, qttools
, qtx11extras
, qtimageformats
, libfm-qt
, menu-cache
, lxmenu-data
, gitUpdater
}:
mkDerivation rec {
pname = "pcmanfm-qt";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo=";
hash = "sha256-+U8eV6oDpaJfTzejsVtbcaQrfSjWUnVpnIDbkvVCY/c=";
};
nativeBuildInputs = [
cmake
pkg-config
lxqt.lxqt-build-tools
lxqt-build-tools
qttools
];
buildInputs = [
libexif
lxqt-menu-data
qtbase
qttools
qtx11extras
qtimageformats # add-on module to support more image file formats
libfm-qt
menu-cache
lxmenu-data
];
passthru.updateScript = gitUpdater { };

4
pkgs/desktops/lxqt/qlipper/default.nix
View File

@ -15,16 +15,16 @@ mkDerivation rec {
owner = "pvanek";
repo = pname;
rev = version;
sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60";
hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834=";
};
nativeBuildInputs = [
cmake
qttools
];
buildInputs = [
qtbase
qttools
];
passthru.updateScript = gitUpdater { };

6
pkgs/desktops/lxqt/qps/default.nix
View File

@ -14,18 +14,19 @@
mkDerivation rec {
pname = "qps";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY=";
hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
@ -33,7 +34,6 @@ mkDerivation rec {
liblxqt
libqtxdg
qtbase
qttools
qtx11extras
];

6
pkgs/desktops/lxqt/qterminal/default.nix
View File

@ -13,23 +13,23 @@
mkDerivation rec {
pname = "qterminal";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU=";
hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
qtx11extras
qtermwidget
];

6
pkgs/desktops/lxqt/qtermwidget/default.nix
View File

@ -11,23 +11,23 @@
mkDerivation rec {
pname = "qtermwidget";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs=";
hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
];
buildInputs = [
qtbase
qttools
];
passthru.updateScript = gitUpdater { };

4
pkgs/desktops/lxqt/qtxdg-tools/default.nix
View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "qtxdg-tools";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc=";
hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ=";
};
nativeBuildInputs = [

6
pkgs/desktops/lxqt/screengrab/default.nix
View File

@ -17,25 +17,25 @@
mkDerivation rec {
pname = "screengrab";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4=";
hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78=";
};
nativeBuildInputs = [
cmake
pkg-config
perl # needed by LXQtTranslateDesktop.cmake
qttools
autoPatchelfHook # fix libuploader.so and libextedit.so not found
];
buildInputs = [
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem

4
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "xdg-desktop-portal-lxqt";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw=";
hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY=";
};
nativeBuildInputs = [

1
pkgs/development/compilers/ghc/8.10.2-binary.nix
View File

@ -212,6 +212,7 @@ stdenv.mkDerivation rec {
(let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
lib.concatStringsSep "\n" [
(''
shopt -u nullglob
echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
if ! test -e ${buildExeGlob}; then
echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;

1
pkgs/development/compilers/ghc/8.10.7-binary.nix
View File

@ -210,6 +210,7 @@ stdenv.mkDerivation rec {
(let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
lib.concatStringsSep "\n" [
(''
shopt -u nullglob
echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
if ! test -e ${buildExeGlob}; then
echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;

5
pkgs/development/compilers/ghc/9.2.4-binary.nix
View File

@ -196,6 +196,7 @@ stdenv.mkDerivation rec {
(let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in
lib.concatStringsSep "\n" [
(''
shopt -u nullglob
echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
if ! test -e ${buildExeGlob}; then
echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
@ -368,7 +369,9 @@ stdenv.mkDerivation rec {
# Recache package db which needs to happen for Hadrian bindists
# where we modify the package db before installing
+ ''
"$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache
shopt -s nullglob
package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d)
"$out/bin/ghc-pkg" --package-db="$package_db" recache
'';
# In nixpkgs, musl based builds currently enable `pie` hardening by default

2
pkgs/development/compilers/ghc/common-hadrian.nix
View File

@ -150,7 +150,7 @@
# GHC's build system hadrian built from the GHC-to-build's source tree
# using our bootstrap GHC.
, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian {
, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } {
ghcSrc = ghcSrc;
ghcVersion = version;
userSettings = hadrianUserSettings;

6
pkgs/development/compilers/ghc/head.nix
View File

@ -1,5 +1,5 @@
import ./common-hadrian.nix {
version = "9.7.20230527";
rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664";
sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2";
version = "9.9.20231014";
rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695";
sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9";
}

3
pkgs/development/coq-modules/interval/default.nix
View File

@ -7,6 +7,7 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.18"; out = "4.9.0"; }
{ case = range "8.12" "8.17"; out = "4.8.0"; }
{ case = range "8.12" "8.16"; out = "4.6.0"; }
{ case = range "8.8" "8.16"; out = "4.5.2"; }
@ -14,6 +15,8 @@ mkCoqDerivation rec {
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.9.0".sha256 = "sha256-+5NppyQahcc1idGu/U3B+EIWuZz2L3/oY7dIJR6pitE=";
release."4.8.1".sha256 = "sha256-gknZ3bA90YY2AvwfFsP5iMhohwkQ8G96mH+4st2RPDc=";
release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY=";
release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ=";
release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0=";

17
pkgs/development/coq-modules/iris-named-props/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, mkCoqDerivation, coq, version ? null, iris }:
mkCoqDerivation rec {
pname = "iris-named-props";
owner = "tchajed";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.16" "8.18"; out = "2023-08-14"; }
] null;
release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g=";
release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc";
propagatedBuildInputs = [ iris ];
meta = {
description = "Named props for Iris";
maintainers = with lib.maintainers; [ ineol ];
};
}

2
pkgs/development/embedded/blisp/default.nix
View File

@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.mit;
mainProgram = "blisp";
homepage = "https://github.com/pine64/blisp";
maintainers = [ maintainers.fortuneteller2k ];
maintainers = [ maintainers.bdd ];
};
})

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