forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
25043f0f28
|
|
@ -31,6 +31,7 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
nix.registry.nixpkgs.flake.outPath = builtins.path { name = "source"; path = pkgs.path; };
|
||||
# Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required
|
||||
# for nixos-install.
|
||||
boot.postBootCommands = mkAfter
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ in {
|
|||
ProtectKernelTunables = true;
|
||||
ProtectSystem = "full";
|
||||
StateDirectory = "rust-motd";
|
||||
RestrictAddressFamilies = "none";
|
||||
RestrictAddressFamilies = [ "AF_UNIX" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
|
|
|||
|
|
@ -212,6 +212,9 @@ with lib;
|
|||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/spool/nullmailer - ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/failed 750 ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/queue 750 ${cfg.user} - - -"
|
||||
"d /var/spool/nullmailer/tmp 750 ${cfg.user} - - -"
|
||||
];
|
||||
|
||||
systemd.services.nullmailer = {
|
||||
|
|
@ -220,7 +223,6 @@ with lib;
|
|||
after = [ "network.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -p /var/spool/nullmailer/{queue,tmp,failed}
|
||||
rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -465,7 +465,13 @@ in
|
|||
networking.wireguard = {
|
||||
|
||||
enable = mkOption {
|
||||
description = lib.mdDoc "Whether to enable WireGuard.";
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable WireGuard.
|
||||
|
||||
Please note that {option}`systemd.network.netdevs` has more features
|
||||
and is better maintained. When building new things, it is advised to
|
||||
use that instead.
|
||||
'';
|
||||
type = types.bool;
|
||||
# 2019-05-25: Backwards compatibility.
|
||||
default = cfg.interfaces != {};
|
||||
|
|
@ -474,7 +480,13 @@ in
|
|||
};
|
||||
|
||||
interfaces = mkOption {
|
||||
description = lib.mdDoc "WireGuard interfaces.";
|
||||
description = lib.mdDoc ''
|
||||
WireGuard interfaces.
|
||||
|
||||
Please note that {option}`systemd.network.netdevs` has more features
|
||||
and is better maintained. When building new things, it is advised to
|
||||
use that instead.
|
||||
'';
|
||||
default = {};
|
||||
example = {
|
||||
wg0 = {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in {
|
|||
hashedPassword = mkOption {
|
||||
default = "";
|
||||
description =
|
||||
lib.mdDoc "Create the password with: 'echo -n 'thisismypassword' | npx argon2-cli -e'.";
|
||||
lib.mdDoc "Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ in {
|
|||
HASHED_PASSWORD = cfg.hashedPassword;
|
||||
} // cfg.extraEnvironment;
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + builtins.concatStringsSep " " cfg.extraArguments;
|
||||
ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + lib.escapeShellArgs cfg.extraArguments;
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
RuntimeDirectory = cfg.user;
|
||||
User = cfg.user;
|
||||
|
|
|
|||
|
|
@ -604,6 +604,10 @@ in
|
|||
The configuration for each network interface. If
|
||||
{option}`networking.useDHCP` is true, then every
|
||||
interface not listed here will be configured using DHCP.
|
||||
|
||||
Please note that {option}`systemd.network.netdevs` has more features
|
||||
and is better maintained. When building new things, it is advised to
|
||||
use that instead.
|
||||
'';
|
||||
type = with types; attrsOf (submodule interfaceOpts);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -678,6 +678,7 @@ in {
|
|||
xfce = handleTest ./xfce.nix {};
|
||||
xmonad = handleTest ./xmonad.nix {};
|
||||
xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};
|
||||
xpadneo = handleTest ./xpadneo.nix {};
|
||||
xrdp = handleTest ./xrdp.nix {};
|
||||
xss-lock = handleTest ./xss-lock.nix {};
|
||||
xterm = handleTest ./xterm.nix {};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix (
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
|
||||
container = {
|
||||
|
|
@ -18,6 +18,7 @@ import ./make-test-python.nix (
|
|||
};
|
||||
|
||||
containerSystem = (import ../lib/eval-config.nix {
|
||||
inherit (pkgs) system;
|
||||
modules = [ container ];
|
||||
}).config.system.build.toplevel;
|
||||
|
||||
|
|
|
|||
18
nixos/tests/xpadneo.nix
Normal file
18
nixos/tests/xpadneo.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "xpadneo";
|
||||
meta.maintainers = with lib.maintainers; [ kira-bruneau ];
|
||||
|
||||
nodes = {
|
||||
machine = {
|
||||
config.hardware.xpadneo.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# This is just a sanity check to make sure the module was
|
||||
# loaded. We'd have to find some way to mock an xbox controller if
|
||||
# we wanted more in-depth testing.
|
||||
testScript = ''
|
||||
machine.start();
|
||||
machine.succeed("modinfo hid_xpadneo | grep 'version:\s\+${pkgs.linuxPackages.xpadneo.version}'")
|
||||
'';
|
||||
})
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
let chia = python3Packages.buildPythonApplication rec {
|
||||
pname = "chia";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "chia-blockchain";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-FzKdb6Z/ykKYjpjCr7QR5fxXPNnQbW3bBY97t7DxS90=";
|
||||
hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,38 +1,47 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook
|
||||
, libtool, pkg-config, gtk2, libGLU, file
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, cglm
|
||||
, gtk3
|
||||
, libepoxy
|
||||
, libGLU
|
||||
}:
|
||||
|
||||
let
|
||||
gtkglarea = stdenv.mkDerivation rec {
|
||||
pname = "gtkglarea";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 libGLU ];
|
||||
hardeningDisable = [ "format" ];
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsv";
|
||||
version = "0.9-1";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcuelenaere";
|
||||
owner = "jabl";
|
||||
repo = "fsv";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj";
|
||||
hash = "sha256-fxsA3qcBPvK4H5P4juGTe6eg1lkygvzFpNW36B9lsE4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# fix build with gettext 0.20
|
||||
sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
|
||||
buildInputs = [ file gtk2 libGLU gtkglarea ];
|
||||
buildInputs = [
|
||||
cglm
|
||||
gtk3
|
||||
libepoxy
|
||||
libGLU
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp src/fsv $out/bin/fsv
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "File system visualizer in cyberspace";
|
||||
|
|
@ -44,7 +53,7 @@ in stdenv.mkDerivation rec {
|
|||
hard drive, or any arbitrarily large collection of files, limited only
|
||||
by the host computer's memory and graphics hardware.
|
||||
'';
|
||||
homepage = "https://github.com/mcuelenaere/fsv";
|
||||
homepage = "https://github.com/jabl/fsv";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GQf5S7mYuucJS5jsz0upe6DiniY8YXZXYQV7nyrjVmE=";
|
||||
sha256 = "sha256-i4jgmqRvBX6g6IOitnBnQqWnFY5QoLk6/Cah0wCU8uc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
|
|
@ -25,13 +25,13 @@ buildGoModule rec {
|
|||
|
||||
ldflags = [ "-s" "-w" "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=nixpkgs" ];
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/hugo gen man
|
||||
postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
${emulator} $out/bin/hugo gen man
|
||||
installManPage man/*
|
||||
installShellCompletion --cmd hugo \
|
||||
--bash <($out/bin/hugo completion bash) \
|
||||
--fish <($out/bin/hugo completion fish) \
|
||||
--zsh <($out/bin/hugo completion zsh)
|
||||
--bash <(${emulator} $out/bin/hugo completion bash) \
|
||||
--fish <(${emulator} $out/bin/hugo completion fish) \
|
||||
--zsh <(${emulator} $out/bin/hugo completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,22 +2,23 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kuttl";
|
||||
version = "0.11.1";
|
||||
version = "0.13.0";
|
||||
cli = "kubectl-kuttl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kudobuilder";
|
||||
repo = "kuttl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jvearvhl2fQV5OOVmvf3C4MjE//wkVs8Ly9BIwv15/8=";
|
||||
sha256 = "sha256-liuP8ALcPxbU+hZ54KDFj2r2yZpAbVago0IxIv52N3o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EytHUfr6RbgXowYlfuajvNt9VwmGmvw9TBRtwYMAIh4=";
|
||||
vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-kuttl" ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.10.7";
|
||||
version = "5.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AGzDs2KZt44uBJRBHvBL7nn5TpgWbcdLTEf9Vx9j89U=";
|
||||
sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cA5QxI1lLBdzPOj3pFqqHPfMwJQPPiyqQA4FLwetNUs=";
|
||||
vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.38.9";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rfAVgnFAxEguFuY+Gfe/T0NcsD6LmPSquxuTR0bRqXQ=";
|
||||
sha256 = "sha256-Y8t5rThkPD3FzY25L2lOIvktU5+NwBZtq9Pn3VzQQf4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vcluster";
|
||||
version = "0.11.1";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aFTugqWr/9e3wQLL4yre2T8CUKq8P0HZLsES8lFZKHY=";
|
||||
sha256 = "sha256-KRm6+WRMGzM7L17ABj/g6Nu+eU6F3C4a9CAa0ePC6i8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.65.1";
|
||||
version = "5.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-6Cy3yScPl2Ax0N2pmJWJEPXrSlj+F0IAoM5G8rIjbT8=";
|
||||
sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub
|
||||
, graphicsmagick, libav, pcre, xorgserver, ffmpeg
|
||||
, graphicsmagick, pcre, xorgserver, ffmpeg
|
||||
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
|
||||
, callPackage
|
||||
}: let
|
||||
|
|
@ -53,16 +53,16 @@ in {
|
|||
|
||||
markad = stdenv.mkDerivation rec {
|
||||
pname = "vdr-markad";
|
||||
version = "2.0.4";
|
||||
version = "3.0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-markad";
|
||||
owner = "jbrundiers";
|
||||
sha256 = "sha256-Y4KsEtUq+KoUooXiw9O9RokBxNwWBkiGB31GncmHkYM=";
|
||||
rev = "288e3dae93421b0176f4f62b68ea4b39d98e8793";
|
||||
owner = "kfb77";
|
||||
sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
buildInputs = [ vdr libav ];
|
||||
buildInputs = [ vdr ffmpeg ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace command/Makefile --replace '/usr' ""
|
||||
|
|
@ -78,6 +78,8 @@ in {
|
|||
buildFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"LIBDIR=/lib/vdr"
|
||||
"BINDIR=/bin"
|
||||
"MANDIR=/share/man"
|
||||
"APIVERSION=${vdr.version}"
|
||||
"VDRDIR=${vdr.dev}/include/vdr"
|
||||
"LOCDIR=/share/locale"
|
||||
|
|
@ -86,7 +88,7 @@ in {
|
|||
installFlags = buildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jbrundiers/vdr-plugin-markad";
|
||||
homepage = "https://github.com/kfb77/vdr-plugin-markad";
|
||||
description = "MarkAd marks advertisements in VDR recordings.";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "distrobox";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo=";
|
||||
sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [ go-md2man installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace Makefile --replace \
|
||||
'$(shell which bash)' '${lib.getBin bash}/bin/bash'
|
||||
make docs
|
||||
make docs SHELL="$SHELL"
|
||||
installManPage doc/man/*.[1-9]
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tipa-1.3";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tipa";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz";
|
||||
url = "mirror://debian/pool/main/t/tipa/${pname}_${version}.orig.tar.gz";
|
||||
sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "restinio";
|
||||
version = "0.6.16";
|
||||
version = "0.6.17";
|
||||
in
|
||||
fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-tl9HUsT9mCupuwp6T4dbPdYOQy3vYyctuwFQPfR8m0Y=";
|
||||
hash = "sha256-8A13r3Qsn5S+kVWLPENoOjqz2tPMxSo6EWBvHG1cTAE=";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "autograd";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OD3g9TfvLji4X/lpJZOwz66JWMmzvUUbUsJV/ZFx/84=";
|
||||
sha256 = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy future ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jsonschema
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,6 +16,13 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ jsonschema ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# Fails with "Unresolvable JSON pointer"
|
||||
"test_local_reference_in_meta"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Merge a series of JSON documents";
|
||||
homepage = "https://github.com/avian2/jsonmerge";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.19";
|
||||
version = "1.6.20";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sWsn5jX4kQbK9rOW5FC94mdBwXNAR2a48XFHe37eK6U=";
|
||||
sha256 = "sha256-WQqEST5f3yUsvjw86ckS/jRaxcnUd13zb7lmQvfmsjM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.31";
|
||||
version = "0.2.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6JMWt6svJwW7FNn2sOSUjFtXBqmC02uFEiybj5H9wTw=";
|
||||
sha256 = "sha256-fHGS05qlRSVTrjEx71hhVridbpbLVyaAOg3uMYIj0TU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-caFM1A4SGZ8MIIoWnzBdKJOAgzscrf9eGtv/GCSfzag=";
|
||||
vendorSha256 = "sha256-ctIKaThBIzaBw3/a0pat+G7Zb4Y2F7mk8VZWoM0XdyI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,63 @@
|
|||
{ lib, stdenv, fetchurl, elfutils, libunwind }:
|
||||
{ lib, stdenv, fetchurl, fetchgit, autoreconfHook, dejagnu, elfutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ltrace";
|
||||
version = "0.7.3";
|
||||
version = "0.7.91";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.bz2";
|
||||
sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf";
|
||||
url = "https://src.fedoraproject.org/repo/pkgs/ltrace/ltrace-0.7.91.tar.bz2/9db3bdee7cf3e11c87d8cc7673d4d25b/ltrace-0.7.91.tar.bz2";
|
||||
sha256 = "sha256-HqellbKh2ZDHxslXl7SSIXtpjV1sodtgVwh8hgTC3Dc=";
|
||||
};
|
||||
|
||||
buildInputs = [ elfutils libunwind ];
|
||||
nativeBuildInputs = [ autoreconfHook ]; # Some patches impact ./configure.
|
||||
buildInputs = [ elfutils ];
|
||||
checkInputs = [ dejagnu ];
|
||||
|
||||
# Import Fedora's (very) large patch series: bug fixes, architecture support,
|
||||
# etc. RH/Fedora are currently working with upstream to merge all these
|
||||
# patches for the next major branch.
|
||||
prePatch = let
|
||||
debian = fetchurl {
|
||||
url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz";
|
||||
sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp";
|
||||
fedora = fetchgit {
|
||||
url = "https://src.fedoraproject.org/rpms/ltrace.git";
|
||||
rev = "00f430ccbebdbd13bdd4d7ee6303b091cf005542";
|
||||
sha256 = "sha256-FBGEgmaslu7xrJtZ2WsYwu9Cw1ZQrWRV1+Eu9qLXO4s=";
|
||||
};
|
||||
in ''
|
||||
tar xf '${debian}'
|
||||
patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
|
||||
# Order matters, read the patch list from the RPM spec. Our own patches
|
||||
# are applied on top of the Fedora baseline.
|
||||
fedorapatches=""
|
||||
for p in $(grep '^Patch[0-9]\+:' ${fedora}/ltrace.spec | awk '{ print $2 }'); do
|
||||
fedorapatches="$fedorapatches ${fedora}/$p"
|
||||
done
|
||||
patches="$fedorapatches $patches"
|
||||
'';
|
||||
|
||||
# Cherry-pick extra patches for recent glibc support in the test suite.
|
||||
patches = [
|
||||
# https://gitlab.com/cespedes/ltrace/-/merge_requests/14
|
||||
./testsuite-newfstatat.patch
|
||||
# https://gitlab.com/cespedes/ltrace/-/merge_requests/15
|
||||
./sysdeps-x86.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
# Hardening options interfere with some of the low-level expectations in
|
||||
# the test suite (e.g. printf ends up redirected to __printf_chk).
|
||||
NIX_HARDENING_ENABLE="" \
|
||||
# Disable test that requires ptrace-ing a non-child process, this might be
|
||||
# forbidden by YAMA ptrace policy on the build host.
|
||||
RUNTESTFLAGS="--host=${stdenv.hostPlatform.config} \
|
||||
--target=${stdenv.targetPlatform.config} \
|
||||
--ignore attach-process.exp" \
|
||||
make check
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library call tracer";
|
||||
homepage = "https://www.ltrace.org/";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
328
pkgs/development/tools/misc/ltrace/sysdeps-x86.patch
Normal file
328
pkgs/development/tools/misc/ltrace/sysdeps-x86.patch
Normal file
|
|
@ -0,0 +1,328 @@
|
|||
diff --git a/sysdeps/linux-gnu/x86/syscallent.h b/sysdeps/linux-gnu/x86/syscallent.h
|
||||
index 345fe20..66ac522 100644
|
||||
--- a/sysdeps/linux-gnu/x86/syscallent.h
|
||||
+++ b/sysdeps/linux-gnu/x86/syscallent.h
|
||||
@@ -238,7 +238,7 @@
|
||||
"setfsgid32", /* 216 */
|
||||
"pivot_root", /* 217 */
|
||||
"mincore", /* 218 */
|
||||
- "madvise1", /* 219 */
|
||||
+ "madvise", /* 219 */
|
||||
"getdents64", /* 220 */
|
||||
"fcntl64", /* 221 */
|
||||
"222", /* 222 */
|
||||
@@ -279,14 +279,14 @@
|
||||
"remap_file_pages", /* 257 */
|
||||
"set_tid_address", /* 258 */
|
||||
"timer_create", /* 259 */
|
||||
- "260", /* 260 */
|
||||
- "261", /* 261 */
|
||||
- "262", /* 262 */
|
||||
- "263", /* 263 */
|
||||
- "264", /* 264 */
|
||||
- "265", /* 265 */
|
||||
- "266", /* 266 */
|
||||
- "267", /* 267 */
|
||||
+ "timer_settime", /* 260 */
|
||||
+ "timer_gettime", /* 261 */
|
||||
+ "timer_getoverrun", /* 262 */
|
||||
+ "timer_delete", /* 263 */
|
||||
+ "clock_settime", /* 264 */
|
||||
+ "clock_gettime", /* 265 */
|
||||
+ "clock_getres", /* 266 */
|
||||
+ "clock_nanosleep", /* 267 */
|
||||
"statfs64", /* 268 */
|
||||
"fstatfs64", /* 269 */
|
||||
"tgkill", /* 270 */
|
||||
@@ -297,11 +297,11 @@
|
||||
"get_mempolicy", /* 275 */
|
||||
"set_mempolicy", /* 276 */
|
||||
"mq_open", /* 277 */
|
||||
- "278", /* 278 */
|
||||
- "279", /* 279 */
|
||||
- "280", /* 280 */
|
||||
- "281", /* 281 */
|
||||
- "282", /* 282 */
|
||||
+ "mq_unlink", /* 278 */
|
||||
+ "mq_timedsend", /* 279 */
|
||||
+ "mq_timedreceive", /* 280 */
|
||||
+ "mq_notify", /* 281 */
|
||||
+ "mq_getsetattr", /* 282 */
|
||||
"kexec_load", /* 283 */
|
||||
"waitid", /* 284 */
|
||||
"285", /* 285 */
|
||||
@@ -368,3 +368,105 @@
|
||||
"setns", /* 346 */
|
||||
"process_vm_readv", /* 347 */
|
||||
"process_vm_writev", /* 348 */
|
||||
+ "kcmp", /* 349 */
|
||||
+ "finit_module", /* 350 */
|
||||
+ "sched_setattr", /* 351 */
|
||||
+ "sched_getattr", /* 352 */
|
||||
+ "renameat2", /* 353 */
|
||||
+ "seccomp", /* 354 */
|
||||
+ "getrandom", /* 355 */
|
||||
+ "memfd_create", /* 356 */
|
||||
+ "bpf", /* 357 */
|
||||
+ "execveat", /* 358 */
|
||||
+ "socket", /* 359 */
|
||||
+ "socketpair", /* 360 */
|
||||
+ "bind", /* 361 */
|
||||
+ "connect", /* 362 */
|
||||
+ "listen", /* 363 */
|
||||
+ "accept4", /* 364 */
|
||||
+ "getsockopt", /* 365 */
|
||||
+ "setsockopt", /* 366 */
|
||||
+ "getsockname", /* 367 */
|
||||
+ "getpeername", /* 368 */
|
||||
+ "sendto", /* 369 */
|
||||
+ "sendmsg", /* 370 */
|
||||
+ "recvfrom", /* 371 */
|
||||
+ "recvmsg", /* 372 */
|
||||
+ "shutdown", /* 373 */
|
||||
+ "userfaultfd", /* 374 */
|
||||
+ "membarrier", /* 375 */
|
||||
+ "mlock2", /* 376 */
|
||||
+ "copy_file_range", /* 377 */
|
||||
+ "preadv2", /* 378 */
|
||||
+ "pwritev2", /* 379 */
|
||||
+ "pkey_mprotect", /* 380 */
|
||||
+ "pkey_alloc", /* 381 */
|
||||
+ "pkey_free", /* 382 */
|
||||
+ "statx", /* 383 */
|
||||
+ "arch_prctl", /* 384 */
|
||||
+ "io_pgetevents", /* 385 */
|
||||
+ "rseq", /* 386 */
|
||||
+ "387", /* 387 */
|
||||
+ "388", /* 388 */
|
||||
+ "389", /* 389 */
|
||||
+ "390", /* 390 */
|
||||
+ "391", /* 391 */
|
||||
+ "392", /* 392 */
|
||||
+ "semget", /* 393 */
|
||||
+ "semctl", /* 394 */
|
||||
+ "shmget", /* 395 */
|
||||
+ "shmctl", /* 396 */
|
||||
+ "shmat", /* 397 */
|
||||
+ "shmdt", /* 398 */
|
||||
+ "msgget", /* 399 */
|
||||
+ "msgsnd", /* 400 */
|
||||
+ "msgrcv", /* 401 */
|
||||
+ "msgctl", /* 402 */
|
||||
+ "clock_gettime64", /* 403 */
|
||||
+ "clock_settime64", /* 404 */
|
||||
+ "clock_adjtime64", /* 405 */
|
||||
+ "clock_getres_time64", /* 406 */
|
||||
+ "clock_nanosleep_time64", /* 407 */
|
||||
+ "timer_gettime64", /* 408 */
|
||||
+ "timer_settime64", /* 409 */
|
||||
+ "timerfd_gettime64", /* 410 */
|
||||
+ "timerfd_settime64", /* 411 */
|
||||
+ "utimensat_time64", /* 412 */
|
||||
+ "pselect6_time64", /* 413 */
|
||||
+ "ppoll_time64", /* 414 */
|
||||
+ "415", /* 415 */
|
||||
+ "io_pgetevents_time64", /* 416 */
|
||||
+ "recvmmsg_time64", /* 417 */
|
||||
+ "mq_timedsend_time64", /* 418 */
|
||||
+ "mq_timedreceive_time64", /* 419 */
|
||||
+ "semtimedop_time64", /* 420 */
|
||||
+ "rt_sigtimedwait_time64", /* 421 */
|
||||
+ "futex_time64", /* 422 */
|
||||
+ "sched_rr_get_interval_time64", /* 423 */
|
||||
+ "pidfd_send_signal", /* 424 */
|
||||
+ "io_uring_setup", /* 425 */
|
||||
+ "io_uring_enter", /* 426 */
|
||||
+ "io_uring_register", /* 427 */
|
||||
+ "open_tree", /* 428 */
|
||||
+ "move_mount", /* 429 */
|
||||
+ "fsopen", /* 430 */
|
||||
+ "fsconfig", /* 431 */
|
||||
+ "fsmount", /* 432 */
|
||||
+ "fspick", /* 433 */
|
||||
+ "pidfd_open", /* 434 */
|
||||
+ "clone3", /* 435 */
|
||||
+ "close_range", /* 436 */
|
||||
+ "openat2", /* 437 */
|
||||
+ "pidfd_getfd", /* 438 */
|
||||
+ "faccessat2", /* 439 */
|
||||
+ "process_madvise", /* 440 */
|
||||
+ "epoll_pwait2", /* 441 */
|
||||
+ "mount_setattr", /* 442 */
|
||||
+ "quotactl_fd", /* 443 */
|
||||
+ "landlock_create_ruleset", /* 444 */
|
||||
+ "landlock_add_rule", /* 445 */
|
||||
+ "landlock_restrict_self", /* 446 */
|
||||
+ "memfd_secret", /* 447 */
|
||||
+ "process_mrelease", /* 448 */
|
||||
+ "futex_waitv", /* 449 */
|
||||
+ "set_mempolicy_home_node", /* 450 */
|
||||
diff --git a/sysdeps/linux-gnu/x86/syscallent1.h b/sysdeps/linux-gnu/x86/syscallent1.h
|
||||
index 91ae8d6..f8b15f7 100644
|
||||
--- a/sysdeps/linux-gnu/x86/syscallent1.h
|
||||
+++ b/sysdeps/linux-gnu/x86/syscallent1.h
|
||||
@@ -36,8 +36,8 @@
|
||||
"rt_sigprocmask", /* 14 */
|
||||
"rt_sigreturn", /* 15 */
|
||||
"ioctl", /* 16 */
|
||||
- "pread", /* 17 */
|
||||
- "pwrite", /* 18 */
|
||||
+ "pread64", /* 17 */
|
||||
+ "pwrite64", /* 18 */
|
||||
"readv", /* 19 */
|
||||
"writev", /* 20 */
|
||||
"access", /* 21 */
|
||||
@@ -233,8 +233,8 @@
|
||||
"get_thread_area", /* 211 */
|
||||
"lookup_dcookie", /* 212 */
|
||||
"epoll_create", /* 213 */
|
||||
- "epoll_ctl", /* 214 */
|
||||
- "epoll_wait", /* 215 */
|
||||
+ "epoll_ctl_old", /* 214 */
|
||||
+ "epoll_wait_old", /* 215 */
|
||||
"remap_file_pages", /* 216 */
|
||||
"getdents64", /* 217 */
|
||||
"set_tid_address", /* 218 */
|
||||
@@ -331,3 +331,142 @@
|
||||
"getcpu", /* 309 */
|
||||
"process_vm_readv", /* 310 */
|
||||
"process_vm_writev", /* 311 */
|
||||
+ "kcmp", /* 312 */
|
||||
+ "finit_module", /* 313 */
|
||||
+ "sched_setattr", /* 314 */
|
||||
+ "sched_getattr", /* 315 */
|
||||
+ "renameat2", /* 316 */
|
||||
+ "seccomp", /* 317 */
|
||||
+ "getrandom", /* 318 */
|
||||
+ "memfd_create", /* 319 */
|
||||
+ "kexec_file_load", /* 320 */
|
||||
+ "bpf", /* 321 */
|
||||
+ "execveat", /* 322 */
|
||||
+ "userfaultfd", /* 323 */
|
||||
+ "membarrier", /* 324 */
|
||||
+ "mlock2", /* 325 */
|
||||
+ "copy_file_range", /* 326 */
|
||||
+ "preadv2", /* 327 */
|
||||
+ "pwritev2", /* 328 */
|
||||
+ "pkey_mprotect", /* 329 */
|
||||
+ "pkey_alloc", /* 330 */
|
||||
+ "pkey_free", /* 331 */
|
||||
+ "statx", /* 332 */
|
||||
+ "io_pgetevents", /* 333 */
|
||||
+ "rseq", /* 334 */
|
||||
+ "335", /* 335 */
|
||||
+ "336", /* 336 */
|
||||
+ "337", /* 337 */
|
||||
+ "338", /* 338 */
|
||||
+ "339", /* 339 */
|
||||
+ "340", /* 340 */
|
||||
+ "341", /* 341 */
|
||||
+ "342", /* 342 */
|
||||
+ "343", /* 343 */
|
||||
+ "344", /* 344 */
|
||||
+ "345", /* 345 */
|
||||
+ "346", /* 346 */
|
||||
+ "347", /* 347 */
|
||||
+ "348", /* 348 */
|
||||
+ "349", /* 349 */
|
||||
+ "350", /* 350 */
|
||||
+ "351", /* 351 */
|
||||
+ "352", /* 352 */
|
||||
+ "353", /* 353 */
|
||||
+ "354", /* 354 */
|
||||
+ "355", /* 355 */
|
||||
+ "356", /* 356 */
|
||||
+ "357", /* 357 */
|
||||
+ "358", /* 358 */
|
||||
+ "359", /* 359 */
|
||||
+ "360", /* 360 */
|
||||
+ "361", /* 361 */
|
||||
+ "362", /* 362 */
|
||||
+ "363", /* 363 */
|
||||
+ "364", /* 364 */
|
||||
+ "365", /* 365 */
|
||||
+ "366", /* 366 */
|
||||
+ "367", /* 367 */
|
||||
+ "368", /* 368 */
|
||||
+ "369", /* 369 */
|
||||
+ "370", /* 370 */
|
||||
+ "371", /* 371 */
|
||||
+ "372", /* 372 */
|
||||
+ "373", /* 373 */
|
||||
+ "374", /* 374 */
|
||||
+ "375", /* 375 */
|
||||
+ "376", /* 376 */
|
||||
+ "377", /* 377 */
|
||||
+ "378", /* 378 */
|
||||
+ "379", /* 379 */
|
||||
+ "380", /* 380 */
|
||||
+ "381", /* 381 */
|
||||
+ "382", /* 382 */
|
||||
+ "383", /* 383 */
|
||||
+ "384", /* 384 */
|
||||
+ "385", /* 385 */
|
||||
+ "386", /* 386 */
|
||||
+ "387", /* 387 */
|
||||
+ "388", /* 388 */
|
||||
+ "389", /* 389 */
|
||||
+ "390", /* 390 */
|
||||
+ "391", /* 391 */
|
||||
+ "392", /* 392 */
|
||||
+ "393", /* 393 */
|
||||
+ "394", /* 394 */
|
||||
+ "395", /* 395 */
|
||||
+ "396", /* 396 */
|
||||
+ "397", /* 397 */
|
||||
+ "398", /* 398 */
|
||||
+ "399", /* 399 */
|
||||
+ "400", /* 400 */
|
||||
+ "401", /* 401 */
|
||||
+ "402", /* 402 */
|
||||
+ "403", /* 403 */
|
||||
+ "404", /* 404 */
|
||||
+ "405", /* 405 */
|
||||
+ "406", /* 406 */
|
||||
+ "407", /* 407 */
|
||||
+ "408", /* 408 */
|
||||
+ "409", /* 409 */
|
||||
+ "410", /* 410 */
|
||||
+ "411", /* 411 */
|
||||
+ "412", /* 412 */
|
||||
+ "413", /* 413 */
|
||||
+ "414", /* 414 */
|
||||
+ "415", /* 415 */
|
||||
+ "416", /* 416 */
|
||||
+ "417", /* 417 */
|
||||
+ "418", /* 418 */
|
||||
+ "419", /* 419 */
|
||||
+ "420", /* 420 */
|
||||
+ "421", /* 421 */
|
||||
+ "422", /* 422 */
|
||||
+ "423", /* 423 */
|
||||
+ "pidfd_send_signal", /* 424 */
|
||||
+ "io_uring_setup", /* 425 */
|
||||
+ "io_uring_enter", /* 426 */
|
||||
+ "io_uring_register", /* 427 */
|
||||
+ "open_tree", /* 428 */
|
||||
+ "move_mount", /* 429 */
|
||||
+ "fsopen", /* 430 */
|
||||
+ "fsconfig", /* 431 */
|
||||
+ "fsmount", /* 432 */
|
||||
+ "fspick", /* 433 */
|
||||
+ "pidfd_open", /* 434 */
|
||||
+ "clone3", /* 435 */
|
||||
+ "close_range", /* 436 */
|
||||
+ "openat2", /* 437 */
|
||||
+ "pidfd_getfd", /* 438 */
|
||||
+ "faccessat2", /* 439 */
|
||||
+ "process_madvise", /* 440 */
|
||||
+ "epoll_pwait2", /* 441 */
|
||||
+ "mount_setattr", /* 442 */
|
||||
+ "quotactl_fd", /* 443 */
|
||||
+ "landlock_create_ruleset", /* 444 */
|
||||
+ "landlock_add_rule", /* 445 */
|
||||
+ "landlock_restrict_self", /* 446 */
|
||||
+ "memfd_secret", /* 447 */
|
||||
+ "process_mrelease", /* 448 */
|
||||
+ "futex_waitv", /* 449 */
|
||||
+ "set_mempolicy_home_node", /* 450 */
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/testsuite/ltrace.main/system_calls.exp b/testsuite/ltrace.main/system_calls.exp
|
||||
index 1b64cb0..af19916 100644
|
||||
--- a/testsuite/ltrace.main/system_calls.exp
|
||||
+++ b/testsuite/ltrace.main/system_calls.exp
|
||||
@@ -133,7 +133,7 @@ Match [Diff [Calls [ltraceRun -L -S -- $bin]] \
|
||||
{ {^write$} == 1 }
|
||||
{ {^unlink(at)?$} >= 2 }
|
||||
{ {^open(at)?$} == 1 }
|
||||
- { {^(new|f)?stat(64)?$} >= 1 }
|
||||
+ { {^(new)?f?statx?(at)?(64)?$} >= 1 }
|
||||
{ {^close$} == 1 }
|
||||
{ {^getcwd$} == 1 }
|
||||
{ {^chdir$} == 1 }
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acpid";
|
||||
version = "2.0.33";
|
||||
version = "2.0.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz";
|
||||
sha256 = "sha256-CFb3Gz6zShtmPQqOY2Pfy8UZ5j2EczBJiJhljily2+g=";
|
||||
sha256 = "sha256-LQlcjPy8hHyux0bWLNyNC/8ewbxy73xnTHIeBNpqszM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conky";
|
||||
version = "1.12.2";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brndnmtthws";
|
||||
repo = "conky";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x6bR5E5LIvKWiVM15IEoUgGas/hcRp3F/O4MTOhVPb8=";
|
||||
sha256 = "sha256-3eCRzjfHGFiKuxmRHvnzqAg/+ApUKnHhsumWnio/Qxg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-firmware";
|
||||
# Check Makefile when updating, make sure postInstall matches make install
|
||||
version = "1.0.42";
|
||||
version = "1.0.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8raRfmNAvgxBVsFeOu/XPs5YU1wPpRBo3Cog/UpE5/o=";
|
||||
sha256 = "sha256-0NlM5ugpJzwzXgm8TqM6/aj3b+lDYbLeYOHNHM3g8aw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
cargoSha256 = "sha256-aKyLAISZlQz5e8MvOoydAZ4bwCEZ1K3FldyoG6R9FJU=";
|
||||
cargoSha256 = "sha256-oyHnEWtQ0pl4SaJsnao+oTDBuu9PJdU3uqLTDowRWQw=";
|
||||
|
||||
# Purposefully don't install systemd unit file, that's for NixOS
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel, bluez }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kernel
|
||||
, bluez
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xpadneo";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atar-axis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-4zd+x9uYl0lJgePM9LEgLYFqvcw6VPF/CbR1XiYSwGE=";
|
||||
repo = "xpadneo";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "sha256-rT2Mq40fE055FemDG7PBjt+cxgIHJG9tTjtw2nW6B98=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
|
@ -22,13 +28,17 @@ stdenv.mkDerivation rec {
|
|||
"-C"
|
||||
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"M=$(sourceRoot)"
|
||||
"VERSION=${version}"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
buildFlags = [ "modules" ];
|
||||
installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
|
||||
installTargets = [ "modules_install" ];
|
||||
|
||||
passthru.tests = {
|
||||
xpadneo = nixosTests.xpadneo;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Advanced Linux driver for Xbox One wireless controllers";
|
||||
homepage = "https://atar-axis.github.io/xpadneo";
|
||||
|
|
@ -36,4 +46,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "22.05.3.1";
|
||||
version = "22.05.4.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "113l23zf98r2rz4smyb0lk68p5jj2gx2y2j11vvf5wq4apzyz8jf";
|
||||
sha256 = "100ixhpi4ahx5w7b1ncgmmg1ar48brp095lrxhcxr55fq2wqlv35";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influx-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i3PN0mvSzPX/hu6fF2oizfioHZ2qU2V+mRwuxT1AYWo=";
|
||||
sha256 = "sha256-l27BAHQtMA4kE7VEZLdOPFnSXtyWUOrcUFitaWqwvTw=";
|
||||
};
|
||||
|
||||
in buildGoModule {
|
||||
|
|
@ -19,7 +19,7 @@ in buildGoModule {
|
|||
version = version;
|
||||
src = src;
|
||||
|
||||
vendorSha256 = "sha256-Boz1G8g0fjjlflxZh4V8sd/v0bE9Oy3DpqywOpKxjd0=";
|
||||
vendorSha256 = "sha256-GnVLr9mWehgw8vs4RiOrFHVlPpPT/LP6XvCq94aJxJQ=";
|
||||
subPackages = [ "cmd/influx" ];
|
||||
|
||||
ldflags = [ "-X main.commit=v${version}" "-X main.version=${version}" ];
|
||||
|
|
|
|||
|
|
@ -12,20 +12,23 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.1.1";
|
||||
ui_version = "2.1.2";
|
||||
libflux_version = "0.139.0";
|
||||
version = "2.4.0";
|
||||
# Despite the name, this is not a rolling release. This is the
|
||||
# version of the UI assets for 2.4.0, as specified in
|
||||
# scripts/fetch-ui-assets.sh in the 2.4.0 tag of influxdb.
|
||||
ui_version = "Master";
|
||||
libflux_version = "0.179.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wf01DhB1ampZuWPkHUEOf3KJK4GjeOAPL3LG2+g4NGY=";
|
||||
sha256 = "sha256-ufJnrVWVfia2/xLRmFkauCw8ktdSJUybJkv42Gd0npg=";
|
||||
};
|
||||
|
||||
ui = fetchurl {
|
||||
url = "https://github.com/influxdata/ui/releases/download/OSS-${ui_version}/build.tar.gz";
|
||||
sha256 = "sha256-fXjShNJfKN/ZQNQHoX9/Ou4XBrXavCN+rcO+8AMc5Ug=";
|
||||
sha256 = "sha256-YKDp1jLyo4n+YTeMaWl8dhN4Lr3H8FXV7stJ3p3zFe8=";
|
||||
};
|
||||
|
||||
flux = rustPlatform.buildRustPackage {
|
||||
|
|
@ -35,10 +38,10 @@ let
|
|||
owner = "influxdata";
|
||||
repo = "flux";
|
||||
rev = "v${libflux_version}";
|
||||
sha256 = "sha256-cELeWZXGVLFoPYfBoBP8NeLBVFIb5o+lWyto42BLyXY=";
|
||||
sha256 = "sha256-xcsmvT8Ve1WbfwrdVPnJcj7RAvrk795N3C95ubbGig0=";
|
||||
};
|
||||
sourceRoot = "source/libflux";
|
||||
cargoSha256 = "sha256-wFgawxgqZqoPnOXJD3r5t2n7Y2bTAkBbBxeBtFEF7N4=";
|
||||
cargoSha256 = "sha256-+hJQFV0tWeTQDN560DzROUNpdkcZ5h2sc13akHCgqPc=";
|
||||
nativeBuildInputs = [ llvmPackages.libclang ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
|
@ -67,7 +70,7 @@ in buildGoModule {
|
|||
|
||||
nativeBuildInputs = [ go-bindata pkg-config ];
|
||||
|
||||
vendorSha256 = "sha256-GVLAzVJzSsC10ZWDZPP8upydwZG21E+zQ6sMKm1lCY0=";
|
||||
vendorSha256 = "sha256-DZsd6qPKfRbnvz0UAww+ubaeTEqQxLeil1S3SZAmmJk=";
|
||||
subPackages = [ "cmd/influxd" "cmd/telemetryd" ];
|
||||
|
||||
PKG_CONFIG_PATH = "${flux}/pkgconfig";
|
||||
|
|
@ -81,7 +84,7 @@ in buildGoModule {
|
|||
exit 1
|
||||
fi
|
||||
|
||||
ui_ver=$(grep influxdata/ui/releases scripts/fetch-ui-assets.sh | ${perl}/bin/perl -pe 's#.*/OSS-([^/]+)/.*#$1#')
|
||||
ui_ver=$(egrep 'influxdata/ui/releases/.*/sha256.txt' scripts/fetch-ui-assets.sh | ${perl}/bin/perl -pe 's#.*/OSS-([^/]+)/.*#$1#')
|
||||
if [ "$ui_ver" != "${ui_version}" ]; then
|
||||
echo "scripts/fetch-ui-assets.sh wants UI $ui_ver, but nix derivation provides ${ui_version}"
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, dataPath ? "/var/lib/snappymail" }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.18.1";
|
||||
version = "2.18.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-0NsDm1dDMg0HbAmuGIrNRkwtjvaZ9QYh7GUXkOJNoKw=";
|
||||
sha256 = "sha256-QAdR7fhF05taVtoUqqbw6EELnSDwRtX2O43VN8p6L7Q=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.112.0";
|
||||
version = "0.113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-kY2AE5lLP1awxfPj16MAhcxO59S3lOZOUXV2EzXDHTY=";
|
||||
sha256 = "sha256-sHknZg34FHhYcf4l2oPQG6RGpybF0lC4n816YoVPeGk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-z/3aUSuAZSVsQ67JgUy6z3T91vKHlBjjQS4oSljl/nk=";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ceph-csi";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
nativeBuildInputs = [ go ];
|
||||
buildInputs = [ ceph ];
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "ceph";
|
||||
repo = "ceph-csi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DmYwLhJoWPsqtXQp2+vpUuEBfo7dTQkxMVa+/oR6LZk=";
|
||||
sha256 = "sha256-VlOKN2PjHM0MdDz6t/AAjcFx4F15+7p3+25tLkRQH1Q=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.13.0";
|
||||
version = "8.13.2";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N2jq68Vs/D+lZcIJVdjBLVaz2gK/TwqKeNfHUWdS3NA=";
|
||||
sha256 = "sha256-Tff+M2qJ/FPxU7Y5gUnuF+Kbwh8DIW5Tb7fe0Lbi0m4=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "birdfont";
|
||||
version = "2.32.0";
|
||||
version = "2.32.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-OnbLDKBxk1IGZZlSM/zK6xus6zmzV7OygfvHFBujHUk=";
|
||||
sha256 = "sha256-ZsYwDS7pgs635P3wPX/PCTuHLX3/Iu97HgVe+qFyjZw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -82,6 +82,10 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
# disable formatting tests because they can break on black updates
|
||||
"test_code_is_black_clean"
|
||||
|
||||
# fails at 2022-09-30
|
||||
"test_identification"
|
||||
"test_diff"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Disable flaky tests on Darwin
|
||||
"test_non_unicode_filename"
|
||||
|
|
|
|||
|
|
@ -7,23 +7,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minipro";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "DavidGriffith";
|
||||
repo = "minipro";
|
||||
rev = version;
|
||||
sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc=";
|
||||
sha256 = "sha256-6i4PYzSm6lcO/Nb6n3holrNe4TtAnG2o81ZIMAIGqOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ];
|
||||
makeFlags = [
|
||||
"VERSION=${version}"
|
||||
"PREFIX=$(out)"
|
||||
"UDEV_DIR=$(out)/lib/udev"
|
||||
"COMPLETIONS_DIR=$(out)/share/bash-completion/completions"
|
||||
"PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"CFLAGS=-O2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
73
pkgs/tools/misc/plantuml/plantuml-c4.nix
Normal file
73
pkgs/tools/misc/plantuml/plantuml-c4.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib, stdenv, makeWrapper, fetchzip, runCommand, plantuml, plantuml-c4, jre }:
|
||||
|
||||
# The C4-PlantUML docs say that it suffices to run plantuml with the
|
||||
# -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates
|
||||
# when included like "!include C4_Container.puml".
|
||||
# Unfortunately, this is not sufficient in practise, when the path is not ".".
|
||||
# What helps is setting -Dplantuml.include.path="..." *before* the jar
|
||||
# parameter.
|
||||
# The -DRELATIVE_INCLUDE param then *still* needs to be set (*after* the jar
|
||||
# argument), because the C4 template vars check for existence of this variable
|
||||
# and if it is not set, reference paths in the internet.
|
||||
|
||||
let
|
||||
c4-lib = fetchzip {
|
||||
url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/88a3f99150c6ff7953c4a99b184d03412ffdedb1.zip";
|
||||
sha256 = "sha256-vk4YWdGb47OsI9mApGTQ7OfELRZdBouzKfUZq3kchcM=";
|
||||
};
|
||||
|
||||
sprites = fetchzip {
|
||||
url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582.zip";
|
||||
sha256 = "sha256-lt9+NNMIaZSkKNsGyHoqXUCTlKmZFGfNYYGjer6X0Xc=";
|
||||
};
|
||||
|
||||
# In order to pre-fix the plantuml.jar parameter with the argument
|
||||
# -Dplantuml.include.path=..., we post-fix the java command using a wrapper.
|
||||
# This way the plantuml derivation can remain unchanged.
|
||||
plantumlWithExtraPath =
|
||||
let
|
||||
plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ];
|
||||
includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}";
|
||||
postFixedJre =
|
||||
runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/java \
|
||||
--add-flags ${lib.escapeShellArg includeFlag}
|
||||
'';
|
||||
in
|
||||
plantuml.override { jre = postFixedJre; };
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plantuml-c4";
|
||||
version = "unstable-2022-08-21";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
makeWrapper ${plantumlWithExtraPath}/bin/plantuml $out/bin/plantuml \
|
||||
--add-flags "-DRELATIVE_INCLUDE=\"${c4-lib}\""
|
||||
|
||||
$out/bin/plantuml -help
|
||||
'';
|
||||
|
||||
passthru.tests.example-c4-diagram =
|
||||
runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } ''
|
||||
sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml
|
||||
plantuml sample.puml -o $out
|
||||
|
||||
sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml
|
||||
plantuml sprites.puml -o $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PlantUML bundled with C4-Plantuml and plantuml sprites library";
|
||||
homepage = "https://github.com/plantuml-stdlib/C4-PlantUML";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tfc ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapper";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "snapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x9anracaa19yqkc0x8wangrkdrx01kdy07c55lvlqrjyimfm4ih";
|
||||
sha256 = "sha256-pi2S5dKUB2pjBQjaSJr789Ke5WU1uKp1RYMPKd0W4J0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
boolToUpper = b: lib.toUpper (lib.boolToString b);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
|
||||
nativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
buildInputs = [
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/cern-fts/davix/releases/tag/R_0_8_0
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz";
|
||||
sha256 = "sha256-iBeiTCPxMJud4jO5qIJFX0V8Qu3CpknccP4lJM922Uw=";
|
||||
sha256 = "sha256-fjC1VB4I0y2/WuA8a8q+rsBjrsEKZkd4eCIie0VBrj4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "passphrase2pgp";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg=";
|
||||
hash = "sha256-Ik/W3gGvrOyUvYgMYqT8FIFoxp62BXd2GpV14pYXEuY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs=";
|
||||
vendorSha256 = "sha256-2H9YRVCaari47ppSkcQYg/P4Dzb4k5PLjKAtfp39NR8=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/$name
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tree";
|
||||
version = "2.0.2";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "OldManProgrammer";
|
||||
repo = "unix-tree";
|
||||
rev = version;
|
||||
sha256 = "sha256-ex4fD8dZJGplL3oMaSokMBn6PRJ8/s83CnWQaAjBcao=";
|
||||
sha256 = "sha256-2voXL31JHh09yBBLuHhYyZsUapiPVF/cgRmTU6wSXk4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -3980,7 +3980,9 @@ with pkgs;
|
|||
|
||||
fx_cast_bridge = callPackage ../tools/misc/fx_cast { };
|
||||
|
||||
fzf = callPackage ../tools/misc/fzf { };
|
||||
fzf = callPackage ../tools/misc/fzf {
|
||||
buildGoModule = buildGo119Module;
|
||||
};
|
||||
|
||||
fzf-obc = callPackage ../shells/bash/fzf-obc { };
|
||||
|
||||
|
|
@ -10125,6 +10127,8 @@ with pkgs;
|
|||
|
||||
plantuml = callPackage ../tools/misc/plantuml { };
|
||||
|
||||
plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { };
|
||||
|
||||
plantuml-server = callPackage ../tools/misc/plantuml-server { };
|
||||
|
||||
plan9port = callPackage ../tools/system/plan9port {
|
||||
|
|
@ -27816,9 +27820,7 @@ with pkgs;
|
|||
|
||||
fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles;
|
||||
|
||||
fsv = callPackage ../applications/misc/fsv {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
fsv = callPackage ../applications/misc/fsv { };
|
||||
|
||||
ft2-clone = callPackage ../applications/audio/ft2-clone {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;
|
||||
|
|
@ -29127,10 +29129,7 @@ with pkgs;
|
|||
|
||||
k3sup = callPackage ../applications/networking/cluster/k3sup {};
|
||||
|
||||
kconf = callPackage ../applications/networking/cluster/kconf {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
kconf = callPackage ../applications/networking/cluster/kconf { };
|
||||
|
||||
kail = callPackage ../tools/networking/kail { };
|
||||
|
||||
|
|
@ -29277,10 +29276,7 @@ with pkgs;
|
|||
|
||||
kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
|
||||
|
||||
kuttl = callPackage ../applications/networking/cluster/kuttl {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
kuttl = callPackage ../applications/networking/cluster/kuttl { };
|
||||
|
||||
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
|
|
|
|||
Loading…
Reference in a new issue