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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-07-13 12:01:07 +00:00 committed by GitHub
commit a7cc4d856f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
205 changed files with 1060 additions and 868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/default.nix
View File

@ -69,8 +69,8 @@ let
$epubPath
echo "application/epub+zip" > mimetype
zip -0Xq "$out" mimetype
cd scratch && zip -Xr9D "$out" *
zip -0Xq -b "$TMP" "$out" mimetype
cd scratch && zip -Xr9D -b "$TMP" "$out" *
'';
# NB: This file describes the Nixpkgs manual, which happens to use module

3
nixos/doc/manual/configuration/profiles/headless.section.md
View File

@ -2,8 +2,7 @@
Common configuration for headless machines (e.g., Amazon EC2 instances).
Disables [sound](#opt-sound.enable),
[vesa](#opt-boot.vesa), serial consoles,
Disables [vesa](#opt-boot.vesa), serial consoles,
[emergency mode](#opt-systemd.enableEmergencyMode),
[grub splash images](#opt-boot.loader.grub.splashImage)
and configures the kernel to reboot automatically on panic.

3
nixos/doc/manual/configuration/profiles/minimal.section.md
View File

@ -5,5 +5,4 @@ graphical stuff. It's a very short file that enables
[noXlibs](#opt-environment.noXlibs), sets
[](#opt-i18n.supportedLocales) to
only support the user-selected locale,
[disables packages' documentation](#opt-documentation.enable),
and [disables sound](#opt-sound.enable).
and [disables packages' documentation](#opt-documentation.enable).

45
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -197,6 +197,8 @@
- `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments.
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
- The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
Consequently the package `pkgs.ma1sd` has also been removed.
@ -233,3 +235,46 @@
should be changed to using *runner authentication tokens* by configuring
{option}`services.gitlab-runner.services.<name>.authenticationTokenConfigFile` instead of the former
{option}`services.gitlab-runner.services.<name>.registrationConfigFile` option.
## Detailed migration information {#sec-release-24.11-migration}
### `sound` options removal {#sec-release-24.11-migration-sound}
The `sound` options have been largely removed, as they are unnecessary for most modern setups, and cause issues when enabled.
If you set `sound.enable` in your configuration:
- If you are using Pulseaudio or PipeWire, simply remove that option
- If you are not using an external sound server, and want volumes to be persisted across shutdowns, set `hardware.alsa.enablePersistence = true` instead
If you set `sound.enableOSSEmulation` in your configuration:
- Make sure it is still necessary, as very few applications actually use OSS
- If necessary, set `boot.kernelModules = [ "snd_pcm_oss" ]`
If you set `sound.extraConfig` in your configuration:
- If you are using another sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that
- If you are not using an external sound server, set `environment.etc."asound.conf".text = yourExtraConfig` instead
If you set `sound.mediaKeys` in your configuration:
- Preferably switch to handling media keys in your desktop environment/compositor
- If you want to maintain the exact behavior of the option, use the following snippet
```nix
services.actkbd = let
volumeStep = "1%";
in {
enable = true;
bindings = [
# "Mute" media key
{ keys = [ 113 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Master toggle"; }
# "Lower Volume" media key
{ keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}- unmute"; }
# "Raise Volume" media key
{ keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${volumeStep}+ unmute"; }
# "Mic Mute" media key
{ keys = [ 190 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }
];
};
```

10
nixos/modules/config/pulseaudio.nix
View File

@ -6,7 +6,6 @@ with lib;
let
cfg = config.hardware.pulseaudio;
alsaCfg = config.sound;
hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable;
@ -58,7 +57,7 @@ let
# Write an /etc/asound.conf that causes all ALSA applications to
# be re-routed to the PulseAudio server through ALSA's Pulse
# plugin.
alsaConf = writeText "asound.conf" (''
alsaConf = ''
pcm_type.pulse {
libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins
@ -76,8 +75,7 @@ let
ctl.!default {
type pulse
}
${alsaCfg.extraConfig}
'');
'';
in {
@ -221,10 +219,8 @@ in {
environment.systemPackages = [ overriddenPackage ];
sound.enable = true;
environment.etc = {
"asound.conf".source = alsaConf;
"alsa/conf.d/99-pulseaudio.conf".text = alsaConf;
"pulse/daemon.conf".source = writeText "daemon.conf"
(lib.generators.toKeyValue {} cfg.daemon.config);

138
nixos/modules/services/audio/alsa.nix
View File

@ -3,132 +3,38 @@
with lib;
let
inherit (pkgs) alsa-utils;
pulseaudioEnabled = config.hardware.pulseaudio.enable;
in
{
imports = [
(mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
(mkRemovedOptionModule [ "sound" ] "The option was heavily overloaded and can be removed from most configurations.")
];
###### interface
options = {
sound = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable ALSA sound.
'';
};
enableOSSEmulation = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!).
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
defaults.pcm.!card 3
'';
description = ''
Set addition configuration for system-wide alsa.
'';
};
mediaKeys = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable volume and capture control with keyboard media keys.
You want to leave this disabled if you run a desktop environment
like KDE, Gnome, Xfce, etc, as those handle such things themselves.
You might want to enable this if you run a minimalistic desktop
environment or work from bare linux ttys/framebuffers.
Enabling this will turn on {option}`services.actkbd`.
'';
};
volumeStep = mkOption {
type = types.str;
default = "1";
example = "1%";
description = ''
The value by which to increment/decrement volume on media keys.
See amixer(1) for allowed values.
'';
};
};
};
options.hardware.alsa.enablePersistence = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable ALSA sound card state saving on shutdown.
This is generally not necessary if you're using an external sound server.
'';
};
###### implementation
config = mkIf config.sound.enable {
environment.systemPackages = [ alsa-utils ];
environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "")
{ "asound.conf".text = config.sound.extraConfig; };
config = mkIf config.hardware.alsa.enablePersistence {
# ALSA provides a udev rule for restoring volume settings.
services.udev.packages = [ alsa-utils ];
boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
systemd.services.alsa-store =
{ description = "Store Sound Card State";
wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = "/var/lib/alsa";
unitConfig.ConditionVirtualization = "!systemd-nspawn";
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
ExecStart = "${alsa-utils}/sbin/alsactl restore --ignore";
ExecStop = "${alsa-utils}/sbin/alsactl store --ignore";
};
systemd.services.alsa-store = {
description = "Store Sound Card State";
wantedBy = [ "multi-user.target" ];
unitConfig = {
RequiresMountsFor = "/var/lib/alsa";
ConditionVirtualization = "!systemd-nspawn";
};
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
ExecStart = "${alsa-utils}/sbin/alsactl restore --ignore";
ExecStop = "${alsa-utils}/sbin/alsactl store --ignore";
};
services.actkbd = mkIf config.sound.mediaKeys.enable {
enable = true;
bindings = [
# "Mute" media key
{ keys = [ 113 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Master toggle"; }
# "Lower Volume" media key
{ keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; }
# "Raise Volume" media key
{ keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsa-utils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; }
# "Mic Mute" media key
{ keys = [ 190 ]; events = [ "key" ]; command = "${alsa-utils}/bin/amixer -q set Capture toggle"; }
];
};
};
}

4
nixos/modules/services/audio/jack.nix
View File

@ -122,7 +122,7 @@ in {
config = mkMerge [
(mkIf pcmPlugin {
sound.extraConfig = ''
environment.etc."alsa/conf.d/98-jack.conf".text = ''
pcm_type.jack {
libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;
${lib.optionalString enable32BitAlsaPlugins
@ -139,7 +139,7 @@ in {
(mkIf loopback {
boot.kernelModules = [ "snd-aloop" ];
boot.kernelParams = [ "snd-aloop.index=${toString cfg.loopback.index}" ];
sound.extraConfig = cfg.loopback.config;
environment.etc."alsa/conf.d/99-jack-loopback.conf".text = cfg.loopback.config;
})
(mkIf cfg.jackd.enable {

11
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -314,7 +314,16 @@ def install_bootloader(args: argparse.Namespace) -> None:
).stdout
# See status_binaries() in systemd bootctl.c for code which generates this
installed_match = re.search(r"^\W+File:.*/EFI/(?:BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$",
# Matches
# Available Boot Loaders on ESP:
# ESP: /boot (/dev/disk/by-partuuid/9b39b4c4-c48b-4ebf-bfea-a56b2395b7e0)
# File: └─/EFI/systemd/systemd-bootx64.efi (systemd-boot 255.2)
# But also:
# Available Boot Loaders on ESP:
# ESP: /boot (/dev/disk/by-partuuid/9b39b4c4-c48b-4ebf-bfea-a56b2395b7e0)
# File: ├─/EFI/systemd/HashTool.efi
# └─/EFI/systemd/systemd-bootx64.efi (systemd-boot 255.2)
installed_match = re.search(r"^\W+.*/EFI/(?:BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$",
installed_out, re.IGNORECASE | re.MULTILINE)
available_match = re.search(r"^\((.*)\)$", available_out)

1
nixos/modules/virtualisation/vagrant-virtualbox-image.nix
View File

@ -15,7 +15,6 @@
usb = "off";
usbehci = "off";
};
sound.enable = false;
documentation.man.enable = false;
documentation.nixos.enable = false;

1
nixos/tests/domination.nix
View File

@ -10,7 +10,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
];
services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.domination ];
};

3
nixos/tests/firefox.nix
View File

@ -21,8 +21,7 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
# Create a virtual sound device, with mixing
# and all, for recording audio.
boot.kernelModules = [ "snd-aloop" ];
sound.enable = true;
sound.extraConfig = ''
environment.etc."asound.conf".text = ''
pcm.!default {
type plug
slave.pcm pcm.dmixer

2
nixos/tests/ft2-clone.nix
View File

@ -8,8 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
imports = [
./common/x11.nix
];
sound.enable = true;
environment.systemPackages = [ pkgs.ft2-clone ];
};

5
nixos/tests/k3s/auto-deploy.nix
View File

@ -1,3 +1,4 @@
# Tests whether container images are imported and auto deploying manifests work
import ../make-test-python.nix (
{
pkgs,
@ -108,8 +109,8 @@ import ../make-test-python.nix (
machine.succeed("ls /var/lib/rancher/k3s/server/manifests/hello.yaml")
# check if container images got imported
machine.succeed("crictl img | grep 'test\.local/pause'")
machine.succeed("crictl img | grep 'test\.local/hello'")
machine.wait_until_succeeds("crictl img | grep 'test\.local/pause'")
machine.wait_until_succeeds("crictl img | grep 'test\.local/hello'")
# check if resources of manifests got created
machine.wait_until_succeeds("kubectl get ns foo")

4
nixos/tests/k3s/default.nix
View File

@ -7,9 +7,7 @@ let
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
in
{
# Test whether container images are imported and auto deploying manifests work
auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;
# Testing K3s with Etcd backend
etcd = lib.mapAttrs (
_: k3s:
import ./etcd.nix {
@ -17,8 +15,6 @@ in
inherit (pkgs) etcd;
}
) allK3s;
# Run a single node k3s cluster and verify a pod can run
single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;
# Run a multi-node k3s cluster and verify pod networking works across nodes
multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s;
}

1
nixos/tests/k3s/etcd.nix
View File

@ -1,3 +1,4 @@
# Tests K3s with Etcd backend
import ../make-test-python.nix (
{
pkgs,

1
nixos/tests/k3s/multi-node.nix
View File

@ -1,3 +1,4 @@
# A test that runs a multi-node k3s cluster and verify pod networking works across nodes
import ../make-test-python.nix (
{
pkgs,

1
nixos/tests/k3s/single-node.nix
View File

@ -1,3 +1,4 @@
# A test that runs a single node k3s cluster and verify a pod can run
import ../make-test-python.nix (
{
pkgs,

1
nixos/tests/login.nix
View File

@ -9,7 +9,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
nodes.machine =
{ pkgs, lib, ... }:
{ boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
};
testScript = ''

1
nixos/tests/mpd.nix
View File

@ -37,7 +37,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
mkServer = { mpd, musicService, }:
{ boot.kernelModules = [ "snd-dummy" ];
sound.enable = true;
services.mpd = mpd;
systemd.services.musicService = musicService;
};

1
nixos/tests/pt2-clone.nix
View File

@ -10,7 +10,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
];
services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.pt2-clone ];
};

1
nixos/tests/sfxr-qt.nix
View File

@ -10,7 +10,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
];
services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.sfxr-qt ];
};

1
nixos/tests/shattered-pixel-dungeon.nix
View File

@ -10,7 +10,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
];
services.xserver.enable = true;
sound.enable = true;
environment.systemPackages = [ pkgs.shattered-pixel-dungeon ];
};

3
nixos/tests/slimserver.nix
View File

@ -8,8 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
enable = true;
extraArguments = "-s 127.0.0.1 -d slimproto=info";
};
sound.enable = true;
boot.initrd.kernelModules = ["snd-dummy"];
boot.kernelModules = ["snd-dummy"];
};
testScript =

1
nixos/tests/systemd-analyze.nix
View File

@ -9,7 +9,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
nodes.machine =
{ pkgs, lib, ... }:
{ boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
};
testScript = ''

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

@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.1";
src = fetchurl {
url = "http://www.sndio.org/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
url = "http://www.sndio.org/aucatctl-${finalAttrs.version}.tar.gz";
sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0";
};

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

@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "falkTX";
repo = finalAttrs.pname;
repo = "carla";
rev = "v${finalAttrs.version}";
hash = "sha256-H15T/z/IRfgWdqToTzq2eJ7q3n9Kj44IZXsd4uaipuU=";
};

6
pkgs/applications/audio/jack-passthrough/default.nix
View File

@ -8,14 +8,14 @@
, fmt_9
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation {
pname = "jack-passthrough";
version = "2021-9-25";
# https://github.com/guysherman/jack-passthrough
src = fetchFromGitHub {
owner = "guysherman";
repo = finalAttrs.pname;
repo = "jack-passthrough";
rev = "aad03b7c5ccc4a4dcb8fa38c49aa64cb9d628660";
hash = "sha256-9IsNaLW5dYAqiwe+vX0+D3oIKFP2TIfy1q1YaqmS6wE=";
};
@ -37,4 +37,4 @@ stdenv.mkDerivation (finalAttrs: {
platforms = [ "x86_64-linux" ];
mainProgram = "jack-passthru";
};
})
}

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

@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.0.0-rc.1";
src = fetchzip {
url = "https://www.zrythm.org/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
url = "https://www.zrythm.org/releases/zrythm-${finalAttrs.version}.tar.xz";
sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw=";
};

2
pkgs/applications/editors/geany/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "dev" "doc" "man" ];
src = fetchurl {
url = "https://download.geany.org/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
url = "https://download.geany.org/geany-${finalAttrs.version}.tar.bz2";
hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI=";
};

2
pkgs/applications/graphics/ocrfeeder/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.8.5";
src = fetchurl {
url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
url = "mirror://gnome/sources/ocrfeeder/${lib.versions.majorMinor finalAttrs.version}/ocrfeeder-${finalAttrs.version}.tar.xz";
sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
};

2
pkgs/applications/misc/bemenu/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "Cloudef";
repo = finalAttrs.pname;
repo = "bemenu";
rev = finalAttrs.version;
hash = "sha256-wdOrVX4AgGXySlwmqFRp9OWoSkEYBIZumBGTrFfyNpg=";
};

2
pkgs/applications/misc/bibletime/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "bibletime";
repo = finalAttrs.pname;
repo = "bibletime";
rev = "v${finalAttrs.version}";
hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps=";
};

2
pkgs/applications/misc/blender/default.nix
View File

@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "4.1.1";
src = fetchurl {
url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg=";
};

2
pkgs/applications/misc/citations/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = finalAttrs.pname;
repo = "citations";
rev = finalAttrs.version;
hash = "sha256-RV9oQcXzRsNcvZc/8Xt7qZ/88DvHofC2Av0ftxzeF6Q=";
};

2
pkgs/applications/misc/genesys/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.0.7";
src = fetchurl {
url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/genesys-${finalAttrs.version}.tar.gz";
hash = "sha256-I1lEVvwRiGf1f4zUtqKhSb+it/nC8WAmw5S6edquOj8=";
};

6
pkgs/applications/misc/rofi-bluetooth/default.nix
View File

@ -5,13 +5,13 @@
, bluez
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation {
pname = "rofi-bluetooth";
version = "unstable-2023-02-03";
src = fetchFromGitHub {
owner = "nickclyde";
repo = finalAttrs.pname;
repo = "rofi-bluetooth";
# https://github.com/nickclyde/rofi-bluetooth/issues/19
rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb";
sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8=";
@ -38,4 +38,4 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "rofi-bluetooth";
platforms = platforms.linux;
};
})
}

4
pkgs/applications/networking/cluster/cilium/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.16.11";
version = "0.16.13";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
hash = "sha256-muIVjT6ssNejp5O8ju06h9e7ZVcfwXyHgQIa0IEP4Xg=";
hash = "sha256-69LDIKaAJYbxTp0qBgfnE/YG6vnyN9/HgyxEBPqFY+4=";
};
vendorHash = null;

41
pkgs/applications/networking/cluster/k3s/builder.nix
View File

@ -88,12 +88,12 @@ lib:
# make sure they're in the path if desired.
let
baseMeta = with lib; {
baseMeta = {
description = "Lightweight Kubernetes distribution";
license = licenses.asl20;
license = lib.licenses.asl20;
homepage = "https://k3s.io";
maintainers = lib.teams.k3s.members;
platforms = platforms.linux;
platforms = lib.platforms.linux;
# resolves collisions with other installations of kubectl, crictl, ctr
# prefer non-k3s versions
@ -367,6 +367,7 @@ buildGoModule rec {
# https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
# So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily.
buildPhase = ''
runHook preBuild
patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload
# copy needed 'go generate' inputs into place
@ -387,12 +388,14 @@ buildGoModule rec {
./scripts/package-cli
mkdir -p $out/bin
runHook postBuild
'';
# Otherwise it depends on 'getGoDirs', which is normally set in buildPhase
doCheck = false;
installPhase = ''
runHook preInstall
# wildcard to match the arm64 build too
install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s
wrapProgram $out/bin/k3s \
@ -404,27 +407,31 @@ buildGoModule rec {
install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh
wrapProgram $out/bin/k3s-killall.sh \
--prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)}
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null
runHook postInstallCheck
'';
passthru.updateScript = updateScript;
passthru.mkTests =
version:
let
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
in
{
auto-deploy = nixosTests.k3s.auto-deploy.${k3s_version};
etcd = nixosTests.k3s.etcd.${k3s_version};
single-node = nixosTests.k3s.single-node.${k3s_version};
multi-node = nixosTests.k3s.multi-node.${k3s_version};
};
passthru.tests = passthru.mkTests k3sVersion;
passthru = {
k3sCNIPlugins = k3sCNIPlugins;
k3sContainerd = k3sContainerd;
k3sRepo = k3sRepo;
k3sRoot = k3sRoot;
k3sServer = k3sServer;
mkTests =
version:
let
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
in
lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
tests = passthru.mkTests k3sVersion;
updateScript = updateScript;
};
meta = baseMeta;
}

2
pkgs/applications/networking/gnome-network-displays/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "0.92.2";
src = fetchurl {
url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz";
sha256 = "sha256-df35UJnRolVSiYcArpnrglxNKbTKA3LAGsNwlDF7cj4=";
};

2
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
src = fetchFromGitHub {
owner = "vector-im";
repo = finalAttrs.pname;
repo = "element-web";
rev = "v${finalAttrs.version}";
hash = webSrcHash;
};

2
pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "vector-im";
repo = finalAttrs.pname;
repo = "hydrogen-web";
rev = "v${finalAttrs.version}";
hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0=";
};

2
pkgs/applications/office/ticktick/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "2.0.30";
src = fetchurl {
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb";
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb";
hash = "sha256-oo1ssIU6nYMBoEc888xAiTS7PHuEkoaC7KsPRTwL0ZA=";
};

4
pkgs/applications/radio/qlog/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "qlog";
version = "0.37.0";
version = "0.37.1";
src = fetchFromGitHub {
owner = "foldynl";
repo = "QLog";
rev = "v${version}";
hash = "sha256-OXE+8e8Wr2EETEfdDaI/fb+SSsRhippqPzTXTlwLP4c=";
hash = "sha256-ZIgKyPRTzlk6N23SmDEPNM8vXXh0FizXb9/WqtbmSCU=";
fetchSubmodules = true;
};

2
pkgs/applications/science/biology/migrate/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
pname = "migrate";
src = fetchurl {
url = "https://peterbeerli.com/migrate-html5/download_version4/${finalAttrs.pname}-${finalAttrs.version}.src.tar.gz";
url = "https://peterbeerli.com/migrate-html5/download_version4/migrate-${finalAttrs.version}.src.tar.gz";
hash = "sha256-twkoR9L6VPUye12OC0B5w0PxcxyKain6RkhCswLEdwg=";
};

2
pkgs/applications/science/logic/surelog/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "chipsalliance";
repo = finalAttrs.pname;
repo = "surelog";
rev = "v${finalAttrs.version}";
hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag=";
fetchSubmodules = false; # we use all dependencies from nix

2
pkgs/applications/science/logic/uhdm/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "chipsalliance";
repo = finalAttrs.pname;
repo = "UHDM";
rev = "v${finalAttrs.version}";
hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok=";
fetchSubmodules = false; # we use all dependencies from nix

2
pkgs/applications/science/math/maxima/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.46.0";
src = fetchurl {
url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
url = "mirror://sourceforge/maxima/maxima-${finalAttrs.version}.tar.gz";
sha256 = "sha256-c5Dwa0jaZckDPosvYpuXi5AFZFSlQCLbfecOIiWqiwc=";
};

2
pkgs/applications/video/obs-studio/default.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "obsproject";
repo = finalAttrs.pname;
repo = "obs-studio";
rev = finalAttrs.version;
sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";
fetchSubmodules = true;

2
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "nowrep";
repo = finalAttrs.pname;
repo = "obs-vkcapture";
rev = "v${finalAttrs.version}";
hash = "sha256-hYPQ1N4k4eb+bvGWZqaQJ/C8C5Lh8ooZ03raGF5ORgE=";
};

5
pkgs/applications/video/pipe-viewer/default.nix
View File

@ -9,7 +9,6 @@
, mpv
, wget
, xdg-utils
, youtube-dl
, yt-dlp
, TestPod
, Gtk3
@ -75,11 +74,11 @@ buildPerlModule rec {
postFixup = ''
wrapProgram "$out/bin/pipe-viewer" \
--prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget youtube-dl yt-dlp ]}"
--prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget yt-dlp ]}"
'' + lib.optionalString withGtk3 ''
# make xdg-open overrideable at runtime
wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \
--prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget youtube-dl yt-dlp ]}" \
--prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget yt-dlp ]}" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
'';

2
pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
repo = "hyprland-protocols";
rev = "v${finalAttrs.version}";
hash = "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=";
};

2
pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
repo = "hyprpaper";
rev = "v${finalAttrs.version}";
hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA=";
};

2
pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
repo = "hyprpicker";
rev = "v${finalAttrs.version}";
hash = "sha256-BYQF1zM6bJ44ag9FJ0aTSkhOTY9U7uRdp3SmRCs5fJM=";
};

2
pkgs/by-name/al/alsa-lib/package.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.2.11";
src = fetchurl {
url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2";
hash = "sha256-nz8vabmV+a03NZBy+8aaOoi/uggfyD6b4w4UZieVu00=";
};

16
pkgs/by-name/an/ansel/fix-desktop-file.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 71a110a7b..e69880d46 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -38,11 +38,6 @@ if(NOT WIN32)
# find the correct file.
set(DESKTOP_ANSEL_BINARY "ansel")
set(DESKTOP_ANSEL_ICON "ansel")
- if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
- set(DESKTOP_ANSEL_BINARY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/ansel")
- # `hicolor` is always available.
- set(DESKTOP_ANSEL_ICON "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/ansel.svg")
- endif()
# Append supported MIME types dynamically.
if("avif" IN_LIST DT_SUPPORTED_EXTENSIONS)

5
pkgs/by-name/an/ansel/package.nix
View File

@ -87,6 +87,11 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
# don't use absolute paths to binary or icon - see https://github.com/NixOS/nixpkgs/issues/308324
./fix-desktop-file.patch
];
strictDeps = true;
nativeBuildInputs = [

2
pkgs/by-name/ba/babeltrace/package.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.5.11";
src = fetchurl {
url = "https://www.efficios.com/files/babeltrace/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
url = "https://www.efficios.com/files/babeltrace/babeltrace-${finalAttrs.version}.tar.bz2";
sha256 = "Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw=";
};

2
pkgs/by-name/ba/base45/package.nix
View File

@ -5,7 +5,7 @@ buildNimPackage (finalAttrs: {
version = "20230124";
src = fetchFromSourcehut {
owner = "~ehmry";
repo = finalAttrs.pname;
repo = "base45";
rev = finalAttrs.version;
hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk=";
};

2
pkgs/by-name/c2/c2nim/package.nix
View File

@ -5,7 +5,7 @@ buildNimPackage (finalAttrs: {
version = "0.9.19";
src = fetchFromGitHub {
owner = "nim-lang";
repo = finalAttrs.pname;
repo = "c2nim";
rev = finalAttrs.version;
hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os=";
};

52
pkgs/by-name/fr/francis/package.nix
View File

@ -1,52 +0,0 @@
{ cmake
, fetchFromGitLab
, kdePackages
, lib
, pkg-config
, stdenv
}:
stdenv.mkDerivation rec {
pname = "francis";
version = "24.05.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
repo = "francis";
owner = "utilities";
rev = "v${version}";
hash = "sha256-mvB01iFvTmGSGaCdvyMOC8BaIgZgyeyRJEra31w04DI=";
};
nativeBuildInputs = [
cmake
kdePackages.kirigami
kdePackages.kirigami-addons
kdePackages.plasma5support
kdePackages.qqc2-desktop-style
kdePackages.qtsvg
kdePackages.qtwayland
kdePackages.wrapQtAppsHook
pkg-config
];
buildInputs = [
kdePackages.kiconthemes
# otherwise buttons are blank on non-kde
kdePackages.breeze-icons
];
cmakeFlags = [
# fix can't find Qt6QmlCompilerPlusPrivate
"-DQT_NO_FIND_QMLSC=TRUE"
];
meta = with lib; {
description = "Using the well-known pomodoro technique to help you get more productive";
homepage = "https://apps.kde.org/francis/";
license = with licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl21Plus gpl3Plus ];
mainProgram = "francis";
maintainers = with maintainers; [ cimm ];
platforms = lib.platforms.linux;
};
}

2
pkgs/by-name/hy/hyprland/package.nix
View File

@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
repo = "hyprland";
fetchSubmodules = true;
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po=";

2
pkgs/by-name/id/ideamaker/package.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
);
in
fetchurl {
url = "https://download.raise3d.com/${finalAttrs.pname}/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb";
url = "https://download.raise3d.com/ideamaker/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb";
sha256 = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM=";
};

2
pkgs/by-name/li/libvpl/package.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "intel";
repo = finalAttrs.pname;
repo = "libvpl";
rev = "v${finalAttrs.version}";
hash = "sha256-2yfJo4iwI/h0CJ+mJJ3cAyG5S7KksUibwJHebF3MR+E=";
};

25
pkgs/by-name/lu/lubelogger/deps.nix generated
View File

@ -2,14 +2,19 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; })
(fetchNuGet { pname = "LiteDB"; version = "5.0.17"; sha256 = "126h0g850nc6dqvhwivfjsgb8lydsg250pcsvbzkasda2z5m9mln"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; })
(fetchNuGet { pname = "Npgsql"; version = "8.0.2"; sha256 = "0w1hm3bjh1vfnkzflp1x8bd4d723mpr4y6gb6ga79v5kkf09cmm2"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.3.1"; sha256 = "095vn30apzwhqf70541617276whp19a92ncfppbknjj97dlb8bja"; })
(fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.3.0"; hash = "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0="; })
(fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; hash = "sha256-lCfo0ZQUJFXABIi18fy/alC1YGwkwM+lGy2zL47RAWw="; })
(fetchNuGet { pname = "LiteDB"; version = "5.0.17"; hash = "sha256-ltZUyxeqaTX/2ppdUMTTzVO0npZuRw43boZZUNAD0Ig="; })
(fetchNuGet { pname = "MailKit"; version = "4.5.0"; hash = "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; hash = "sha256-lbZKfnulWcM4Mxbz6Hkrp/lM41hsOfCnsHLEb+u2czc="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; hash = "sha256-C7uySnKBB0e5Wf6z8YNtjbtBbhalJMdqx0EWVcYy7Q4="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; hash = "sha256-6OHGsItAXicCSlW0ghCy5szNi6HwhlCmbykbN1O5yAw="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; hash = "sha256-qfTNU0g9QA8kV42VTAez1pSTmfFRJBbeTbGn/nfGFUU="; })
(fetchNuGet { pname = "MimeKit"; version = "4.5.0"; hash = "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU="; })
(fetchNuGet { pname = "Npgsql"; version = "8.0.3"; hash = "sha256-weBGo/IXKI5ufixBCuWG7OqDSyIqvGV07oxrG0XnQIQ="; })
(fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.3.1"; hash = "sha256-Si60aDtJSjvXvY5ZkVQKF3JzxAkmkAKOw5D/q8CwuyQ="; })
(fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "8.0.0"; hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="; })
]

6
pkgs/by-name/lu/lubelogger/package.nix
View File

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.3.1";
version = "1.3.5";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-5gpwB4x2/JAaNtPQrlgFwh7om3rTJE0/mGr/Kn4qIIw=";
hash = "sha256-Og7yDZn6PBkoihApCy/dWxWt/DoBwQDXVAio8nwcI9A=";
};
projectFile = "CarCareTracker.sln";
@ -36,7 +36,7 @@ buildDotnetModule rec {
'';
homepage = "https://lubelogger.com";
changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}";
license = licenses.unfree;
license = licenses.mit;
maintainers = with maintainers; [ samasaur ];
mainProgram = "CarCareTracker";
platforms = platforms.all;

6
pkgs/by-name/mf/mfoc-hardnested/package.nix
View File

@ -7,13 +7,13 @@
, xz
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation {
pname = "mfoc-hardnested";
version = "unstable-2023-03-27";
src = fetchFromGitHub {
owner = "nfc-tools";
repo = finalAttrs.pname;
repo = "mfoc-hardnested";
rev = "a6007437405a0f18642a4bbca2eeba67c623d736";
hash = "sha256-YcUMS4wx5ML4yYiARyfm7T7nLomgG9YCSFj+ZUg5XZk=";
};
@ -37,4 +37,4 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ azuwis ];
platforms = platforms.unix;
};
})
}

2
pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "mikeoliphant";
repo = finalAttrs.pname;
repo = "neural-amp-modeler-lv2";
rev = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-sRZngmivNvSWcjkIqcqjjaIgXFH8aMq+/caNroXmzIk=";

2
pkgs/by-name/ni/nimdow/package.nix
View File

@ -7,7 +7,7 @@ buildNimPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "avahe-kellenberger";
repo = finalAttrs.pname;
repo = "nimdow";
rev = "v${finalAttrs.version}";
hash = "sha256-GPu3Z63rFBgCCV7bdBg9cJh5thv2xrv/nSMa5Q/zp48=";
};

6
pkgs/by-name/se/serious-sans/package.nix
View File

@ -3,13 +3,13 @@
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "serious-sans";
version = "unstable-2023-09-04";
src = fetchFromGitHub {
owner = "kaBeech";
repo = finalAttrs.pname;
repo = "serious-sans";
rev = "a23f2b303fa3b1ec8788c5abba67b44ca5a3cc0a";
hash = "sha256-sPb9ZVDTBaZHT0Q/I9OfP7BMYJXPBiKkebzKgUHNuZM=";
};
@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ CobaltCause ];
platforms = lib.platforms.all;
};
})
}

2
pkgs/by-name/st/steam-play-none/package.nix
View File

@ -7,8 +7,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "steam-play-none";
version = "0-unstable-2022-12-15";
src = fetchFromGitHub {
repo = finalAttrs.pname;
owner = "Scrumplex";
repo = "steam-play-none";
rev = "42e38706eb37fdaaedbe9951d59ef44148fcacbf";
hash = "sha256-sSHLrB5TlGMKpztTnbh5oIOhcrRd+ke2OUUbiQUqoh0=";
};

6
pkgs/by-name/st/step-cli/package.nix
View File

@ -3,7 +3,7 @@
buildGoModule,
fetchFromGitHub,
}: let
version = "0.26.2";
version = "0.27.1";
in
buildGoModule {
pname = "step-cli";
@ -13,7 +13,7 @@ in
owner = "smallstep";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-CrV6kWgq2ldeOh5G0SgO8+q0HC1l8RuTELT3YXLxClU=";
hash = "sha256-+2++unFtLXQCDTem49DfO1ZjbaDWeBw0C7Z3CSGQkTk=";
};
ldflags = [
@ -27,7 +27,7 @@ in
rm command/certificate/remote_test.go
'';
vendorHash = "sha256-pqwrjreysMLfVmzPE7Tj/hLdM1HO13UfmbMXvNgLd5Y=";
vendorHash = "sha256-1+WLdjShvprt2fqzRYsEWQj/ohn6HqLGTde+3GZq7x0=";
meta = {
description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

2
pkgs/by-name/sw/swaycwd/package.nix
View File

@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
src = fetchFromGitLab {
owner = "cab404";
repo = finalAttrs.pname;
repo = "swaycwd";
rev = "v${finalAttrs.version}";
hash = "sha256-R/LnojbA0vBQVivGLaoM0+M4qVJ7vjf4kggB59i896w=";
};

6
pkgs/by-name/sy/syft/package.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "syft";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
rev = "refs/tags/v${version}";
hash = "sha256-S61O/JxVu60GS/T9jVBuebn+EFBwB5jiSEkKV/h/S+s=";
hash = "sha256-OO8tGjfp2iQvR800L6ykf36A4JEx/ImKirKP74rcvJc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-WSDbTI0U3Vqkfy8fxuqq9G5uBnBQ3421vyn6RriQx/U=";
vendorHash = "sha256-xf7ES9LZpVbvjiSTZP2stu0WpABlKqAr1OT3lV4mvVA=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/by-name/ty/typstyle/package.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "typstyle";
version = "0.11.28";
version = "0.11.29";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typstyle";
rev = "refs/tags/v${version}";
hash = "sha256-U3A3ye45o8q+Kvv2lJqJ72Vn/Q9iPgUkwpA79DAHU2k=";
hash = "sha256-7BjbML7mz5ohEdh+x6qL8pH2BTFW8WdtB0g91NHFIBY=";
};
cargoHash = "sha256-A13nVLvjhoAPGIXfQX6AE+zMuvT7QT7BWJVS6ASnw10=";
cargoHash = "sha256-bcOfgiQ7mT7HE1hUXfBlj6SzMUtS5Ar2X9kjFGKPR2w=";
nativeBuildInputs = [
pkg-config

2
pkgs/by-name/wb/wb32-dfu-updater/package.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "WestberryTech";
repo = finalAttrs.pname;
repo = "wb32-dfu-updater";
rev = finalAttrs.version;
hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w=";
};

2
pkgs/by-name/xl/xld/package.nix
View File

@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
version = "20240511";
src = fetchurl {
url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.dmg";
url = "mirror://sourceforge/xld/xld-${finalAttrs.version}.dmg";
hash = "sha256-8xfjAWgtSdbD8gGlkGzT8QRz7egIf4PE/rFsFEDX0+c=";
};

8
pkgs/data/fonts/aileron/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "102";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "aileron";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/aileron_${majorVersion}${minorVersion}.zip";
hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/aileron/";
description = "Helvetica font in nine weights";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.cc0;
};
})
}

6
pkgs/data/fonts/blackout/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "blackout";
version = "2014-07-29";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "blackout";
rev = "4864cfc1749590e9f78549c6e57116fe98480c0f";
hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw=";
};
@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/chunk/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "chunk";
version = "2021-03-03";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "chunk";
rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104";
hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E=";
};
@ -35,4 +35,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/eunomia/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "200";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "eunomia";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/eunomia_${majorVersion}${minorVersion}.zip";
hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4=";
stripRoot = false;
};
@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.ofl;
};
})
}

6
pkgs/data/fonts/f1_8/default.nix
View File

@ -4,7 +4,7 @@ let
majorVersion = "1";
minorVersion = "101";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "f1_8";
version = "${majorVersion}.${minorVersion}";
@ -24,10 +24,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/f1_8/";
description = "Weighted decorative font";
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
license = licenses.ofl;
};
})
}

8
pkgs/data/fonts/f5_6/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "110";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "f5_6";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/f5_6_${majorVersion}${minorVersion}.zip";
hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/f5_6/";
description = "Weighted decorative font";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.ofl;
};
})
}

8
pkgs/data/fonts/fa_1/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "100";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "fa_1";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/fa_1_${majorVersion}${minorVersion}.zip";
hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/fa_1/";
description = "Weighted decorative font";
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
license = licenses.ofl;
};
})
}

6
pkgs/data/fonts/fanwood/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "fanwood";
version = "2011-05-11";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "fanwood";
rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432";
hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg=";
};
@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

8
pkgs/data/fonts/ferrum/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "200";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "ferrum";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/ferrum_${majorVersion}${minorVersion}.zip";
hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/ferrum/";
description = "Decorative font";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.cc0;
};
})
}

6
pkgs/data/fonts/goudy-bookletter-1911/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "goudy-bookletter-1911";
version = "2011-05-11";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "goudy-bookletter-1911";
rev = "85ff5b834b4f63feb36fd2053949c19660580e48";
hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8=";
};
@ -25,4 +25,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/junction/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "junction";
version = "2014-05-29";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "junction";
rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535";
hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8=";
};
@ -31,4 +31,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/knewave/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "knewave";
version = "2012-07-30";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "knewave";
rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb";
hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0=";
};
@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/league-script-number-one/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "league-script-number-one";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "league-script-number-one";
rev = "225add0b37cf8268759ba4572e02630d9fb54ecf";
hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI=";
};
@ -32,4 +32,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

6
pkgs/data/fonts/linden-hill/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "linden-hill";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "linden-hill";
rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee";
hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw=";
};
@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

8
pkgs/data/fonts/medio/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "200";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "medio";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/medio_${majorVersion}${minorVersion}.zip";
hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ=";
stripRoot = false;
};
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/medio/";
description = "Serif font designed by Sora Sagano";
longDescription = ''
Medio is a serif font designed by Sora Sagano, based roughly
@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.cc0;
};
})
}

8
pkgs/data/fonts/melete/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "200";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "melete";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/melete_${majorVersion}${minorVersion}.zip";
hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/melete/";
description = "Headline typeface that could be used as a movie title";
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
license = licenses.ofl;
};
})
}

8
pkgs/data/fonts/nacelle/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "1";
minorVersion = "00";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "nacelle";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/nacelle_${majorVersion}${minorVersion}.zip";
hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/nacelle/";
description = "Improved version of the Aileron font";
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
license = licenses.ofl;
};
})
}

6
pkgs/data/fonts/orbitron/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "orbitron";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "orbitron";
rev = "13e6a5222aa6818d81c9acd27edd701a2d744152";
hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA=";
};
@ -45,4 +45,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
platforms = platforms.all;
maintainers = with lib.maintainers; [ leenaars minijackson ];
};
})
}

6
pkgs/data/fonts/ostrich-sans/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "ostrich-sans";
version = "2014-04-18";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "ostrich-sans";
rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964";
hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw=";
};
@ -29,4 +29,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

8
pkgs/data/fonts/penna/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "100";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "penna";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/penna_${majorVersion}${minorVersion}.zip";
hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w=";
stripRoot = false;
};
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/penna/";
description = "Geometric sans serif designed by Sora Sagano";
longDescription = ''
Penna is a geometric sans serif designed by Sora Sagano,
@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.cc0;
};
})
}

6
pkgs/data/fonts/prociono/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "prociono";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "prociono";
rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844";
hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk=";
};
@ -31,4 +31,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

8
pkgs/data/fonts/route159/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "1";
minorVersion = "10";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "route159";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/route159_${majorVersion}${minorVersion}.zip";
hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU=";
stripRoot = false;
};
@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/route159/";
description = "Weighted sans serif font";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.ofl;
};
})
}

8
pkgs/data/fonts/seshat/default.nix
View File

@ -4,12 +4,12 @@ let
majorVersion = "0";
minorVersion = "100";
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "seshat";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/download/fonts/seshat_${majorVersion}${minorVersion}.zip";
hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q=";
stripRoot = false;
};
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/${finalAttrs.pname}/";
homepage = "http://dotcolon.net/font/seshat/";
description = "Roman body font designed for main text by Sora Sagano";
longDescription = ''
Seshat is a Roman body font designed for the main text. By
@ -39,4 +39,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ leenaars minijackson ];
license = licenses.cc0;
};
})
}

6
pkgs/data/fonts/sniglet/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, stdenvNoCC }:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation {
pname = "sniglet";
version = "2011-05-25";
src = fetchFromGitHub {
owner = "theleagueof";
repo = finalAttrs.pname;
repo = "sniglet";
rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4";
hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c=";
};
@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ minijackson ];
};
})
}

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