Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-22 06:17:05 +00:00 committed by GitHub
commit 227aa2c9b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 282 additions and 107 deletions

View file

@ -16,7 +16,7 @@ Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs
In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like:
```nix
{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
{ stdenv, fooDep, barDep, ... }: ...stdenv.buildPlatform...
```
`buildPlatform`
@ -99,15 +99,26 @@ Some examples will make this table clearer. Suppose there's some package that is
Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list!
#### My package fails to find a binutils command (`cc`/`ar`/`ld` etc.) {#cross-qa-fails-to-find-binutils}
Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefix. For instance, instead of `cc`, use `${stdenv.cc.targetPrefix}cc`.
```nix
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
```
#### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler}
On less powerful machines, it can be inconvenient to cross-compile a package only to find out that GCC has to be compiled from source, which could take up to several hours. Nixpkgs maintains a limited [cross-related jobset on Hydra](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk), which tests cross-compilation to various platforms from build platforms "x86\_64-darwin", "x86\_64-linux", and "aarch64-linux". See `pkgs/top-level/release-cross.nix` for the full list of target platforms and packages. For instance, the following invocation fetches the pre-built cross-compiled GCC for `armv6l-unknown-linux-gnueabihf` and builds GNU Hello from source.
```ShellSession
$ nix-build '<nixpkgs>' -A pkgsCross.raspberryPi.hello
```
#### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment}
Add the following to your `mkDerivation` invocation.
```nix
depsBuildBuild = [ buildPackages.stdenv.cc ];
```
#### My package fails to find `ar`. {#cross-qa-fails-to-find-ar}
Many packages assume that an unprefixed `ar` is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
#### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}
Add the following to your `mkDerivation` invocation.

View file

@ -3297,6 +3297,12 @@
githubId = 10528737;
name = "Severin Fürbringer";
};
fufexan = {
email = "fufexan@protonmail.com";
github = "fufexan";
githubId = 36706276;
name = "Fufezan Mihai";
};
funfunctor = {
email = "eocallaghan@alterapraxis.com";
name = "Edward O'Callaghan";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ticker";
version = "3.0.0";
version = "3.1.7";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = "ticker";
rev = "v${version}";
sha256 = "sha256-k4ahoaEI2HBoEcRQscpitp2tWsiWmSYaErnth99xOqw=";
sha256 = "sha256-OA01GYp6E0zsEwkUUtvpmvl0y/YTXChl0pwIKozB4Qg=";
};
vendorSha256 = "sha256-8Ew+K/uTFoBAhPQwebtjl6bJPiSEE3PaZCYZsQLOMkw=";
vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
# Tests require internet
doCheck = false;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F9PyJ2uvnKPcjHS4VeuVJuK48HiqqCG8kFzphGW4QyA=";
sha256 = "sha256-Gxrz0RNv7sEIfl0Ac5eLVXvbbxIWIL31mDOZrgY88ps=";
};
cargoSha256 = "sha256-0JSsCtAsqukFuwtbVS1L2jgLNBjquFBInjsJ1XVocjc=";
cargoSha256 = "sha256-9UlEmc9gbZDWelOPD3jZAIkVKNk9jMq5Ljzwur1UiGs=";
nativeBuildInputs = [ perl ];

View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.18.9";
version = "0.18.10";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bsLqTpBhYeDMAv8vmnbjz+bmkyGqX3V7OkOwCprftC0=";
sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY=";
};
vendorSha256 = null;

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "1vg236vc2v4g47lb68hb1vy3phamhsyb383fdbblh3vc4vf46j8a";
sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x";
};
modRoot = "./agent";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "last";
version = "1178";
version = "1179";
src = fetchurl {
url = "http://last.cbrc.jp/last-${version}.zip";
sha256 = "sha256-LihTYXiYCHAFZaWDb2MqN+RvHayGSyZd3vJf4TVCu3A=";
sha256 = "sha256-949oiE7ZNkCOJuOK/huPkCN0c4TlVaTskkBe0joc0HU=";
};
nativeBuildInputs = [ unzip ];

View file

@ -3,17 +3,17 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.12.8.1";
version = "2.12.8.2";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-TwVcuGaWIgzEc34DFEGFcmckXrwZ4ruRqselJClz15o=";
sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8=";
};
patchPhase = ''
postPatch = ''
substituteInPlace Makefile \
--replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C-style arbitrary precision calculator";
homepage = "http://www.isthe.com/chongo/tech/comp/calc/";
license = licenses.lgpl21;
license = licenses.lgpl21Only;
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.all;
};

View file

