Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-07-02 18:01:45 +00:00 committed by GitHub
commit d3954e9196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 387 additions and 118 deletions

View File

@ -9,25 +9,20 @@ let
in {
options = {
services.jenkins.jobBuilder = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether or not to enable the Jenkins Job Builder (JJB) service. It
allows defining jobs for Jenkins in a declarative manner.
enable = mkEnableOption (mdDoc ''
the Jenkins Job Builder (JJB) service. It
allows defining jobs for Jenkins in a declarative manner.
Jobs managed through the Jenkins WebUI (or by other means) are left
unchanged.
Jobs managed through the Jenkins WebUI (or by other means) are left
unchanged.
Note that it really is declarative configuration; if you remove a
previously defined job, the corresponding job directory will be
deleted.
Note that it really is declarative configuration; if you remove a
previously defined job, the corresponding job directory will be
deleted.
Please see the Jenkins Job Builder documentation for more info:
[
http://docs.openstack.org/infra/jenkins-job-builder/](http://docs.openstack.org/infra/jenkins-job-builder/)
'';
};
Please see the Jenkins Job Builder documentation for more info:
<https://jenkins-job-builder.readthedocs.io/>
'');
accessUser = mkOption {
default = "admin";

View File

@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "mmlgui";
version = "unstable-2023-03-19";
version = "unstable-2023-06-12";
src = fetchFromGitHub {
owner = "superctr";
repo = "mmlgui";
rev = "59ac28c0008e227c03799cce85b77f96241159b1";
rev = "d680f576aba769b0d63300fbed57a0e9e54dfa4b";
fetchSubmodules = true;
sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU=";
hash = "sha256-BqwayGQBIa0ru22Xci8vHNYPFr9scZSdrUOlDtGBnno=";
};
postPatch = ''
@ -31,10 +31,18 @@ stdenv.mkDerivation rec {
# Removing a pkgconf-specific option makes it work with pkg-config
substituteInPlace libvgm.mak \
--replace '--with-path=/usr/local/lib/pkgconfig' ""
# Use correct pkg-config
substituteInPlace {imgui,libvgm}.mak \
--replace 'pkg-config' "\''$(PKG_CONFIG)"
# Don't force building tests
substituteInPlace Makefile \
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
'';
strictDeps = true;
nativeBuildInputs = [
pkg-config
];
@ -51,7 +59,7 @@ stdenv.mkDerivation rec {
Cocoa
];
nativeCheckInputs = [
checkInputs = [
cppunit
];
@ -61,7 +69,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installPhase = ''
runHook preInstall

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ncpamixer";
version = "1.3.3.4";
version = "1.3.3.5";
src = fetchFromGitHub {
owner = "fulhax";
repo = "ncpamixer";
rev = version;
sha256 = "sha256-JvIxq9CYFR/4p03e2LeJbLn3NUNwhRNF0GlqN6aPfMo=";
sha256 = "sha256-iwwfuMZn8HwnTIEBgTuvnJNlRlPt4G+j/piXO8S7mPc=";
};
nativeBuildInputs = [ cmake pkg-config ];
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/fulhax/ncpamixer";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members;
maintainers = teams.c3d2.members;
};
}

View File

@ -106,7 +106,8 @@ in stdenv.mkDerivation {
mkdir -p $ext/{adapter,formatters}
mv -t $ext vsix-extracted/extension/*
cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py
cp -t $ext/adapter ${adapter}/{bin,lib}/*
cp -r ../adapter/scripts $ext/adapter
wrapProgram $ext/adapter/codelldb \
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
cp -t $ext/formatters ../formatters/*.py

View File

@ -1,7 +1,7 @@
{ config
, lib
, stdenv
, fetchzip
, fetchgit
, autoreconfHook
, autoconf-archive
, pkg-config
@ -39,8 +39,13 @@ stdenv.mkDerivation rec {
pname = "sox";
version = "unstable-2021-05-09";
src = fetchzip {
url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip";
src = fetchgit {
# not really needed, but when this src was updated from `fetchurl ->
# fetchgit`, we spared the mass rebuild by changing this `name` and
# therefor merge this to `master` and not to `staging`.
name = "source";
url = "https://git.code.sf.net/p/sox/code";
rev = "42b3557e13e0fe01a83465b672d89faddbe65f49";
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
};

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttdl";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
sha256 = "sha256-qeMGJn3UNz9VQSn3J71DEzg0lOqO9DyPpwd21UQwXc0=";
sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ=";
};
cargoHash = "sha256-oIiTiJC+FmiudnJdhSjmKBg6EwXNpDshRZDjeftVR0o=";
cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU=";
meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format";

View File

@ -7,20 +7,20 @@
buildGoModule rec {
pname = "arkade";
version = "0.9.22";
version = "0.9.23";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-+PfJ8U/ulFaXZvz1Z5uN0/PJ+NV8dh9FdKi/d0rLb2g=";
sha256 = "sha256-opq6XurS3hWI7U3fukTy2VdxxVJAO16mCjd6CZyAJ1w=";
};
CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-r3bhqTI+DXSw21sjNJkO8cNA5JJitB+UcUwm/u5I0tY=";
vendorHash = "sha256-cI/Q6eeLw3oJtEHNcFvl5nq+x4dSJUDI/BdLkMzkncs=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-pgWNmjIyRWsshuP+GGc/Kxd32DIoHphwYvBIx2hBWZg=";
hash = "sha256-jC502ju44seg2khHszshRIE66f7cfYTKqssNIFkDxrs=";
};
vendorHash = "sha256-Fr4yfwRdhwH1UHAb4rQ74rzAGjIyEX4+0lFujUs8Tos=";
vendorHash = "sha256-XTN8JKssj3a88B+CNF6a4rqsf+tRYkQxFbyHco9r6Y8=";
ldflags = [ "-s" "-w" ];

View File

@ -5,20 +5,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "diswall";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "dis-works";
repo = "diswall-rs";
rev = "v${version}";
sha256 = "sha256-g5KhJlkW32b2g2ZtpYd/52TTmCezxAT5SavvgXYEJoE=";
sha256 = "sha256-uT17FJc7T2Q31E7aCjJn2QkUNHUXDqWAVB5v88why9w=";
};
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
cargoHash = "sha256-SnYNp+iWqDPi2kdM3qzGIj6jsWgl0pj0x9f3gd7lbpA=";
cargoHash = "sha256-g6jxe7L4B/e+CStCudkhj0hTR+ZSA8M5EI5fb7d8f5c=";
doCheck = false;

View File

@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar
--add-flags $out/share/${pname}/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
'';
meta = with lib; {

View File

@ -0,0 +1,44 @@
{ lib
, stdenv
, clangStdenv
, darwin
, xcbuild
, openssl
, pkg-config
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "crunchy-cli";
version = "3.0.0-dev.10";
src = fetchFromGitHub {
owner = "crunchy-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-uc19SmVfa5BZYDidlEgV6GNvcm9Dj0mSjdwHP5S+O4A=";
};
cargoHash = "sha256-H3D55qMUAF6t45mRbGZl+DORAl1H1a7AOe+lQP0WUUQ=";
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
xcbuild
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "A pure Rust written Crunchyroll cli client and downloader";
homepage = "https://github.com/crunchy-labs/crunchy-cli";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ stepbrobd ];
};
}

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kode-mono";
version = "1.017";
version = "1.018";
src = fetchzip {
url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
hash = "sha256-5bTciBQhWNUokOP3YzAwrvp7jeyiF4JMdJDX+6NXvLU=";
hash = "sha256-ITz37lO0+bQd156WKBT8bcz8571kMiJGKepGCCVxaJU=";
stripRoot = false;
};

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "flix";
version = "0.37.0";
version = "0.38.0";
src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
sha256 = "sha256-7Hny8Y74Ihptto4LkvANStUAwBQBrNlwjQ5PqBwsbW0=";
sha256 = "sha256-KiN7qpyAd1svRWWRtuj/lRXyHoLNM2FaTWVgFC4aPrg=";
};
dontUnpack = true;

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "leptonica";
version = "1.83.0";
version = "1.83.1";
src = fetchurl {
url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
sha256 = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";
url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
hash = "sha256-jxhhXgdDr3339QmFxzDfzwyTVIBz0fVmIeQVaotU090=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View File

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, coverage
, fetchPypi
, isPyPy
, python
, stdenv
}:
buildPythonPackage rec {
pname = "nose3";
version = "1.3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y=";
};
propagatedBuildInputs = [ coverage ];
# PyPy hangs for unknwon reason
# darwin fails an assertion and I didn't find a way to find skip that test
doCheck = !isPyPy && !stdenv.isDarwin;
checkPhase = ''
${python.pythonForBuild.interpreter} selftest.py
'';
meta = with lib; {
description = "Fork of nose v1 not using lib2to3 for compatibility with Python 3";
homepage = "https://github.com/jayvdb/nose3";
license = licenses.lgpl3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "moon";
version = "1.8.3";
version = "1.9.1";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-bo0C7gbzpc42uZIQGFGheC4RahdhxgTEpCjGERKaT4U=";
hash = "sha256-9H1PMSWHPqBZQ6d/C9dBTl2+e3r3Ik6Q7b+nSmHDax0=";
};
cargoHash = "sha256-qLd1+4AROZMGZ5VyILkyvK5l7IYYbxzEVIEL3Yo7Zkg=";
cargoHash = "sha256-GqYLoWiGKCkOLrrRuti0H+OBGdD5Kzg2+mkT5sDm0Yc=";
env = {
RUSTFLAGS = "-C strip=symbols";

View File

@ -3,16 +3,16 @@
nixosTests }:
buildGoModule rec {
pname = "buildkite-agent";
version = "3.48.0";
version = "3.49.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "sha256-Bg5g/0J3A1Snh1KV+dMFAvFXFo1oOljUhDQ4nomAzKM=";
sha256 = "sha256-gsGG0NljFBbqsuY0nk5PVpIPLgusE5C/ruxANl4F9Xg=";
};
vendorHash = "sha256-bPfEl6wzYSDcAaVcKyKRfTbDV15xo5Au2xKrJfccweo=";
vendorHash = "sha256-Gz7A0pbbLuxzNIfcUh5ki2EiSJY/qtBeWxv0Y6pQkTc=";
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "delve";
version = "1.20.2";
version = "1.21.0";
src = fetchFromGitHub {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
sha256 = "sha256-NHVgNoMa/K1wVbXKycd7sdxfCpLYY6kn2uSfJWUpq1o=";
sha256 = "sha256-bDxpXm53PCdUQDq6pIigutY1JxrGWfsPkVSA+0i3vr0=";
};
vendorHash = null;

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ko";
version = "0.13.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "ko-build";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KVJqqvp46BAUscG5Xj/g4ThUXKFsuJdzEB++uBskFiw=";
rev = "refs/tags/v${version}";
hash = "sha256-jBysfeoZ9W94c07xFODBASrWGJbZRHsUODfEul9f4Ug=";
};
vendorSha256 = null;
vendorHash = null;
nativeBuildInputs = [ installShellFiles ];
@ -25,6 +25,11 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ];
checkFlags = [
# requires docker daemon
"-skip=TestNewPublisherCanPublish"
];
nativeCheckInputs = [ git ];
preCheck = ''
# Feed in all the tests for testing

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.31";
version = "0.0.33";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-1sUsCZFm61XYFguohLA3NzYa2tX21lc3wYiFkg1y0/o=";
hash = "sha256-0XJYd4mgPbbl/WbeztvJlqB9mc2DFougQi8JCJ0DMK8=";
};
cargoHash = "sha256-pQnRFGAeVVGKRBfpbQXCGBHxkXBYei7nOxYKg3hPJ1k=";
cargoHash = "sha256-5yaySCuEZ78EUbewMH/pgahUGEFfUIH2P/liUm9nd0A=";
nativeBuildInputs = [
git

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.21.1";
version = "1.21.2";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
sha256 = "knYiK3+4mZNExVLFOj+cLbR8gdsm8CAHQY6xpdsqiew=";
sha256 = "ujYyyL9RWpTUJl2sQSJFYT5JQebjgLZy3F0S5zg3aRY=";
};
cargoHash = "sha256-aUtx5wqH6E1AkXoXiiu9ODMziX6k/HG0H0wQSQttOig=";
cargoHash = "sha256-SI2UXp99JdWN6nkON/5lzm6nPmAqCwJ+qSg//jexIhA=";
buildFeatures = [
"cli"

View File

@ -25,14 +25,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "slint-lsp";
version = "1.0.2";
version = "1.1.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-KSpfi8hXMz5A5ra+oxOmKieKpjCTB565JDNrRwtIwxU=";
sha256 = "sha256-YVOxzxkvvW2pFDsYdDM2uiK6kIam+EP/BOF+Vs+RM2g=";
};
cargoHash = "sha256-tmbJBxQoXpHmBJI1z42Kg1XrZ+9+DE5nLmkIp5cWCF4=";
cargoHash = "sha256-Nt8t4nyfwxyX8mugQy4La3Y+nertJg9MFE1ROePISSg=";
nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]

View File

@ -0,0 +1,54 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
}:
stdenv.mkDerivation rec {
pname = "pyenv";
version = "2.3.21";
src = fetchFromGitHub {
owner = "pyenv";
repo = "pyenv";
rev = "refs/tags/v${version}";
hash = "sha256-+rMkbrRSQBHX9qdifIpdLmQ8Uk39ott0xyJTD/mb+9w=";
};
postPatch = ''
patchShebangs --build src/configure
'';
nativeBuildInputs = [
installShellFiles
];
configureScript = "src/configure";
makeFlags = ["-C" "src"];
installPhase = ''
runHook preInstall
mkdir -p "$out"
cp -R bin "$out/bin"
cp -R libexec "$out/libexec"
cp -R plugins "$out/plugins"
runHook postInstall
'';
postInstall = ''
installManPage man/man1/pyenv.1
installShellCompletion completions/pyenv.{bash,fish,zsh}
'';
meta = with lib; {
description = "Simple Python version management";
homepage = "https://github.com/pyenv/pyenv";
changelog = "https://github.com/pyenv/pyenv/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ tjni ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,24 @@
{ lib
, rustPlatform
, fetchCrate
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-toml-lint";
version = "0.1.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM=";
};
cargoHash = "sha256-ujdekIucqes2Wya4jwTMLstb8JMptbAlqYhgMxfp2gg=";
meta = with lib; {
description = "A simple linter for Cargo.toml manifests";
homepage = "https://github.com/fuellabs/cargo-toml-lint";
changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ mitchmindtree ];
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-nCJcgWVQeX5QsMyH117PWBBW+7H5ZigjDxPmiaYER1Y=";
hash = "sha256-ncUA3sN8rWIf4tb3RAuUJWkOlxMMj/FrtSXy0sPfwGM=";
};
vendorHash = null;

View File

@ -3,13 +3,13 @@
rustPlatform.buildRustPackage rec {
pname = "trunk";
version = "0.16.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "thedodd";
repo = "trunk";
rev = "v${version}";
sha256 = "sha256-6o+frbLtuw+DwJiWv4x11qX4GUffhxF19pi/7FLYmHA=";
sha256 = "sha256-z6/CogY7X3u4BvvP8gRjBeKw0Cci9d6TKZYrKLwoTqs=";
};
nativeBuildInputs = [ pkg-config ];
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
# requires network
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
cargoSha256 = "sha256-j/i2io1JfcNA7eeAXAAKMBtHORZm4J5dOFFNnzvx2cg=";
cargoHash = "sha256-7j4SNBMNtu4vFkZic4I6Wjlt+oHQ1o8gOxweIq8t7ro=";
meta = with lib; {
homepage = "https://github.com/thedodd/trunk";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "upbound";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = pname;
repo = "up";
rev = "v${version}";
sha256 = "sha256-WUMFWI3SzpgQgf6txOOIVTK/gTp9h5w/iQUkwyxVbKA=";
sha256 = "sha256-kpk54P9+ITBdlytwxfAhVNTkJN8SReFXgjUdWXclr1I=";
};
vendorHash = "sha256-FDwcsf69l8GcMet9zUG2fuyoZgpEujB3A59eWg2GbdI=";
vendorHash = "sha256-aqKLWd7C7LLIZm5jSksqp35zWNSYSzTZ8gGHUgWgq9E=";
subPackages = [ "cmd/docker-credential-up" "cmd/up" ];

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.5.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-CSuHaQEnaBLGIMjJ6/8JzOEwQUrm9vI/a2cumyjTT8k=";
sha256 = "sha256-k6Q6Tu8drMFkQFpSRJaLk9Wejo5ciSoA0cjv4+3TuPE=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-jP6jm4yNx6wzbUsGDBaRSGcD62wpyvct/q4q4ryqvpY=";
vendorHash = "sha256-SKIp3xdnVN0l/kRf4XXyEV3rOfPXsBEqFDn6uvHe5/Y=";
proxyVendor = true;
doCheck = false;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "carapace";
version = "0.24.5";
version = "0.25.0";
src = fetchFromGitHub {
owner = "rsteube";
repo = "${pname}-bin";
rev = "v${version}";
sha256 = "sha256-R54zIWo8u7GIYvj3eyxwP7ffOg3Dw8ObwZQmSSlu3YY=";
sha256 = "sha256-bDyq//2sk97Dq8jAToOsQowGUUJTfc2s/bCK47O9ns0=";
};
vendorHash = "sha256-3ukm9bIGYdYfHGQOy6KYah2GuLWGWW/JJ1uA7R3i1PE=";
vendorHash = "sha256-hDMq6XksYvMGDR7MAjoSNhKBC5/WgPQWuc/PYotvdTA=";
ldflags = [
"-s"

View File

@ -1,37 +1,63 @@
{ stdenv
, lib
, fetchgit
, installShellFiles
, makeWrapper
, xorg
, pkg-config
, wayland-scanner
, pipewire
, wayland
, wayland-protocols
, libxkbcommon
, wlr-protocols
, pulseaudio
, config
}:
stdenv.mkDerivation rec {
pname = "drawterm";
version = "unstable-2023-03-05";
version = "unstable-2023-06-27";
src = fetchgit {
url = "git://git.9front.org/plan9front/drawterm";
rev = "ed9cff5a4c39322744c4708699c9ae6651b7c9ab";
sha256 = "LM6UnggoxKC3e6xOlHYk9VFF99Abbdmp37nuUML8RgI=";
rev = "36debf46ac184a22c6936345d22e4cfad995948c";
sha256 = "ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA=";
};
buildInputs = [
xorg.libX11
xorg.libXt
];
nativeBuildInputs = [ installShellFiles ] ++ {
linux = [ pkg-config wayland-scanner ];
unix = [ makeWrapper ];
}."${config}" or (throw "unsupported CONF");
buildInputs = {
linux = [ pipewire wayland wayland-protocols libxkbcommon wlr-protocols ];
unix = [ xorg.libX11 xorg.libXt ];
}."${config}" or (throw "unsupported CONF");
# TODO: macos
makeFlags = [ "CONF=unix" ];
makeFlags = [ "CONF=${config}" ];
installPhase = ''
install -Dm755 -t $out/bin/ drawterm
install -Dm644 -t $out/man/man1/ drawterm.1
installPhase = {
linux = ''
install -Dm755 -t $out/bin/ drawterm
'';
unix = ''
# wrapping the oss output with pulse seems to be the easiest
mv drawterm drawterm.bin
install -Dm755 -t $out/bin/ drawterm.bin
makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
'';
}."${config}" or (throw "unsupported CONF") + ''
installManPage drawterm.1
'';
meta = with lib; {
description = "Connect to Plan9 CPU servers from other operating systems.";
description = "Connect to Plan 9 CPU servers from other operating systems.";
homepage = "https://drawterm.9front.org/";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
maintainers = with maintainers; [ luc65r moody ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, dbus
, hidapi
, udev
}:
stdenv.mkDerivation rec {
pname = "dualsensectl";
version = "0.3";
src = fetchFromGitHub {
owner = "nowrep";
repo = "dualsensectl";
rev = "v${version}";
hash = "sha256-OZmZ+ENBBKzRZ9jLIn9Bz7oGYrSAjZ5XlOR9fpN0cZs=";
};
postPatch = ''
substituteInPlace Makefile --replace "/usr/" "/"
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = [
dbus
hidapi
udev
];
makeFlags = [
"DESTDIR=$(out)"
];
meta = with lib; {
description = "Linux tool for controlling PS5 DualSense controller";
homepage = "https://github.com/nowrep/dualsensectl";
license = licenses.gpl2Only;
maintainers = with maintainers; [ azuwis ];
platforms = platforms.linux;
};
}

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, testers, ghz }:
buildGoModule rec {
pname = "ghz";
@ -15,7 +15,21 @@ buildGoModule rec {
subPackages = [ "cmd/ghz" "cmd/ghz-web" ];
ldflags = [ "-s" "-w" ];
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
];
passthru.tests = {
version = testers.testVersion {
package = ghz;
};
web-version = testers.testVersion {
package = ghz;
command = "ghz-web -v";
};
};
meta = with lib; {
description = "Simple gRPC benchmarking and load testing tool";

View File

@ -12,7 +12,7 @@
let
pname = "ockam";
version = "0.89.0";
version = "0.90.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
owner = "build-trust";
repo = pname;
rev = "ockam_v${version}";
sha256 = "sha256-KyhOPcE23nvCVGLnQSxL88WeQVWeTx+70CTvH2KfqK8=";
sha256 = "sha256-IblL87YSSTew4UOZEkbPrQ1Zy9x33mfxGG1kg1atxrs=";
};
cargoHash = "sha256-LMGm+/fjyHMj8fZjw8uhVHTbG4PuxJjzq8kKP+DPVWE=";
cargoHash = "sha256-/fKqUOa1Dos01IKyIZIjWwpZNXKh+cVoq4s2TUFWkBw=";
nativeBuildInputs = [ git pkg-config ];
buildInputs = [ openssl dbus ]
++ lib.optionals stdenv.isDarwin [ Security ];

View File

@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "osv-scanner";
version = "1.3.4";
version = "1.3.5";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
hash = "sha256-HJ+IQjoVD/qAVLcptuaG1Z+SZPZsLdp93cVVcJJ0HDw=";
hash = "sha256-QKswDnqPJzucfOrRzKkBMvyuGsjamY9yhyBqcyhZNvI=";
};
vendorHash = "sha256-9sQmoASTfOTPE9lmoDshV7hBqzKfCjbZb9rRlhSvnNg=";
vendorHash = "sha256-xHgatAblsnPikAYnfoWTGzpeAHs3ON06bDuxELH/AKI=";
subPackages = [
"cmd/osv-scanner"

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "1.0.102";
version = "1.0.106";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4iHQ6mYG6DZa5RYPHW791J9kFqMDM9W+T3ufOg43u5g=";
sha256 = "sha256-8oFdUXjn0fIomEK0SncOmFGQeGurPWO9ecntfYdJJA4=";
};
cargoHash = "sha256-i98kWlkaijWNVycbkqrjo4GrQPz8wmZTO3vQaqukCuI=";
cargoHash = "sha256-WNqa80Nu2ihdbiZhuZli+7/ImEZne8kmjs/gLGO+rUo=";
meta = with lib; {
description = "Automatically update system timezone based on location";

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gopsuinfo";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "gopsuinfo";
rev = "v${version}";
sha256 = "sha256-kivxuy0fdSfF5zAKiflTkYsb6jdeQ75Or7WmbadxsrY=";
sha256 = "sha256-h+CdiQh7IguCduIMCCI/UPIUAdXlNSHdkz6hrG10h3c=";
};
vendorHash = "sha256-S2ZHfrbEjPDweazwWbMbEMcMl/i+8Nru0G0e7RjOJMk=";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nats-top";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ZSPv4meyIYqNJm6SvqnpOjTtRGvfkUOAxn3JHmK5UEQ=";
hash = "sha256-YQNIEhs/KNJp7184zBk0NZyXRWLQDaySZBJWe11vI9E=";
};
vendorHash = "sha256-8UcHRFt/O8RgZRxODIJZ16zvBi7FmadYdA/NUH9kfEo=";
vendorHash = "sha256-IhaeM/stU9O48reT/mUadSkZDz0JXKCXjSRw8TMesTY=";
meta = with lib; {
description = "top-like tool for monitoring NATS servers";

View File

@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
# Don't forget to update go.d.plugin.nix as well
version = "1.40.0";
version = "1.40.1";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "sha256-phPfbmzOVOLBCD29tg5DAak+Q2548iqiE1ZXbEkBhzc=";
sha256 = "sha256-4bYCsEeB0kEYtVFVXymFv7ELUo9RXoKbPjOlDKav8Rg=";
fetchSubmodules = true;
};

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gtree";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "ddddddO";
repo = "gtree";
rev = "v${version}";
hash = "sha256-FbJc12hr4lmz1jEsfWdLZpd9Z17HDFgLBUMw9noakqM=";
hash = "sha256-1ceSkO7curN4Jl42iSYvcrpZMBdsYpFDpKVGH20N98g=";
};
vendorHash = "sha256-BMfJFR4sqJNNlJ7Y3q2GlXWjMDH+DXhuFQVX5I9Czkc=";

View File

@ -1591,6 +1591,8 @@ with pkgs;
donkey = callPackage ../tools/security/donkey { };
dualsensectl = callPackage ../tools/games/dualsensectl { };
dwarfs = callPackage ../tools/filesystems/dwarfs { };
etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
@ -4607,6 +4609,8 @@ with pkgs;
crunch = callPackage ../tools/security/crunch { };
crunchy-cli = callPackage ../applications/video/crunchy-cli { };
crudini = callPackage ../tools/misc/crudini { };
csv2odf = callPackage ../applications/office/csv2odf { };
@ -5913,6 +5917,8 @@ with pkgs;
psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
pyenv = callPackage ../development/tools/pyenv { };
r53-ddns = callPackage ../applications/networking/r53-ddns { };
rare = python3Packages.callPackage ../games/rare { };
@ -16804,6 +16810,7 @@ with pkgs;
cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme { };
cargo-tally = callPackage ../development/tools/rust/cargo-tally { };
cargo-temp = callPackage ../development/tools/rust/cargo-temp { };
cargo-toml-lint = callPackage ../development/tools/rust/cargo-toml-lint { };
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
@ -30520,7 +30527,8 @@ with pkgs;
buildServerGui = false;
};
drawterm = callPackage ../tools/admin/drawterm { };
drawterm = callPackage ../tools/admin/drawterm { config = "unix"; };
drawterm-wayland = callPackage ../tools/admin/drawterm { config = "linux"; };
droopy = python3Packages.callPackage ../applications/networking/droopy { };
@ -39856,6 +39864,7 @@ with pkgs;
nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;
nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy;
nix-derivation = haskell.lib.compose.justStaticExecutables haskellPackages.nix-derivation;
nix-diff = haskell.lib.compose.justStaticExecutables haskellPackages.nix-diff;
nix-du = callPackage ../tools/package-management/nix-du {

View File

@ -6920,9 +6920,11 @@ self: super: with self; {
normality = callPackage ../development/python-modules/normality { };
nose = callPackage ../development/python-modules/nose { };
nose2 = callPackage ../development/python-modules/nose2 { };
nose = callPackage ../development/python-modules/nose { };
nose3 = callPackage ../development/python-modules/nose3 { };
nose-cov = callPackage ../development/python-modules/nose-cov { };