dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Jörg Thalheim 2021-01-17 18:08:59 +01:00
commit 1279bf812c
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
303 changed files with 1084 additions and 964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/languages-frameworks/rust.section.md
View File

@ -567,12 +567,13 @@ in the `~/.config/nixpkgs/overlays` directory.
Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:
```
nixpkgs = {
{ pkgs ? import <nixpkgs> {
overlays = [
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
# Further overlays go here
];
};
};
```
Note that this will fetch the latest overlay version when rebuilding your system.

6
maintainers/maintainer-list.nix
View File

@ -4815,6 +4815,12 @@
github = "kmein";
githubId = 10352507;
};
kmicklas = {
email = "maintainer@kmicklas.com";
name = "Ken Micklas";
github = "kmicklas";
githubId = 929096;
};
knairda = {
email = "adrian@kummerlaender.eu";
name = "Adrian Kummerlaender";

10
nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
View File

@ -46,11 +46,11 @@ in
DynamicUser = false;
ExecStart = ''
${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \
-a ${cfg.listenAddress}:${toString cfg.port} \
-u ${cfg.username} \
-t ${cfg.timeout} \
-l ${cfg.url} \
-p ${escapeShellArg "@${cfg.passwordFile}"} \
--addr ${cfg.listenAddress}:${toString cfg.port} \
--username ${cfg.username} \
--timeout ${cfg.timeout} \
--server ${cfg.url} \
--password ${escapeShellArg "@${cfg.passwordFile}"} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};

3
nixos/tests/prometheus-exporters.nix
View File

@ -423,7 +423,7 @@ let
exporterConfig = {
enable = true;
passwordFile = "/var/nextcloud-pwfile";
url = "http://localhost/negative-space.xml";
url = "http://localhost";
};
metricProvider = {
systemd.services.nc-pwfile = let
@ -441,6 +441,7 @@ let
basicAuth.nextcloud-exporter = "snakeoilpw";
locations."/" = {
root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata";
tryFiles = "/negative-space.xml =404";
};
};
};

4
pkgs/applications/misc/cura/lulzbot/curaengine.nix
View File

@ -1,4 +1,4 @@
{ gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
{ lib, gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
gcc8Stdenv.mkDerivation rec {
pname = "curaengine-lulzBot";
@ -17,7 +17,7 @@ gcc8Stdenv.mkDerivation rec {
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
meta = with gcc8Stdenv.lib; {
meta = with lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/";
license = licenses.agpl3;

49
pkgs/applications/misc/snapper-gui/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib, stdenv, fetchFromGitHub, python3, python3Packages
, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper
, gobject-introspection
}:
python3Packages.buildPythonApplication rec {
pname = "snapper-gui";
version = "2020-10-20";
src = fetchFromGitHub {
owner = "ricardomv";
repo = pname;
rev = "f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1";
sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h";
};
nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [
python3
gobject-introspection
gnome3.adwaita-icon-theme
];
doCheck = false; # it doesn't have any tests
propagatedBuildInputs = with python3Packages; [
gtk3
dbus-python
pygobject3
setuptools
gtksourceview3
snapper
];
meta = with lib; {
description = "Graphical interface for snapper";
longDescription = ''
A graphical user interface for the tool snapper for Linux filesystem
snapshot management. It can compare snapshots and revert differences between snapshots.
In simple terms, this allows root and non-root users to view older versions of files
and revert changes. Currently works with btrfs, ext4 and thin-provisioned LVM volumes.
'';
homepage = "https://github.com/ricardomv/snapper-gui";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ahuzik ];
};
}

38
pkgs/applications/video/mpv/scripts/mpvacious.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, stdenv, fetchFromGitHub, curl, xclip }:
stdenv.mkDerivation rec {
pname = "mpvacious";
version = "0.12";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "1xz4qh2ibfv03m3pfdasim9byvlm78wigx1linmih19vgg99vky2";
};
postPatch = ''
substituteInPlace subs2srs.lua \
--replace "'curl'" "'${curl}/bin/curl'" \
--replace "xclip" "${xclip}/bin/xclip"
'';
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/mpv/scripts
cp subs2srs.lua $out/share/mpv/scripts
runHook postInstall
'';
passthru.scriptName = "subs2srs.lua";
meta = with lib; {
description = "Adds mpv keybindings to create Anki cards from movies and TV shows";
homepage = "https://github.com/Ajatt-Tools/mpvacious";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ kmicklas ];
};
}

7
pkgs/applications/video/vlc/default.nix
View File

