mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-19 20:09:01 +02:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
31a14cb69e
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -38,7 +38,7 @@ Reviewing helps to reduce the average time-to-merge for everyone.
|
|||
Thanks a lot if you do!
|
||||
|
||||
List of open PRs: https://github.com/NixOS/nixpkgs/pulls
|
||||
Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
|
||||
Reviewing guidelines: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#reviewing-contributions
|
||||
-->
|
||||
|
||||
---
|
||||
|
|
|
|||
11
README.md
11
README.md
|
|
@ -1,9 +1,10 @@
|
|||
<p align="center">
|
||||
<a href="https://nixos.org#gh-light-mode-only">
|
||||
<img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"/>
|
||||
</a>
|
||||
<a href="https://nixos.org#gh-dark-mode-only">
|
||||
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" width="500px" alt="NixOS logo"/>
|
||||
<a href="https://nixos.org">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
|
||||
<img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo">
|
||||
</picture>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
|
|
|
|||
|
|
@ -243,10 +243,14 @@ rec {
|
|||
vncSupport = false;
|
||||
gtkSupport = false;
|
||||
sdlSupport = false;
|
||||
alsaSupport = false;
|
||||
pulseSupport = false;
|
||||
pipewireSupport = false;
|
||||
jackSupport = false;
|
||||
smbdSupport = false;
|
||||
seccompSupport = false;
|
||||
tpmSupport = false;
|
||||
capstoneSupport = false;
|
||||
enableDocs = false;
|
||||
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9524,6 +9524,12 @@
|
|||
githubId = 1843676;
|
||||
name = "Jonathan Reeve";
|
||||
};
|
||||
jonboh = {
|
||||
email = "jon.bosque.hernando@gmail.com";
|
||||
github = "jonboh";
|
||||
githubId = 31407988;
|
||||
name = "Jon Bosque";
|
||||
};
|
||||
jonnybolton = {
|
||||
email = "jonnybolton@gmail.com";
|
||||
github = "jonnynightingale";
|
||||
|
|
@ -18538,6 +18544,12 @@
|
|||
githubId = 6362238;
|
||||
name = "Christoph Honal";
|
||||
};
|
||||
starsep = {
|
||||
email = "nix@starsep.com";
|
||||
github = "starsep";
|
||||
githubId = 2798728;
|
||||
name = "Filip Czaplicki";
|
||||
};
|
||||
star-szr = {
|
||||
email = "nixpkgs@szr.fastmail.com";
|
||||
github = "star-szr";
|
||||
|
|
@ -21293,6 +21305,12 @@
|
|||
githubId = 3028542;
|
||||
name = "Guillermo NWDD";
|
||||
};
|
||||
xokdvium = {
|
||||
email = "xokdvium@proton.me";
|
||||
github = "xokdvium";
|
||||
githubId = 145775305;
|
||||
name = "Sergei Zimmerman";
|
||||
};
|
||||
xrelkd = {
|
||||
github = "xrelkd";
|
||||
githubId = 46590321;
|
||||
|
|
|
|||
|
|
@ -109,6 +109,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).
|
||||
|
||||
- [fritz-exporter](https://github.com/pdreker/fritz_exporter), a Prometheus exporter for extracting metrics from [FRITZ!](https://avm.de/produkte/) devices. Available as [services.prometheus.exporters.fritz](#opt-services.prometheus.exporters.fritz.enable).
|
||||
|
||||
- [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad.<server>.enable`.
|
||||
|
||||
- [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ rec {
|
|||
let
|
||||
s = if builtins.isPath arg then "${arg}"
|
||||
else if builtins.isString arg then arg
|
||||
else if builtins.isInt arg || builtins.isFloat arg then toString arg
|
||||
else throw "escapeSystemdExecArg only allows strings, paths and numbers";
|
||||
else if builtins.isInt arg || builtins.isFloat arg || lib.isDerivation arg then toString arg
|
||||
else throw "escapeSystemdExecArg only allows strings, paths, numbers and derivations";
|
||||
in
|
||||
replaceStrings [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);
|
||||
|
||||
|
|
|
|||
|
|
@ -683,7 +683,7 @@ let
|
|||
(let dp9ik = config.security.pam.dp9ik; in { name = "p9"; enable = dp9ik.enable; control = dp9ik.control; modulePath = "${pkgs.pam_dp9ik}/lib/security/pam_p9.so"; args = [
|
||||
dp9ik.authserver
|
||||
]; })
|
||||
{ name = "fprintd"; enable = cfg.fprintAuth; control = "sufficient"; modulePath = "${pkgs.fprintd}/lib/security/pam_fprintd.so"; }
|
||||
{ name = "fprintd"; enable = cfg.fprintAuth; control = "sufficient"; modulePath = "${config.services.fprintd.package}/lib/security/pam_fprintd.so"; }
|
||||
] ++
|
||||
# Modules in this block require having the password set in PAM_AUTHTOK.
|
||||
# pam_unix is marked as 'sufficient' on NixOS which means nothing will run
|
||||
|
|
|
|||
|
|
@ -37,22 +37,13 @@ in
|
|||
enable = mkEnableOption (mdDoc "Wyoming faster-whisper server");
|
||||
|
||||
model = mkOption {
|
||||
# Intersection between available and referenced models here:
|
||||
# https://github.com/rhasspy/models/releases/tag/v1.0
|
||||
# https://github.com/rhasspy/rhasspy3/blob/wyoming-v1/programs/asr/faster-whisper/server/wyoming_faster_whisper/download.py#L17-L27
|
||||
type = enum [
|
||||
"tiny"
|
||||
"tiny-int8"
|
||||
"base"
|
||||
"base-int8"
|
||||
"small"
|
||||
"small-int8"
|
||||
"medium-int8"
|
||||
];
|
||||
type = str;
|
||||
default = "tiny-int8";
|
||||
example = "medium-int8";
|
||||
example = "Systran/faster-distil-whisper-small.en";
|
||||
description = mdDoc ''
|
||||
Name of the voice model to use.
|
||||
|
||||
Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ in
|
|||
systemd.services."autovt@${tty}".enable = false;
|
||||
|
||||
systemd.services.greetd = {
|
||||
aliases = [ "display-manager.service" ];
|
||||
|
||||
unitConfig = {
|
||||
Wants = [
|
||||
"systemd-user-sessions.service"
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ let
|
|||
"dovecot"
|
||||
"fastly"
|
||||
"flow"
|
||||
"fritz"
|
||||
"fritzbox"
|
||||
"graphite"
|
||||
"idrac"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,97 @@
|
|||
{ config, lib, pkgs, utils, ... }:
|
||||
let
|
||||
inherit (lib) mkOption types mdDoc;
|
||||
cfg = config.services.prometheus.exporters.fritz;
|
||||
yaml = pkgs.formats.yaml { };
|
||||
configFile = yaml.generate "fritz-exporter.yaml" cfg.settings;
|
||||
in
|
||||
{
|
||||
port = 9787;
|
||||
|
||||
extraOpts = {
|
||||
settings = mkOption {
|
||||
description = mdDoc "Configuration settings for fritz-exporter.";
|
||||
type = types.submodule {
|
||||
freeformType = yaml.type;
|
||||
|
||||
options = {
|
||||
# Pull existing port option into config file.
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = cfg.port;
|
||||
internal = true;
|
||||
visible = false;
|
||||
};
|
||||
# Pull existing listen address option into config file.
|
||||
listen_address = mkOption {
|
||||
type = types.str;
|
||||
default = cfg.listenAddress;
|
||||
internal = true;
|
||||
visible = false;
|
||||
};
|
||||
log_level = mkOption {
|
||||
type = types.enum [ "DEBUG" "INFO" "WARNING" "ERROR" "CRITICAL" ];
|
||||
default = "INFO";
|
||||
description = mdDoc ''
|
||||
Log level to use for the exporter.
|
||||
'';
|
||||
};
|
||||
devices = mkOption {
|
||||
default = [];
|
||||
description = "Fritz!-devices to monitor using the exporter.";
|
||||
type = with types; listOf (submodule {
|
||||
freeformType = yaml.type;
|
||||
|
||||
options = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = mdDoc ''
|
||||
Name to use for the device.
|
||||
'';
|
||||
};
|
||||
hostname = mkOption {
|
||||
type = types.str;
|
||||
default = "fritz.box";
|
||||
description = mdDoc ''
|
||||
Hostname under which the target device is reachable.
|
||||
'';
|
||||
};
|
||||
username = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
Username to authenticate with the target device.
|
||||
'';
|
||||
};
|
||||
password_file = mkOption {
|
||||
type = types.path;
|
||||
description = mdDoc ''
|
||||
Path to a file which contains the password to authenticate with the target device.
|
||||
Needs to be readable by the user the exporter runs under.
|
||||
'';
|
||||
};
|
||||
host_info = mkOption {
|
||||
type = types.bool;
|
||||
description = mdDoc ''
|
||||
Enable extended host info for this device. *Warning*: This will heavily increase scrape time.
|
||||
'';
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = utils.escapeSystemdExecArgs ([
|
||||
(lib.getExe pkgs.fritz-exporter)
|
||||
"--config" configFile
|
||||
] ++ cfg.extraFlags);
|
||||
DynamicUser = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -9,17 +9,23 @@ in
|
|||
peers = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of peers to connect to in the format quic://1.2.3.4:9651.
|
||||
If addHostedPublicNodes is set to true, the hosted public nodes will be added to this list.
|
||||
List of peers to connect to, in the formats:
|
||||
- `quic://[2001:0db8::1]:9651`
|
||||
- `quic://192.0.2.1:9651`
|
||||
- `tcp://[2001:0db8::1]:9651`
|
||||
- `tcp://192.0.2.1:9651`
|
||||
|
||||
If addHostedPublicNodes is set to true, the hosted public nodes will also be added.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
keyFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
optional path to a keyFile, if unset the default location (/var/lib/mycelium/key) will be used
|
||||
If this key does not exist, it will be generated
|
||||
Optional path to a file containing the mycelium key material.
|
||||
If unset, the default location (`/var/lib/mycelium/key.bin`) will be used.
|
||||
If no key exist at this location, it will be generated on startup.
|
||||
'';
|
||||
};
|
||||
openFirewall = lib.mkOption {
|
||||
|
|
@ -37,7 +43,7 @@ in
|
|||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
add the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes
|
||||
Adds the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -79,9 +85,10 @@ in
|
|||
"--key-file \${CREDENTIALS_DIRECTORY}/keyfile" else
|
||||
"--key-file %S/mycelium/key.bin"
|
||||
)
|
||||
"--tun-name" "mycelium"
|
||||
"--tun-name"
|
||||
"mycelium"
|
||||
] ++
|
||||
(lib.optional (cfg.addHostedPublicNodes || cfg.peers != []) "--peers")
|
||||
(lib.optional (cfg.addHostedPublicNodes || cfg.peers != [ ]) "--peers")
|
||||
++ cfg.peers ++ (lib.optionals cfg.addHostedPublicNodes [
|
||||
"tcp://188.40.132.242:9651" # DE 01
|
||||
"tcp://[2a01:4f8:221:1e0b::2]:9651"
|
||||
|
|
|
|||
|
|
@ -101,6 +101,9 @@ Not all the configuration options are available directly in this module, but you
|
|||
port = 4567;
|
||||
autoDownloadNewChapters = false;
|
||||
maxSourcesInParallel" = 6;
|
||||
extensionRepos = [
|
||||
"https://raw.githubusercontent.com/MY_ACCOUNT/MY_REPO/repo/index.min.json"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -102,6 +102,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
extensionRepos = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = [
|
||||
"https://raw.githubusercontent.com/MY_ACCOUNT/MY_REPO/repo/index.min.json"
|
||||
];
|
||||
description = mdDoc ''
|
||||
URL of repositories from which the extensions can be installed.
|
||||
'';
|
||||
};
|
||||
|
||||
localSourcePath = mkOption {
|
||||
type = types.path;
|
||||
default = cfg.dataDir;
|
||||
|
|
|
|||
|
|
@ -290,8 +290,8 @@ in {
|
|||
activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
|
||||
activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
|
||||
activation-perlless = runTest ./activation/perlless.nix;
|
||||
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
|
||||
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
|
||||
etcd = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix {};
|
||||
etcd-cluster = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix {};
|
||||
etebase-server = handleTest ./etebase-server.nix {};
|
||||
etesync-dav = handleTest ./etesync-dav.nix {};
|
||||
evcc = handleTest ./evcc.nix {};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# This test runs simple etcd cluster
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, ... } : let
|
||||
import ../make-test-python.nix ({ pkgs, ... } : let
|
||||
|
||||
runWithOpenSSL = file: cmd: pkgs.runCommand file {
|
||||
buildInputs = [ pkgs.openssl ];
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# This test runs simple etcd node
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, ... } : {
|
||||
import ../make-test-python.nix ({ pkgs, ... } : {
|
||||
name = "etcd";
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
20
nixos/tests/redlib.nix
Normal file
20
nixos/tests/redlib.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "redlib";
|
||||
meta.maintainers = with lib.maintainers; [ soispha ];
|
||||
|
||||
nodes.machine = {
|
||||
services.libreddit = {
|
||||
package = pkgs.redlib;
|
||||
enable = true;
|
||||
# Test CAP_NET_BIND_SERVICE
|
||||
port = 80;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("libreddit.service")
|
||||
machine.wait_for_open_port(80)
|
||||
# Query a page that does not require Internet access
|
||||
machine.succeed("curl --fail http://localhost:80/settings")
|
||||
'';
|
||||
})
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "castopod";
|
||||
version = "1.6.4";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz";
|
||||
sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v";
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/66de724407be8f940af5eb1d633fbbc3/castopod-1.10.5.tar.gz";
|
||||
sha256 = "0ssdgqxqldg2f6ni54k5vlndnjjy9lah47q1crpz5nnkkjgvc96y";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "7.1.4";
|
||||
version = "7.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UNS7kHyxHB4VneELXGn2G8T8EeKUpjb1ib2q0G+gf/s=";
|
||||
hash = "sha256-QoH1dOzBtQHQQKA0+eZFX6yOvjRUmUZVxcdpISIpLLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,20 @@
|
|||
{ lib, fetchurl, alsa-lib, fluidsynth, libjack2, autoconf, pkg-config
|
||||
, mkDerivation, qtbase, qttools, qtx11extras
|
||||
{ lib, stdenv, fetchurl, alsa-lib, fluidsynth, libjack2, cmake, pkg-config
|
||||
, qtbase, qttools, qtx11extras, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qsynth";
|
||||
version = "0.9.4";
|
||||
version = "0.9.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-dlgIkMde7uv4UlMKEPhtZ7MfSTBc7RvHs+Q2yk+G/JM=";
|
||||
hash = "sha256-SvgZrdS6BwWhNgbovcfhpQKVcu0iwr4dDqeIckuo1fk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ alsa-lib fluidsynth libjack2 qtbase qttools qtx11extras ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# Missing install depends:
|
||||
# lrelease error: Parse error at src/translations/qsynth_ru.ts:1503:33: Premature end of document.
|
||||
# make: *** [Makefile:107: src/translations/qsynth_ru.qm] Error 1
|
||||
enableParallelInstalling = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fluidsynth GUI";
|
||||
mainProgram = "qsynth";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seq66";
|
||||
version = "0.90.5";
|
||||
version = "0.99.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahlstromcj";
|
||||
repo = pname;
|
||||
repo = "seq66";
|
||||
rev = version;
|
||||
sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9";
|
||||
hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ];
|
||||
|
|
@ -18,13 +18,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ alsa-lib libjack2 liblo qtbase ];
|
||||
|
||||
postPatch = ''
|
||||
for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do
|
||||
substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}'
|
||||
for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do
|
||||
substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}'
|
||||
done
|
||||
|
||||
# gcc-13 headers compatibilty. TODO: try to remove with next version
|
||||
# update
|
||||
sed -e '1i #include <cstdint>' -i libseq66/src/os/daemonize.cpp
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ stdenv.mkDerivation {
|
|||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "2.0.0.1468";
|
||||
version = "2.0.0.1473";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "fd89d67b1b9a17a6dd212be0c91d0417b440f60a";
|
||||
hash = "sha256-wYVRlv+Y1jvdAGlj2zXKUhQBwWX9pGgNX6U71PsfySg=";
|
||||
rev = "66c9b6a21834019a0230c39fcee74b6bf2891f7d";
|
||||
hash = "sha256-MCH7vltF3jLGfxcRspXg9eQMx+e+lHSoxIanf91NrE0=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, curl
|
||||
, fetchFromBitbucket
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, ghc_filesystem
|
||||
, glew
|
||||
, glfw
|
||||
|
|
@ -19,8 +18,6 @@
|
|||
, libjack2
|
||||
, libpulseaudio
|
||||
, libsamplerate
|
||||
, libXext
|
||||
, libXi
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
|
|
@ -114,8 +111,8 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VCV-Rack";
|
||||
version = "2.4.0";
|
||||
pname = "vcv-rack";
|
||||
version = "2.4.1";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
@ -135,7 +132,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "VCVRack";
|
||||
repo = "Rack";
|
||||
rev = "v${version}";
|
||||
sha256 = "0azrqyx5as4jmk9dxb7cj7x9dha81i0mm9pkvdv944qyccqwg55i";
|
||||
hash = "sha256-Gn/sFltLXX2mLv4dDqmr/UPd+JBXVkIZGwMI6Rm0Ih4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -169,6 +166,10 @@ stdenv.mkDerivation rec {
|
|||
cp -r ${fundamental-source} plugins/Fundamental/
|
||||
chmod -R +rw plugins/Fundamental # will be used as build dir
|
||||
substituteInPlace plugin.mk --replace ":= all" ":= dist"
|
||||
substituteInPlace plugins/Fundamental/src/Logic.cpp \
|
||||
--replace \
|
||||
"LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>" \
|
||||
"struct rack::componentlibrary::LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>"
|
||||
|
||||
# Fix reference to zenity
|
||||
substituteInPlace dep/osdialog/osdialog_zenity.c \
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-ru6/PDgsQOpOjKSolk3US6dV/NMH/lWEuJf5lmuR4SI=";
|
||||
hash = "sha256-p3dbyszUeknAXrI1WqN9WS6AkEYQdVfMP90Kk/L41vM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-BrlF8uwnD1hlrrpvc2JEsaPY4/+bGR1cXwjkkYANyiE=";
|
||||
vendorHash = "sha256-24zj480UU9SYqr2mV6rCJ46gwLgzilLuhqrkNKHVR28=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -21,45 +21,47 @@
|
|||
|
||||
let
|
||||
pname = "sparrow";
|
||||
version = "1.8.1";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
|
||||
sha256 = "sha256-dpYGMclYMjxjUbIcSZ7V54I1LTVfHxAKH9+7CaprD4U=";
|
||||
sha256 = "0w6z84w9spwfpqrf5m9bcq30xqp94c27jw3qzxfdyisp8n22xvd8";
|
||||
};
|
||||
|
||||
launcher = writeScript "sparrow" ''
|
||||
#! ${bash}/bin/bash
|
||||
params=(
|
||||
--module-path @out@/lib:@jdkModules@/modules
|
||||
--add-opens javafx.graphics/com.sun.javafx.css=org.controlsfx.controls
|
||||
--add-opens javafx.graphics/javafx.scene=org.controlsfx.controls
|
||||
--add-opens javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls
|
||||
--add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls
|
||||
--add-opens javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls
|
||||
--add-opens javafx.base/com.sun.javafx.event=org.controlsfx.controls
|
||||
--add-opens javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow
|
||||
--add-opens org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow
|
||||
--add-opens org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml
|
||||
--add-opens javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx
|
||||
--add-opens javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx
|
||||
--add-opens javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx
|
||||
--add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx
|
||||
--add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx
|
||||
--add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow
|
||||
--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls
|
||||
--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls
|
||||
--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls
|
||||
--add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls
|
||||
--add-opens=javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls
|
||||
--add-opens=javafx.base/com.sun.javafx.event=org.controlsfx.controls
|
||||
--add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow
|
||||
--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow
|
||||
--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml
|
||||
--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx
|
||||
--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx
|
||||
--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx
|
||||
--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx
|
||||
--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx
|
||||
--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow
|
||||
--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow
|
||||
--add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow
|
||||
--add-opens java.base/java.net=com.sparrowwallet.sparrow
|
||||
--add-opens java.base/java.io=com.google.gson
|
||||
--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow
|
||||
--add-opens=java.base/java.net=com.sparrowwallet.sparrow
|
||||
--add-opens=java.base/java.io=com.google.gson
|
||||
--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow
|
||||
--add-reads com.sparrowwallet.merged.module=java.desktop
|
||||
--add-reads com.sparrowwallet.merged.module=java.sql
|
||||
--add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow
|
||||
--add-reads com.sparrowwallet.merged.module=logback.classic
|
||||
--add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.databind
|
||||
--add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation
|
||||
--add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.core
|
||||
--add-reads com.sparrowwallet.merged.module=co.nstant.in.cbor
|
||||
--add-reads=com.sparrowwallet.merged.module=java.desktop
|
||||
--add-reads=com.sparrowwallet.merged.module=java.sql
|
||||
--add-reads=com.sparrowwallet.merged.module=com.sparrowwallet.sparrow
|
||||
--add-reads=com.sparrowwallet.merged.module=ch.qos.logback.classic
|
||||
--add-reads=com.sparrowwallet.merged.module=org.slf4j
|
||||
--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind
|
||||
--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation
|
||||
--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core
|
||||
--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor
|
||||
--add-reads=kotlin.stdlib=kotlinx.coroutines.core
|
||||
-m com.sparrowwallet.sparrow
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "24.2.4";
|
||||
version = "24.3.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
|
|
@ -19,8 +19,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA==";
|
||||
x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA==";
|
||||
aarch64-linux = "sha512-oj/UrUFTH0QZD2eTHdR/Lu6Tz6AIhbIBgPJD3jH1YJKgOZIzX21H0KSddMgu+iKPw2WmoKf0UP+qqf+yFs/mVQ==";
|
||||
x86_64-linux = "sha512-RakNuSDKR0neO0IZwTVaARX9tWNDfJwOBFL3teUsNlcrur862I1c6NaaA/RxriujolDRI+wgG0twaUGEXXar5g==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -955,6 +955,10 @@
|
|||
dependencies = with self; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
neotest-gtest = super.neotest-gtest.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim nui-nvim ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dmenu";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";
|
||||
sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=";
|
||||
sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama zlib libXft ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.26.8";
|
||||
version = "1.26.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
sha256 = "sha256-tfNmKgWKr2TGQNgvC/qo2+Dvij4LUL0Zy77mfTcci2k=";
|
||||
sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ=";
|
||||
hash = "sha256-FGSMXiVygkA3thHtWaA6s5Kz96PYZgMzQQwIjOr6a0c=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waycorner";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndreasBackx";
|
||||
repo = "waycorner";
|
||||
rev = version;
|
||||
hash = "sha256-b0wGqtCvWzCV9mj2eZ0SXzxM02fbyQ+OfKcbZ2MhLOE=";
|
||||
hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y=";
|
||||
};
|
||||
cargoHash = "sha256-Xl2nBBcfWjULKG2L+qX4ruw7gux6+qfFg/dTAarqgAU=";
|
||||
cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU=";
|
||||
buildInputs = [
|
||||
wayland
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,35 @@
|
|||
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config
|
||||
, libtool, openssl, qtbase, qttools, sphinx }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openssl
|
||||
, qtbase
|
||||
, qttools
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xca";
|
||||
version = "2.4.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chris2511";
|
||||
repo = "xca";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
|
||||
owner = "chris2511";
|
||||
repo = "xca";
|
||||
rev = "RELEASE.${finalAttrs.version}";
|
||||
hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220=";
|
||||
};
|
||||
|
||||
# Adaptions to stay OpenSSL 3.0 compatible
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch";
|
||||
hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8=";
|
||||
}) ];
|
||||
buildInputs = [ openssl qtbase ];
|
||||
|
||||
buildInputs = [ libtool openssl qtbase ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
sphinx
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
# Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
|
@ -28,12 +37,11 @@ mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";
|
||||
mainProgram = "xca";
|
||||
homepage = "https://hohnstaedt.de/xca/";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://hohnstaedt.de/xca/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ offline peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
inherit (qtbase.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "124.0b9";
|
||||
version = "125.0b3";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "1da2f0384719334bdef36293fe175850874dad3ee2e4edc97d7328e7967d19ebc7b241148d34d5e6108663dfb8282c3ed5bfbea734b797ce94c0c215d2e23051";
|
||||
sha512 = "7743cda6eed1274591243718dab2d85c0c84ebcaa97283eaded5293243c1c4a40712d3a4b66da4cd18e0eeb50296f3fc9b91a61a4a744b20dd70bd3b3291973d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -62,13 +62,13 @@
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "124.0b9";
|
||||
version = "125.0b3";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "74460dcb68b895203752266f83243ca90328f5bad4745e9b435cfa403f0f7e5e8a367cad6c31dd970a51b008b0b88188790f64a943c1e6eecd9c6799d992c3d0";
|
||||
sha512 = "9c452aa0358f227ec988058dc27cd4e3345dc2febea295fe1f061fa4a8d1d118c180e554836c647f4c82ab7a26a9ec9eeb8a73543ba1e23a511842b900ce56e5";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ let
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.12";
|
||||
version = "13.0.13";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -102,7 +102,7 @@ let
|
|||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-qqz3tdic2muBQI6JXc0/uxBeenWFYHN43K7qJee9q78=";
|
||||
hash = "sha256-CAJJs14U9zsl5PiyZIwXYZG4dZz+Cqn7sD9u3S+/WvA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "107.0.5045.36";
|
||||
version = "108.0.5067.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-NSJmPwDZbmZUv7HoTiZJbvJTAS6HENFWX+JjKVC0oPc=";
|
||||
hash = "sha256-lPazFtTWb/AbK/5H5MQK+dn0imJqUHiL6/KRq1CNxfo=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.12";
|
||||
version = "13.0.13";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-2AzcDYngLr+J+s12tAMdB9SjDzOWPnQY9WL7/3+N0FA=";
|
||||
hash = "sha256-l7Ka8vjVX67ZPPzRnQixtki5/cYhP6P/J91CyGPnwfI=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-ect++2xZe00Hlikz6eMNMiiHnVoETSvjD0Cf1oBgj9E=";
|
||||
hash = "sha256-Ro9F3SZiagtj3AnDOtHmyy1G/KOi/O9M3f775qrZig4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.6.3271.48";
|
||||
version = "6.6.3271.53";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
|
|
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-NeYyPgIioURSDomwZq7Cc08+A/XnQEk6yEiag7YxQO0=";
|
||||
x86_64-linux = "sha256-/zBvH0IQZJr8PKWkIznPRxNLMxQoxVOnDrAw+0BWOEM=";
|
||||
aarch64-linux = "sha256-iB8BPA7A2S9fsg5n6QDt6iKFnS1lQ6Xp2yO9VBGndq8=";
|
||||
x86_64-linux = "sha256-2HS8SxaKu0NF++J8PhGJWEbA9FU1a+g/t9+HIKjvt58=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helm-docs";
|
||||
version = "1.11.2";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norwoodj";
|
||||
repo = "helm-docs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w4QV96/02Pbs/l0lTLPYY8Ag21ZDDVPdgvuveiKUCoM=";
|
||||
hash = "sha256-lSGgT+aWp4NgiIoCnR4TNdecEqIZVnKMmGtEingq05o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6byD8FdeqdRDNUZFZ7FUUdyTuFOO8s3rb6YPGKdwLB8=";
|
||||
vendorHash = "sha256-LpARmDupT+vUPqUwFnvOGKOaBQbTuTvQnWc5Q2bGBaY=";
|
||||
|
||||
subPackages = [ "cmd/helm-docs" ];
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "0.13.0";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jFzxAzLv3EfqWgbXsN8d0OPY8pDy7OBjJIzr+x5yFF0=";
|
||||
sha256 = "sha256-0SCuQzRwluowF48lzyLxY+0rvTOyDbpkMI7Iwb6GHJo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k8sgpt";
|
||||
version = "0.3.28";
|
||||
version = "0.3.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VDVCkGTLoAZZyTX+zn43KisnUV9XQ9xo9ZIQf3AwDcY=";
|
||||
hash = "sha256-SYMgImnNqkP0A8EzR2btpVPb37G4Oxyb+Am//lXxTxU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NOXySV9sQl4Q1eDbcGMk0msMSosjyxYyJfhu7hd/4gw=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.32.3";
|
||||
version = "0.32.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rw+MoMI/VmFvCE94atfP+djg+N75qwRfxjRlyCvLxR8=";
|
||||
hash = "sha256-0MAnN1ekzHLs25EspDN3xacmDvwXGwKO/5RsCMMwTI8=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ=";
|
||||
vendorHash = "sha256-Eaz56iU862KDAlVPuMo8qPuWSFCxEFcJ3Qubl9TUiyI=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NeLMHecfDyMhXmq1HO3qRIWeYpkoj9Od5wWStZEkHYU=";
|
||||
hash = "sha256-hul348zF81oXTcvcfRpNYiiqfocS3HPwcPdXp7Ij91Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EIvwzgpC9Ls43RJEhxNYDlF4luKthFgJleaXcYzOYow=";
|
||||
vendorHash = "sha256-CKOZxmUVZWFb7cc+amPwyMv5ScujWeipEqm95m63SYk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.22.6";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L5TOFhAMfbKjNK/Q74V2lcZs5vyynvMZMhHFB1ay5F8=";
|
||||
hash = "sha256-4e8z4k7loL9vVYe5jut1X/5qDboChQxZtPO1ZBHNb7o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ItJ4Bng9TTGJpSHaNglODIheO2ZmntHl7QfK4+2I2CM=";
|
||||
vendorHash = "sha256-4xwdVFE0CGcOA8Efj4ECionPP9rbzT02zyr2HR143AM=";
|
||||
|
||||
excludedPackages = [ "./build" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.55.18";
|
||||
version = "0.55.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-66yNRBh4WzArHL/yPn6IuLXt2YEthnufkcR2sw7LJYQ=";
|
||||
hash = "sha256-Ag5EmgX4xWbKBhXVsGTu5EtjXV3deGETPtsM9IpOr7s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ijAg0Y/dfNxDS/Jov7QYjlTZ4N4/jDMH/zCV0jdVXRc=";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pythonPackages, fetchurl, lib, nixosTests }:
|
||||
{ lib
|
||||
, pythonPackages
|
||||
, fetchPypi
|
||||
, fetchpatch2
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with pythonPackages;
|
||||
|
||||
|
|
@ -9,11 +14,19 @@ buildPythonApplication rec {
|
|||
propagatedBuildInputs = [ feedparser html2text ];
|
||||
nativeCheckInputs = [ beautifulsoup4 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "html2text-2024.2.25-compat.patch";
|
||||
url = "https://github.com/rss2email/rss2email/commit/b5c0e78006c2db6929b5ff50e8529de58a00412a.patch";
|
||||
hash = "sha256-edmsi3I0acx5iF9xoAS9deSexqW2UtWZR/L7CgeZs/M=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.60";
|
||||
"version" = "1.11.61";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-r4Kcf8iBACHSiUceHq5T2BswGqgVkMBm/5ANq0smA20=";
|
||||
"desktopSrcHash" = "sha256-1Pq26e2ngcji7wieHNOQAWPFBKGLoeTRAKQ3Aqnn1jw=";
|
||||
"desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1";
|
||||
"webSrcHash" = "sha256-k+jtTUuLaux2HSDsLT2ktcShQTNNnDe0e3Icoa31WdE=";
|
||||
"webYarnHash" = "0rgdfdkri7mxs7rvp3rwbnijbcs5chc02smw1kbb00j6qzf6k3dj";
|
||||
"webSrcHash" = "sha256-RJhZgwTMDLMt+ha0lxPwqiP5sipXIcGZfdPVgCxePH4=";
|
||||
"webYarnHash" = "1vj3f2bml8jyjz6djzvw1hbrv7148wk8y9hwp323zf8n6y4rnk28";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,13 +63,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.9.16";
|
||||
version = "6.9.20";
|
||||
pname = "feishu";
|
||||
packageHash = "fe01b99b"; # A hash value used in the download url
|
||||
packageHash = "6085d1c4"; # A hash value used in the download url
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb";
|
||||
hash = "sha256-+koH6/K0J8KCVaNGIVvmLmPn/Ttyc9WcNAp0f7PLkqg=";
|
||||
hash = "sha256-kg5j/vWaCBUjnF983kk0ZMJ+inF5z5ctED9+ITuIn94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-PmTiXQp+AkTwCKisH1tR6B1+cHPx25P8FAAlLvKEb3w=";
|
||||
hash = "sha256-fSj/AX1uCUAC3Vg5+rtGF3IDPFTHRAgJ8CPVL8BYc+E=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
|
|
@ -39,5 +39,6 @@ appimageTools.wrapType2 {
|
|||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ nazarewk ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.3.0-beta.1";
|
||||
version = "7.4.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-sXZC6JgeMlX3lNPSMdB64SyiOAMPkjDAjYZrEwnIMpM=";
|
||||
hash = "sha256-Pjz55iVBww7d7WIAonTeX+cdEobitltoAyOU79RY40c=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twitch-tui";
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xithrius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eJw3C38+FdiMLE+x+akIo8c/VqsbWVbcGJj1Lb2vImE=";
|
||||
hash = "sha256-71VpLTPOqSEosLt3noiWhsFPpIp7n3S3BHhIzWYGwkI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zhRrZr5RXKhjZCIjN3lRJ8BJlW/zxKJUzWtpOygX9oo=";
|
||||
cargoHash = "sha256-2SWYKqZfIN+Ghryuoh77eDiM7cqJcLihdWpEhOGpLZg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webex";
|
||||
version = "43.11.0.27795";
|
||||
version = "43.11.0.28947";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z";
|
||||
sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466";
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240311173044/Webex_ubuntu.7z";
|
||||
sha256 = "f84669a2cd974435c6c0f8a6dc5a62c4ef01a3848e36ffcc8077f718be4a3b86";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
|
|
@ -8,6 +9,7 @@
|
|||
, qtbase
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, qtquickcontrols2
|
||||
, getconf
|
||||
, glibc
|
||||
, libXrandr
|
||||
|
|
@ -26,12 +28,22 @@ mkDerivation rec {
|
|||
pname = "teamviewer";
|
||||
# teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
|
||||
outputs = [ "out" "dev" ];
|
||||
version = "15.38.3";
|
||||
version = "15.49.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-+GGpGV8rl15VQvPRA2PWngQI4VoxCrZ0ArEm9FgdOVE=";
|
||||
};
|
||||
src =
|
||||
let
|
||||
base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x";
|
||||
in
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-Ag41RQD4lp4Sxuz6wZwiFzVxUalV+M3Zwa2Cug4iNSM=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${version}_arm64.deb";
|
||||
sha256 = "sha256-JGSmFq4q8TQJVIrS6qQxIxZPNKgor+pFetextLJPHtg=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
unpackPhase = ''
|
||||
ar x $src
|
||||
|
|
@ -39,7 +51,7 @@ mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase qtwebengine qtx11extras icu63 ];
|
||||
buildInputs = [ qtbase qtwebengine qtx11extras qtquickcontrols2 icu63 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/teamviewer $out/bin $out/share/applications
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
let
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "24.3.4";
|
||||
version = "24.3.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
|
||||
hash = "sha256-PQoZKb0kf/tMQBJ5OpL9XqXv7fAftGTVsg3tZYe3j5c=";
|
||||
hash = "sha256-s3OeTK6XodIMrNTuImdljbQYX1Abj7SFOZmPJgm2teo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.6.6";
|
||||
version = "2.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-wq7CCf+IJ7BpbLwXBemDrsqXy2dHITubQKNR2bUfqW0=";
|
||||
hash = "sha256-blWMfe/eqeccGE5dWVJWV7L1akWnhO3t5n8HbjlJIcA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "magic-vlsi";
|
||||
version = "8.3.464";
|
||||
version = "8.3.465";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
|
||||
sha256 = "sha256-ICXFskoB/mqKPgjWeIoJ81H2eg4dPSj0bHY7S5/A858=";
|
||||
sha256 = "sha256-cb9A8rpjD3x3fJo+xexlyzn+/3M5iUJmSoBraom9zd8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "R";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
src = let
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo=";
|
||||
sha256 = "sha256-gIUSMTk7hb84d+6eObKC51Dthkxexgy9aObhOfBSAzA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tex" ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "unstable-2024-03-11";
|
||||
version = "unstable-2024-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "dfa24af6c747e1c90d79a462c2a5a0716b3a1dc0";
|
||||
hash = "sha256-kgC+E/ecgl27Hs+qCyqg8CjbEyB91AgN397DST/dPMI=";
|
||||
rev = "262a6525225be7bcef52c3072b1061db3c238055";
|
||||
hash = "sha256-QH8mLlcCOuq77vLer8RsSnD9VeJu9kAVv2qWAH3ky6I=";
|
||||
};
|
||||
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.33.0";
|
||||
version = "0.33.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0bdDolaFbVI3CqcOtKFrvRqrKXIiSIfH5rxJgK5XssI=";
|
||||
hash = "sha256-E6gFGgySXs2oCS4Ipevbr9aPWzF4tb4Arl4w+4lQ+wg=";
|
||||
};
|
||||
|
||||
goModules = (buildGo122Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-7301wHGCXUdfPFOhgLEJILmYxNohNm6H2zXGd9W11Wk=";
|
||||
vendorHash = "sha256-ypSZHJpk9wTXLH9sbmaSQB28iOIpv2nDPlgweM0Ldhs=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -234,7 +234,7 @@ buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
tests = lib.mkIf stdenv.isLinux {
|
||||
tests = lib.optionalAttrs stdenv.isLinux {
|
||||
default = nixosTests.terminal-emulators.kitty;
|
||||
};
|
||||
updateScript = nix-update-script {};
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+oJBpERU2WbfmS7MyBbJKrh4kzY+rgSw4uKAU1y5kR4=";
|
||||
hash = "sha256-52Vyh2aImus9ZTb082N2FRMIsfykfQ2+AVUT2VD6lJ4=";
|
||||
};
|
||||
vendorHash = "sha256-Z46eDqUc8Mdq9lEMx1YOuSh5zPIMQrSkbto33AmgANU=";
|
||||
vendorHash = "sha256-fQTd7J2l7W3E5RQIr2hn2wp9CPHn8N8TpDqfbb3TFgI=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.25.1";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+u0XvZb42RRlQnQUZHrMXRJU+31CDy/oLYQ55tLlmUg=";
|
||||
hash = "sha256-1sBuyY6lpxb/Vlpy6pi7YP69HZID6D97ZkVLbPEZ4Qw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3FBrJvLSuDehCy+o7valkf5LSuMkD2loD2JPQO4+3sY=";
|
||||
cargoHash = "sha256-S8Oy5DII05430nkRJmMgZsb4fUIks2zliDea9RycH3E=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cinelerra-cv";
|
||||
version = "unstable-2023-01-29";
|
||||
version = "2.3-unstable-2024-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cinelerra-cv-team";
|
||||
repo = "cinelerra-cv";
|
||||
rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89";
|
||||
sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q";
|
||||
rev = "18a693425f78f7c4c68b5a342efce3e8db2a30dc";
|
||||
hash = "sha256-+47Xa63GoKiQzEXbxmKUwJLDIFUnzc/FfxRPXCCxzpE=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -107,7 +107,10 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Professional video editing and compositing environment (community version)";
|
||||
homepage = "http://cinelerra-cv.wikidot.com/";
|
||||
mainProgram = "cinelerracv";
|
||||
maintainers = with maintainers; [ marcweber ];
|
||||
license = licenses.gpl2Only;
|
||||
# https://github.com/cinelerra-cv-team/cinelerra-cv/issues/3
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/fzwoch/obs-gstreamer";
|
||||
maintainers = with maintainers; [ ahuzik pedrohlc ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "121.3";
|
||||
version = "122.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "1e7125327a29b7b7a0593caf339d382728c55cf6";
|
||||
sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0=";
|
||||
rev = "562d81eb28a49ed6e0d771a430c21a458cdd33f9";
|
||||
sha256 = "l5sIUInOhhkn3ernQLIEwEpRCyICDH/1k4C/aidy1/I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs=";
|
||||
cargoHash = "sha256-2MaRfQCAjW560sdAPqdWymClwY1U5QjIMzknHry+9zs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
|
@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec {
|
|||
patchShebangs third_party/minijail/tools/*.py
|
||||
'';
|
||||
|
||||
CROSVM_USE_SYSTEM_MINIGBM = true;
|
||||
CROSVM_USE_SYSTEM_VIRGLRENDERER = true;
|
||||
|
||||
buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ];
|
||||
buildFeatures = [ "virgl_renderer" ];
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ=";
|
||||
hash = "sha256-mesFwYgDCZ44/EJ31mzx9yLeMyV2bXpxaNSx6L3BQG0=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.25.0";
|
||||
version = "2.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QfzFo6VqNK+4GvF2sSVLeDTcoBOG8Jtqs6K5o5bwddA=";
|
||||
hash = "sha256-hOBWtvls4rRYPMTvkTRkEAftzQB6SG1bv9vasK54d/4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-zAIf5ljy9trJE27RpsK0atPoqNIDUdTn6ywRo0yk/18=";
|
||||
vendorHash = "sha256-uyGGzfsfjk0mUoJ/0Sm89Mus2fQS3HZGBAQ48xMecwU=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -155,5 +155,6 @@ buildGoModule rec {
|
|||
changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marsam ] ++ teams.podman.members;
|
||||
mainProgram = "podman";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, binutils
|
||||
, cairo
|
||||
, git
|
||||
, hyprcursor
|
||||
, hyprland-protocols
|
||||
, hyprlang
|
||||
, jq
|
||||
|
|
@ -22,11 +23,11 @@
|
|||
, pciutils
|
||||
, systemd
|
||||
, tomlplusplus
|
||||
, udis86
|
||||
, udis86-hyprland
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, wlroots
|
||||
, wlroots-hyprland
|
||||
, xcbutilwm
|
||||
, xwayland
|
||||
, debug ? false
|
||||
|
|
@ -42,15 +43,19 @@
|
|||
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
|
||||
assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
|
||||
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
|
||||
|
||||
let
|
||||
wlr = wlroots-hyprland.override { inherit enableXWayland; };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.36.0";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U=";
|
||||
hash = "sha256-W+34KhCnqscRXN/IkvuJMiVx0Fa64RcYn8H4sZjzceI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -68,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace "@HASH@" '${finalAttrs.src.rev}' \
|
||||
--replace "@BRANCH@" "" \
|
||||
--replace "@MESSAGE@" "" \
|
||||
--replace "@DATE@" "2024-02-05" \
|
||||
--replace "@DATE@" "2024-03-16" \
|
||||
--replace "@TAG@" "" \
|
||||
--replace "@DIRTY@" ""
|
||||
'';
|
||||
|
|
@ -92,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
[
|
||||
cairo
|
||||
git
|
||||
hyprcursor
|
||||
hyprland-protocols
|
||||
hyprlang
|
||||
libGL
|
||||
|
|
@ -99,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libinput
|
||||
libxkbcommon
|
||||
mesa
|
||||
udis86
|
||||
udis86-hyprland
|
||||
wayland
|
||||
wayland-protocols
|
||||
pango
|
||||
pciutils
|
||||
tomlplusplus
|
||||
wlroots
|
||||
wlr
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]
|
||||
++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
|
||||
|
|
@ -125,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots
|
||||
ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots
|
||||
${lib.optionalString wrapRuntimeDeps ''
|
||||
wrapProgram $out/bin/Hyprland \
|
||||
--suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]}
|
||||
|
|
@ -135,11 +141,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
passthru.providedSessions = [ "hyprland" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vaxerski/Hyprland";
|
||||
homepage = "https://github.com/hyprwm/Hyprland";
|
||||
description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ wozeparrot fufexan ];
|
||||
mainProgram = "Hyprland";
|
||||
platforms = wlroots.meta.platforms;
|
||||
platforms = wlr.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@ let
|
|||
|
||||
plugins = {
|
||||
hy3 = { fetchFromGitHub, cmake, hyprland }:
|
||||
mkHyprlandPlugin hyprland rec {
|
||||
mkHyprlandPlugin hyprland {
|
||||
pluginName = "hy3";
|
||||
version = "0.36.0";
|
||||
version = "0.36.0-unstable-2024-03-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
rev = "hl${version}";
|
||||
hash = "sha256-nRBeHh0Vr0gB3BHiqP9ZE4/yyZvRt8jJHwBF5lFu/24=";
|
||||
rev = "a392bfd13caf865ccf6b9df6917b67cc3a054b82";
|
||||
hash = "sha256-QuapQR9DJI9+vt7xqULYIXx2QCCX1I/YB50c+7ReexU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
{ fetchFromGitLab
|
||||
, wlroots
|
||||
, enableXWayland ? true
|
||||
}:
|
||||
wlroots.overrideAttrs
|
||||
(old: {
|
||||
inherit enableXWayland;
|
||||
version = "0.18.0-dev";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5";
|
||||
hash = "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=";
|
||||
rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b";
|
||||
hash = "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=";
|
||||
};
|
||||
|
||||
patches = [ ]; # don't inherit old.patches
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ rec {
|
|||
runCommand "${baseNameOf name}.tar${compress.ext}"
|
||||
{
|
||||
inherit (stream) imageName;
|
||||
passthru = { inherit (stream) imageTag; };
|
||||
passthru = { inherit (stream) imageTag; inherit stream; };
|
||||
nativeBuildInputs = compress.nativeInputs;
|
||||
} "${stream} | ${compress.compress} > $out"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "2.7.13";
|
||||
version = "2.7.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xCq1XpHXvuX8v3/4w1hHFMusqgNl8JHn5gT3+Ek8fjU=";
|
||||
hash = "sha256-egF4PwW32Q82rqeHHMBnV0ma6K3pM0l6rrbFCCdOc1g=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
|
|
|||
67
pkgs/by-name/cb/cbtemulator/package.nix
Normal file
67
pkgs/by-name/cb/cbtemulator/package.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, cbtemulator
|
||||
, google-cloud-bigtable-tool
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cbtemulator";
|
||||
version = "1.22.0";
|
||||
|
||||
# There's a go.{mod,sum} in the root and in the "bigtable" subdir.
|
||||
# We only ever use things in that subdir.
|
||||
src = (fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-cloud-go";
|
||||
rev = "bigtable/v${version}";
|
||||
hash = "sha256-eOi4QFthnmZb5ry/5L7wzr4Fy1pF/H07BzxOnXtmSu4=";
|
||||
}) + "/bigtable";
|
||||
|
||||
vendorHash = "sha256-7M7YZfl0usjN9hLGozqJV2bGh+M1ec4PZRGYUhEckpY=";
|
||||
subPackages = [ "cmd/emulator" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/emulator $out/bin/cbtemulator
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# Sets up a table and family, then inserts, and ensures it gets back the value.
|
||||
tests.smoketest = runCommand "cbtemulator-smoketest"
|
||||
{
|
||||
nativeBuildInputs = [ google-cloud-bigtable-tool ];
|
||||
} ''
|
||||
# Start the emulator
|
||||
${lib.getExe cbtemulator} &
|
||||
EMULATOR_PID=$!
|
||||
|
||||
cleanup() {
|
||||
kill $EMULATOR_PID
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
export BIGTABLE_EMULATOR_HOST=localhost:9000
|
||||
|
||||
cbt -instance instance-1 -project project-1 createtable table-1
|
||||
cbt -instance instance-1 -project project-1 createfamily table-1 cf1
|
||||
cbt -instance instance-1 -project project-1 ls table-1
|
||||
cbt -instance instance-1 -project project-1 set table-1 key1 cf1:c1=value1
|
||||
|
||||
cbt -instance instance-1 -project project-1 read table-1 | grep -q value1
|
||||
|
||||
touch $out;
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "In-memory Google Cloud Bigtable server";
|
||||
homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v1.22.0/bigtable/cmd/emulator/cbtemulator.go";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.flokli ];
|
||||
mainProgram = "cbtemulator";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
40
pkgs/by-name/ch/ch341eeprom/package.nix
Normal file
40
pkgs/by-name/ch/ch341eeprom/package.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libusb1
|
||||
,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "ch341eeprom";
|
||||
version = "0-unstable-2021-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "command-tab";
|
||||
repo = "ch341eeprom";
|
||||
rev = "d5b2fba35a33a1cddd7a3e920e1df933f21ba9b0";
|
||||
hash = "sha256-QUl5ErOfEfDhk1fF+BNu6n0Bake3IagNfn4I43b6Uns=";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 -T ch341eeprom $out/bin/ch341eeprom
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC";
|
||||
homepage = "https://github.com/command-tab/ch341eeprom";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
mainProgram = "ch341eeprom";
|
||||
maintainers = with maintainers; [ xokdvium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,10 +26,17 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# solve error[E0310]: the parameter type `T` may not live long enough
|
||||
# in rust-serialize crate
|
||||
./rustc_serialize_update.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-M3UMeGkLf57/I/9BIkyiMpOvjbKQJrOk+axf05vRoW0=";
|
||||
patches = [ ./rustc_serialize_update.patch ];
|
||||
hash = "sha256-1Zb0J2tO/gIifDymmoXxZf6RNV8foE9QiQqZcrHrWzE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
16
pkgs/by-name/ch/chromatic/rustc_serialize_update.patch
Normal file
16
pkgs/by-name/ch/chromatic/rustc_serialize_update.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ab2add4..7740629 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1031,9 +1031,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-serialize"
|
||||
-version = "0.3.24"
|
||||
+version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
|
||||
+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fritz-exporter";
|
||||
version = "2.4.3";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdreker";
|
||||
repo = "fritz_exporter";
|
||||
rev = "fritzexporter-v${version}";
|
||||
hash = "sha256-2A8hw2XkdxkauG+lMlKfObEvLHUQk79xWmlp0hlrXYM=";
|
||||
hash = "sha256-x5WCVDIKdreQCmVpiWbmVBNo42P5kSxX9dLMBKfZTWc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,26 +9,26 @@ let
|
|||
systemToPlatform = {
|
||||
"x86_64-linux" = {
|
||||
name = "linux-amd64";
|
||||
hash = "sha256-FKzvERcVYkyy1aNYHZIftC2WvSHRxFqSG/g7gpTTvoo=";
|
||||
hash = "sha256-uEG9wvoUyX54rcsZI2dgSfEy9d/FMfjf4+kn5wJoojY=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
name = "linux-arm64";
|
||||
hash = "sha256-4vX9On0upgfjM/IL/UzQj5ioeVnSsd2rUgIz6w4szZM=";
|
||||
hash = "sha256-r0Vo9lZygIEQeSqPv1ix/NK347wqoCkaIL635qeP5ok=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
name = "darwin-amd64";
|
||||
hash = "sha256-W4ElKXsMo47dVRNJEnLzH2rpvkua56lj/NkJd3R8CCE=";
|
||||
hash = "sha256-Hu7A/M5JvwFaA5AmO1WO65D7KD3dYTGnNb0A5CqAPH0=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
name = "darwin-arm64";
|
||||
hash = "sha256-F2OA66h/ptkjLZ2oQgkbZlDo31YDZzhk5Pre36TkHvI=";
|
||||
hash = "sha256-d6db1YOmo7If/2PTkgScsTaMqZZNZl6OL/qpgYfCa3s=";
|
||||
};
|
||||
};
|
||||
platform = systemToPlatform.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gh-copilot";
|
||||
version = "0.5.4-beta";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "gh-copilot";
|
||||
|
|
|
|||
30
pkgs/by-name/me/med/package.nix
Normal file
30
pkgs/by-name/me/med/package.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, lib, qt6, fetchFromGitHub, cmake, pkg-config, jsoncpp, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "med";
|
||||
version = "3.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allencch";
|
||||
repo = "med";
|
||||
rev = version;
|
||||
sha256 = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt6.wrapQtAppsHook cmake pkg-config ];
|
||||
buildInputs = [ qt6.qtbase qt6.qttools qt6.qtwayland jsoncpp readline ];
|
||||
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i "s|/opt/med|$out/share/med|g" {} +
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI game memory scanner and editor";
|
||||
homepage = "https://github.com/allencch/med";
|
||||
changelog = "https://github.com/allencch/med/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ zebreus ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "med";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "4.4.4";
|
||||
version = "4.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-ELWVQzlC56EYy0op42jKmRsuVnSZfz2fQATWOlhxWbk=";
|
||||
hash = "sha256-NRTfWHtItwjZi3O26MzH8GtetCkj7egZa3OArs+Q2SY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
44
pkgs/by-name/op/opcua-commander/package.nix
Normal file
44
pkgs/by-name/op/opcua-commander/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, typescript
|
||||
, esbuild
|
||||
, makeWrapper
|
||||
, nodejs
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "opcua-commander";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "node-opcua";
|
||||
repo = "opcua-commander";
|
||||
rev = version;
|
||||
hash = "sha256-wQXSSNinY85Ti+D/zklYP2N8IP3OsN9xQNJuuQr4kVU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ux1X/3sam9WHrTfqoWv1r9p3pJOs6BaeFsxHizAvjXA=";
|
||||
nativeBuildInputs = [ esbuild typescript makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
--replace-warn "npx -y esbuild" "esbuild"
|
||||
'';
|
||||
|
||||
# We need to add `nodejs` to PATH for `opcua-commander` to properly work
|
||||
# when connected to an OPC-UA server.
|
||||
# Test it with:
|
||||
# ./opcua-commander -e opc.tcp://opcuademo.sterfive.com:26543
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/opcua-commander \
|
||||
--prefix PATH : "${lib.makeBinPath [nodejs]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A opcua client with blessed (ncurses)";
|
||||
homepage = "https://github.com/node-opcua/opcua-commander";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonboh ];
|
||||
mainProgram = "opcua-commander";
|
||||
};
|
||||
}
|
||||
128
pkgs/by-name/pl/plasticity/package.nix
Normal file
128
pkgs/by-name/pl/plasticity/package.nix
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
{ alsa-lib
|
||||
, at-spi2-atk
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, expat
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, gvfs
|
||||
, hicolor-icon-theme
|
||||
, lib
|
||||
, libdrm
|
||||
, libglvnd
|
||||
, libnotify
|
||||
, libsForQt5
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, openssl
|
||||
, pango
|
||||
, rpmextract
|
||||
, stdenv
|
||||
, systemd
|
||||
, trash-cli
|
||||
, vulkan-loader
|
||||
, wrapGAppsHook
|
||||
, xdg-utils
|
||||
, xorg
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plasticity";
|
||||
version = "1.4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
|
||||
hash = "sha256-wiUpDsfGVkhyjoXVpxaw3fqpo1aAfi0AkkvlkAZxTYI=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook rpmextract mesa ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
desktop-file-utils
|
||||
expat
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
gvfs
|
||||
hicolor-icon-theme
|
||||
libdrm
|
||||
libnotify
|
||||
libsForQt5.kde-cli-tools
|
||||
libxkbcommon
|
||||
nspr
|
||||
nss
|
||||
openssl
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
trash-cli
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
systemd
|
||||
libglvnd
|
||||
vulkan-loader #may help with nvidia users
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# can't find anything on the internet about these files, no clue what they do
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"ACCAMERA.tx"
|
||||
"AcMPolygonObj15.tx"
|
||||
"ATEXT.tx"
|
||||
"ISM.tx"
|
||||
"RText.tx"
|
||||
"SCENEOE.tx"
|
||||
"TD_DbEntities.tx"
|
||||
"TD_DbIO.tx"
|
||||
"WipeOut.tx"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cd $out
|
||||
rpmextract $src
|
||||
mv $out/usr/* $out
|
||||
rm -r $out/usr
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
#--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates
|
||||
postInstall = ''
|
||||
substituteInPlace share/applications/Plasticity.desktop \
|
||||
--replace-fail 'Exec=Plasticity %U' "Exec=Plasticity --use-gl=egl %U"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CAD for artists";
|
||||
homepage = "https://www.plasticity.xyz";
|
||||
license = licenses.unfree;
|
||||
mainProgram = "Plasticity";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ imadnyc ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
17
pkgs/by-name/pl/plasticity/update.sh
Executable file
17
pkgs/by-name/pl/plasticity/update.sh
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
#shellcheck shell=bash
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
|
||||
old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r)
|
||||
|
||||
if [[ $version == "$old_version" ]]; then
|
||||
echo "New version same as old version, nothing to do." >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version plasticity "$version"
|
||||
|
||||
61
pkgs/by-name/re/redlib/package.nix
Normal file
61
pkgs/by-name/re/redlib/package.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cacert
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d3Jjs/a2EgdqRBTjXKwDDRnU6orb7RQGl1CVz9b9SdI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2MugS0/MO85lQvDbiFwnsX4LYdk7TACDFR8OOLEFGUQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# All these test try to connect to Reddit.
|
||||
"--skip=test_fetching_subreddit_quarantined"
|
||||
"--skip=test_fetching_nsfw_subreddit"
|
||||
"--skip=test_fetching_ws"
|
||||
|
||||
"--skip=test_obfuscated_share_link"
|
||||
"--skip=test_share_link_strip_json"
|
||||
|
||||
"--skip=test_localization_popular"
|
||||
"--skip=test_fetching_subreddit"
|
||||
"--skip=test_fetching_user"
|
||||
|
||||
# These try to connect to the oauth client
|
||||
"--skip=test_oauth_client"
|
||||
"--skip=test_oauth_client_refresh"
|
||||
"--skip=test_oauth_token_exists"
|
||||
];
|
||||
|
||||
env = {
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) redlib;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/redlib-org/redlib/releases/tag/v${version}";
|
||||
description = "Private front-end for Reddit (Continued fork of Libreddit)";
|
||||
homepage = "https://github.com/redlib-org/redlib";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "redlib";
|
||||
maintainers = with lib.maintainers; [ soispha ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "unstable-2024-03-19";
|
||||
version = "unstable-2024-03-22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "dc4160a3a4c23aee846625ac9115fe2cbb91fe42";
|
||||
hash = "sha256-cy4XLKKiWqEvWWDHmj2bhp38pbtSxp+P92r7NxueAaE=";
|
||||
rev = "b5c2d03cce95c2488d80ce5214131fba8d119fec";
|
||||
hash = "sha256-q8Q5Lx2CQIjdL/LBRaYXvQl1MFw3Bh0RbnGHJgMnXyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,30 +7,25 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "retool";
|
||||
version = "unstable-2023-08-24";
|
||||
version = "2.02.2-unstable-2024-03-17";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
disabled = python3.pkgs.pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unexpectedpanda";
|
||||
repo = "retool";
|
||||
rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301";
|
||||
hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s=";
|
||||
rev = "30d547c7d04b8cbf7710b2037388bf18a00a0c22";
|
||||
hash = "sha256-5Tmi3eVJh9STP9A0dDNPDs4SlIWHw8sk+g1GgpnmqeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
hatchling
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
# ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none)
|
||||
# ERROR: No matching distribution found for PySide6
|
||||
pythonRemoveDeps = [ "PySide6" ];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
] ++
|
||||
|
|
@ -40,11 +35,12 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
alive-progress
|
||||
darkdetect
|
||||
lxml
|
||||
psutil
|
||||
validators
|
||||
pyside6
|
||||
strictyaml
|
||||
validators
|
||||
];
|
||||
|
||||
# Upstream has no tests
|
||||
|
|
@ -31,13 +31,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "roxterm";
|
||||
version = "3.15.0";
|
||||
version = "3.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "realh";
|
||||
repo = "roxterm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-mmfnpZTCsLJ4EPxsKZXeHBZnpvc2n1TCEPmiIHmnxKc=";
|
||||
hash = "sha256-NSOGq3rN+9X4WA8Q0gMbZ9spO/dbZkzeo4zEno/Kgcs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simde";
|
||||
version = "0.7.6";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY=";
|
||||
hash = "sha256-hQtSxO8Uld6LT6V1ZhR6tbshTK1QTGgyQ99o3jOIbQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SpFFT";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-cscs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-70fPbIYbW50CoMdRS93hZKSbMEIQvZGFNE+eiRvuw0o=";
|
||||
hash = "sha256-hZdB/QcjL8rjvR1YZS+CHe5U5zxedpfDq6msMih4Elc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeBinaryWrapper
|
||||
, makeWrapper
|
||||
, undmg
|
||||
, wrapGAppsHook
|
||||
|
|
@ -51,13 +52,13 @@ let
|
|||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
nativeBuildInputs = [ undmg makeBinaryWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r spotube.app $out/Applications
|
||||
ln -s $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
makeBinaryWrapper $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ in
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "suwayomi-server";
|
||||
version = "0.7.0";
|
||||
revision = 1197;
|
||||
version = "1.0.0";
|
||||
revision = 1498;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Tachidesk-Server-v${finalAttrs.version}-r${toString finalAttrs.revision}.jar";
|
||||
hash = "sha256-4DO1WiBCu/8ypFgJdBmEwQXQ1xaWAlbt8N5TELomVVA=";
|
||||
url = "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}-r${toString finalAttrs.revision}.jar";
|
||||
hash = "sha256-CskVYc+byfn3mNzbOX1fCXPpjihtWpoRGBpXDY378c0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.8.12";
|
||||
vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw=";
|
||||
version = "5.8.13";
|
||||
vendorHash = "sha256-OBXurPjyB2/JCQBna+tk0p3+n8gPoNLXCppXkII3ZUc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eH388JSy6+D1ZIXfuArdmwdBHqwVvZcb+tQXZ/CcsLo=";
|
||||
hash = "sha256-5fxvC+5XclHnPKZE0jt6fuWxa16uaxLH/PchlFQH7NI=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg";
|
||||
version = "2024.02.14";
|
||||
version = "2024.03.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qYRNf2NMvYkxq7CRbJIqC7HAhznTNK7zW6JCsP4+v6M=";
|
||||
hash = "sha256-861r4XsXCyxUVDlSrekZ+g17td+idUN8qJmmTZNDzow=";
|
||||
};
|
||||
|
||||
installPhase = let
|
||||
|
|
|
|||
49
pkgs/by-name/vi/vim-language-server/package.json
Normal file
49
pkgs/by-name/vi/vim-language-server/package.json
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"name": "vim-language-server",
|
||||
"version": "2.3.1",
|
||||
"description": "vim language server",
|
||||
"keywords": [
|
||||
"viml",
|
||||
"vim",
|
||||
"lsp",
|
||||
"language",
|
||||
"server",
|
||||
"autocomplete"
|
||||
],
|
||||
"main": "./out/index.js",
|
||||
"repository": "https://github.com/iamcco/vim-language-server",
|
||||
"author": "iamcco <ooiss@qq.com>",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"build-docs": "rm ./src/docs/builtin-docs.json && ./bin/build-docs.js",
|
||||
"build": "rm -rf ./out && webpack",
|
||||
"watch": "webpack -w",
|
||||
"test": "mocha test/src/**/*.ts --require ts-node/register",
|
||||
"lint": "tslint -c tslint.json --format verbose {.,test}/src/**/*.ts src/index.ts",
|
||||
"fix": "tslint -c tslint.json --fix {.,test}/src/**/*.ts src/index.ts"
|
||||
},
|
||||
"bin": {
|
||||
"vim-language-server": "./bin/index.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/node": "^11.13.6",
|
||||
"chai": "^4.2.0",
|
||||
"chai-as-promised": "^7.1.1",
|
||||
"fast-glob": "^3.2.4",
|
||||
"findup": "^0.1.5",
|
||||
"mocha": "^7.1.2",
|
||||
"rxjs": "^6.6.7",
|
||||
"rxjs-operators": "^1.1.3",
|
||||
"shvl": "^2.0.0",
|
||||
"ts-loader": "^8.1.0",
|
||||
"ts-node": "^9.1.1",
|
||||
"tslint": "^6.1.3",
|
||||
"typescript": "^4.2.3",
|
||||
"vscode-languageserver": "^7.0.0",
|
||||
"vscode-languageserver-textdocument": "^1.0.1",
|
||||
"vscode-uri": "^3.0.2",
|
||||
"webpack": "^5.30.0",
|
||||
"webpack-cli": "^4.6.0"
|
||||
}
|
||||
}
|
||||
43
pkgs/by-name/vi/vim-language-server/package.nix
Normal file
43
pkgs/by-name/vi/vim-language-server/package.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, mkYarnPackage
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "vim-language-server";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamcco";
|
||||
repo = "vim-language-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NfBKNCTvCMIJrSiTlCG+LtVoMBMdCc3rzpDb9Vp2CGM=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-mo8urQaWIHu33+r0Y7mL9mJ/aSe/5CihuIetTeDHEUQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
# https://stackoverflow.com/a/69699772/4935114
|
||||
env NODE_OPTIONS=--openssl-legacy-provider yarn --offline build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "VImScript language server, LSP for vim script";
|
||||
homepage = "https://github.com/iamcco/vim-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
mainProgram = "vim-language-server";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,8 @@
|
|||
#shellcheck shell=bash
|
||||
set -eu -o pipefail
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
cd "$(dirname "$0")"
|
||||
nixpkgs=../../../../.
|
||||
|
||||
err() {
|
||||
echo "$*" >&2
|
||||
|
|
@ -11,11 +12,11 @@ err() {
|
|||
}
|
||||
|
||||
json_get() {
|
||||
jq -r "$1" < "$dirname/versions.json"
|
||||
jq -r "$1" < "./versions.json"
|
||||
}
|
||||
|
||||
json_set() {
|
||||
jq --arg x "$2" "$1 = \$x" < "$dirname/versions.json" | sponge "$dirname/versions.json"
|
||||
jq --arg x "$2" "$1 = \$x" < "./versions.json" | sponge "./versions.json"
|
||||
}
|
||||
|
||||
resolve_url() {
|
||||
|
|
@ -53,10 +54,10 @@ get_version() {
|
|||
sri_get() {
|
||||
local ouput sri
|
||||
output=$(nix-build --expr \
|
||||
'with import <nixpkgs>{};
|
||||
"with import $nixpkgs {};
|
||||
fetchurl {
|
||||
url = "'"$1"'";
|
||||
}' 2>&1 || true)
|
||||
url = \"$1\";
|
||||
}" 2>&1 || true)
|
||||
sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }')
|
||||
[[ -z "$sri" ]] && err "$output"
|
||||
echo "$sri"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-GgaRlROSWYZgFlH0bH6PTnRE3L/bb0kX0P6m7nmPlsY=",
|
||||
"version": "0.2024.03.12.08.02.stable_01"
|
||||
"hash": "sha256-aOw/c6Y+4x6kwxcwnajHh92ZZDeaM/Y1df76HgUjVn8=",
|
||||
"version": "0.2024.03.19.08.01.stable_01"
|
||||
},
|
||||
"linux": {
|
||||
"hash": "sha256-9reFBIu32TzxE46c3PBVzkZYaMV4HVDASvTAVQltYN0=",
|
||||
"version": "0.2024.03.12.08.02.stable_01"
|
||||
"hash": "sha256-efnYh48xcLneeotH9iSY0xQRgMXI/erM6F2fIH38yjY=",
|
||||
"version": "0.2024.03.19.08.01.stable_01"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "websecprobe";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "WebSecProbe";
|
||||
inherit version;
|
||||
hash = "sha256-OKbKz3HSTtwyx/JNUtLJBTaHQcxkUWroMg9/msVWgk4=";
|
||||
hash = "sha256-RX4tc6JaUVaNx8nidn8eMcbsmbcSY+VZbup6c6P7oOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
requests
|
||||
tabulate
|
||||
];
|
||||
|
|
@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Web Security Assessment Tool";
|
||||
homepage = "https://github.com/spyboy-productions/WebSecProbe/";
|
||||
changelog = "https://github.com/spyboy-productions/WebSecProbe/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "websecprobe";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue