b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-06-24 06:01:54 +00:00 committed by GitHub
parent 7832edeaf0 880ae7cccd
commit 6df8849a4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 264 additions and 1389 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -262,6 +262,12 @@
and require manual remediation.
</para>
</listitem>
<listitem>
<para>
<literal>zfs</literal> was updated from 2.1.4 to 2.1.5,
enabling it to be used with Linux kernel 5.18.
</para>
</listitem>
<listitem>
<para>
memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -102,6 +102,8 @@ Use `configure.packages` instead.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18.
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

4
pkgs/applications/audio/geonkick/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "geonkick";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY=";
sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "6.9.7";
version = "6.9.8";
pname = "frostwire";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc=";
sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/networking/sync/onedrive/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
version = "2.4.17";
version = "2.4.19";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA=";
hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4=";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

19
pkgs/tools/misc/dterm/default.nix → pkgs/applications/terminal-emulators/dterm/default.nix
View file

@ -1,4 +1,8 @@
{ lib, stdenv, fetchurl, readline }:
{ lib
, stdenv
, fetchurl
, readline
}:
stdenv.mkDerivation rec {
pname = "dterm";
@ -6,20 +10,31 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz";
sha256 = "94533be79f1eec965e59886d5f00a35cb675c5db1d89419f253bb72f140abddb";
hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds=";
};
buildInputs = [ readline ];
postPatch = ''
substituteInPlace Makefile \
--replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
preInstall = "mkdir -p $out/bin";
installFlags = [ "BIN=$(out)/bin/" ];
meta = with lib; {
homepage = "http://www.knossos.net.nz/resources/free-software/dterm/";
description = "A simple terminal program";
longDescription = ''
dterm is a simple terminal emulator, which doesn’t actually emulate any
particular terminal. Mainly, it is designed for use with xterm and
friends, which already do a perfectly good emulation, and therefore don’t
need any special help; dterm simply provides a means by which keystrokes
are forwarded to the serial line, and data forwarded from the serial line
appears on the terminal.
'';
license = licenses.gpl2Only;
maintainers = with maintainers; [ auchter ];
platforms = platforms.unix;

37
pkgs/development/compilers/hare/disable-failing-test-cases.patch Normal file
View file

@ -0,0 +1,37 @@
diff --git a/math/complex/+test.ha b/math/complex/+test.ha
index a1cc0916..705a0a41 100644
--- a/math/complex/+test.ha
+++ b/math/complex/+test.ha
@@ -567,8 +567,8 @@ const TEST_COSSC: [](c128, c128) = [
(math::INF, math::NAN)), // real sign unspecified
((math::INF, math::NAN),
(math::NAN, math::NAN)),
- ((math::NAN, 0f64),
- (math::NAN, -0f64)), // imaginary sign unspecified
+// ((math::NAN, 0f64),
+// (math::NAN, -0f64)), // imaginary sign unspecified
((math::NAN, 1f64),
(math::NAN, math::NAN)),
((math::NAN, math::INF),
@@ -583,8 +583,8 @@ const TEST_COSHSC: [](c128, c128) = [
(1f64, 0f64)),
((0f64, math::INF),
(math::NAN, 0f64)), // imaginary sign unspecified
- ((0f64, math::NAN),
- (math::NAN, 0f64)), // imaginary sign unspecified
+// ((0f64, math::NAN),
+// (math::NAN, 0f64)), // imaginary sign unspecified
((1f64, math::INF),
(math::NAN, math::NAN)),
((1f64, math::NAN),
@@ -627,8 +627,8 @@ const TEST_EXPSC: [](c128, c128) = [
(0f64, 0f64)), // real and imaginary sign unspecified
((math::INF, math::INF),
(math::INF, math::NAN)), // real sign unspecified
- ((-math::INF, math::NAN),
- (0f64, 0f64)), // real and imaginary sign unspecified
+// ((-math::INF, math::NAN),
+// (0f64, 0f64)), // real and imaginary sign unspecified
((math::INF, math::NAN),
(math::INF, math::NAN)), // real sign unspecified
((math::NAN, 0f64),

10
pkgs/development/compilers/hare/hare.nix
View file

@ -11,16 +11,18 @@
stdenv.mkDerivation rec {
pname = "hare";
version = "0.pre+date=2022-04-27";
version = "unstable-2022-06-18";
src = fetchFromSourcehut {
name = pname + "-src";
owner = "~sircmpwn";
repo = pname;
rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0";
hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU=";
rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba";
hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4=";
};
patches = [ ./disable-failing-test-cases.patch ];
nativeBuildInputs = [
binutils-unwrapped
harec
@ -35,6 +37,7 @@ stdenv.mkDerivation rec {
qbe
];
setupHook = ./setup-hook.sh;
strictDeps = true;
configurePhase =
@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
runHook preConfigure
export HARECACHE="$NIX_BUILD_TOP/.harecache"
export BINOUT="$NIX_BUILD_TOP/.bin"
cat ${config-file} > config.mk
runHook postConfigure

6
pkgs/development/compilers/hare/harec.nix
View file

@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "harec";
version = "0.pre+date=2022-04-26";
version = "unstable-2022-06-20";
src = fetchFromSourcehut {
name = pname + "-src";
owner = "~sircmpwn";
repo = pname;
rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0";
hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18=";
rev = "2eccbc4b959a590dda91143c8487edda841106d9";
hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM=";
};
nativeBuildInputs = [

11
pkgs/development/compilers/hare/setup-hook.sh Normal file
View file

@ -0,0 +1,11 @@
export HARECACHE="$NIX_BUILD_TOP/.harecache"
addHarepath () {
for haredir in third-party stdlib; do
if [[ -d "$1/src/hare/$haredir" ]]; then
addToSearchPath HAREPATH "$1/src/hare/$haredir"
fi
done
}
addEnvHooks "$hostOffset" addHarepath

4
pkgs/development/ocaml-modules/ffmpeg/base.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.1.3";
version = "1.1.4";
useDune2 = true;
@ -9,7 +9,7 @@ rec {
owner = "savonet";
repo = "ocaml-ffmpeg";
rev = "v${version}";
sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c";
sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0=";
};
meta = with lib; {

6
pkgs/development/python-modules/imap-tools/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.55.0";
version = "0.56.0";
disabled = isPy27;
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw=";
rev = "refs/tags/v${version}";
hash = "sha256-g1m44hUtD/x7zEe/ELY6zj2hJikSmZB6S8ZHEHPrvz0=";
};
checkInputs = [

4
pkgs/development/python-modules/mysqlclient/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mysqlclient";
version = "2.1.0";
version = "2.1.1";
nativeBuildInputs = [
libmysqlclient
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12";
sha256 = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I=";
};
meta = with lib; {

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.332.3";
version = "2.346.1";
src = fetchurl {
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8=";
sha256 = "09rvwpywf8wc3605kc0x171kmxfigqg4dq7gkd1hng1xqbjjqvhp";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/misc/terraform-ls/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.26.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw=";
sha256 = "sha256-6K4aOp5mjX+qhG/OS/Gs1kAOpDGUPdgRNx4zp3i/c2A=";
};
vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c=";
vendorSha256 = "sha256-YouAdTo7huco35er84MRfI1gmq11VbFwRGSovs1XDYo=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];

6
pkgs/development/web/deno/default.nix
View file

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.23.0";
version = "1.23.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nPVghkLtXhd2/TeBeNDtA1ucgiqzZWmtxXf9bCrFh44=";
sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA=";
};
cargoSha256 = "sha256-bCk6zgsfyI5Nk0AHPyr29KzgltobxfD6b72N0ZaQyOU=";
cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

10
pkgs/development/web/deno/librusty_v8.nix
View file

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.44.1";
version = "0.44.2";
shas = {
x86_64-linux = "sha256-8aBjN9ukbH+lr3YPdngXxSjPjutBgWv4hEdhYmcvtO4=";
aarch64-linux = "sha256-h0mxzeA/wB+/zNz0ZKjSBH7lpYrCLRdTgeDGwZypuXE=";
x86_64-darwin = "sha256-4YXYHhYwCBnb1clxW1ziccHMWsUcGz8Rr8/anCvI1lY=";
aarch64-darwin = "sha256-3sBeL+YJB1HaEhM76GfABvN/6iWeST7Z6lVu3X8sRjk=";
x86_64-linux = "sha256-I1ad9a9FtJGGGW7Odc8HfysQyCEAb8xoEYmYti0pEkE=";
aarch64-linux = "sha256-KHjVMI9qiJ6q3D6t6iUKxbp1qthHSSl+2AfvL3Hvk6I=";
x86_64-darwin = "sha256-UO1NRpbCA5MtqeRLTGM3FIWdX/ECDW/JG52U756FIv8=";
aarch64-darwin = "sha256-FqakcG050m52/F6nWlS7VeW0r+77CCIzG1qvBP3Naik=";
};
}

4
pkgs/games/freeciv/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "freeciv";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "freeciv";
repo = "freeciv";
rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-Nzc6Tirj6TKLgTYN5XjZZut9HVYLKGOp1GZeaoqEtW8=";
sha256 = "sha256-1QGARXIfb97aLxQ5TZ6Fjznlniznnyuc2ugiW/Drf9g=";
};
postPatch = ''

18
pkgs/os-specific/linux/zfs/default.nix
View file

@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18
}:
let
@ -216,28 +216,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_15;
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
# this package should point to the latest release.
version = "2.1.4";
version = "2.1.5";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_15;
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.4";
version = "2.1.5";
# rev = "0000000000000000000000000000000000000000";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
isUnstable = true;
};

4
pkgs/servers/web-apps/snipe-it/default.nix
View file

@ -18,13 +18,13 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.4";
version = "6.0.5";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "06h8rnk8q85f0z0a1q0j010kzs4z2k5sxvi06avk7ndpkrisv4wz";
sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb";
};
meta = with lib; {

26
pkgs/tools/backup/zfsbackup/default.nix
View file

@ -1,26 +1,34 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
, zfs
}:
buildGoPackage rec {
buildGoModule rec {
pname = "zfsbackup";
version = "unstable-2020-09-30";
rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053";
goPackagePath = "github.com/someone1/zfsbackup-go";
version = "unstable-2021-05-26";
rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0";
src = fetchFromGitHub {
owner = "someone1";
repo = "zfsbackup-go";
inherit rev;
sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi";
sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k=";
};
goDeps = ./deps.nix;
vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg=";
ldflags = [ "-w" "-s" ];
# Tests require loading the zfs kernel module.
doCheck = false;
meta = with lib; {
description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc";
homepage = "https://github.com/someone1/zfsbackup-go";
license = licenses.mit;
maintainers = [ maintainers.xfix ];
maintainers = with maintainers; [ xfix ];
platforms = platforms.linux;
mainProgram = "zfsbackup-go";
};
}

1326
pkgs/tools/backup/zfsbackup/deps.nix generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/tools/games/minecraft/packwiz/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "packwiz";
version = "unstable-2022-5-25";
version = "unstable-2022-06-08";
src = fetchFromGitHub {
owner = "packwiz";
repo = "packwiz";
rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61";
sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg=";
rev = "d051932bbbeb7b16cd21a1897019428e71f63bfd";
sha256 = "sha256-H1v5pY9hJYGP0ZiE/GrsATf1ljw69085t6PQhPOfYCs=";
};
vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk=";

4
pkgs/tools/misc/chafa/default.nix
View file

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "1.8.0";
version = "1.10.3";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE=";
sha256 = "sha256-GRPn0xPWtCayOdmA6M+KQrObAHtZIJLEydXaKhhO5IU=";
};
nativeBuildInputs = [ autoconf

46
pkgs/tools/security/himitsu-firefox/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromSourcehut
, hare
, himitsu
, zip
}:
stdenv.mkDerivation rec {
pname = "himitsu-firefox";
version = "0.3";
src = fetchFromSourcehut {
name = pname + "-src";
owner = "~sircmpwn";
repo = pname;
rev = "d6d0fdb30aefc93f6ff7d48e5737557051f1ffea";
hash = "sha256-5RbNdEGPnfDt1KDeU2LnuRsqqqMRyV/Dh2cgEWkz4vQ=";
};
nativeBuildInputs = [
hare
zip
];
buildInputs = [
himitsu
];
buildFlags = [ "LIBEXECDIR=$(out)/libexec" ];
# Only install the native component; per the docs:
# > To install the add-on for Firefox ESR, run make install-xpi. Be advised
# > that this will probably not work. The recommended installation procedure
# > for the native extension is to install it from addons.mozilla.org instead.
installTargets = [ "install-native" ];
installFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
meta = with lib; {
homepage = "https://git.sr.ht/~sircmpwn/himitsu-firefox";
description = "Himitsu integration for Firefox";
license = licenses.gpl3Only;
maintainers = with maintainers; [ auchter ];
inherit (hare.meta) platforms badPlatforms;
};
}

34
pkgs/tools/security/himitsu/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromSourcehut
, hare
, scdoc
}:
stdenv.mkDerivation rec {
pname = "himitsu";
version = "0.1";
src = fetchFromSourcehut {
name = pname + "-src";
owner = "~sircmpwn";
repo = pname;
rev = "003c14747fcddceb5359c9503f20c44b15fea5fa";
hash = "sha256-tzBTDJKMuFh9anURy1aKQTmt77tI7wZDZQiOUowuomk=";
};
nativeBuildInputs = [
hare
scdoc
];
installFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
meta = with lib; {
homepage = "https://himitsustore.org/";
description = "A secret storage manager";
license = licenses.gpl3Only;
maintainers = with maintainers; [ auchter ];
inherit (hare.meta) platforms badPlatforms;
};
}

33
pkgs/tools/x11/xmcp/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, libX11
}:
stdenv.mkDerivation rec {
pname = "xmcp";
version = "unstable-2020-10-10";
src = fetchFromGitHub {
owner = "blblapco";
repo = "xmcp";
rev = "ee56225f1665f9edc04fe5c165809f2fe160a420";
sha256 = "sha256-B3YkYrVEg6UJ2ApaVook4N2XvrCboxDMUG5CN9I79Sg=";
};
buildInputs = [ libX11 ];
installPhase = ''
runHook preInstall
install -Dm0755 xmcp $out/bin/xmcp
runHook postInstall
'';
meta = with lib; {
description = "Tiny color picker for X11";
homepage = "https://github.com/blblapco/xmcp";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ azahi ];
platforms = platforms.linux;
};
}

9
pkgs/top-level/all-packages.nix
View file

@ -1147,8 +1147,6 @@ with pkgs;
cope = callPackage ../tools/misc/cope { };
dterm = callPackage ../tools/misc/dterm { };
ejson2env = callPackage ../tools/admin/ejson2env { };
davinci-resolve = callPackage ../applications/video/davinci-resolve { };
@ -1583,6 +1581,8 @@ with pkgs;
darktile = callPackage ../applications/terminal-emulators/darktile { };
dterm = callPackage ../applications/terminal-emulators/dterm { };
eterm = callPackage ../applications/terminal-emulators/eterm { };
foot = callPackage ../applications/terminal-emulators/foot { };
@ -2403,6 +2403,10 @@ with pkgs;
hime = callPackage ../tools/inputmethods/hime {};
himitsu = callPackage ../tools/security/himitsu { };
himitsu-firefox = callPackage ../tools/security/himitsu-firefox { };
hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
hostctl = callPackage ../tools/system/hostctl { };
@ -35665,6 +35669,7 @@ with pkgs;
xsos = callPackage ../os-specific/linux/xsos { };
xmcp = callPackage ../tools/x11/xmcp { };
zk = callPackage ../applications/office/zk {};