@ -9,8 +9,9 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
, jackSupport ? false
, skins2Support ? !onlyLibVLC, freetype
, removeReferencesTo
, chromecastSupport ? true, protobuf, libmicrodns
}:
@ -21,8 +22,6 @@
with lib;
assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc";
version = "3.0.11.1";
@ -52,6 +51,7 @@ stdenv.mkDerivation rec {
fluidsynth wayland wayland-protocols
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ];
@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-kde-solid=$out/share/apps/solid/actions"
] ++ optional onlyLibVLC "--disable-vlc"
++ optional skins2Support "--enable-skins2"
++ optionals chromecastSupport [
"--enable-sout"
"--enable-chromecast"

4
pkgs/data/icons/bibata-cursors/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
let
py = python3.withPackages(ps: [ ps.pillow ]);
@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec {
done
'';
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "Material Based Cursor";
homepage = "https://github.com/KaizIqbal/Bibata_Cursor";
license = licenses.gpl3;

4
pkgs/data/icons/bibata-cursors/extra.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
let
py = python3.withPackages(ps: [ ps.pillow ]);
@ -41,7 +41,7 @@ in stdenvNoCC.mkDerivation rec {
done
'';
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "Cursors Based on Bibata";
homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor";
license = licenses.gpl3;

4
pkgs/data/icons/bibata-cursors/translucent.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors-translucent";
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
cp -pr Bibata_* $out/share/icons/
'';
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "Translucent Varient of the Material Based Cursor";
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
license = licenses.gpl3;

4
pkgs/data/machine-learning/mnist/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchurl }:
{ lib, stdenvNoCC, fetchurl }:
let
srcs = {
train-images = fetchurl {
@ -30,7 +30,7 @@ in
ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}"
'';
phases = [ "installPhase" ];
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "A large database of handwritten digits";
longDescription = ''
The MNIST database (Modified National Institute of Standards and

7
pkgs/data/misc/fedora-backgrounds/generic.nix
View File

@ -1,4 +1,5 @@
{ stdenvNoCC
{ lib
, stdenvNoCC
, coreutils
}:
@ -10,7 +11,7 @@
stdenvNoCC.mkDerivation {
inherit patches src version;
pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds";
pname = "fedora${lib.versions.major version}-backgrounds";
dontBuild = true;
@ -32,7 +33,7 @@ stdenvNoCC.mkDerivation {
"DESTDIR=$(out)"
];
meta = with stdenvNoCC.lib; {
meta = with lib; {
homepage = "https://github.com/fedoradesign/backgrounds";
description = "A set of default and supplemental wallpapers for Fedora";
license = licenses.cc-by-sa-40;

3
pkgs/development/libraries/arb/default.nix
View File

@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
];
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = "A library for arbitrary-precision interval arithmetic";
homepage = "http://arblib.org/";
homepage = "https://arblib.org/";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = teams.sage.members;
platforms = stdenv.lib.platforms.unix;

11
pkgs/development/libraries/science/networking/ns-3/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, python
, wafHook
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
owner = "nsnam";
repo = "ns-3-dev";
rev = "ns-3.${version}";
sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4";
};
nativeBuildInputs = [ wafHook python ];
@ -97,6 +98,14 @@ stdenv.mkDerivation rec {
${pythonEnv.interpreter} ./test.py --nowaf
'';
patches = [
(fetchpatch {
name = "upstream-issue-336.patch";
url = "https://gitlab.com/nsnam/ns-3-dev/-/commit/673004edae1112e6cb249b698aad856d728530fb.patch";
sha256 = "0q96ividinbh9xlws014b2ir6gaavygnln5ca9m1db06m4vfwhng";
})
];
# strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [ "fortify" "strictoverflow"];

2
pkgs/development/libraries/sqlite/sqlar.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ fuse zlib ];
buildFlags = [ "sqlar" "sqlarfs" ];
buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ];
installPhase = ''
install -D -t $out/bin sqlar sqlarfs

27
pkgs/development/python-modules/awsiotpythonsdk/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "AWSIoTPythonSDK";
version = "1.4.9";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-iot-device-sdk-python";
rev = "v${version}";
sha256 = "0mbppz1lnia4br5vjz1l4z4vw47y3bzcfpckzhs9lxhj4vq6d001";
};
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "AWSIoTPythonSDK" ];
meta = with lib; {
description = "Python SDK for connecting to AWS IoT";
homepage = "https://github.com/aws/aws-iot-device-sdk-python";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/development/python-modules/fnvhash/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "fnvhash";
version = "0.1.0";
src = fetchFromGitHub {
owner = "znerol";
repo = "py-fnvhash";
rev = "v${version}";
sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "fnvhash" ];
meta = with lib; {
description = "Python FNV hash implementation";
homepage = "https://github.com/znerol/py-fnvhash";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

57
pkgs/development/python-modules/pubnub/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, aiohttp
, buildPythonPackage
, cbor2
, fetchFromGitHub
, pycryptodomex
, pytestCheckHook
, pyyaml
, pytest-vcr
, pytest-asyncio
, requests
, six
}:
buildPythonPackage rec {
pname = "pubnub";
version = "4.8.0";
src = fetchFromGitHub {
owner = pname;
repo = "python";
rev = "v${version}";
sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir";
};
propagatedBuildInputs = [
cbor2
pycryptodomex
requests
six
];
checkInputs = [
aiohttp
pycryptodomex
pytest-asyncio
pytestCheckHook
pytest-vcr
];
# Some tests don't pass with recent releases of tornado/twisted
pytestFlagsArray = [
"--ignore tests/integrational"
"--ignore tests/manual/asyncio"
"--ignore tests/manual/tornado/test_reconnections.py"
];
pythonImportsCheck = [ "pubnub" ];
meta = with lib; {
description = "Python-based APIs for PubNub";
homepage = "https://github.com/pubnub/python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

34
pkgs/development/python-modules/pubnubsub-handler/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, pubnub
, pycryptodomex
, requests
}:
buildPythonPackage rec {
pname = "pubnubsub-handler";
version = "1.0.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy";
};
propagatedBuildInputs = [
pubnub
pycryptodomex
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pubnubsubhandler" ];
meta = with lib; {
description = "PubNub subscription between PubNub and Home Assistant";
homepage = "https://github.com/w1ll1am23/pubnubsub-handler";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

36
pkgs/development/python-modules/pytest-vcr/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest
, vcrpy
}:
buildPythonPackage rec {
pname = "pytest-vcr";
version = "1.0.2";
src = fetchFromGitHub {
owner = "ktosiek";
repo = pname;
rev = version;
sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
};
propagatedBuildInputs = [
pytest
vcrpy
];
# Tests are using an obsolete attribute 'config'
# https://github.com/ktosiek/pytest-vcr/issues/43
doCheck = false;
pythonImportsCheck = [ "pytest_vcr" ];
meta = with lib; {
description = "Integration VCR.py into pytest";
homepage = "https://github.com/ktosiek/pytest-vcr";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

35
pkgs/development/python-modules/rachiopy/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, requests
, buildPythonPackage
, fetchFromGitHub
, jsonschema
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "rachiopy";
version = "1.0.3";
src = fetchFromGitHub {
owner = "rfverbruggen";
repo = pname;
rev = version;
sha256 = "1d5v9qc7ymzns3ivc5fzwxnxz9sjkhklh57cw05va95mpk5kdskc";
};
propagatedBuildInputs = [ requests ];
checkInputs = [
jsonschema
pytestCheckHook
];
pythonImportsCheck = [ "rachiopy" ];
meta = with lib; {
description = "Python client for Rachio Irrigation controller";
homepage = "https://github.com/rfverbruggen/rachiopy";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/snappergui/default.nix
View File

@ -1,30 +0,0 @@
{ lib, stdenv
, buildPythonPackage
, fetchgit
, pygobject3
, dbus-python
}:
buildPythonPackage {
pname = "Snapper-GUI";
version = "0.1";
src = fetchgit {
url = "https://github.com/ricardomv/snapper-gui";
rev = "11d98586b122180c75a86fccda45c4d7e3137591";
sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1";
};
# no tests available
doCheck = false;
propagatedBuildInputs = [ pygobject3 dbus-python ];
meta = with lib; {
homepage = "https://github.com/ricardomv/snapper-gui";
description = "Graphical frontend for snapper";
license = licenses.gpl2;
maintainers = with maintainers; [ tstrobel ];
};
}

28
pkgs/development/python-modules/swisshydrodata/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "swisshydrodata";
version = "0.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "1adpy6k2bknffzl5rckqpvaqyrvc00d6a4a4541438dqasx61npl";
};
propagatedBuildInputs = [ requests ];
# Tests are not releases at the moment
doCheck = false;
pythonImportsCheck = [ "swisshydrodata" ];
meta = with lib; {
description = "Python client to get data from the Swiss federal Office for Environment FEON";
homepage = "https://github.com/bouni/swisshydrodata";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

11
pkgs/development/python-modules/ufoprocessor/default.nix
View File

@ -26,9 +26,14 @@ buildPythonPackage rec {
mutatormath
];
# tests require custom commands to run
doCheck = false;
pythonImportsCheck = [ "ufoProcessor" ];
checkPhase = ''
runHook preCheck
for t in Tests/*.py; do
# https://github.com/LettError/ufoProcessor/issues/32
[[ "$(basename "$t")" = "tests_fp.py" ]] || python "$t"
done
runHook postCheck
'';
meta = with lib; {
description = "Read, write and generate UFOs with designspace data";

17
pkgs/development/tools/misc/texi2html/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, gettext }:
{ stdenv, fetchurl, perl, gettext, buildPackages }:
stdenv.mkDerivation rec {
pname = "texi2html";
@ -9,12 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
};
nativeBuildInputs = [ gettext ];
strictDeps = true;
nativeBuildInputs = [ gettext perl ];
buildInputs = [ perl ];
preBuild = ''
substituteInPlace separated_to_hash.pl \
--replace "/usr/bin/perl" "${perl}/bin/perl"
postPatch = ''
patchShebangs separated_to_hash.pl
'';
postInstall = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
for f in $out/bin/*; do
substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"
done
'';
meta = with stdenv.lib; {

2
pkgs/games/dwarf-fortress/lazy-pack.nix
View File

@ -38,7 +38,7 @@ buildEnv {
++ lib.optional enableDwarfTherapist dwarf-therapist
++ lib.optional enableLegendsBrowser legends-browser;
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "An opinionated wrapper for Dwarf Fortress";
maintainers = with maintainers; [ Baughn numinit ];
license = licenses.mit;

4
pkgs/games/dwarf-fortress/legends-browser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }:
{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }:
let
name = "legends-browser-${version}";
@ -26,7 +26,7 @@ buildEnv {
inherit name;
paths = [ script ];
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "A multi-platform, open source, java-based legends viewer for dwarf fortress";
maintainers = with maintainers; [ Baughn ];
license = licenses.mit;

2
pkgs/games/dwarf-fortress/twbt/default.nix
View File

@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation rec {
cp -a *.png $art/data/art/
'';
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
maintainers = with maintainers; [ Baughn numinit ];
license = licenses.mit;

24
pkgs/games/factorio/versions.json
View File

@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.10.tar.xz",
"name": "factorio_alpha_x64-1.1.12.tar.xz",
"needsAuth": true,
"sha256": "1vz0av669l6li87sld59v1yjlfxkzwdprbh152wnaym7sgszp3lq",
"sha256": "1b6rccm3vvvgs1sky0nrm001hsrzahrd8hc0pgldgyk0i6g5bmss",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.10/alpha/linux64",
"version": "1.1.10"
"url": "https://factorio.com/get-download/1.1.12/alpha/linux64",
"version": "1.1.12"
},
"stable": {
"name": "factorio_alpha_x64-1.0.0.tar.xz",
@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.10.tar.xz",
"name": "factorio_demo_x64-1.1.12.tar.xz",
"needsAuth": false,
"sha256": "151crxb5xihj9fygf5n335g342mjmqi9fs1nblx6nspk2s4firwm",
"sha256": "037lipqxgfxycjsjffgd6rnx3xv62r40fmkyarcclww3yi596zrw",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.10/demo/linux64",
"version": "1.1.10"
"url": "https://factorio.com/get-download/1.1.12/demo/linux64",
"version": "1.1.12"
},
"stable": {
"name": "factorio_demo_x64-1.0.0.tar.xz",
@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.10.tar.xz",
"name": "factorio_headless_x64-1.1.12.tar.xz",
"needsAuth": false,
"sha256": "1132spanr8w71v6y6ynd9ciy22nk60mz4vdaxgdnwmjd8yfbg1d7",
"sha256": "0chgv7ymsiz4rrjmp04ckdhk2yzgi4ly7rwl0nv2fswajhl7ngmf",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.10/headless/linux64",
"version": "1.1.10"
"url": "https://factorio.com/get-download/1.1.12/headless/linux64",
"version": "1.1.12"
},
"stable": {
"name": "factorio_headless_x64-1.0.0.tar.xz",

4
pkgs/games/julius/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "julius";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "bvschaik";
repo = "julius";
rev = "v${version}";
sha256 = "10d6py1cmkq8lnb5h3w8rdpp4fmpd1wgqkgiabdghqxi7b2s0g4b";
sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc";
};
nativeBuildInputs = [ cmake ];

2
pkgs/os-specific/linux/alsa-lib/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
MIDI functionality to the Linux-based operating system.
'';
license = licenses.gpl3Plus;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}

2
pkgs/os-specific/linux/checksec/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A tool for checking security bits on executables";
homepage = "http://www.trapkit.de/tools/checksec.html";
homepage = "https://www.trapkit.de/tools/checksec/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice globin ];

4
pkgs/os-specific/linux/klibc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, linuxHeaders, perl }:
{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }:
let
commonMakeFlags = [
@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
patches = [ ./no-reinstall-kernel-headers.patch ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
strictDeps = true;
hardeningDisable = [ "format" "stackprotector" ];

8
pkgs/servers/home-assistant/component-packages.nix
View File

@ -350,7 +350,7 @@
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
"home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
"homeassistant" = ps: with ps; [ ];
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG fnvhash
"homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG
"homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ];
"homematic" = ps: with ps; [ pyhomematic ];
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
@ -653,7 +653,7 @@
"quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
"qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro
"qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
"rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy
"rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ];
"radarr" = ps: with ps; [ ];
"radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm
"rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird
@ -794,7 +794,7 @@
"supervisord" = ps: with ps; [ ];
"supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla
"surepetcare" = ps: with ps; [ ]; # missing inputs: surepy
"swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata
"swiss_hydrological_data" = ps: with ps; [ swisshydrodata ];
"swiss_public_transport" = ps: with ps; [ python-opendata-transport ];
"swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
@ -927,7 +927,7 @@
"whois" = ps: with ps; [ python-whois ];
"wiffi" = ps: with ps; [ ]; # missing inputs: wiffi
"wilight" = ps: with ps; [ pywilight ];
"wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink
"wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler ]; # missing inputs: python-wink
"wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
"withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api
"wled" = ps: with ps; [ wled ];

4
pkgs/servers/mail/opensmtpd/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "opensmtpd";
version = "6.7.1p1";
version = "6.8.0p2";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l";
sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi";
};
patches = [

12
pkgs/servers/mail/opensmtpd/proc_path.diff
View File

@ -1,7 +1,7 @@
diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index e049f07c..a1bd03a0 100644
--- a/smtpd/smtpd.c
+++ b/smtpd/smtpd.c
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
char path[PATH_MAX];
char name[PATH_MAX];
@ -24,10 +24,10 @@ index e049f07c..a1bd03a0 100644
(ssize_t)sizeof(path)) {
log_warn("warn: %s-proc: exec path too long", key);
return (-1);
diff --git a/smtpd/table.c b/smtpd/table.c
diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c
index 9cfdfb99..24dfcca4 100644
--- a/smtpd/table.c
+++ b/smtpd/table.c
--- a/usr.sbin/smtpd/table.c
+++ b/usr.sbin/smtpd/table.c
@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
struct table_backend *tb;
char buf[LINE_MAX];

300
pkgs/servers/monitoring/prometheus/nextcloud-exporter-deps.nix
View File

@ -1,300 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "v1.0.1";
sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/go-kit/kit";
fetch = {
type = "git";
url = "https://github.com/go-kit/kit";
rev = "v0.8.0";
sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
};
}
{
goPackagePath = "github.com/go-logfmt/logfmt";
fetch = {
type = "git";
url = "https://github.com/go-logfmt/logfmt";
rev = "v0.4.0";
sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.3.2";
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.3.0";
sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
};
}
{
goPackagePath = "github.com/google/gofuzz";
fetch = {
type = "git";
url = "https://github.com/google/gofuzz";
rev = "v1.0.0";
sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36";
};
}
{
goPackagePath = "github.com/json-iterator/go";
fetch = {
type = "git";
url = "https://github.com/json-iterator/go";
rev = "v1.1.7";
sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz";
};
}
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
type = "git";
url = "https://github.com/julienschmidt/httprouter";
rev = "v1.2.0";
sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "v1.0.1";
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
};
}
{
goPackagePath = "github.com/kr/logfmt";
fetch = {
type = "git";
url = "https://github.com/kr/logfmt";
rev = "b84e30acd515";
sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "v1.0.1";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/modern-go/concurrent";
fetch = {
type = "git";
url = "https://github.com/modern-go/concurrent";
rev = "bacd9c7ef1dd";
sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
};
}
{
goPackagePath = "github.com/modern-go/reflect2";
fetch = {
type = "git";
url = "https://github.com/modern-go/reflect2";
rev = "v1.0.1";
sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
};
}
{
goPackagePath = "github.com/mwitkow/go-conntrack";
fetch = {
type = "git";
url = "https://github.com/mwitkow/go-conntrack";
rev = "cc309e4a2223";
sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.0";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "v1.1.0";
sha256 = "1r0irxkmfnj6ininb06w6ybknini5lz02idawrbkk2i5lq1qcvvf";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "14fe0d1b01d4";
sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "v0.6.0";
sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "v0.0.3";
sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.2.0";
sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "v1.0.3";
sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.1";
sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "d28f0bde5980";
sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "37e7f081c4d4";
sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "4e8604ab3aff";
sha256 = "1y4nvb8xqk3gzmkk3pc0bdphxbnphz71cld9i6f75js01pggaspc";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
fetch = {
type = "git";
url = "https://gopkg.in/alecthomas/kingpin.v2";
rev = "v2.2.6";
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.1";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

22
pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
View File

@ -1,21 +1,27 @@
{ lib, fetchFromGitHub, buildGoPackage, nixosTests }:
{ lib, fetchFromGitHub, buildGoModule, nixosTests, fetchpatch }:
buildGoPackage rec {
buildGoModule rec {
pname = "prometheus-nextcloud-exporter";
version = "0.1.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "xperimental";
repo = "nextcloud-exporter";
rev = "v${version}";
sha256 = "1xpc6q6zp92ckkyd24cfl65vyzjv60qwh44ys6mza4k6yrxhacv4";
sha256 = "1nmw1hkxgdp7nibrn1gz0lry0666rcc55s3kkfx64ykw6bnl0l34";
};
goPackagePath = "github.com/xperimental/nextcloud-exporter";
patches = [
# fixes failing test, remove with next update
# see https://github.com/xperimental/nextcloud-exporter/pull/25
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/xperimental/nextcloud-exporter/pull/25.patch";
sha256 = "03jvqlqbs5g6ijncx6vxkgwq646yrjlrm0lk2q5vhfjrgrkv0alv";
includes = [ "internal/config/config_test.go" ];
})
];
goDeps = ./nextcloud-exporter-deps.nix;
doCheck = true;
vendorSha256 = "0xdjphki0p03n6g5b4mm2x0rgm902rnbvq8r6p4r45k3mv8cggmf";
passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };

4
pkgs/servers/web-apps/mediawiki/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediawiki";
version = "1.35.0";
version = "1.35.1";
src = with lib; fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "1m1f7yaabmfpp3ma394j9nqhx9xv47vpbc48qrbknlq3xhfvqzrs";
sha256 = "05g3mgyi789drhzk3wclkyw4f06mz21q90m2c0z6zshn98fscrcf";
};
prePatch = ''

39
pkgs/shells/scponly/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, lib, fetchFromGitHub, openssh, debugLevel ? 0 }:
stdenv.mkDerivation {
pname = "scponly";
version = "4.8";
src = fetchFromGitHub {
owner = "scponly";
repo = "scponly";
rev = "d8ca58257b9905186aa5706f35813d5f80ea07c1";
sha256 = "U0K7lOp18ytNjh3KVFmc6vL+/tG4ETnwLEPQEhM4lXE=";
};
patches = [ ./scponly-fix-make.patch ];
buildInputs = [ openssh ];
# Add path to sftp-server so configure finds it
preConfigure = "export PATH=$PATH:${openssh}/libexec";
# chroot doesn't seem to work, so not enabling
# rsync could also be optionally enabled
configureFlags = [ "--enable-winscp-compat" ];
postInstall = lib.optionalString (debugLevel > 0) ''
mkdir -p $out/etc/scponly && echo ${
toString debugLevel
} > $out/etc/scponly/debuglevel
'';
passthru.shellPath = "/bin/scponly";
meta = with lib; {
description = "A shell that only permits scp and sftp-server";
homepage = "https://github.com/scponly/scponly";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ wmertens ];
};
}

21
pkgs/shells/scponly/scponly-fix-make.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,14 +41,14 @@
${INSTALL} -d ${DESTDIR}${bindir}
${INSTALL} -d ${DESTDIR}${mandir}/man8
${INSTALL} -d ${DESTDIR}${CONFDIR}
- ${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly
- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
+ ${INSTALL} scponly ${DESTDIR}${bindir}/scponly
+ ${INSTALL} -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
+ ${INSTALL} -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
if test "x${CHROOTED_NAME}" != "x"; then \
${INSTALL} -d ${DESTDIR}${sbindir}; \
rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
cp scponly ${CHROOTED_NAME}; \
- ${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
+ ${INSTALL} ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
fi
debuglevel:

4
pkgs/tools/X11/alttab/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash
, xorg }:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf
automake
pkgconfig
pkg-config
ronn
];

4
pkgs/tools/X11/bgs/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}:
{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXinerama imlib2 ];

4
pkgs/tools/X11/bumblebee/default.nix
View File

@ -16,7 +16,7 @@
#
# To use at startup, see hardware.bumblebee options.
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper
, glib, libbsd
, libX11, xorgserver, kmod, xf86videonouveau
, nvidia_x11, virtualgl, libglvnd
@ -103,7 +103,7 @@ in stdenv.mkDerivation rec {
# Build-time dependencies of bumblebeed and optirun.
# Note that it has several runtime dependencies.
buildInputs = [ libX11 glib libbsd kmod ];
nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ];
nativeBuildInputs = [ makeWrapper pkg-config help2man automake111x autoconf ];
# The order of LDPATH is very specific: First X11 then the host
# environment then the optional sub architecture paths.

4
pkgs/tools/X11/dragon-drop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, gtk, pkgconfig, fetchFromGitHub }:
{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "dragon-drop";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk ];
installPhase = ''

4
pkgs/tools/X11/keynav/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext
{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
, libXinerama, libXrandr, glib, cairo, xdotool }:
let release = "20180821"; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
glib cairo xdotool ];

4
pkgs/tools/X11/ksuperkey/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }:
{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkg-config, xorgproto, libXi }:
stdenv.mkDerivation rec {
pname = "ksuperkey";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXtst xorgproto libXi ];
meta = with lib; {

4
pkgs/tools/X11/nitrogen/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
{ lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }:
let version = "1.6.1";
in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtkmm2 ];

4
pkgs/tools/X11/nx-libs/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
, libpng, libtool, libxml2, pkgconfig, which, xorg
, libpng, libtool, libxml2, pkg-config, which, xorg
, libtirpc
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig which
nativeBuildInputs = [ autoconf automake libtool pkg-config which
xorg.gccmakedep xorg.imake ];
buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil
xorg.libXcomposite xorg.libXdamage xorg.libXdmcp xorg.libXext xorg.libXfont2

4
pkgs/tools/X11/obconf/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox,
imlib2, libstartup_notification, makeWrapper, libSM }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk2 libglade libSM openbox imlib2 libstartup_notification
makeWrapper

4
pkgs/tools/X11/runningx/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libX11 }:
{ lib, stdenv, fetchurl, pkg-config, libX11 }:
stdenv.mkDerivation {
pname = "runningx";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 ];

4
pkgs/tools/X11/screen-message/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }:
stdenv.mkDerivation rec {
pname = "screen-message";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gtk3 ];
# screen-message installs its binary in $(prefix)/games per default

4
pkgs/tools/X11/skippy-xd/default.nix
View File

@ -1,10 +1,10 @@
{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
, libXext, libXinerama, libjpeg, giflib, pkgconfig
, libXext, libXinerama, libjpeg, giflib, pkg-config
}:
let
buildInputs = [
xorgproto libX11 libXft libXcomposite libXdamage libXext
libXinerama libjpeg giflib pkgconfig
libXinerama libjpeg giflib pkg-config
];
in
stdenv.mkDerivation rec {

4
pkgs/tools/X11/vdpauinfo/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libvdpau }:
{ lib, stdenv, fetchurl, pkg-config, libvdpau }:
stdenv.mkDerivation rec {
pname = "vdpauinfo";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libvdpau ];
meta = with lib; {

4
pkgs/tools/X11/wmctrl/default.nix
View File

@ -2,7 +2,7 @@
, fetchurl
, libX11
, glib
, pkgconfig
, pkg-config
, libXmu
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXmu glib ];
patches = [ ./64-bit-data.patch ];

4
pkgs/tools/X11/x11spice/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config
, xorg, gtk2, spice, spice-protocol
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
xorg.libxcb xorg.xcbutil xorg.utilmacros

4
pkgs/tools/X11/x11vnc/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch,
openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
autoreconfHook, pkgconfig }:
autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
pname = "x11vnc";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs =
[ xorg.libXfixes xorg.xorgproto openssl xorg.libXdamage

4
pkgs/tools/X11/xautomation/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
{ lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }:
let version = "1.09"; in
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng libX11 libXext libXi libXtst ];
meta = {

4
pkgs/tools/X11/xbindkeys-config/default.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
{ lib, stdenv, fetchurl, gtk, pkg-config, procps, makeWrapper, ... }:
stdenv.mkDerivation rec {
pname = "xbindkeys-config";
version = "0.1.3";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk makeWrapper ];
src = fetchurl {

4
pkgs/tools/X11/xbindkeys/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }:
{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
let version = "1.8.7"; in
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 guile ];
meta = {

4
pkgs/tools/X11/xcape/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto,
{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXtst, xorgproto,
libXi }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXtst xorgproto libXi ];

4
pkgs/tools/X11/xdotool/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
stdenv.mkDerivation rec {
pname = "xdotool";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim";
};
nativeBuildInputs = [ pkgconfig perl ];
nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ];
preBuild = ''

4
pkgs/tools/X11/xidlehook/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitLab, python3
, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:
, xlibsWrapper, xorg, libpulseaudio, pkg-config, patchelf, Security }:
rustPlatform.buildRustPackage rec {
pname = "xidlehook";
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz";
buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkgconfig patchelf python3 ];
nativeBuildInputs = [ pkg-config patchelf python3 ];
postFixup = lib.optionalString stdenv.isLinux ''
RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"

4
pkgs/tools/X11/xinput_calibrator/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
stdenv.mkDerivation rec {
pname = "xinput_calibrator";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh --with-gui=X11";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ];
meta = {

4
pkgs/tools/X11/xmousepasteblock/default.nix
View File

@ -1,4 +1,4 @@
{ xorg, lib, stdenv, libev, fetchFromGitHub, pkgconfig }:
{ xorg, lib, stdenv, libev, fetchFromGitHub, pkg-config }:
stdenv.mkDerivation rec {
pname = "xmousepasteblock";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
makeFlags = "PREFIX=$(out)";
buildInputs = with xorg; [ libX11 libXext libXi libev ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Middle mouse button primary X selection/clipboard paste disabler";
homepage = "https://github.com/milaq/XMousePasteBlock";

4
pkgs/tools/X11/xnee/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst
, gtk2, libXi, pkgconfig, texinfo }:
, gtk2, libXi, pkg-config, texinfo }:
stdenv.mkDerivation rec {
version = "3.19";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ libX11 xorgproto libXext libXtst gtk2
libXi pkgconfig
libXi pkg-config
texinfo
];

4
pkgs/tools/X11/xpra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265
@ -50,7 +50,7 @@ in buildPythonApplication rec {
substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security'
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = with xorg; [
libX11 xorgproto libXrender libXi
libXtst libXfixes libXcomposite libXdamage

4
pkgs/tools/X11/xprintidle-ng/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
, autoconf, automake, libtool, gettext, pkgconfig
, autoconf, automake, libtool, gettext, pkg-config
, git, perl, texinfo, help2man
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf automake gettext git gnulib
help2man libtool perl pkgconfig texinfo
help2man libtool perl pkg-config texinfo
];
configurePhase = ''

4
pkgs/tools/X11/xrestop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }:
{ lib, stdenv, fetchurl, xorg, pkg-config, ncurses }:
stdenv.mkDerivation {
pname = "xrestop";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ];
meta = {

4
pkgs/tools/X11/xsecurelock/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver
, pam, apacheHttpd, pamtester, xscreensaver }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
autoreconfHook pkgconfig
autoreconfHook pkg-config
];
buildInputs = [
libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver

4
pkgs/tools/X11/xsettingsd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }:
stdenv.mkDerivation rec {
pname = "xsettingsd";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
./SConstruct.patch
];
nativeBuildInputs = [ scons pkgconfig ];
nativeBuildInputs = [ scons pkg-config ];
buildInputs = [ libX11 ];

4
pkgs/tools/X11/xwinmosaic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }:
stdenv.mkDerivation rec {
version = "0.4.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
};
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ gtk2 libXdamage ];
meta = {

4
pkgs/tools/admin/gtk-vnc/default.nix
View File

@ -7,7 +7,7 @@
, gnutls
, cairo
, glib
, pkgconfig
, pkg-config
, cyrus_sasl
, libpulseaudio
, libgcrypt
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
pkgconfig
pkg-config
gobject-introspection
vala
gettext

4
pkgs/tools/admin/intecture/agent.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
with rustPlatform;
@ -18,7 +18,7 @@ buildRustPackage rec {
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
meta = with lib; {
description = "Authentication client/server for Intecture components";

4
pkgs/tools/admin/intecture/auth.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
with rustPlatform;
@ -18,7 +18,7 @@ buildRustPackage rec {
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
meta = with lib; {
description = "Authentication client/server for Intecture components";

4
pkgs/tools/admin/intecture/cli.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform
, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
with rustPlatform;
@ -18,7 +18,7 @@ buildRustPackage rec {
buildInputs = [ openssl zeromq czmq zlib ];
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
# Needed for tests
USER = "$(whoami)";

4
pkgs/tools/admin/lxd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl
{ lib, stdenv, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap
, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
@ -58,7 +58,7 @@ buildGoPackage rec {
installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client
'';
nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ];
nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];
buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
raft-canonical.dev sqlite-replication udev.dev ];

4
pkgs/tools/archivers/cromfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, fuse, perl }:
{ lib, stdenv, fetchurl, pkg-config, fuse, perl }:
stdenv.mkDerivation rec {
name = "cromfs-1.5.10.2";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
install util/unmkcromfs $out/bin
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse perl ];
meta = with lib; {

4
pkgs/tools/archivers/fsarchiver/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, zlib, bzip2, lzma, lzo, lz4, zstd, xz
, libgcrypt, e2fsprogs, util-linux, libgpgerror }:
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [
autoreconfHook pkgconfig
autoreconfHook pkg-config
];
buildInputs = [

4
pkgs/tools/audio/abcm2ps/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }:
stdenv.mkDerivation rec {
pname = "abcm2ps";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"CC=${stdenv.cc}/bin/cc"
];
nativeBuildInputs = [ which pkgconfig docutils ];
nativeBuildInputs = [ which pkg-config docutils ];
buildInputs = [ freetype pango ];

4
pkgs/tools/audio/darkice/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig
{ lib, stdenv, fetchurl, pkg-config
, libjack2, alsaLib, libpulseaudio
, faac, lame, libogg, libopus, libvorbis, libsamplerate
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
];

4
pkgs/tools/audio/ezstream/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkg-config }:
stdenv.mkDerivation rec {
pname = "ezstream";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libiconv libshout taglib libxml2 ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
doCheck = true;

4
pkgs/tools/audio/glyr/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake
, curl, glib, sqlite, pkgconfig }:
, curl, glib, sqlite, pkg-config }:
stdenv.mkDerivation rec {
version = "1.0.10";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ sqlite glib curl ];
meta = with lib; {

4
pkgs/tools/audio/gvolicon/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
name = "gvolicon-2014-04-28";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook

4
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, makeWrapper, fetchurl, which, pkgconfig
{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config
, ocamlPackages
, libao, portaudio, alsaLib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg
@ -49,7 +49,7 @@ stdenv.mkDerivation {
configureFlags = [ "--localstatedir=/var" ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs =
[ which ocamlPackages.ocaml ocamlPackages.findlib
libao portaudio alsaLib libpulseaudio libjack2

4
pkgs/tools/audio/mpdas/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }:
{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }:
stdenv.mkDerivation rec {
pname = "mpdas";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mpd_clientlib curl ];

4
pkgs/tools/audio/mpdcron/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon
, mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }:
let
@ -26,7 +26,7 @@ in stdenv.mkDerivation {
};
buildInputs =
[ autoconf automake libtool pkgconfig glib libdaemon pandoc
[ autoconf automake libtool pkg-config glib libdaemon pandoc
mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ];
preConfigure = ''

4
pkgs/tools/audio/pa-applet/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
stdenv.mkDerivation {
name = "pa-applet-2012-04-11";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev
];

4
pkgs/tools/audio/pasystray/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome3.adwaita-icon-theme
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper

4
pkgs/tools/audio/playerctl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkg-config, gtk-doc, docbook_xsl, gobject-introspection }:
stdenv.mkDerivation rec {
pname = "playerctl";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn";
};
nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ];
nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ];
buildInputs = [ glib ];
mesonFlags = [ "-Dbash-completions=true" ];

4
pkgs/tools/audio/pnmixer/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
stdenv.mkDerivation rec {
pname = "pnmixer";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
};
nativeBuildInputs = [ cmake pkgconfig gettext ];
nativeBuildInputs = [ cmake pkg-config gettext ];
buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ];

4
pkgs/tools/audio/volumeicon/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, fetchurl, lib, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }:
stdenv.mkDerivation {
pname = "volumeicon";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 intltool alsaLib ];
meta = with lib; {

4
pkgs/tools/backup/bareos/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
{ lib, stdenv, fetchFromGitHub, pkg-config, nettools, gettext, flex
, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
nettools gettext readline openssl python2 flex ncurses sqlite postgresql
libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb

4
pkgs/tools/backup/burp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, acl, librsync, ncurses, openssl, zlib, uthash }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ librsync ncurses openssl zlib uthash ]
++ lib.optional (!stdenv.isDarwin) acl;

4
pkgs/tools/backup/dump/default.nix
View File

@ -1,7 +1,7 @@
# Tested with simple dump and restore -i, but complains that
# /nix/store/.../etc/dumpdates doesn't exist.
{ lib, stdenv, fetchurl, pkgconfig,
{ lib, stdenv, fetchurl, pkg-config,
e2fsprogs, ncurses, readline }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0";
};
buildInputs = [ e2fsprogs pkgconfig ncurses readline ];
buildInputs = [ e2fsprogs pkg-config ncurses readline ];
meta = with lib; {
homepage = "https://dump.sourceforge.io/";

4
pkgs/tools/backup/hpe-ltfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }:
stdenv.mkDerivation rec {
version = "3.4.2_Z7550-02501";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source/ltfs";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fuse icu libxml2 libuuid

4
pkgs/tools/backup/httrack/qt.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, makeWrapper
, httrack, qtbase, qtmultimedia }:
mkDerivation rec {
@ -12,7 +12,7 @@ mkDerivation rec {
buildInputs = [ httrack qtbase qtmultimedia ];
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
prePatch = ''
substituteInPlace cmake/HTTRAQTFindHttrack.cmake \

4
pkgs/tools/backup/luckybackup/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, stdenv, fetchurl
, pkgconfig, libtool, qmake
, pkg-config, libtool, qmake
, rsync, ssh
}:
@ -15,7 +15,7 @@ mkDerivation rec {
buildInputs = [ rsync ssh ];
nativeBuildInputs = [ pkgconfig libtool qmake ];
nativeBuildInputs = [ pkg-config libtool qmake ];
prePatch = ''
for File in luckybackup.pro menu/luckybackup-pkexec \

4
pkgs/tools/backup/mydumper/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, glib, zlib, pcre, libmysqlclient, libressl }:
let inherit (lib) getDev; in
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glib zlib pcre libmysqlclient libressl ];

Some files were not shown because too many files have changed in this diff Show More