@ -2,14 +2,18 @@
stdenv.mkDerivation rec {
pname = "cbc";
version = "2.10.3";
version = "2.10.4";
# Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug
# that breaks or-tools https://github.com/coin-or/Clp/issues/130
src = fetchurl {
url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d";
sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39";
};
configureFlags = [ "-C" ];
# or-tools has a hard dependency on Cbc static libraries, so we build both
configureFlags = [ "-C" "--enable-static" ];
enableParallelBuilding = true;
@ -24,7 +28,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
broken = stdenv.isAarch64; # Missing <immintrin.h> after 2.10.0
description = "A mixed integer programming solver";
};
}

View file

@ -0,0 +1,42 @@
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine
, accentColor ? "default" }:
stdenv.mkDerivation rec {
pname = "orchis";
version = "2021-01-22";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc";
};
nativeBuildInputs = [ gtk3 ];
buildInputs = [ gnome-themes-extra ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontPatch = true;
dontConfigure = true;
dontBuild = true;
preInstall = ''
mkdir -p $out/share/themes
'';
installPhase = ''
runHook preInstall
bash install.sh -d $out/share/themes -t ${accentColor}
runHook postInstall
'';
meta = with lib; {
description = "A Material Design theme for GNOME/GTK based desktop environments.";
homepage = "https://github.com/vinceliuice/Orchis-theme";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.fufexan ];
};
}

View file

@ -2,15 +2,19 @@
stdenv.mkDerivation rec {
pname = "abseil-cpp";
version = "20200225.2";
version = "20200923.3";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = version;
sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y";
sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl";
};
cmakeFlags = [
"-DCMAKE_CXX_STANDARD=17"
];
nativeBuildInputs = [ cmake ];
meta = with lib; {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hpx";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9";
sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk=";
};
buildInputs = [ boost hwloc gperftools ];

View file

