Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
4ec6244865
@ -364,8 +364,8 @@ rec {
|
||||
musleabihf = { float = "hard"; };
|
||||
musl = {};
|
||||
|
||||
uclibceabihf = { float = "soft"; };
|
||||
uclibceabi = { float = "hard"; };
|
||||
uclibceabi = { float = "soft"; };
|
||||
uclibceabihf = { float = "hard"; };
|
||||
uclibc = {};
|
||||
|
||||
unknown = {};
|
||||
|
||||
@ -9121,6 +9121,12 @@
|
||||
githubId = 158758;
|
||||
name = "Oliver Dunkl";
|
||||
};
|
||||
ofek = {
|
||||
email = "oss@ofek.dev";
|
||||
github = "ofek";
|
||||
githubId = 9677399;
|
||||
name = "Ofek Lev";
|
||||
};
|
||||
offline = {
|
||||
email = "jaka@x-truder.net";
|
||||
github = "offlinehacker";
|
||||
|
||||
@ -169,6 +169,7 @@
|
||||
./programs/iotop.nix
|
||||
./programs/java.nix
|
||||
./programs/k40-whisperer.nix
|
||||
./programs/kclock.nix
|
||||
./programs/kdeconnect.nix
|
||||
./programs/kbdlight.nix
|
||||
./programs/less.nix
|
||||
|
||||
13
nixos/modules/programs/kclock.nix
Normal file
13
nixos/modules/programs/kclock.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ lib, pkgs, config, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.programs.kclock;
|
||||
kclockPkg = pkgs.libsForQt5.kclock;
|
||||
in {
|
||||
options.programs.kclock = { enable = mkEnableOption "Enable KClock"; };
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.dbus.packages = [ kclockPkg ];
|
||||
environment.systemPackages = [ kclockPkg ];
|
||||
};
|
||||
}
|
||||
@ -7,23 +7,24 @@ let cfg = config.services.input-remapper; in
|
||||
options = {
|
||||
services.input-remapper = {
|
||||
enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons.";
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.input-remapper;
|
||||
defaultText = literalExpression "pkgs.input-remapper";
|
||||
description = ''
|
||||
The input-remapper package to use.
|
||||
'';
|
||||
package = options.mkPackageOption pkgs "input-remapper" { };
|
||||
enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140";
|
||||
serviceWantedBy = mkOption {
|
||||
default = [ "graphical.target" ];
|
||||
example = [ "multi-user.target" ];
|
||||
type = types.listOf types.str;
|
||||
description = "Specifies the WantedBy setting for the input-remapper service.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# FIXME: udev rule hangs sometimes when lots of devices connected, so let's not use it
|
||||
# config.services.udev.packages = mapper-pkg;
|
||||
services.dbus.packages = cfg.package;
|
||||
systemd.packages = cfg.package;
|
||||
environment.systemPackages = cfg.package;
|
||||
systemd.services.input-remapper.wantedBy = [ "graphical.target" ];
|
||||
services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ];
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ LunNova ];
|
||||
}
|
||||
|
||||
@ -49,6 +49,13 @@ in
|
||||
services.nitter = {
|
||||
enable = mkEnableOption "If enabled, start Nitter.";
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.nitter;
|
||||
type = types.package;
|
||||
defaultText = literalExpression "pkgs.nitter";
|
||||
description = "The nitter derivation to use.";
|
||||
};
|
||||
|
||||
server = {
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
@ -78,8 +85,8 @@ in
|
||||
|
||||
staticDir = mkOption {
|
||||
type = types.path;
|
||||
default = "${pkgs.nitter}/share/nitter/public";
|
||||
defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"'';
|
||||
default = "${cfg.package}/share/nitter/public";
|
||||
defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"'';
|
||||
description = "Path to the static files directory.";
|
||||
};
|
||||
|
||||
@ -306,8 +313,8 @@ in
|
||||
Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ];
|
||||
# Some parts of Nitter expect `public` folder in working directory,
|
||||
# see https://github.com/zedeus/nitter/issues/414
|
||||
WorkingDirectory = "${pkgs.nitter}/share/nitter";
|
||||
ExecStart = "${pkgs.nitter}/bin/nitter";
|
||||
WorkingDirectory = "${cfg.package}/share/nitter";
|
||||
ExecStart = "${cfg.package}/bin/nitter";
|
||||
ExecStartPre = "${preStart}";
|
||||
AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
|
||||
Restart = "on-failure";
|
||||
|
||||
@ -224,6 +224,7 @@ in
|
||||
initrd-network-ssh = handleTest ./initrd-network-ssh {};
|
||||
initrdNetwork = handleTest ./initrd-network.nix {};
|
||||
initrd-secrets = handleTest ./initrd-secrets.nix {};
|
||||
input-remapper = handleTest ./input-remapper.nix {};
|
||||
inspircd = handleTest ./inspircd.nix {};
|
||||
installer = handleTest ./installer.nix {};
|
||||
invoiceplane = handleTest ./invoiceplane.nix {};
|
||||
|
||||
52
nixos/tests/input-remapper.nix
Normal file
52
nixos/tests/input-remapper.nix
Normal file
@ -0,0 +1,52 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "input-remapper";
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ LunNova ];
|
||||
};
|
||||
|
||||
machine = { config, ... }:
|
||||
let user = config.users.users.sybil; in
|
||||
{
|
||||
imports = [
|
||||
./common/user-account.nix
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.input-remapper.enable = true;
|
||||
users.users.sybil = { isNormalUser = true; group = "wheel"; };
|
||||
test-support.displayManager.auto.user = user.name;
|
||||
# workaround for pkexec not working in the test environment
|
||||
# Error creating textual authentication agent:
|
||||
# Error opening current controlling terminal for the process (`/dev/tty'):
|
||||
# No such device or address
|
||||
# passwordless pkexec with polkit module also doesn't work
|
||||
# to allow the program to run, we replace pkexec with sudo
|
||||
# and turn on passwordless sudo
|
||||
# this is not correct in general but good enough for this test
|
||||
security.sudo = { enable = true; wheelNeedsPassword = false; };
|
||||
security.wrappers.pkexec = pkgs.lib.mkForce
|
||||
{
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${pkgs.sudo}/bin/sudo";
|
||||
};
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
start_all()
|
||||
machine.wait_for_x()
|
||||
|
||||
machine.succeed("systemctl status input-remapper.service")
|
||||
machine.execute("su - sybil -c input-remapper-gtk >&2 &")
|
||||
|
||||
machine.wait_for_text("Input Remapper")
|
||||
machine.wait_for_text("Preset")
|
||||
machine.wait_for_text("Change Key")
|
||||
'';
|
||||
})
|
||||
@ -45,21 +45,19 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
"{}"
|
||||
).format(" ".join(args))
|
||||
|
||||
def parallel(*fns):
|
||||
from threading import Thread
|
||||
threads = [ Thread(target=fn) for fn in fns ]
|
||||
for t in threads: t.start()
|
||||
for t in threads: t.join()
|
||||
|
||||
start_all()
|
||||
server.wait_for_unit("nats.service")
|
||||
|
||||
client1.fail("test -f ${file}")
|
||||
|
||||
# Subscribe on topic on client1 and echo messages to file.
|
||||
client1.execute("({} | tee ${file} &)".format(nats_cmd("sub", "--raw", "${topic}")))
|
||||
|
||||
# Give client1 some time to subscribe.
|
||||
client1.execute("sleep 2")
|
||||
|
||||
# Publish message on client2.
|
||||
client2.execute(nats_cmd("pub", "${topic}", "hello"))
|
||||
|
||||
# Check if message has been received.
|
||||
client1.succeed("grep -q hello ${file}")
|
||||
with subtest("pub sub"):
|
||||
parallel(
|
||||
lambda: client1.succeed(nats_cmd("sub", "--count", "1", "${topic}")),
|
||||
lambda: client2.succeed("sleep 2 && {}".format(nats_cmd("pub", "${topic}", "hello"))),
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, gnumake
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, fetchpatch
|
||||
, autopanosiftc
|
||||
, boost
|
||||
, cairo
|
||||
@ -37,21 +36,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hugin";
|
||||
version = "2019.0.0";
|
||||
version = "2021.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
|
||||
sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";
|
||||
sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build with exiv2 0.27.1
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch";
|
||||
sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
cairo
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "22.0.0"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg=";
|
||||
sha256 = "sha256-LSEsaCEUoKViKC+IjJrV/w1VzOGi4EOr4LnAutOIyJU=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, rpmextract
|
||||
, patchelf
|
||||
@ -9,11 +10,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snowsql";
|
||||
majorVersion = "1.2";
|
||||
version = "${majorVersion}.9";
|
||||
version = "${majorVersion}.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm";
|
||||
sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8";
|
||||
sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||
, enableWidevine ? false, vivaldi-widevine ? null
|
||||
, commandLineArgs ? ""
|
||||
, pulseSupport ? stdenv.isLinux, libpulseaudio
|
||||
}:
|
||||
|
||||
let
|
||||
@ -40,7 +41,8 @@ in stdenv.mkDerivation rec {
|
||||
freetype fontconfig libXrender libuuid expat glib nss nspr
|
||||
libxml2 pango cairo
|
||||
libdrm mesa
|
||||
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
|
||||
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
|
||||
++ lib.optional pulseSupport libpulseaudio;
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs
|
||||
+ lib.optionalString (stdenv.is64bit)
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "himalaya";
|
||||
version = "0.5.5";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ=";
|
||||
sha256 = "sha256-Ejaspj0YpkGmfO1omOhx8ZDg77J7NqC32mw5Cd3K1FM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU=";
|
||||
cargoSha256 = "sha256-xce2iHrqTxIirrut4dN7526pjE4T+ruaDS44jr+KeGs=";
|
||||
|
||||
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
|
||||
@ -34,6 +34,8 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
];
|
||||
|
||||
cargoTestFlags = [ "--lib" ];
|
||||
|
||||
postInstall = lib.optionalString enableCompletions ''
|
||||
# Install shell function
|
||||
installShellCompletion --cmd himalaya \
|
||||
@ -46,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "CLI email client written in Rust";
|
||||
homepage = "https://github.com/soywod/himalaya";
|
||||
changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ yanganto ];
|
||||
};
|
||||
}
|
||||
|
||||
50
pkgs/applications/networking/remote/rustdesk/cargo.patch
Normal file
50
pkgs/applications/networking/remote/rustdesk/cargo.patch
Normal file
@ -0,0 +1,50 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c3e139e..b77d8bd 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1761,11 +1761,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "magnum-opus"
|
||||
-version = "0.3.4-2"
|
||||
-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f"
|
||||
+version = "0.4.0"
|
||||
+source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604"
|
||||
dependencies = [
|
||||
- "bindgen 0.59.1",
|
||||
- "target_build_utils",
|
||||
+ "libc",
|
||||
+ "opusic-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2188,6 +2188,16 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
|
||||
+[[package]]
|
||||
+name = "opusic-sys"
|
||||
+version = "0.3.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5"
|
||||
+dependencies = [
|
||||
+ "cmake",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "parity-tokio-ipc"
|
||||
version = "0.7.2"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 75504a0..43e1624 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -32,7 +32,7 @@ libc = "0.2"
|
||||
parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
|
||||
flexi_logger = "0.17"
|
||||
runas = "0.2"
|
||||
-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" }
|
||||
+magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" }
|
||||
dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
|
||||
rubato = { version = "0.8", optional = true }
|
||||
samplerate = { version = "0.2", optional = true }
|
||||
104
pkgs/applications/networking/remote/rustdesk/default.nix
Normal file
104
pkgs/applications/networking/remote/rustdesk/default.nix
Normal file
@ -0,0 +1,104 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, makeWrapper
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, yasm
|
||||
, nasm
|
||||
, zip
|
||||
, pkg-config
|
||||
, clang
|
||||
, gtk3
|
||||
, xdotool
|
||||
, libxcb
|
||||
, libXfixes
|
||||
, alsa-lib
|
||||
, pulseaudio
|
||||
, libXtst
|
||||
, libvpx
|
||||
, libyuv
|
||||
, libopus
|
||||
, libsciter
|
||||
, llvmPackages
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustdesk";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustdesk";
|
||||
repo = "rustdesk";
|
||||
rev = "0325500ebf331b66220cec6e9078afb83b0e98a7";
|
||||
sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw=";
|
||||
|
||||
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
# Change magnus-opus version to upstream so that it does not use
|
||||
# vcpkg for libopus since it does not work.
|
||||
cargoPatches = [
|
||||
./cargo.patch
|
||||
];
|
||||
|
||||
# Manually simulate a vcpkg installation so that it can link the libaries
|
||||
# properly.
|
||||
postUnpack = let
|
||||
vcpkg_target = "x64-linux";
|
||||
in ''
|
||||
export VCPKG_ROOT="$TMP/vcpkg";
|
||||
|
||||
mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
|
||||
|
||||
ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ];
|
||||
buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ];
|
||||
|
||||
# Checks require an active X display.
|
||||
doCheck = false;
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "rustdesk";
|
||||
exec = meta.mainProgram;
|
||||
icon = "rustdesk";
|
||||
desktopName = "RustDesk";
|
||||
comment = meta.description;
|
||||
genericName = "Remote Desktop";
|
||||
categories = ["Network"];
|
||||
}) ];
|
||||
|
||||
# Add static ui resources and libsciter to same folder as binary so that it
|
||||
# can find them.
|
||||
postInstall = ''
|
||||
mkdir -p $out/{share/src,lib/rustdesk}
|
||||
|
||||
# so needs to be next to the executable
|
||||
mv $out/bin/rustdesk $out/lib/rustdesk
|
||||
ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk
|
||||
|
||||
makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \
|
||||
--run "cd $out/share"
|
||||
|
||||
cp -a $src/src/ui $out/share/src
|
||||
|
||||
install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet another remote desktop software";
|
||||
homepage = "https://rustdesk.com";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ leixb ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "rustdesk";
|
||||
};
|
||||
}
|
||||
@ -1,36 +1,40 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring,
|
||||
harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel,
|
||||
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
|
||||
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
|
||||
lcms2,
|
||||
librsync,
|
||||
installShellFiles,
|
||||
dbus,
|
||||
darwin,
|
||||
Cocoa,
|
||||
CoreGraphics,
|
||||
Foundation,
|
||||
IOKit,
|
||||
Kernel,
|
||||
OpenGL,
|
||||
libcanberra,
|
||||
libicns,
|
||||
libpng,
|
||||
python3,
|
||||
zlib,
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
|
||||
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel
|
||||
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
|
||||
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
|
||||
, lcms2
|
||||
, librsync
|
||||
, installShellFiles
|
||||
, dbus
|
||||
, darwin
|
||||
, Cocoa
|
||||
, CoreGraphics
|
||||
, Foundation
|
||||
, IOKit
|
||||
, Kernel
|
||||
, OpenGL
|
||||
, libcanberra
|
||||
, libicns
|
||||
, libpng
|
||||
, python3
|
||||
, zlib
|
||||
, bashInteractive
|
||||
, zsh
|
||||
, fish
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.24.2";
|
||||
version = "0.24.4";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs=";
|
||||
sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -74,6 +78,19 @@ buildPythonApplication rec {
|
||||
|
||||
outputs = [ "out" "terminfo" "shell_integration" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-zsh-completion-test-1.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch";
|
||||
sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-zsh-completion-test-2.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch";
|
||||
sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0=";
|
||||
})
|
||||
];
|
||||
|
||||
# Causes build failure due to warning
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
|
||||
@ -101,7 +118,14 @@ buildPythonApplication rec {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
checkInputs = [ pillow ];
|
||||
checkInputs = [
|
||||
pillow
|
||||
|
||||
# Shells needed for shell integration tests
|
||||
bashInteractive
|
||||
zsh
|
||||
fish
|
||||
];
|
||||
|
||||
checkPhase =
|
||||
let buildBinPath =
|
||||
@ -132,9 +156,9 @@ buildPythonApplication rec {
|
||||
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
|
||||
|
||||
installShellCompletion --cmd kitty \
|
||||
--bash <("$out/bin/kitty" + complete setup bash) \
|
||||
--fish <("$out/bin/kitty" + complete setup fish) \
|
||||
--zsh <("$out/bin/kitty" + complete setup zsh)
|
||||
--bash <("$out/bin/kitty" +complete setup bash) \
|
||||
--fish <("$out/bin/kitty" +complete setup fish2) \
|
||||
--zsh <("$out/bin/kitty" +complete setup zsh)
|
||||
|
||||
terminfo_src=${if stdenv.isDarwin then
|
||||
''"$out/Applications/kitty.app/Contents/Resources/terminfo"''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.7.10";
|
||||
version = "1.7.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u5/BUAkaxu+uKLemYggIGtMP4E4eevw0gDI7R4LxnoA=";
|
||||
sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -82,11 +82,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${optionalString onlyLibVLC "lib"}vlc";
|
||||
version = "3.0.16";
|
||||
version = "3.0.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";
|
||||
sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY=";
|
||||
sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";
|
||||
};
|
||||
|
||||
# VLC uses a *ton* of libraries for various pieces of functionality, many of
|
||||
@ -187,11 +187,6 @@ stdenv.mkDerivation rec {
|
||||
BUILDCC = "${stdenv.cc}/bin/gcc";
|
||||
|
||||
patches = [
|
||||
# Required in order to run newer srt plugin. Remove it when next release arrives
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch";
|
||||
sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ=";
|
||||
})
|
||||
# patches to build with recent live555
|
||||
# upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473
|
||||
(fetchpatch {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q=";
|
||||
sha256 = "sha256-DbZzVyTafBVsXvm1/aSdXJruKxBq5Ff8AIfDREFFVh0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww=";
|
||||
vendorSha256 = "sha256-ePL1L/A+48JEu6jpbzy8UBWrFY10iqITILSclfYs8Lw=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "berry";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JLErvin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM=";
|
||||
hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -75,5 +75,3 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
# TODO: report upstream that `which` is not POSIX; the `command` shell builtin
|
||||
# should be used instead
|
||||
|
||||
@ -48,7 +48,7 @@ do
|
||||
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
|
||||
cat << EOL
|
||||
{
|
||||
name = "$package";
|
||||
pname = "$package";
|
||||
version = "$version";
|
||||
src = fetchurl {
|
||||
url = "$url";
|
||||
|
||||
@ -13,8 +13,7 @@
|
||||
let
|
||||
|
||||
deps = map (package: stdenv.mkDerivation (with package; {
|
||||
pname = name;
|
||||
inherit version src;
|
||||
inherit pname version src;
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
unpackPhase = ''
|
||||
@ -40,7 +39,7 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
package=$out/lib/dotnet/${name}/${version}
|
||||
package=$out/lib/dotnet/${pname}/${version}
|
||||
mkdir -p $package
|
||||
cp -r . $package
|
||||
echo "{}" > $package/.nupkg.metadata
|
||||
|
||||
284
pkgs/development/compilers/roslyn/deps.nix
generated
284
pkgs/development/compilers/roslyn/deps.nix
generated
File diff suppressed because it is too large
Load Diff
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.6.8";
|
||||
version = "0.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw=";
|
||||
sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-cal";
|
||||
version = "0.5.12";
|
||||
version = "0.5.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc=";
|
||||
sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.6.18";
|
||||
version = "0.6.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY=";
|
||||
sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-io";
|
||||
version = "0.10.13";
|
||||
version = "0.10.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY=";
|
||||
sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-mqtt";
|
||||
version = "0.7.9";
|
||||
version = "0.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-mqtt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc=";
|
||||
sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-s3";
|
||||
version = "0.1.30";
|
||||
version = "0.1.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-s3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vsKQJPYdaBveb9kpZitmXFTqEeWWA4h0BkqxRzdOu28=";
|
||||
sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-crt-cpp";
|
||||
version = "0.17.8";
|
||||
version = "0.17.16";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "awslabs";
|
||||
repo = "aws-crt-cpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo=";
|
||||
sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
45
pkgs/development/libraries/libsciter/default.nix
Normal file
45
pkgs/development/libraries/libsciter/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, glib
|
||||
, cairo
|
||||
, libuuid
|
||||
, pango
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsciter";
|
||||
version = "4.4.8.23-bis"; # Version specified in GitHub commit title
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so";
|
||||
sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [ glib cairo libuuid pango gtk3 ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m755 -D $src $out/lib/libsciter-gtk.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sciter.com";
|
||||
description = "Embeddable HTML/CSS/JavaScript engine for modern UI development";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ leixb ];
|
||||
license = licenses.unfree;
|
||||
};
|
||||
}
|
||||
34
pkgs/development/libraries/libyuv/default.nix
Normal file
34
pkgs/development/libraries/libyuv/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, cmake
|
||||
, libjpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libyuv";
|
||||
version = "1787"; # Defined in: include/libyuv/version.h
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/libyuv/libyuv.git";
|
||||
rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable
|
||||
sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
# NEON does not work on aarch64, we disable it
|
||||
cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"];
|
||||
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://chromium.googlesource.com/libyuv/libyuv";
|
||||
description = "Open source project that includes YUV scaling and conversion functionality";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ leixb ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY=";
|
||||
hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -237,6 +237,7 @@
|
||||
, "postcss-cli"
|
||||
, "prebuild-install"
|
||||
, "prettier"
|
||||
, "prettier_d_slim"
|
||||
, "prettier-plugin-toml"
|
||||
, "prisma"
|
||||
, "@prisma/language-server"
|
||||
|
||||
1335
pkgs/development/node-packages/node-packages.nix
generated
1335
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -14,12 +14,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2b3d9336afab0e5df67201234976519a28da3ccb7c9a0e463be28e2827a9fdaa";
|
||||
sha256 = "sha256-ldnzEeinr2kJ8q52lq5uMKpnXwTvHQII1oUegogR8OA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "samsungtvws";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-b6nlOJgrlUDgsjYzr2nOntPTRWIjh4JUWP+UzsdiqgU=";
|
||||
sha256 = "sha256-yTRRcY3PTmhNku7kfrG2ff1i4hEow6JaiBvq0Ic19uI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osslsigncode";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ=";
|
||||
sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.40.0";
|
||||
version = "0.40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Oc4hNeSDsGHsA7V05LHFAJ5xvxWth2wEd3ag2ltVR10=";
|
||||
sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, fetchFromGitHub
|
||||
, xorgproto
|
||||
, libX11
|
||||
, libXft
|
||||
@ -12,7 +12,16 @@
|
||||
, giflib
|
||||
, pkg-config
|
||||
}:
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "skippy-xd";
|
||||
version = "unstable-2015-03-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "richardgv";
|
||||
repo = "skippy-xd";
|
||||
rev = "397216ca67074c71314f5e9a6e3f1710ccabc29e";
|
||||
sha256 = "sha256-iP6g3iS1aPPkauBLHbgZH/l+TXbWyIJ2TmbrSiNTkn0=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libX11
|
||||
@ -23,26 +32,15 @@ let
|
||||
libXinerama
|
||||
libjpeg
|
||||
giflib
|
||||
pkg-config
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "unstable-2015-03-01";
|
||||
pname = "skippy-xd";
|
||||
inherit buildInputs;
|
||||
src = fetchgit {
|
||||
url = "https://github.com/richardgv/skippy-xd/";
|
||||
rev = "397216ca67";
|
||||
sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8";
|
||||
};
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
preInstall = ''
|
||||
sed -e "s@/etc/xdg@$out&@" -i Makefile
|
||||
'';
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Expose-style compositing-based standalone window switcher";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,12 +18,17 @@
|
||||
, buildPythonApplication
|
||||
, procps
|
||||
, gtksourceview4
|
||||
, nixosTests
|
||||
# Change the default log level to debug for easier debugging of package issues
|
||||
, withDebugLogLevel ? false
|
||||
# Xmodmap is an optional dependency
|
||||
# If you use Xmodmap to set keyboard mappings (or your DE does)
|
||||
# it is required to correctly map keys
|
||||
, withXmodmap ? true
|
||||
# Some tests are flakey under high CPU load and could cause intermittent
|
||||
# failures when building. Override this to true to run tests anyway
|
||||
# See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306
|
||||
, withDoCheck ? false
|
||||
# Version and rev and hash are package arguments to allow overriding
|
||||
# while ensuring the values in prePatch and src match
|
||||
# https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7
|
||||
@ -65,7 +70,7 @@ buildPythonApplication {
|
||||
substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)"
|
||||
'');
|
||||
|
||||
doCheck = true;
|
||||
doCheck = withDoCheck;
|
||||
checkInputs = [
|
||||
psutil
|
||||
];
|
||||
@ -146,6 +151,8 @@ buildPythonApplication {
|
||||
install -m755 -D -t $out/bin/ bin/input-remapper*
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.input-remapper;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy to use tool to change the mapping of your input device buttons";
|
||||
homepage = "https://github.com/sezanzeb/input-remapper";
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tio";
|
||||
version = "1.32";
|
||||
version = "1.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tio";
|
||||
repo = "tio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM=";
|
||||
hash = "sha256-JXY6C2gYG7UmTrYIvHjn/8mL70uvXTsXbNoFr09qhcw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Serial console TTY";
|
||||
|
||||
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-1vo8ZvcH/5O1vSfOaecKiWTXtweFSLUYaNR9ffOUP+Q=";
|
||||
sha256 = "sha256-3EAV2Fx/74EbRZgDt2MAHYCbB6klHcGGT+25oHtErvs=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# TODO: make it work on bsd as well
|
||||
makeFlags = [
|
||||
"PREFIX=\${out}"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
("TARGET=" + (if stdenv.isSunOS then "solaris"
|
||||
else if stdenv.isLinux then "linux-glibc"
|
||||
else if stdenv.isDarwin then "osx"
|
||||
@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
|
||||
hardware.
|
||||
'';
|
||||
homepage = "https://haproxy.org";
|
||||
license = licenses.gpl2;
|
||||
changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG";
|
||||
license = with licenses; [ gpl2Plus lgpl21Only ];
|
||||
maintainers = with maintainers; [ fuzzy-id ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdk-go";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk-team";
|
||||
repo = "CDK";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml";
|
||||
sha256 = "sha256-Ngv+/b9D27ERwjNIC3s3ZBPkV10G+tT8QW8YMOgb8aA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l";
|
||||
vendorSha256 = "sha256-9Q7f3keMUEI2cWal2dvp4b8kvTZVM1Cf4iTvH9yCyX0=";
|
||||
|
||||
# At least one test is outdated
|
||||
doCheck = false;
|
||||
|
||||
@ -30,11 +30,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tor";
|
||||
version = "0.4.6.9";
|
||||
version = "0.4.6.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ad99k4wysxrnlaprv7brxr2nc0h5zdnrh0rma10pqlck2037sf7";
|
||||
sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "geoip" ];
|
||||
|
||||
@ -15,14 +15,11 @@ with lib;
|
||||
let
|
||||
downloadPageUrl = "https://dist.torproject.org";
|
||||
|
||||
# See https://www.torproject.org/docs/signing-keys.html
|
||||
# See https://support.torproject.org/little-t-tor/#fetching-the-tor-developers-key
|
||||
signingKeys = [
|
||||
# Roger Dingledine
|
||||
"B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5"
|
||||
"F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451"
|
||||
# Nick Mathewson
|
||||
"2133 BC60 0AB1 33E1 D826 D173 FE43 009C 4607 B1FB"
|
||||
"B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5"
|
||||
"514102454D0A87DB0767A1EBBE6A0531C18A9179" # Alexander Færøy
|
||||
"B74417EDDF22AC9F9E90F49142E86A2A11F48D36" # David Goulet
|
||||
"2133BC600AB133E1D826D173FE43009C4607B1FB" # Nick Mathewson
|
||||
];
|
||||
in
|
||||
|
||||
@ -52,20 +49,24 @@ srcName=''${srcBase/.tar.gz/}
|
||||
srcVers=(''${srcName//-/ })
|
||||
version=''${srcVers[1]}
|
||||
|
||||
sigUrl=$srcUrl.asc
|
||||
checksumUrl=$srcUrl.sha256sum
|
||||
checksumFile=''${checksumUrl##*/}
|
||||
|
||||
sigUrl=$checksumUrl.asc
|
||||
sigFile=''${sigUrl##*/}
|
||||
|
||||
# upstream does not support byte ranges ...
|
||||
[[ -e "$srcFile" ]] || curl -L -o "$srcFile" -- "$srcUrl"
|
||||
[[ -e "$checksumFile" ]] || curl -L -o "$checksumFile" -- "$checksumUrl"
|
||||
[[ -e "$sigFile" ]] || curl -L -o "$sigFile" -- "$sigUrl"
|
||||
|
||||
export GNUPGHOME=$PWD/gnupg
|
||||
mkdir -m 700 -p "$GNUPGHOME"
|
||||
|
||||
gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)}
|
||||
gpg --batch --verify "$sigFile" "$srcFile"
|
||||
gpg --batch --verify "$sigFile" "$checksumFile"
|
||||
|
||||
sha256=$(nix-hash --type sha256 --flat --base32 "$srcFile")
|
||||
sha256sum -c "$checksumFile"
|
||||
|
||||
update-source-version tor "$version" "$sha256"
|
||||
update-source-version tor "$version" "$(cut -d ' ' "$checksumFile")"
|
||||
''
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2pysQsJynuedqX9Yi4BjTnWuJZ5XTq11UEgkSh7eZyw=";
|
||||
sha256 = "sha256-zqtRM2p+RrLrXzDCMtHJZNx/dKWyFqM+3V5eICwWvWs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LNN0u48B6xGjrUasxGF+4sw1HxiR22hj8H2/mSyh1SI=";
|
||||
vendorSha256 = "sha256-EiQ6XmGrw1O2Zd8TM7HSr3sQUd1naQYKbYLKB/vWdXU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -9569,6 +9569,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
rustdesk = callPackage ../applications/networking/remote/rustdesk { };
|
||||
|
||||
rustscan = callPackage ../tools/security/rustscan {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -18641,6 +18643,8 @@ with pkgs;
|
||||
|
||||
libschrift = callPackage ../development/libraries/libschrift { };
|
||||
|
||||
libsciter = callPackage ../development/libraries/libsciter { };
|
||||
|
||||
libsearpc = callPackage ../development/libraries/libsearpc { };
|
||||
|
||||
libsigcxx = callPackage ../development/libraries/libsigcxx { };
|
||||
@ -18972,6 +18976,8 @@ with pkgs;
|
||||
|
||||
libyubikey = callPackage ../development/libraries/libyubikey { };
|
||||
|
||||
libyuv = callPackage ../development/libraries/libyuv { };
|
||||
|
||||
libzapojit = callPackage ../development/libraries/libzapojit { };
|
||||
|
||||
libzen = callPackage ../development/libraries/libzen { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user