mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-18 18:14:42 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
de5cfff7c1
@ -3402,16 +3402,6 @@
|
||||
githubId = 5949913;
|
||||
name = "Carlos Fernandez Sanz";
|
||||
};
|
||||
cge = {
|
||||
email = "cevans@evanslabs.org";
|
||||
github = "cgevans";
|
||||
githubId = 2054509;
|
||||
name = "Constantine Evans";
|
||||
keys = [
|
||||
{ fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; }
|
||||
{ fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; }
|
||||
];
|
||||
};
|
||||
Ch1keen = {
|
||||
email = "gihoong7@gmail.com";
|
||||
github = "Ch1keen";
|
||||
@ -12419,6 +12409,11 @@
|
||||
githubId = 26470037;
|
||||
name = "Markus Kowalewski";
|
||||
};
|
||||
markusscherer = {
|
||||
github = "markusscherer";
|
||||
githubId = 1913876;
|
||||
name = "Markus Scherer";
|
||||
};
|
||||
marmolak = {
|
||||
email = "hack.robin@gmail.com";
|
||||
github = "marmolak";
|
||||
@ -12660,6 +12655,13 @@
|
||||
name = "Matthias Wimmer";
|
||||
keys = [ { fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; } ];
|
||||
};
|
||||
max = {
|
||||
email = "max+nixpkgs@privatevoid.net";
|
||||
matrix = "@max:privatevoid.net";
|
||||
github = "max-privatevoid";
|
||||
githubId = 55053574;
|
||||
name = "Max Headroom";
|
||||
};
|
||||
max-amb = {
|
||||
email = "max_a@e.email";
|
||||
github = "max-amb";
|
||||
@ -14525,6 +14527,11 @@
|
||||
github = "dev-nis";
|
||||
githubId = 132921300;
|
||||
};
|
||||
nishimara = {
|
||||
name = "nishimara";
|
||||
github = "Nishimara";
|
||||
githubId = 59232119;
|
||||
};
|
||||
nitsky = {
|
||||
name = "nitsky";
|
||||
github = "nitsky";
|
||||
@ -16163,6 +16170,11 @@
|
||||
githubId = 146413;
|
||||
name = "Tobias Poschwatta";
|
||||
};
|
||||
potb = {
|
||||
name = "Peïo Thibault";
|
||||
github = "potb";
|
||||
githubId = 10779093;
|
||||
};
|
||||
poweredbypie = {
|
||||
name = "poweredbypie";
|
||||
github = "poweredbypie";
|
||||
@ -18346,6 +18358,12 @@
|
||||
githubId = 1151264;
|
||||
name = "Sebastian Graf";
|
||||
};
|
||||
shackra = {
|
||||
name = "Jorge Javier Araya Navarro";
|
||||
email = "jorge@esavara.cr";
|
||||
github = "shackra";
|
||||
githubId = 1055216;
|
||||
};
|
||||
shadaj = {
|
||||
github = "shadaj";
|
||||
githubId = 543055;
|
||||
@ -20848,6 +20866,13 @@
|
||||
githubId = 1607770;
|
||||
name = "Ulrik Strid";
|
||||
};
|
||||
ulysseszhan = {
|
||||
email = "ulysseszhan@gmail.com";
|
||||
github = "UlyssesZh";
|
||||
githubId = 26196187;
|
||||
matrix = "@ulysseszhan:matrix.org";
|
||||
name = "Ulysses Zhan";
|
||||
};
|
||||
umlx5h = {
|
||||
github = "umlx5h";
|
||||
githubId = 20206121;
|
||||
|
||||
@ -362,6 +362,7 @@ with lib.maintainers;
|
||||
|
||||
geospatial = {
|
||||
members = [
|
||||
autra
|
||||
imincik
|
||||
l0b0
|
||||
nh2
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib) mkOption optionalString types versionAtLeast;
|
||||
inherit (lib.options) literalExpression;
|
||||
cfg = config.amazonImage;
|
||||
amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
|
||||
|
||||
@ -15,7 +15,7 @@ in {
|
||||
# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
|
||||
config.boot.kernelParams =
|
||||
let timeout =
|
||||
if pkgs.lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
|
||||
if versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
|
||||
then "4294967295"
|
||||
else "255";
|
||||
in [ "nvme_core.io_timeout=${timeout}" ];
|
||||
@ -156,5 +156,5 @@ in {
|
||||
};
|
||||
in if config.ec2.zfs.enable then zfsBuilder else extBuilder;
|
||||
|
||||
meta.maintainers = with maintainers; [ arianvp ];
|
||||
meta.maintainers = with lib.maintainers; [ arianvp ];
|
||||
}
|
||||
|
||||
@ -842,7 +842,6 @@
|
||||
./services/misc/wastebin.nix
|
||||
./services/misc/weechat.nix
|
||||
./services/misc/workout-tracker.nix
|
||||
./services/misc/xmr-stak.nix
|
||||
./services/misc/xmrig.nix
|
||||
./services/misc/zoneminder.nix
|
||||
./services/misc/zookeeper.nix
|
||||
|
||||
@ -68,7 +68,6 @@ in
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
ProtectUser = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
@ -106,6 +106,7 @@ in
|
||||
as the underlying package isn't being maintained. Working alternatives are
|
||||
libinput and synaptics.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "xmr-stak" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream")
|
||||
(mkRemovedOptionModule [ "services" "racoon" ] ''
|
||||
The racoon module has been removed, because the software project was abandoned upstream.
|
||||
|
||||
@ -206,9 +206,12 @@ in
|
||||
|
||||
extraFlags = mkOption {
|
||||
description = "Extra flags to pass to the k3s command.";
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";
|
||||
type = with types; either str (listOf str);
|
||||
default = [ ];
|
||||
example = [
|
||||
"--no-deploy traefik"
|
||||
"--cluster-cidr 10.24.0.0/16"
|
||||
];
|
||||
};
|
||||
|
||||
disableAgent = mkOption {
|
||||
@ -427,7 +430,7 @@ in
|
||||
++ (optional (cfg.token != "") "--token ${cfg.token}")
|
||||
++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
|
||||
++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")
|
||||
++ [ cfg.extraFlags ]
|
||||
++ (lib.flatten cfg.extraFlags)
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
@ -15,6 +15,7 @@ let
|
||||
message_journal_dir = ${cfg.messageJournalDir}
|
||||
mongodb_uri = ${cfg.mongodbUri}
|
||||
plugin_dir = /var/lib/graylog/plugins
|
||||
data_dir = ${cfg.dataDir}
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
@ -93,6 +94,12 @@ in
|
||||
description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/graylog/data";
|
||||
description = "Directory used to store Graylog server state.";
|
||||
};
|
||||
|
||||
messageJournalDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/graylog/data/journal";
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.xmr-stak;
|
||||
|
||||
pkg = pkgs.xmr-stak.override {
|
||||
inherit (cfg) openclSupport;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xmr-stak = {
|
||||
enable = mkEnableOption "xmr-stak miner";
|
||||
openclSupport = mkEnableOption "support for OpenCL (AMD/ATI graphics cards)";
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = [ "--noCPU" "--currency monero" ];
|
||||
description = "List of parameters to pass to xmr-stak.";
|
||||
};
|
||||
|
||||
configFiles = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
{
|
||||
"config.txt" = '''
|
||||
"verbose_level" : 4,
|
||||
"h_print_time" : 60,
|
||||
"tls_secure_algo" : true,
|
||||
''';
|
||||
"pools.txt" = '''
|
||||
"currency" : "monero7",
|
||||
"pool_list" :
|
||||
[ { "pool_address" : "pool.supportxmr.com:443",
|
||||
"wallet_address" : "my-wallet-address",
|
||||
"rig_id" : "",
|
||||
"pool_password" : "nixos",
|
||||
"use_nicehash" : false,
|
||||
"use_tls" : true,
|
||||
"tls_fingerprint" : "",
|
||||
"pool_weight" : 23
|
||||
},
|
||||
],
|
||||
''';
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Content of config files like config.txt, pools.txt or cpu.txt.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.xmr-stak = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
bindsTo = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
|
||||
preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: ''
|
||||
ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}'
|
||||
''));
|
||||
|
||||
serviceConfig = let rootRequired = cfg.openclSupport; in {
|
||||
ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}";
|
||||
# xmr-stak generates cpu and/or gpu configuration files
|
||||
WorkingDirectory = "/tmp";
|
||||
PrivateTmp = true;
|
||||
DynamicUser = !rootRequired;
|
||||
LimitMEMLOCK = toString (1024*1024);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule ["services" "xmr-stak" "configText"] ''
|
||||
This option was removed in favour of `services.xmr-stak.configFiles`
|
||||
because the new config file `pools.txt` was introduced. You are
|
||||
now able to define all other config files like cpu.txt or amd.txt.
|
||||
'')
|
||||
];
|
||||
}
|
||||
@ -7,7 +7,27 @@ in {
|
||||
port = 9117;
|
||||
extraOpts = {
|
||||
settings = mkOption {
|
||||
type = types.attrs;
|
||||
type = types.submodule {
|
||||
options = {
|
||||
consul = mkOption {
|
||||
default = null;
|
||||
type = types.nullOr (types.attrsOf types.anything);
|
||||
description = ''
|
||||
Consul integration options. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file).
|
||||
|
||||
This is disabled by default.
|
||||
'';
|
||||
};
|
||||
namespaces = mkOption {
|
||||
default = [];
|
||||
type = types.listOf (types.attrsOf types.anything);
|
||||
|
||||
description = ''
|
||||
Namespaces to collect the metrics for. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file).
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = ''
|
||||
All settings of nginxlog expressed as an Nix attrset.
|
||||
|
||||
@ -22,6 +22,8 @@ let
|
||||
'';
|
||||
|
||||
systemdBootBuilder = pkgs.substituteAll rec {
|
||||
name = "systemd-boot";
|
||||
|
||||
src = checkedSource;
|
||||
|
||||
isExecutable = true;
|
||||
|
||||
@ -6,9 +6,8 @@
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault mkIf;
|
||||
cfg = config.ec2;
|
||||
in
|
||||
|
||||
@ -107,5 +106,5 @@ in
|
||||
# (e.g. it depends on GTK).
|
||||
services.udisks2.enable = false;
|
||||
};
|
||||
meta.maintainers = with maintainers; [ arianvp ];
|
||||
meta.maintainers = with lib.maintainers; [ arianvp ];
|
||||
}
|
||||
|
||||
@ -4,6 +4,11 @@ with lib;
|
||||
|
||||
{
|
||||
options.proxmoxLXC = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc "Whether to enable the Proxmox VE LXC module.";
|
||||
};
|
||||
privileged = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
@ -35,7 +40,7 @@ with lib;
|
||||
let
|
||||
cfg = config.proxmoxLXC;
|
||||
in
|
||||
{
|
||||
mkIf cfg.enable {
|
||||
system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
|
||||
storeContents = [{
|
||||
object = config.system.build.toplevel;
|
||||
|
||||
@ -687,7 +687,9 @@ in {
|
||||
ocis = handleTest ./ocis.nix {};
|
||||
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix {};
|
||||
oh-my-zsh = handleTest ./oh-my-zsh.nix {};
|
||||
ollama = handleTest ./ollama.nix {};
|
||||
ollama = runTest ./ollama.nix;
|
||||
ollama-cuda = runTestOn ["x86_64-linux" "aarch64-linux"] ./ollama-cuda.nix;
|
||||
ollama-rocm = runTestOn ["x86_64-linux" "aarch64-linux"] ./ollama-rocm.nix;
|
||||
ombi = handleTest ./ombi.nix {};
|
||||
openarena = handleTest ./openarena.nix {};
|
||||
openldap = handleTest ./openldap.nix {};
|
||||
|
||||
@ -5,8 +5,11 @@ makeInstalledTest {
|
||||
|
||||
testConfig = {
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
||||
config.common.default = "gtk";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
|
||||
virtualisation.diskSize = 2048;
|
||||
};
|
||||
|
||||
@ -49,7 +49,7 @@ import ../make-test-python.nix (
|
||||
services.k3s.role = "server";
|
||||
services.k3s.package = k3s;
|
||||
# Slightly reduce resource usage
|
||||
services.k3s.extraFlags = builtins.toString [
|
||||
services.k3s.extraFlags = [
|
||||
"--disable coredns"
|
||||
"--disable local-storage"
|
||||
"--disable metrics-server"
|
||||
|
||||
@ -50,20 +50,14 @@ import ../make-test-python.nix (
|
||||
services.k3s = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
extraFlags = builtins.toString [
|
||||
extraFlags = [
|
||||
"--datastore-endpoint=\"http://192.168.1.1:2379\""
|
||||
"--disable"
|
||||
"coredns"
|
||||
"--disable"
|
||||
"local-storage"
|
||||
"--disable"
|
||||
"metrics-server"
|
||||
"--disable"
|
||||
"servicelb"
|
||||
"--disable"
|
||||
"traefik"
|
||||
"--node-ip"
|
||||
"192.168.1.2"
|
||||
"--disable coredns"
|
||||
"--disable local-storage"
|
||||
"--disable metrics-server"
|
||||
"--disable servicelb"
|
||||
"--disable traefik"
|
||||
"--node-ip 192.168.1.2"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -76,21 +76,14 @@ import ../make-test-python.nix (
|
||||
role = "server";
|
||||
package = k3s;
|
||||
clusterInit = true;
|
||||
extraFlags = builtins.toString [
|
||||
"--disable"
|
||||
"coredns"
|
||||
"--disable"
|
||||
"local-storage"
|
||||
"--disable"
|
||||
"metrics-server"
|
||||
"--disable"
|
||||
"servicelb"
|
||||
"--disable"
|
||||
"traefik"
|
||||
"--node-ip"
|
||||
"192.168.1.1"
|
||||
"--pause-image"
|
||||
"test.local/pause:local"
|
||||
extraFlags = [
|
||||
"--disable coredns"
|
||||
"--disable local-storage"
|
||||
"--disable metrics-server"
|
||||
"--disable servicelb"
|
||||
"--disable traefik"
|
||||
"--node-ip 192.168.1.1"
|
||||
"--pause-image test.local/pause:local"
|
||||
];
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
|
||||
@ -58,19 +58,13 @@ import ../make-test-python.nix (
|
||||
services.k3s.role = "server";
|
||||
services.k3s.package = k3s;
|
||||
# Slightly reduce resource usage
|
||||
services.k3s.extraFlags = builtins.toString [
|
||||
"--disable"
|
||||
"coredns"
|
||||
"--disable"
|
||||
"local-storage"
|
||||
"--disable"
|
||||
"metrics-server"
|
||||
"--disable"
|
||||
"servicelb"
|
||||
"--disable"
|
||||
"traefik"
|
||||
"--pause-image"
|
||||
"test.local/pause:local"
|
||||
services.k3s.extraFlags = [
|
||||
"--disable coredns"
|
||||
"--disable local-storage"
|
||||
"--disable metrics-server"
|
||||
"--disable servicelb"
|
||||
"--disable traefik"
|
||||
"--pause-image test.local/pause:local"
|
||||
];
|
||||
|
||||
users.users = {
|
||||
|
||||
17
nixos/tests/ollama-cuda.nix
Normal file
17
nixos/tests/ollama-cuda.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "ollama-cuda";
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes.cuda =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "cuda";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
cuda.wait_for_unit("multi-user.target")
|
||||
cuda.wait_for_open_port(11434)
|
||||
'';
|
||||
}
|
||||
17
nixos/tests/ollama-rocm.nix
Normal file
17
nixos/tests/ollama-rocm.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "ollama-rocm";
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes.rocm =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "rocm";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
rocm.wait_for_unit("multi-user.target")
|
||||
rocm.wait_for_open_port(11434)
|
||||
'';
|
||||
}
|
||||
@ -1,56 +1,53 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
{ lib, ... }:
|
||||
let
|
||||
mainPort = 11434;
|
||||
altPort = 11435;
|
||||
|
||||
curlRequest = port: request:
|
||||
"curl http://127.0.0.1:${toString port}/api/generate -d '${builtins.toJSON request}'";
|
||||
|
||||
prompt = {
|
||||
model = "tinydolphin";
|
||||
prompt = "lorem ipsum";
|
||||
options = {
|
||||
seed = 69;
|
||||
temperature = 0;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "ollama";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ abysssol ];
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ abysssol ];
|
||||
|
||||
nodes = {
|
||||
cpu = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
};
|
||||
cpu =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
};
|
||||
|
||||
rocm = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "rocm";
|
||||
};
|
||||
|
||||
cuda = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.acceleration = "cuda";
|
||||
};
|
||||
|
||||
altAddress = { ... }: {
|
||||
services.ollama.enable = true;
|
||||
services.ollama.port = altPort;
|
||||
};
|
||||
altAddress =
|
||||
{ ... }:
|
||||
{
|
||||
services.ollama.enable = true;
|
||||
services.ollama.port = altPort;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
vms = [ cpu, rocm, cuda, altAddress ];
|
||||
import json
|
||||
|
||||
def curl_request_ollama(prompt, port):
|
||||
json_prompt = json.dumps(prompt)
|
||||
return f"""curl http://127.0.0.1:{port}/api/generate -d '{json_prompt}'"""
|
||||
|
||||
prompt = {
|
||||
"model": "tinydolphin",
|
||||
"prompt": "lorem ipsum",
|
||||
"options": {
|
||||
"seed": 69,
|
||||
"temperature": 0,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
vms = [
|
||||
(cpu, ${toString mainPort}),
|
||||
(altAddress, ${toString altPort}),
|
||||
]
|
||||
|
||||
start_all()
|
||||
for vm in vms:
|
||||
vm.wait_for_unit("multi-user.target")
|
||||
|
||||
stdout = cpu.succeed("""${curlRequest mainPort prompt}""", timeout=100)
|
||||
|
||||
stdout = altAddress.succeed("""${curlRequest altPort prompt}""", timeout=100)
|
||||
for (vm, port) in vms:
|
||||
vm.wait_for_unit("multi-user.target")
|
||||
vm.wait_for_open_port(port)
|
||||
stdout = vm.succeed(curl_request_ollama(prompt, port), timeout = 100)
|
||||
'';
|
||||
})
|
||||
}
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl
|
||||
, withALSA ? true, alsa-lib
|
||||
, withPulseAudio ? false, libpulseaudio
|
||||
, withPortAudio ? false, portaudio
|
||||
, withMpris ? false
|
||||
, withKeyring ? false
|
||||
, dbus
|
||||
}:
|
||||
|
||||
rustPackages.rustPlatform.buildRustPackage rec {
|
||||
pname = "spotifyd";
|
||||
version = "0.3.5-unstable-2024-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Spotifyd";
|
||||
repo = "spotifyd";
|
||||
rev = "ff2f7a06e54bf05afd57a0243dc9f67abc15f040";
|
||||
hash = "sha256-nebAd4a+ht+blRP52OF830/Dm15ZPwRL4IPWmmT9ViM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6BRIMTrWTwvX3yIGEYEvigMT+n4EtaruMdrej2Dd49w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optional withALSA alsa-lib
|
||||
++ lib.optional withPulseAudio libpulseaudio
|
||||
++ lib.optional withPortAudio portaudio
|
||||
++ lib.optional (withMpris || withKeyring) dbus;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = lib.optional withALSA "alsa_backend"
|
||||
++ lib.optional withPulseAudio "pulseaudio_backend"
|
||||
++ lib.optional withPortAudio "portaudio_backend"
|
||||
++ lib.optional withMpris "dbus_mpris"
|
||||
++ lib.optional withKeyring "dbus_keyring";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source Spotify client running as a UNIX daemon";
|
||||
homepage = "https://spotifyd.rs/";
|
||||
changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ anderslundstedt Br1ght0ne ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "spotifyd";
|
||||
};
|
||||
}
|
||||
@ -121,4 +121,4 @@ self: let
|
||||
|
||||
in elpaDevelPackages // { inherit elpaBuild; });
|
||||
|
||||
in (generateElpa { }) // { __attrsFailEvaluation = true; }
|
||||
in generateElpa { }
|
||||
|
||||
@ -210,4 +210,5 @@ self: let
|
||||
|
||||
in elpaPackages // { inherit elpaBuild; });
|
||||
|
||||
in (generateElpa { }) // { __attrsFailEvaluation = true; }
|
||||
in
|
||||
generateElpa { }
|
||||
|
||||
@ -125,6 +125,4 @@ in
|
||||
emacsSessionManagement = self.session-management-for-emacs;
|
||||
rectMark = self.rect-mark;
|
||||
sunriseCommander = self.sunrise-commander;
|
||||
|
||||
__attrsFailEvaluation = true;
|
||||
}
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
{ trivialBuild
|
||||
, llvmPackages
|
||||
}:
|
||||
{ melpaBuild, llvmPackages }:
|
||||
|
||||
trivialBuild {
|
||||
melpaBuild {
|
||||
pname = "llvm-mode";
|
||||
inherit (llvmPackages.llvm) src version;
|
||||
inherit (llvmPackages.llvm) version;
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot="$sourceRoot/llvm/utils/emacs"
|
||||
'';
|
||||
src = "${llvmPackages.llvm.src}/llvm/utils/emacs";
|
||||
|
||||
meta = {
|
||||
inherit (llvmPackages.llvm.meta) homepage license;
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
{
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
melpaBuild {
|
||||
pname = "sunrise-commander";
|
||||
ename = "sunrise";
|
||||
version = "0-unstable-2021-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -15,10 +16,6 @@ trivialBuild {
|
||||
hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/sunrise-commander/sunrise-commander/";
|
||||
description = "Orthodox (two-pane) file manager for Emacs";
|
||||
|
||||
@ -755,5 +755,4 @@ let
|
||||
in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);
|
||||
|
||||
in
|
||||
(generateMelpa { })
|
||||
// { __attrsFailEvaluation = true; }
|
||||
generateMelpa { }
|
||||
|
||||
@ -20,12 +20,12 @@ self: let
|
||||
generated ? ./nongnu-generated.nix
|
||||
}: let
|
||||
|
||||
imported = (import generated {
|
||||
imported = import generated {
|
||||
callPackage = pkgs: args: self.callPackage pkgs (args // {
|
||||
# Use custom elpa url fetcher with fallback/uncompress
|
||||
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
|
||||
});
|
||||
}) // { __attrsFailEvaluation = true; };
|
||||
};
|
||||
|
||||
super = imported;
|
||||
|
||||
|
||||
@ -532,6 +532,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/";
|
||||
};
|
||||
|
||||
advanced-git-search-nvim = buildVimPlugin {
|
||||
pname = "advanced-git-search.nvim";
|
||||
version = "2024-05-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aaronhallaert";
|
||||
repo = "advanced-git-search.nvim";
|
||||
rev = "d11e1360b7cdb9270673b7852bbc1e91e1af25da";
|
||||
sha256 = "12ymb4n81z8brzc6n19h5mfb1pnfxwrnvgnss6wqjilzqa1cmjzw";
|
||||
};
|
||||
meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
|
||||
};
|
||||
|
||||
adwaita-nvim = buildVimPlugin {
|
||||
pname = "adwaita.nvim";
|
||||
version = "2024-04-28";
|
||||
|
||||
@ -135,6 +135,10 @@
|
||||
nvimRequireCheck = "alpha";
|
||||
};
|
||||
|
||||
advanced-git-search-nvim = super.autosave-nvim.overrideAttrs {
|
||||
dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ];
|
||||
};
|
||||
|
||||
autosave-nvim = super.autosave-nvim.overrideAttrs {
|
||||
dependencies = with super; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
@ -43,6 +43,7 @@ https://github.com/vim-scripts/a.vim/,,
|
||||
https://github.com/mileszs/ack.vim/,,
|
||||
https://github.com/eikenb/acp/,,
|
||||
https://github.com/aznhe21/actions-preview.nvim/,,
|
||||
https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD,
|
||||
https://github.com/Mofiqul/adwaita.nvim/,HEAD,
|
||||
https://github.com/stevearc/aerial.nvim/,,
|
||||
https://github.com/Numkil/ag.nvim/,,
|
||||
|
||||
@ -406,8 +406,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.17.2";
|
||||
hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU=";
|
||||
version = "1.18.4";
|
||||
hash = "sha256-mTmfIEXObDWi82z+59JaCjUDqFd9nOO/6QDtlHGuVvk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
@ -1644,8 +1644,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.22.0";
|
||||
hash = "sha256-pus5rOyVgheiblvWrkM3H/GZifBzUGR++JiHN4aU/3I=";
|
||||
version = "0.22.1";
|
||||
hash = "sha256-zi+Rcy63AUqDnVZCbPuljs+aBHsyOTHgbiJ+h9dB9us=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
||||
@ -51,13 +51,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-34";
|
||||
version = "7.1.1-35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU=";
|
||||
hash = "sha256-ac0xvCwwH/qsdewBAO6POcPY74kBPkcnW6ywVvnegKw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -18,8 +18,7 @@
|
||||
cudaSupport ? config.cudaSupport,
|
||||
dbus,
|
||||
embree,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
fetchzip,
|
||||
ffmpeg,
|
||||
fftw,
|
||||
@ -55,7 +54,6 @@
|
||||
llvmPackages,
|
||||
makeWrapper,
|
||||
mesa,
|
||||
ocl-icd,
|
||||
openal,
|
||||
opencollada,
|
||||
opencolorio,
|
||||
@ -102,41 +100,46 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./draco.patch
|
||||
(fetchpatch {
|
||||
url = "https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch";
|
||||
hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc=";
|
||||
srcs = [
|
||||
(fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY=";
|
||||
})
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
(fetchgit {
|
||||
name = "assets";
|
||||
url = "https://projects.blender.org/blender/blender-assets.git";
|
||||
rev = "6864f1832e71a31e1e04f72bb7a5a1f53f0cd01c";
|
||||
fetchLFS = true;
|
||||
hash = "sha256-vepK0inPMuleAJBSipwoI99nMBBiFaK/eSMHDetEtjY=";
|
||||
})
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
chmod -R u+w *
|
||||
rm -r assets/working
|
||||
mv assets --target-directory source/release/datafiles/
|
||||
'';
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
postPatch =
|
||||
(
|
||||
if stdenv.isDarwin then
|
||||
''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
''
|
||||
else
|
||||
''
|
||||
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
||||
''
|
||||
)
|
||||
(lib.optionalString stdenv.isDarwin ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
substituteInPlace source/creator/CMakeLists.txt \
|
||||
--replace-fail '${"$"}{LIBDIR}/python' \
|
||||
'${python3}' \
|
||||
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
|
||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
|
||||
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
|
||||
'${lib.getLib brotli}/lib/libbrotlidec.dylib'
|
||||
'')
|
||||
+ (lib.optionalString hipSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||
@ -375,7 +378,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
PYTHON
|
||||
|
||||
mkdir $out
|
||||
for engine in BLENDER_EEVEE CYCLES; do
|
||||
for engine in BLENDER_EEVEE_NEXT CYCLES; do
|
||||
echo "Rendering with $engine..."
|
||||
# Beware that argument order matters
|
||||
${lib.getExe finalAttrs.finalPackage} \
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
# enable boost for cycles, audaspace or i18n
|
||||
# otherwise if the user disabled
|
||||
|
||||
--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
+++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
--- a/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
+++ b/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
|
||||
@@ -17,7 +17,7 @@ def dll_path() -> Path:
|
||||
"""
|
||||
lib_name = 'extern_draco'
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
, lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
# python requirements
|
||||
, fetchpatch
|
||||
# python requirements
|
||||
, beautifulsoup4
|
||||
, boto3
|
||||
, faker
|
||||
@ -54,6 +55,20 @@ buildPythonApplication rec {
|
||||
hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Drop when next release is out
|
||||
(fetchpatch {
|
||||
name = "drop-support-for-python-37.patch";
|
||||
url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch";
|
||||
hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "update-tests-for-python-312.patch";
|
||||
url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch";
|
||||
hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# from visidata/requirements.txt
|
||||
# packages not (yet) present in nixpkgs are commented
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
{ stdenv, lib, fetchpatch
|
||||
, fetchFromGitHub, cmake, libmicrohttpd, openssl
|
||||
, opencl-headers, ocl-icd, hwloc
|
||||
, devDonationLevel ? "0.0"
|
||||
, openclSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmr-stak";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fireice-uk";
|
||||
repo = "xmr-stak";
|
||||
rev = version;
|
||||
sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-libmicrohttpd-0-9-71.patch";
|
||||
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
|
||||
excludes = [ "CMakeLists.txt.user" ];
|
||||
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
|
||||
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libmicrohttpd openssl hwloc ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace xmrstak/donate-level.hpp \
|
||||
--replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Does not build against gcc-13. No development activity upstream
|
||||
# for past few years.
|
||||
broken = true;
|
||||
description = "Unified All-in-one Monero miner";
|
||||
homepage = "https://github.com/fireice-uk/xmr-stak";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ bfortz ];
|
||||
};
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "127.0.2651.31";
|
||||
version = "127.0.2651.49";
|
||||
revision = "1";
|
||||
hash = "sha256-SERogsWM4mtIEVAVtwaRu2VOjK012yWBb2FygDfKO80=";
|
||||
hash = "sha256-fMB7CuC5u8RNbbtFEZWFIIBwZTPkTP9LVs7DCXltGEA=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
@ -13,8 +13,8 @@
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "126.0.2592.87";
|
||||
version = "126.0.2592.102";
|
||||
revision = "1";
|
||||
hash = "sha256-ntcewiAc/hDUF9wiURCXm8TxqatvEPXaTUn8kblzK0o=";
|
||||
hash = "sha256-xCjtsZoetxlOV77VSbt09cGbpfHUYhTA6WXuZAvD/a4=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.11.4";
|
||||
version = "2.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k=";
|
||||
hash = "sha256-0Td4TMi9HTvf+GeW2f/ufRW0Y3KBrBSDWhgPW4noXi4=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30=";
|
||||
vendorHash = "sha256-y6B//zal2OyzZ1slC+x3vxHasFTM+xD+/6Sd2AFHFgY=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.87";
|
||||
version = "1.0.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9uoh0rdBgIONqiGwak9Hvrf3davqcvuB6KbhmyU16fk=";
|
||||
sha256 = "sha256-fPCafa0V5lbzXocUa1gabLxAcPbg8rqOExMT0QnGUk8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bEyknQc7TCxbWj7VsjJ2WGz65BG8HaP8ldL2kb+bbtc=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TVRWcgBt6MmHOh3LYSjJtp5qf/+ar+LWDGfHKQhDFZ8=";
|
||||
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-30fMLczb4+BVSxZSbhQ2S1MrQ2+Ykyqf+Dio8n0LGE0=";
|
||||
vendorHash = "sha256-8UIey+r1tdVRN1RBK5xxcAzaHb0VFdgenUXSFgoWh1g=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2024-04-27";
|
||||
version = "0-unstable-2024-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "d76a7db668900a7fc41ead7db194e20f126071ac";
|
||||
hash = "sha256-uEMz7n0IFTGK1fZC1/vuwJpyySGdTUIMUjunCmycnzM=";
|
||||
rev = "31905f3e790e63cd0f2366526afe41fb278c226e";
|
||||
hash = "sha256-IhGZGHV/A1m653WlVCwxtb9OZbMolQ3GHOr2fXehjNk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hSrGN3NHPpp5601l4KcmNHVYOGWfLjFeWWr9g11nM3I=";
|
||||
vendorHash = "sha256-5ZsvoIDwxZCGkMRxlCyp2Iv6fcvvpmzG+krz3MZSiTM=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -1,23 +1,30 @@
|
||||
{ lib, appimageTools, fetchurl }:
|
||||
{ lib, appimageTools, fetchzip }:
|
||||
|
||||
let
|
||||
pname = "keet";
|
||||
version = "1.2.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://keet.io/downloads/${version}/Keet.AppImage";
|
||||
sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98";
|
||||
src = fetchzip {
|
||||
url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz";
|
||||
hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version;
|
||||
src = "${src}/Keet.AppImage";
|
||||
};
|
||||
in appimageTools.wrapType2 {
|
||||
inherit src pname version;
|
||||
inherit pname version;
|
||||
|
||||
src = "${src}/Keet.AppImage";
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
gtk4
|
||||
];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
install -m 444 -D ${appimageContents}/Keet.desktop -t $out/share/applications
|
||||
cp -r ${appimageContents}/*.png $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
|
||||
hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo=";
|
||||
hash = "sha256-GWU2qGeQB8bou0+Ja6Cs4bQM1stAL+dlKC3QNTA0EIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "232.240626.0";
|
||||
version = "235.240712.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE=";
|
||||
hash = "sha256-IhGfpHzK853b21oqhlfvXVrS1gl/4xgrZeWvBCIL1qg=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.6.2";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-vwhFFSdKlt2Ddikhdr3uyILjTVdgCjMtAW9HeLmT5qU=";
|
||||
hash = "sha256-PVlHPjr6aUkTp9x4MVC8cgebmdaUQXX6eV0/LfAmiJc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
, libetonyek
|
||||
, liborcus
|
||||
, libpng
|
||||
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ]
|
||||
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false
|
||||
, qtbase ? null
|
||||
@ -562,6 +562,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
jdk = jre';
|
||||
python = python311; # for unoconv
|
||||
updateScript = [
|
||||
./update.sh
|
||||
# Pass it this file name as argument
|
||||
|
||||
@ -21,13 +21,13 @@ with lib;
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tryton";
|
||||
version = "7.2.2";
|
||||
version = "7.2.3";
|
||||
|
||||
disabled = !python3Packages.isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk=";
|
||||
hash = "sha256-W5DXOLUr4c9w9Zcp9i5esNjSSIMewe+NJGh+h3PiD30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
, useChineseVersion ? false
|
||||
}:
|
||||
let
|
||||
pkgVersion = "11.1.0.11719";
|
||||
pkgVersion = "11.1.0.11720";
|
||||
url =
|
||||
if useChineseVersion then
|
||||
"https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb"
|
||||
@ -31,9 +31,9 @@ let
|
||||
"https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb";
|
||||
hash =
|
||||
if useChineseVersion then
|
||||
"sha256-LgE5du2ZnMsAqgoQkY63HWyWYA5TLS5I8ArRYrpxffs="
|
||||
"sha256-wf0zgFrhqHXV68Qsa20X8FbMA83XeYr/dSCBg1IjVlg="
|
||||
else
|
||||
"sha256-6fXzHSMzZDGuBubOXsHA0YEUGKcy5QIPg3noyxUbdjA=";
|
||||
"sha256-MvJ5XQx9fmNIFKvzSEbu1BAdxiASJ6HR+qsDFLm53dU=";
|
||||
uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url;
|
||||
securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b";
|
||||
in
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2024-05-24";
|
||||
version = "0.4.0-unstable-2024-07-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "e17c021ba4fc39eea8a2a1de37ef04a0d1253090";
|
||||
hash = "sha256-YvIRo7g9fxnlf8og5CM2JLf8DeADVkcHdvb4ppS1veE=";
|
||||
rev = "f28814fff0566dcf6f93ac5b7a79d6d594202757";
|
||||
hash = "sha256-SQ0j9DGJc48TsaUaesixJT/pMBm9NGw22qapSokj9r8=";
|
||||
};
|
||||
buildInputs = [
|
||||
glib
|
||||
@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pyserial
|
||||
requests
|
||||
six
|
||||
suds
|
||||
wxpython
|
||||
yattag
|
||||
];
|
||||
@ -47,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Free, open-source tool for programming your amateur radio";
|
||||
homepage = "https://chirp.danplanet.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.emantor ];
|
||||
maintainers = with maintainers; [ emantor wrmilling ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, python3Packages
|
||||
{ stdenv, lib, fetchFromGitHub, python3Packages
|
||||
, hackrf, rtl-sdr, airspy, limesuite, libiio
|
||||
, libbladeRF
|
||||
, qt5
|
||||
@ -16,8 +16,9 @@ python3Packages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF qt5.qtwayland ]
|
||||
++ lib.optional USRPSupport uhd;
|
||||
buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ]
|
||||
++ lib.optional USRPSupport uhd
|
||||
++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqt5 numpy psutil cython pyzmq pyaudio setuptools
|
||||
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = [ lib.maintainers.cge ];
|
||||
maintainers = [ ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-9nqho+iDqy8oQLSxBppXoafzEuS6AkcUuqEY3xxfFs4=";
|
||||
hash = "sha256-mM2TkNXZSTr6fo8FxqDYbRlKw4dsADddS+VUEeeH3h8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "17.1.1",
|
||||
"repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf",
|
||||
"version": "17.1.2",
|
||||
"repo_hash": "08nd4194wyb1rs47crcq7vci9b5a6izda23bkjavc0iwdsibf0c3",
|
||||
"yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v17.1.1-ee",
|
||||
"rev": "v17.1.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "17.1.1",
|
||||
"GITLAB_PAGES_VERSION": "17.1.1",
|
||||
"GITALY_SERVER_VERSION": "17.1.2",
|
||||
"GITLAB_PAGES_VERSION": "17.1.2",
|
||||
"GITLAB_SHELL_VERSION": "14.36.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.1.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "17.1.2"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "17.1.1";
|
||||
version = "17.1.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY=";
|
||||
hash = "sha256-KL6BL5iSOUV0iu0omDGc7upl45p0yet92DiP4DesB+Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M=";
|
||||
hash = "sha256-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";
|
||||
vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable flaky inmemory storage driver test
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "17.1.1";
|
||||
version = "17.1.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus=";
|
||||
hash = "sha256-QnB5VH8iPWdMCK690REepws6hvX0e++6DNX2vE9t2JM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE=";
|
||||
|
||||
@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "17.1.1";
|
||||
version = "17.1.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@ -255,7 +255,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat
|
||||
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability
|
||||
gem 'sidekiq', '~> 7.1.6', feature_category: :scalability
|
||||
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
|
||||
gem 'gitlab-sidekiq-fetcher',
|
||||
path: 'vendor/gems/sidekiq-reliable-fetch',
|
||||
|
||||
@ -173,15 +173,6 @@ PATH
|
||||
nokogiri (>= 1.4.4)
|
||||
omniauth (~> 2.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-7.1.6
|
||||
specs:
|
||||
sidekiq (7.1.6)
|
||||
concurrent-ruby (< 2)
|
||||
connection_pool (>= 2.3.0)
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.14.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-reliable-fetch
|
||||
specs:
|
||||
@ -1668,6 +1659,11 @@ GEM
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (5.1.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq (7.1.6)
|
||||
concurrent-ruby (< 2)
|
||||
connection_pool (>= 2.3.0)
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.14.0)
|
||||
sidekiq-cron (1.12.0)
|
||||
fugit (~> 1.8)
|
||||
globalid (>= 1.0.1)
|
||||
@ -1691,7 +1687,8 @@ GEM
|
||||
simplecov_json_formatter (0.1.4)
|
||||
singleton (0.1.1)
|
||||
sixarm_ruby_unaccent (1.2.0)
|
||||
slack-messenger (2.3.4)
|
||||
slack-messenger (2.3.5)
|
||||
re2 (= 2.7.0)
|
||||
snaky_hash (2.0.0)
|
||||
hashie
|
||||
version_gem (~> 1.1)
|
||||
@ -2212,7 +2209,7 @@ DEPENDENCIES
|
||||
sentry-ruby (~> 5.17.3)
|
||||
sentry-sidekiq (~> 5.17.3)
|
||||
shoulda-matchers (~> 5.1.0)
|
||||
sidekiq!
|
||||
sidekiq (~> 7.1.6)
|
||||
sidekiq-cron (~> 1.12.0)
|
||||
sigdump (~> 0.2.4)
|
||||
simple_po_parser (~> 1.1.6)
|
||||
|
||||
@ -6175,8 +6175,9 @@ src:
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/sidekiq-7.1.6";
|
||||
type = "path";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.1.6";
|
||||
};
|
||||
@ -6295,14 +6296,15 @@ src:
|
||||
version = "1.2.0";
|
||||
};
|
||||
slack-messenger = {
|
||||
dependencies = ["re2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9";
|
||||
sha256 = "1kb3dhp38wllw8f54qcik05zw0w4v0a5171cqmgjqp6c63mb0q63";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
};
|
||||
snaky_hash = {
|
||||
dependencies = ["hashie" "version_gem"];
|
||||
|
||||
@ -180,6 +180,21 @@ def update_rubyenv():
|
||||
cwd=rubyenv_dir,
|
||||
)
|
||||
|
||||
# Un-vendor sidekiq
|
||||
#
|
||||
# The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as
|
||||
# stated in this [comment]) but unfortunately, it seems to cause a crash in the
|
||||
# application, as noted in this [upstream issue].
|
||||
#
|
||||
# We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0.
|
||||
#
|
||||
# [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600
|
||||
# [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
|
||||
subprocess.check_output(
|
||||
["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"],
|
||||
cwd=rubyenv_dir,
|
||||
)
|
||||
|
||||
# Fetch vendored dependencies temporarily in order to build the gemset.nix
|
||||
subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir)
|
||||
subprocess.check_output(
|
||||
@ -194,7 +209,7 @@ def update_rubyenv():
|
||||
[
|
||||
"sh",
|
||||
"-c",
|
||||
f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3",
|
||||
f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=2",
|
||||
],
|
||||
cwd=f"{rubyenv_dir}/gems",
|
||||
)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }:
|
||||
{ lib, rel, buildKodiAddon, fetchzip, fetchpatch, addonUpdateScript }:
|
||||
buildKodiAddon rec {
|
||||
pname = "inputstreamhelper";
|
||||
namespace = "script.module.inputstreamhelper";
|
||||
@ -9,6 +9,13 @@ buildKodiAddon rec {
|
||||
sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emilsvennesson/script.module.inputstreamhelper/commit/af6adc16a0bee4921a827946b004ee070406ae37.patch";
|
||||
hash = "sha256-901EyVeZUb0EMvxsEza95qFjTOZ7PDYyqHMRawPM5Zs=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
pythonPath = "lib";
|
||||
updateScript = addonUpdateScript {
|
||||
|
||||
@ -13,7 +13,10 @@ buildKodiAddon rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-packaged-deps.patch
|
||||
# Unconditionally depend on packaged yt-dlp. This removes the ability to
|
||||
# use youtube_dl, which is unmaintained and considered vulnerable (see
|
||||
# CVE-2024-38519).
|
||||
./use-packaged-yt-dlp.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -26,14 +29,14 @@ buildKodiAddon rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via
|
||||
# the Python path.
|
||||
pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ];
|
||||
# Instead of the vendored libraries, we propagate yt-dlp via the Python
|
||||
# path.
|
||||
pythonPath = with kodi.pythonPackages; makePythonPath [ yt-dlp ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/firsttris/plugin.video.sendtokodi";
|
||||
description = "Plays various stream sites on Kodi using youtube-dl";
|
||||
description = "Plays various stream sites on Kodi using yt-dlp";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.kodi.members ++ [ maintainers.pks ];
|
||||
};
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
diff --git a/service.py b/service.py
|
||||
index 1d7b6e4..9782993 100644
|
||||
index 024ad9a..6ef71dd 100644
|
||||
--- a/service.py
|
||||
+++ b/service.py
|
||||
@@ -241,9 +241,9 @@ def playlistIndex(url, playlist):
|
||||
@@ -243,11 +243,8 @@ def playlistIndex(url, playlist):
|
||||
|
||||
|
||||
# Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+)
|
||||
if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2:
|
||||
-if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2:
|
||||
- from lib.youtube_dl import YoutubeDL
|
||||
+ from youtube_dl import YoutubeDL
|
||||
else:
|
||||
-else:
|
||||
- from lib.yt_dlp import YoutubeDL
|
||||
+ from yt_dlp import YoutubeDL
|
||||
|
||||
-
|
||||
+from yt_dlp import YoutubeDL
|
||||
+
|
||||
# patch broken strptime (see above)
|
||||
patch_strptime()
|
||||
|
||||
@ -1,34 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, obs-studio }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
obs-studio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-source-record";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-source-record";
|
||||
rev = version;
|
||||
sha256 = "sha256-H65uQ9HnKmHs52v3spG92ayeYH/TvmwcMoePMmBMqN8=";
|
||||
sha256 = "sha256-VgG9Fn75aKTkth4TC9rhfj/HIOO2lIO4n3ZYmemkzx8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix obs 29.1 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/exeldro/obs-source-record/pull/83.diff";
|
||||
hash = "sha256-eWOjHHfoXZeoPtqvVyexSi/UQqHm8nu4FEEjma64Ly4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
];
|
||||
buildInputs = [ obs-studio ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_OUT_OF_TREE=On"
|
||||
];
|
||||
cmakeFlags = [ "-DBUILD_OUT_OF_TREE=On" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/{data,obs-plugins}
|
||||
@ -37,7 +31,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "OBS Studio plugin to make sources available to record via a filter";
|
||||
homepage = "https://github.com/exeldro/obs-source-record";
|
||||
maintainers = with maintainers; [ robbins ];
|
||||
maintainers = with maintainers; [
|
||||
robbins
|
||||
shackra
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-pwA0LBQZ0jYXgBHhboAhyPM/kM7sboGw0O+3OIg5Nz4=";
|
||||
sha256 = "sha256-i/lxR/iSarmhJvqjcu8+HscTYoVExwCcweSNo206BYU=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA=";
|
||||
hash = "sha256-pEPm4NtuJeoULmESIZfWVW4jzS1eC6hUb5/62Tjsv0I=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -319,7 +319,7 @@ rec {
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU=";
|
||||
mobyHash = "sha256-xinRILDSuubAAJh/dmpaU3csTf0VgukJIfSUkcHpa28=";
|
||||
runcRev = "v1.1.13";
|
||||
runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
|
||||
containerdRev = "v1.7.18";
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, libpulseaudio
|
||||
, libnotify
|
||||
, gobject-introspection
|
||||
, python3Packages
|
||||
, extraLibs ? [] }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
# i3pystatus moved to rolling release:
|
||||
# https://github.com/enkore/i3pystatus/issues/584
|
||||
version = "unstable-2020-06-12";
|
||||
pname = "i3pystatus";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enkore";
|
||||
repo = "i3pystatus";
|
||||
rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
|
||||
sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [ libpulseaudio libnotify ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
keyring colour netifaces psutil basiciw pygobject3
|
||||
] ++ extraLibs;
|
||||
|
||||
makeWrapperArgs = [
|
||||
# LC_TIME != C results in locale.Error: unsupported locale setting
|
||||
"--set" "LC_TIME" "C"
|
||||
"--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
''${makeWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
# no tests in tarball
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/enkore/i3pystatus";
|
||||
description = "Complete replacement for i3status";
|
||||
longDescription = ''
|
||||
i3pystatus is a growing collection of python scripts for status output compatible
|
||||
to i3status / i3bar of the i3 window manager.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.igsha ];
|
||||
};
|
||||
}
|
||||
@ -227,8 +227,8 @@ stdenvNoCC.mkDerivation (args // {
|
||||
else
|
||||
''$(mktemp -t "${pname}-deps-XXXXXX.nix")'';
|
||||
storeSrc = srcOnly args;
|
||||
projectFileStr = lib.escapeShellArg projectFiles;
|
||||
testProjectFileStr = lib.escapeShellArg testProjectFiles;
|
||||
projectFileStr = lib.escapeShellArgs projectFiles;
|
||||
testProjectFileStr = lib.escapeShellArgs testProjectFiles;
|
||||
path = lib.makeBinPath [
|
||||
coreutils
|
||||
runtimeShellPackage
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2024-07-03";
|
||||
version = "0-unstable-2024-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "3f76b3f497e590c4b6a4f9316b212c627631399b";
|
||||
hash = "sha256-qwyqOgv4djIrJn9MlHO/I8zC741b4ORxDMgYZ+Da2eM=";
|
||||
rev = "d0cfc437783a2ca2bb0f071419df753a98981614";
|
||||
hash = "sha256-FMZok6rW3UbkotPPG1xmdlMPfHB2JBqJZ1oTg8eUux8=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-1GsRBAVAfD0SAM1gk8W+bX7MtxunGKOLtXweL4rrf9Q=";
|
||||
hash = "sha256-vKRjxehwqbvvgq+EMHoF3KRiPIxay06MpZRjapBFdVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-rabiNqw4hg0Js8VadxfkhNLIsrKfMuoKa5lFIfSMNPY=";
|
||||
hash = "sha256-JOfS3vCkqI5wvFWgGkw1PIfmzW9yuP/Zp/x98MPdbUQ=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2024.6.1";
|
||||
version = "2024.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI=";
|
||||
hash = "sha256-FH7++E+kc86lksHjTbVFU0mP0ZB2xb6ZCojdyNm1iWU=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20;
|
||||
|
||||
npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI=";
|
||||
npmDepsHash = "sha256-F2iqTWgK+5ts2wd5NLsuyMZp1FnsbJmSjT3lJzV9PUo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python311
|
||||
|
||||
@ -31,6 +31,10 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
hardeningDisable = [
|
||||
"zerocallusedregs"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Dynamic real-time view of running eBPF programs";
|
||||
homepage = "https://github.com/Netflix/bpftop";
|
||||
|
||||
@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.20.4";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0YWkZdfthHpX4Duc0kP9/QBBTQk1Jx0Hrjd/aoRUIKU=";
|
||||
hash = "sha256-k8pRSAQpE//qH7XRjSTXmxundgK5dmOQTRKP9D2RUdY=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
@ -158,7 +158,7 @@ buildNpmPackage' rec {
|
||||
homepage = "https://www.usebruno.com";
|
||||
inherit (electron.meta) platforms;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks ];
|
||||
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks redyf ];
|
||||
mainProgram = "bruno";
|
||||
};
|
||||
}
|
||||
|
||||
60
pkgs/by-name/ch/chance/package.nix
Normal file
60
pkgs/by-name/ch/chance/package.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
blueprint-compiler,
|
||||
cargo,
|
||||
desktop-file-utils,
|
||||
fetchFromGitLab,
|
||||
libadwaita,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
stdenv,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chance";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "zelikos";
|
||||
repo = "rollit";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-2lZ7iMHMFE1wTSlJj0mIUV62jO0NundYiOC8rdUJGkQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
cargo
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Dice roller built using GTK4 and libadwaita";
|
||||
homepage = "https://gitlab.com/zelikos/rollit";
|
||||
changelog = "https://gitlab.com/zelikos/rollit/-/releases/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ Guanran928 ];
|
||||
mainProgram = "rollit";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -1,15 +1,13 @@
|
||||
Add the -m option to man's command line to augment the list of paths
|
||||
searched by man. The string "OUT" must be substituted with chawan's $out
|
||||
path after patching.
|
||||
Add the -m option to man's command line to augment the list of paths searched by man.
|
||||
The required -m option is only available in the mandoc implementation.
|
||||
--- a/adapter/protocol/man
|
||||
+++ b/adapter/protocol/man
|
||||
@@ -75,7 +75,7 @@ EOF
|
||||
--- a/adapter/protocol/man.nim
|
||||
+++ b/adapter/protocol/man.nim
|
||||
@@ -264,7 +264,7 @@ proc myOpen(cmd: string): tuple[ofile, efile: File] =
|
||||
|
||||
$section =~ s:([^-\w\200-\377.,])::g;
|
||||
$man =~ s:([^-\w\200-\377.,])::g;
|
||||
- open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |");
|
||||
+ open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN -m OUT/share/man $section $man 2> /dev/null |");
|
||||
}
|
||||
|
||||
$ok = 0;
|
||||
proc doMan(man, keyword, section: string) =
|
||||
let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section)
|
||||
let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " &
|
||||
- man & sectionOpt & ' ' & quoteShellPosix(keyword)
|
||||
+ man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword)
|
||||
let (ofile, efile) = myOpen(cmd)
|
||||
if ofile == nil:
|
||||
|
||||
@ -7,33 +7,37 @@
|
||||
, ncurses
|
||||
, nim
|
||||
, pandoc
|
||||
, perl
|
||||
, pkg-config
|
||||
, zlib
|
||||
, unstableGitUpdater
|
||||
, libseccomp
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "chawan";
|
||||
version = "0-unstable-2024-03-01";
|
||||
version = "0-unstable-2024-07-14";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bptato";
|
||||
repo = "chawan";
|
||||
rev = "87ba9a87be15abbe06837f1519cfb76f4bf759f3";
|
||||
hash = "sha256-Xs+Mxe5/uoxPMf4FuelpO+bRJ1KdfASVI7rWqtboJZw=";
|
||||
rev = "0e3d67f31df2c2d53aa0e578439852731e5f5af9";
|
||||
hash = "sha256-eVoZisQyaebWO58a0a0KR7fwsL1kTmPX1SayqdnmSuk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Include chawan's man pages in mancha's search path
|
||||
./mancha-augment-path.diff
|
||||
(substituteAll {
|
||||
src = ./mancha-augment-path.diff;
|
||||
out = placeholder "out";
|
||||
})
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
|
||||
);
|
||||
|
||||
buildInputs = [ curlMinimal ncurses perl zlib ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
nim
|
||||
@ -41,10 +45,12 @@ stdenv.mkDerivation {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace adapter/protocol/man \
|
||||
--replace-fail "OUT" $out
|
||||
'';
|
||||
buildInputs = [
|
||||
curlMinimal
|
||||
libseccomp
|
||||
ncurses
|
||||
zlib
|
||||
];
|
||||
|
||||
buildFlags = [ "all" "manpage" ];
|
||||
installFlags = [
|
||||
@ -64,6 +70,8 @@ stdenv.mkDerivation {
|
||||
wrapProgram $out/bin/mancha ${makeWrapperArgs}
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Lightweight and featureful terminal web browser";
|
||||
homepage = "https://sr.ht/~bptato/chawan/";
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.50.0";
|
||||
version = "2.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-l1c55vItMIfPbcwVWnpx3mlzT75KRlbd8V8DzQoQB2w=";
|
||||
hash = "sha256-18y1AmCCoxu365bsLwUrPTUqT/Hy6e2WC2xt0o4K8/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5jc7i+vX6aGq//Zl924FIdjAVyqlusZfWRbc8aj3iLw=";
|
||||
vendorHash = "sha256-wWvvNc7W+7/Hwy4/hwCyY0k/Qm5M7Z6PPCa9DXbXY0E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
65
pkgs/by-name/co/collector/package.nix
Normal file
65
pkgs/by-name/co/collector/package.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
appstream-glib,
|
||||
desktop-file-utils,
|
||||
libadwaita,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook4,
|
||||
gtk4,
|
||||
python3,
|
||||
gettext,
|
||||
cmake,
|
||||
gobject-introspection,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "collector";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "collector";
|
||||
rev = "d98a11c65c7de054cb894aeb4b5e963aeb83c0d8";
|
||||
hash = "sha256-un+PvLAHfosX9jWExepWDbDKev7D9TAu+XfOFm7xOyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
ninja
|
||||
gettext
|
||||
cmake
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
gobject-introspection
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
pillow
|
||||
requests
|
||||
pygobject3
|
||||
]
|
||||
))
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
meta = {
|
||||
description = "Drag multiple files and folders on to Collection window, drop them anywhere!";
|
||||
mainProgram = "collector";
|
||||
homepage = "https://github.com/mijorus/collector";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ CaptainJawZ ];
|
||||
};
|
||||
})
|
||||
51
pkgs/by-name/de/dediprog-sf100/package.nix
Normal file
51
pkgs/by-name/de/dediprog-sf100/package.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
let
|
||||
dediprogVersion = "1.14.20.x";
|
||||
dediprogHash = "sha256-hQvBZIwaWEC41vj2flaekIUP9Fwtj/JPi3XwRxfUbD0=";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dediprog-sf100-linux";
|
||||
version = finalAttrs.dediprogVersion;
|
||||
|
||||
inherit dediprogVersion dediprogHash;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DediProgSW";
|
||||
repo = "SF100Linux";
|
||||
rev = "V${finalAttrs.dediprogVersion}";
|
||||
hash = finalAttrs.dediprogHash;
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
udevRules = pkgs.writeText "dediprog.rules" ''
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm0755 ./dpcmd -t $out/bin
|
||||
install -Dm0644 ./ChipInfoDb.dedicfg -t $out/share/DediProg
|
||||
install -Dm0644 ${finalAttrs.udevRules} -D $out/lib/udev/rules.d/60-dediprog.rules
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/DediProgSW/SF100Linux";
|
||||
description = "Linux software for DediProg SF100/SF600 programmers";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ thillux ];
|
||||
};
|
||||
})
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e6f1267..3bf16a5 100644
|
||||
index cccafd9..75d2a85 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1632,7 +1632,8 @@ dependencies = [
|
||||
@@ -1655,7 +1655,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot"
|
||||
version = "0.4.2"
|
||||
@ -12,7 +12,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"base64 0.13.1",
|
||||
"env_logger",
|
||||
@@ -1658,7 +1659,8 @@ dependencies = [
|
||||
@@ -1681,7 +1682,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-audio"
|
||||
version = "0.4.2"
|
||||
@ -22,7 +22,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"aes-ctr",
|
||||
"byteorder",
|
||||
@@ -1673,7 +1675,8 @@ dependencies = [
|
||||
@@ -1696,7 +1698,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-connect"
|
||||
version = "0.4.2"
|
||||
@ -32,7 +32,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"futures-util",
|
||||
@@ -1693,7 +1696,8 @@ dependencies = [
|
||||
@@ -1716,7 +1719,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-core"
|
||||
version = "0.4.2"
|
||||
@ -42,7 +42,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"aes",
|
||||
"base64 0.13.1",
|
||||
@@ -1733,7 +1737,8 @@ dependencies = [
|
||||
@@ -1756,7 +1760,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-discovery"
|
||||
version = "0.4.2"
|
||||
@ -52,7 +52,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"aes-ctr",
|
||||
"base64 0.13.1",
|
||||
@@ -1754,7 +1759,8 @@ dependencies = [
|
||||
@@ -1777,7 +1782,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-metadata"
|
||||
version = "0.4.2"
|
||||
@ -62,7 +62,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"byteorder",
|
||||
@@ -1767,7 +1773,8 @@ dependencies = [
|
||||
@@ -1790,7 +1796,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-playback"
|
||||
version = "0.4.2"
|
||||
@ -72,7 +72,7 @@ index e6f1267..3bf16a5 100644
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"cpal",
|
||||
@@ -1792,7 +1799,8 @@ dependencies = [
|
||||
@@ -1815,7 +1822,8 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "librespot-protocol"
|
||||
version = "0.4.2"
|
||||
@ -83,15 +83,15 @@ index e6f1267..3bf16a5 100644
|
||||
"glob",
|
||||
"protobuf 2.28.0",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 40ca2c1..734a3fb 100644
|
||||
index c7e2fe2..28e895a 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -29,7 +29,7 @@ reqwest = "0.11"
|
||||
@@ -30,7 +30,7 @@ reqwest = "0"
|
||||
colored = "2"
|
||||
lame = "0.1"
|
||||
aspotify = "0.7.1"
|
||||
lame = "0"
|
||||
aspotify = "0"
|
||||
-librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" }
|
||||
+librespot = "0.4.2"
|
||||
async-std = { version = "1.12", features = ["attributes", "tokio1"] }
|
||||
serde_json = "1.0"
|
||||
async-stream = "0.3"
|
||||
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
||||
serde_json = "1"
|
||||
async-stream = "0"
|
||||
|
||||
@ -10,19 +10,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "downonspot";
|
||||
version = "unstable-2024-04-30";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oSumAtrIX";
|
||||
repo = "DownOnSpot";
|
||||
rev = "669dbb18e105129fff4886ba3710596d54a5f33a";
|
||||
hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PA11R/hVAmismayE8uU03P0eeNnrgpD2HxbMW0vlk3k=";
|
||||
};
|
||||
|
||||
# Use official public librespot version
|
||||
cargoPatches = [ ./Cargo.lock.patch ];
|
||||
|
||||
cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ=";
|
||||
cargoHash = "sha256-jdscYr4Emm2+mWXbxfhU1rp855tsGY5hrdJsDEfXeUo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -1,21 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, glm, meshoptimizer, SDL2, ninja}:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, glm, meshoptimizer, SDL2, ninja }:
|
||||
|
||||
let
|
||||
|
||||
major = "2024";
|
||||
minor = "05";
|
||||
patch.seriousproton = "16";
|
||||
patch.emptyepsilon = "16";
|
||||
|
||||
version.seriousproton = "${major}.${minor}.${patch.seriousproton}";
|
||||
version.emptyepsilon = "${major}.${minor}.${patch.emptyepsilon}";
|
||||
version.basis-universal = "v1_15_update2";
|
||||
version = {
|
||||
seriousproton = "2024.06.20";
|
||||
emptyepsilon = "2024.06.20";
|
||||
basis-universal = "v1_15_update2";
|
||||
};
|
||||
|
||||
basis-universal = fetchFromGitHub {
|
||||
owner = "BinomialLLC";
|
||||
repo = "basis_universal";
|
||||
rev = version.basis-universal;
|
||||
sha256 = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
|
||||
hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
|
||||
};
|
||||
|
||||
serious-proton = stdenv.mkDerivation {
|
||||
@ -26,7 +22,7 @@ let
|
||||
owner = "daid";
|
||||
repo = "SeriousProton";
|
||||
rev = "EE-${version.seriousproton}";
|
||||
sha256 = "sha256-0gCwWvx7ceJG3VmVVufRkwreuHn41pl7jHsJXzNwqaE=";
|
||||
hash = "sha256-byLk4ukpj+s74+3K+1wzRTXhe4pKkH0pOSYeVs94muc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -48,7 +44,6 @@ let
|
||||
|
||||
in
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "empty-epsilon";
|
||||
version = version.emptyepsilon;
|
||||
@ -57,7 +52,7 @@ stdenv.mkDerivation {
|
||||
owner = "daid";
|
||||
repo = "EmptyEpsilon";
|
||||
rev = "EE-${version.emptyepsilon}";
|
||||
sha256 = "sha256-pLnyzahGEPb2cEwH89RE5Jq8UHIoDWXatmDWdeZ+rqo=";
|
||||
hash = "sha256-YTZliu1o3LFab43DqmSk/cifxRWZMPxdV4gNoNy8LEk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -66,9 +61,9 @@ stdenv.mkDerivation {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${major}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${minor}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${patch.emptyepsilon}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major version.emptyepsilon}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor version.emptyepsilon}")
|
||||
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch version.emptyepsilon}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}")
|
||||
(lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar")
|
||||
47
pkgs/by-name/ev/everest-mons/package.nix
Normal file
47
pkgs/by-name/ev/everest-mons/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, python3Packages
|
||||
} :
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "everest-mons";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "mons";
|
||||
hash = "sha256-E1yBTwZ4T2C3sXoLGz0kAcvas0q8tO6Aaiz3SHrT4ZE=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
pyproject = true;
|
||||
dependencies = with python3Packages; [
|
||||
dnfile
|
||||
pefile
|
||||
click
|
||||
tqdm
|
||||
xxhash
|
||||
pyyaml
|
||||
urllib3
|
||||
platformdirs
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mons" ];
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mons.coloursofnoise.ca/";
|
||||
description = "A commandline Everest installer and mod manager for Celeste";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
mainProgram = "mons";
|
||||
};
|
||||
}
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "6.3.9";
|
||||
version = "6.3.10";
|
||||
|
||||
nugetHash = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw=";
|
||||
nugetHash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
, yelp-tools
|
||||
, vala
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, gtk4
|
||||
, adwaita-icon-theme
|
||||
, desktop-file-utils
|
||||
, nix-update-script
|
||||
, wrapGAppsHook3
|
||||
, wrapGAppsHook4
|
||||
, gobject-introspection
|
||||
# withWebkit enables the "webkit" feature, also known as Google Fonts
|
||||
, withWebkit ? true, glib-networking, libsoup, webkitgtk
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "font-manager";
|
||||
version = "0.8.9";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FontManager";
|
||||
repo = "font-manager";
|
||||
rev = version;
|
||||
hash = "sha256-LsQry6CjvVcJFRutKOaqA4lLP7Ek09Q/D/TPnSvx59Q=";
|
||||
hash = "sha256-nUFxjqUiL8zLfPJrLM1aQ/SZ2x6CYFKFJI1W/eXlrV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
desktop-file-utils
|
||||
vala
|
||||
yelp-tools
|
||||
wrapGAppsHook3
|
||||
wrapGAppsHook4
|
||||
# For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build
|
||||
gobject-introspection
|
||||
];
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
json-glib
|
||||
sqlite
|
||||
gsettings-desktop-schemas # for font settings
|
||||
gtk3
|
||||
gtk4
|
||||
adwaita-icon-theme
|
||||
] ++ lib.optionals withWebkit [
|
||||
glib-networking # for SSL so that Google Fonts can load
|
||||
@ -67,11 +67,6 @@ stdenv.mkDerivation rec {
|
||||
(lib.mesonBool "webkit" withWebkit)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-keyring";
|
||||
version = "46.1";
|
||||
version = "46.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y=";
|
||||
hash = "sha256-vybJZriot/MoXsyLs+RnucIPlTW5TcRRycVZ3c/2GSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,18 +14,24 @@
|
||||
, autoPatchelfHook
|
||||
, testers
|
||||
, signify
|
||||
, overrideSDK
|
||||
, withSsh ? true, openssh
|
||||
# Default editor to use when neither VISUAL nor EDITOR are defined
|
||||
, defaultEditor ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
stdenv' = if stdenv.isDarwin && stdenv.isx86_64
|
||||
then overrideSDK stdenv "11.0"
|
||||
else stdenv;
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "got";
|
||||
version = "0.100";
|
||||
version = "0.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/DqKIGf/aZ09aL/rB7te+AauHmJ+mOTrVEbkqT9WUBI=";
|
||||
hash = "sha256-JQZBgscxoMv4Dki77s8tYo4r5BBG+ErsDYnY5/am3MA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ]
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.79.2";
|
||||
version = "0.79.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8GO5vMUl6b1qjQ9+FdieLkSvkMQuJBwrfhJJies/37U=";
|
||||
hash = "sha256-EAolb8r4n0r9SC7eh4wogHIM3iYgf9lKRFHryD4hhGc=";
|
||||
# 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;
|
||||
@ -30,7 +30,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-nws+/haDtyVC80f3S0wM7zI8ZB7c7KalqV96mp2D4C8=";
|
||||
vendorHash = "sha256-/SbEc2YEXwBqR8PPnPj8Q3lDGMp/Kpib8E4lUzFGGV8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,28 +1,45 @@
|
||||
diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha
|
||||
index 26d78ab1..6861bfe8 100644
|
||||
index af49080e..3dde7963 100644
|
||||
--- a/time/chrono/+freebsd.ha
|
||||
+++ b/time/chrono/+freebsd.ha
|
||||
@@ -2,7 +2,7 @@
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
||||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_PATH: str = "/var/db/ntpd.leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha
|
||||
index 600f606c..8d5617e2 100644
|
||||
index 2756fd6f..1ea22385 100644
|
||||
--- a/time/chrono/+linux.ha
|
||||
+++ b/time/chrono/+linux.ha
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
||||
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_FILE: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_FILE: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
diff --git a/time/chrono/+openbsd.ha b/time/chrono/+openbsd.ha
|
||||
index 2756fd6f..1ea22385 100644
|
||||
--- a/time/chrono/+openbsd.ha
|
||||
+++ b/time/chrono/+openbsd.ha
|
||||
@@ -2,8 +2,8 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
def LOCALTIME_PATH: str = "/etc/localtime";
|
||||
-def TZDB_PATH: str = "/usr/share/zoneinfo/";
|
||||
+def TZDB_PATH: str = "@tzdata@/share/zoneinfo/";
|
||||
|
||||
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
||||
// leap second data.
|
||||
-export def UTC_LEAPSECS_PATH: str = "/usr/share/zoneinfo/leap-seconds.list";
|
||||
+export def UTC_LEAPSECS_PATH: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha
|
||||
index b2ac6518..417b46c6 100644
|
||||
index ce19af9e..8631b325 100644
|
||||
--- a/cmd/hare/build.ha
|
||||
+++ b/cmd/hare/build.ha
|
||||
@@ -37,7 +37,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
@@ -36,7 +36,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
case let ncpu: size =>
|
||||
yield ncpu;
|
||||
},
|
||||
- version = build::get_version(os::tryenv("HAREC", "harec"))?,
|
||||
+ version = build::get_version(os::tryenv("HAREC", "@harec@"))?,
|
||||
arch = arch.qbe_name,
|
||||
+ version = build::get_version(os::tryenv("HAREC", "@harec_bin@"))?,
|
||||
arch = arch,
|
||||
platform = build::get_platform(os::sysname())?,
|
||||
...
|
||||
@@ -145,8 +145,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
@@ -143,8 +143,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
|
||||
set_arch_tags(&ctx.ctx.tags, arch);
|
||||
|
||||
ctx.cmds = ["",
|
||||
- os::tryenv("HAREC", "harec"),
|
||||
- os::tryenv("QBE", "qbe"),
|
||||
+ os::tryenv("HAREC", "@harec@"),
|
||||
+ os::tryenv("QBE", "@qbe@"),
|
||||
+ os::tryenv("HAREC", "@harec_bin@"),
|
||||
+ os::tryenv("QBE", "@qbe_bin@"),
|
||||
os::tryenv("AS", arch.as_cmd),
|
||||
os::tryenv("LD", arch.ld_cmd),
|
||||
];
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/mime/system.ha b/mime/system.ha
|
||||
index 73ff3496..42e7b640 100644
|
||||
--- a/mime/system.ha
|
||||
+++ b/mime/system.ha
|
||||
@@ -11,7 +11,7 @@ use strings;
|
||||
use types;
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
|
||||
@init fn init() void = {
|
||||
// Done in a separate function so we can discard errors here
|
||||
30
pkgs/by-name/ha/hare/004-use-mailcap-for-mimetypes.patch
Normal file
30
pkgs/by-name/ha/hare/004-use-mailcap-for-mimetypes.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/mime/+freebsd.ha b/mime/+freebsd.ha
|
||||
index e536d9bd..022f18c4 100644
|
||||
--- a/mime/+freebsd.ha
|
||||
+++ b/mime/+freebsd.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
diff --git a/mime/+linux.ha b/mime/+linux.ha
|
||||
index e536d9bd..022f18c4 100644
|
||||
--- a/mime/+linux.ha
|
||||
+++ b/mime/+linux.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/etc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
diff --git a/mime/+openbsd.ha b/mime/+openbsd.ha
|
||||
index 611b2dce..022f18c4 100644
|
||||
--- a/mime/+openbsd.ha
|
||||
+++ b/mime/+openbsd.ha
|
||||
@@ -2,4 +2,4 @@
|
||||
// (c) Hare authors <https://harelang.org>
|
||||
|
||||
// Path to the system MIME database.
|
||||
-export def SYSTEM_DB: str = "/usr/share/misc/mime.types";
|
||||
+export def SYSTEM_DB: str = "@mailcap@/etc/mime.types";
|
||||
@ -8,7 +8,6 @@
|
||||
tzdata,
|
||||
mailcap,
|
||||
substituteAll,
|
||||
fetchpatch,
|
||||
callPackage,
|
||||
enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit),
|
||||
pkgsCross,
|
||||
@ -78,7 +77,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hare";
|
||||
version = "0.24.0";
|
||||
version = "0.24.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8=";
|
||||
hash = "sha256-61lckI0F+Ez5LR/8g6ftS0W7Q/+EU/1flTDFleBg6pc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -98,28 +97,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = ./001-tzdata.patch;
|
||||
inherit tzdata;
|
||||
})
|
||||
# Use correct comment syntax for debug+riscv64.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a6e90d999846b86471cac00d2a6d5.patch";
|
||||
hash = "sha256-S7nXpiO0tYnKpmpj+fLkolGeHb1TrmgKlMF0+j0qLPQ=";
|
||||
})
|
||||
# Don't build haredoc since it uses the build `hare` bin, which breaks
|
||||
# cross-compilation.
|
||||
./002-dont-build-haredoc.patch
|
||||
# Hardcode harec and qbe.
|
||||
(substituteAll {
|
||||
src = ./003-hardcode-qbe-and-harec.patch;
|
||||
harec = lib.getExe harec;
|
||||
qbe = lib.getExe qbe;
|
||||
})
|
||||
# Display toolchains when using `hare version -v`.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare/commit/e35f2284774436f422e06f0e8d290b173ced1677.patch";
|
||||
hash = "sha256-A59bGO/9tOghV8/MomTxd8xRExkHVdoMom2d+HTfQGg=";
|
||||
harec_bin = lib.getExe harec;
|
||||
qbe_bin = lib.getExe qbe;
|
||||
})
|
||||
# Use mailcap `/etc/mime.types` for Hare's mime module
|
||||
(substituteAll {
|
||||
src = ./003-use-mailcap-for-mimetypes.patch;
|
||||
src = ./004-use-mailcap-for-mimetypes.patch;
|
||||
inherit mailcap;
|
||||
})
|
||||
];
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "harec";
|
||||
version = "0.24.0";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "harec";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs=";
|
||||
hash = "sha256-YCUBdPYr/44stW9k54QoUEhNkti6ULJkVBphx7xhmKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qbe ];
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2024-07-05";
|
||||
version = "0-unstable-2024-07-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "c514e862cd5705e51edb6fe8d01146fdeec661f2";
|
||||
hash = "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=";
|
||||
rev = "90ae324e2c56af10f20549ab72014804a3064c7f";
|
||||
hash = "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user