@ -1,40 +1,84 @@
{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
, lsb-release, glog, protobuf, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, abseil-cpp
, bzip2
, zlib
, lsb-release
, which
, protobuf
, cbc
, ensureNewerSourcesForZipFilesHook
, python
, swig4
}:
stdenv.mkDerivation rec {
pname = "or-tools";
version = "7.7";
version = "8.1";
disabled = python.pythonOlder "3.6"; # not supported upstream
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = "v${version}";
sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv";
sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg";
};
patches = [
# This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect
# USE_SCIP=OFF and then failing to find scip/scip.h
(fetchpatch {
url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch";
sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0";
})
];
# The original build system uses cmake which does things like pull
# in dependencies through git and Makefile creation time. We
# obviously don't want to do this so instead we provide the
# dependencies straight from nixpkgs and use the make build method.
# Cbc is linked against bzip2 and declares this in its pkgs-config file,
# but this makefile doesn't use pkgs-config, so we also have to add lbz2
configurePhase = ''
substituteInPlace makefiles/Makefile.third_party.unix.mk \
--replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \
'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2'
cat <<EOF > Makefile.local
UNIX_ABSL_DIR=${abseil-cpp}
UNIX_GFLAGS_DIR=${gflags}
UNIX_GLOG_DIR=${glog}
UNIX_PROTOBUF_DIR=${protobuf}
UNIX_CBC_DIR=${cbc}
UNIX_ABSL_DIR=${abseil-cpp}
UNIX_PROTOBUF_DIR=${protobuf}
UNIX_CBC_DIR=${cbc}
USE_SCIP=OFF
EOF
'';
# Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1
# will just crash if SCIP is not found because it doesn't fall back to using one of
# the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427
# We don't compile with SCIP because it does not have an open source license.
# See https://github.com/google/or-tools/issues/2395
preBuild = ''
for file in ortools/linear_solver/samples/*.cc; do
if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then
substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING
fi;
done
substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \
--replace 'SCIP' 'CBC'
'';
makeFlags = [
"prefix=${placeholder "out"}"
"PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
];
buildFlags = [ "cc" "pypi_archive" ];
checkTarget = "test_cc";
doCheck = true;
checkTarget = "test_cc";
installTargets = [ "install_cc" ];
# The upstream install_python target installs to $HOME.
@ -43,14 +87,30 @@ stdenv.mkDerivation rec {
(cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python')
'';
enableParallelBuilding = true;
nativeBuildInputs = [
cmake lsb-release swig which zlib python
cmake
lsb-release
swig4
which
ensureNewerSourcesForZipFilesHook
python.pkgs.setuptools python.pkgs.wheel
python.pkgs.setuptools
python.pkgs.wheel
];
buildInputs = [
zlib
bzip2
python
];
propagatedBuildInputs = [
abseil-cpp gflags glog protobuf cbc
python.pkgs.protobuf python.pkgs.six
abseil-cpp
protobuf
python.pkgs.protobuf
python.pkgs.six
python.pkgs.absl-py
python.pkgs.mypy-protobuf
];
outputs = [ "out" "python" ];

View file

@ -41,6 +41,7 @@
, "coc-metals"
, "coc-pairs"
, "coc-prettier"
, "coc-pyright"
, "coc-python"
, "coc-r-lsp"
, "coc-rls"

View file

@ -45833,6 +45833,15 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
"pyright-1.1.113" = {
name = "pyright";
packageName = "pyright";
version = "1.1.113";
src = fetchurl {
url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz";
sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg==";
};
};
"q-0.9.7" = {
name = "q";
packageName = "q";
@ -68867,6 +68876,27 @@ in
bypassCache = true;
reconstructLock = true;
};
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
version = "1.1.113";
src = fetchurl {
url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.113.tgz";
sha512 = "a9mC0b7oVLT3KEHbBw1e7D7k2UD0lRaTk/HrZJJ/lkIDlpF/6TrwqTcL/BUWptUjwUA4sOOdAoQQeOR88Ugsww==";
};
dependencies = [
sources."pyright-1.1.113"
];
buildInputs = globalBuildInputs;
meta = {
description = "Pyright extension for coc.nvim";
homepage = "https://github.com/fannheyward/coc-pyright#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
coc-python = nodeEnv.buildNodePackage {
name = "coc-python";
packageName = "coc-python";

View file

@ -1,23 +0,0 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
buildPythonPackage rec {
pname = "jabberbot";
version = "0.16";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d";
};
propagatedBuildInputs = [ xmpppy ];
doCheck = false; # lol, it does not even specify dependencies properly
meta = with lib; {
description = "A framework for writing Jabber/XMPP bots and services";
homepage = "http://thp.io/2007/python-jabberbot/";
license = licenses.gpl3;
maintainers = with maintainers; [ mic92 ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "krew";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "krew";
rev = "v${version}";
sha256 = "1fcbpipnbms096c36b2z06ysfwyjj22lm1zd1r5xlv5gp24qimlv";
sha256 = "sha256-+YwBkXrj5sWlMA01GfBhu12st+es5YygkD16jc+blt8=";
};
vendorSha256 = "1bmsjv5snrabd9h9szkpcl15rwxm54jgm361ghhy234d2s45c3gn";
vendorSha256 = "sha256-49kWaU5dYqd86DvHi3mh5jYUQVmFlI8zsWtAFseYriE=";
subPackages = [ "cmd/krew" ];

View file

@ -0,0 +1,34 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kustomize-sops";
version = "2.4.0";
src = fetchFromGitHub {
owner = "viaduct-ai";
repo = pname;
rev = "v${version}";
sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp";
};
vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv";
installPhase = ''
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec
'';
# Tests are broken in a nix environment
doCheck = false;
meta = with lib; {
description = "A Flexible Kustomize Plugin for SOPS Encrypted Resource";
longDescription = ''
KSOPS can be used to decrypt any Kubernetes resource, but is most commonly
used to decrypt encrypted Kubernetes Secrets and ConfigMaps.
'';
homepage = "https://github.com/viaduct-ai/kustomize-sops";
license = licenses.asl20;
maintainers = with maintainers; [ starcraft66 ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sdTDBEdBl+IM2HB4hIrAijG4dF3OU7+CjPpGWD8HQm8=";
sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4=";
};
vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30=";

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-limit";
version = "0.0.5";
version = "0.0.6";
src = fetchFromGitHub {
owner = "alopatindev";
repo = "cargo-limit";
rev = version;
sha256 = "sha256-GYdWKRgdS9gCQRu1C8ht0wC1eBTtIMg585OuAfDn/+4=";
sha256 = "sha256-2YngMRPNiUVqg82Ck/ovcMbZV+STGyowT9zlwBkcKok=";
};
cargoSha256 = "0381wgyb2xnsiick8invrkhcvp905rrfyikgv01w6qn9872z11s0";
cargoSha256 = "sha256-4HQhBE4kNhOhO48PBiAxtppmaqy7jaV8p/jb/Uv7vJk=";
passthru = {
updateScript = nix-update-script {

View file

@ -788,6 +788,8 @@ self: super: {
} // (
let
nodePackageNames = [
"coc-clangd"
"coc-cmake"
"coc-css"
"coc-diagnostic"
"coc-emmet"
@ -805,6 +807,7 @@ self: super: {
"coc-metals"
"coc-pairs"
"coc-prettier"
"coc-pyright"
"coc-python"
"coc-r-lsp"
"coc-rls"
@ -814,6 +817,7 @@ self: super: {
"coc-solargraph"
"coc-stylelint"
"coc-tabnine"
"coc-texlab"
"coc-tslint"
"coc-tslint-plugin"
"coc-tsserver"

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ipset";
version = "7.10";
version = "7.11";
src = fetchurl {
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY=";
sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "gonic";
version = "0.12.0";
version = "0.12.2";
src = fetchFromGitHub {
owner = "sentriz";
repo = pname;
rev = "6c69bd3be6279f743c83596c4f0fc12798fdb26a";
sha256 = "1igb2lbkc1nfxp49id3yxql9sbdqr467661jcgnchcnbayj4d664";
rev = "7d420f61a90739cd82a81c2740274c538405d950";
sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ];
buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
meta = {

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "swego";
version = "0.9";
version = "0.91";
src = fetchFromGitHub {
owner = "nodauf";
repo = "Swego";
rev = "v${version}";
sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I=";
sha256 = "sha256-cNsVRYKnzsxYnTkPRfX3ga0eGd09uJ0dyJj1doxfCrg=";
};
vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI=";

View file

@ -2,19 +2,23 @@
python3Packages.buildPythonApplication rec {
pname = "awslogs";
version = "0.11.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "jorgebastida";
repo = "awslogs";
rev = version;
sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc";
sha256 = "1gyry8b64psvmjcb2lb3yilpa7b17yllga06svls4hi69arvrd8f";
};
doCheck = false;
propagatedBuildInputs = with python3Packages; [
boto3 termcolor dateutil docutils setuptools
boto3 termcolor dateutil docutils setuptools jmespath
];
checkInputs = [ python3Packages.pytestCheckHook ];
disabledTests = [
"test_main_get_query"
"test_main_get_with_color"
];
meta = with lib; {

View file

@ -5,16 +5,15 @@ stdenv.mkDerivation rec {
version = "1.7.21";
src = fetchFromGitHub {
owner = "major";
repo = "MySQLTuner-perl";
rev = version;
owner = "major";
repo = "MySQLTuner-perl";
rev = version;
sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0=";
};
postPatch = ''
substituteInPlace mysqltuner.pl \
--replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \
--replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\""
--replace '/usr/share' "$out/share"
'';
buildInputs = [ perl ];
@ -22,10 +21,8 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner"
install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt"
install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv"
install -Dm0555 mysqltuner.pl $out/bin/mysqltuner
install -Dm0444 -t $out/share/mysqltuner basic_passwords.txt vulnerabilities.csv
runHook postInstall
'';

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "powerline-go";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "justjanne";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8=";
sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE=";
};
vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg=";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clash";
version = "1.3.5";
version = "1.4.0";
src = fetchFromGitHub {
owner = "Dreamacro";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yTkUGsVwK6nwHUQpYhkPYF/Cf4URrr5ThB67sxq7Ecs=";
sha256 = "sha256-yTj3kXG7xB1+PhaiGgQR4bUcKkdk5eiF4bGXmxuMMsg=";
};
vendorSha256 = "sha256-J7VGYxX1bH5CeDhpqK9mIbHUekXslImZ+O3wN5Q7kYk=";
vendorSha256 = "sha256-HqlHUVWwvO15nitpwIh/u0GfF8wqJqkviyxOp7QHYz8=";
doCheck = false;

View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
sha256 = "0w1himwix7iv40rixj9afknwmqg2qmkif23z217gc7x63zyg9vdc";
sha256 = "sha256-99rYdyDLAdY2JCy/x4wYksrV8mhKPERYjWNh4UOtYrk=";
};
cargoSha256 = "1qzhii72hjdxmgfncvyk80ybvk6zywd6v73bb1ibhnry734grzvw";
cargoSha256 = "sha256-9XmCZwLzaX61HJWRSi7wf7BdLCOMFYIVXiDNYYfUTlk=";
meta = with lib; {
description = "Nix code formatter for nixpkgs";

View file

@ -12512,6 +12512,8 @@ in
kustomize = callPackage ../development/tools/kustomize { };
kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { };
ktlint = callPackage ../development/tools/ktlint { };
kythe = callPackage ../development/tools/kythe { };
@ -20790,6 +20792,8 @@ in
orbitron = callPackage ../data/fonts/orbitron { };
orchis = callPackage ../data/themes/orchis { };
orion = callPackage ../data/themes/orion {};
overpass = callPackage ../data/fonts/overpass { };

View file

@ -3291,8 +3291,6 @@ in {
j2cli = callPackage ../development/python-modules/j2cli { };
jabberbot = callPackage ../development/python-modules/jabberbot { };
janus = callPackage ../development/python-modules/janus { };
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };