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] 2021-04-26 06:05:56 +00:00 committed by GitHub
parent b8b1081666 d60a4bd64e
commit 28c3da370d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 181 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/heimer/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "heimer";
version = "2.2.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo=";
sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View file

@ -2,12 +2,12 @@
mkDerivation rec {
pname = "chatterino2";
version = "2.2.2";
version = "2.3.0";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz";
sha256 = "0x12zcrbkxn2nn0hqkj1amrxv4q032id282cajzsx7by970r1shd";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];

4
pkgs/applications/science/geometry/tetgen/default.nix
View file

@ -1,13 +1,13 @@
{lib, stdenv, fetchurl}:
let version = "1.5.1"; in
let version = "1.6.0"; in
stdenv.mkDerivation {
pname = "tetgen";
inherit version;
src = fetchurl {
url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
sha256 = "0l5q066crs4cjj7qr0r2gnz8ajkgighngwglr1201h77lcs48sp4";
sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk=";
};
installPhase = ''

15
pkgs/applications/version-management/subversion/CVE-2020-17525.patch Normal file
View file

@ -0,0 +1,15 @@
Patch included in advisory @ https://subversion.apache.org/security/CVE-2020-17525-advisory.txt
--- a/subversion/libsvn_repos/config_file.c
+++ b/subversion/libsvn_repos/config_file.c
@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
{
/* Search for a repository in the full path. */
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
+ if (repos_root_dirent == NULL)
+ return svn_error_trace(handle_missing_file(stream, checksum, access,
+ url, must_exist,
+ svn_node_none));
/* Attempt to open a repository at repos_root_dirent. */
SVN_ERR(svn_repos_open3(&access->repos, repos_root_dirent, NULL,

5
pkgs/applications/version-management/subversion/default.nix
View file

@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
let
common = { version, sha256 }: stdenv.mkDerivation (rec {
common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec {
inherit version;
pname = "subversion";
@ -35,7 +35,7 @@ let
++ lib.optional perlBindings perl
++ lib.optional saslSupport sasl;
patches = [ ./apr-1.patch ];
patches = [ ./apr-1.patch ] ++ extraPatches;
# We are hitting the following issue even with APR 1.6.x
# -> https://issues.apache.org/jira/browse/SVN-4813
@ -118,5 +118,6 @@ in {
subversion = common {
version = "1.12.2";
sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
extraPatches = [ ./CVE-2020-17525.patch ];
};
}

8
pkgs/applications/video/jellyfin-media-player/default.nix
View file

@ -26,18 +26,18 @@
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-500Qlxpqkf+9D/jrzkrYkkFwxs0soLG/I5mgFV1UOc8=";
sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg=";
};
jmpDist = fetchzip {
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-2/dist.zip";
sha256 = "sha256-9oxOcSCV1Gm8WLpwVLanyUlhPx5PWUrkkWvKmwND94g=";
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip";
sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4=";
};
patches = [

7
pkgs/applications/virtualization/docker/default.nix
View file

@ -105,6 +105,8 @@ rec {
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
substituteInPlace $out/etc/systemd/system/docker.service --replace /usr/bin/dockerd $out/bin/dockerd
install -Dm644 ./contrib/init/systemd/docker.socket $out/etc/systemd/system/docker.socket
'';
DOCKER_BUILDTAGS = []
@ -178,6 +180,11 @@ rec {
'' + optionalString (stdenv.isLinux) ''
# symlink docker daemon to docker cli derivation
ln -s ${moby}/bin/dockerd $out/bin/dockerd
# systemd
mkdir -p $out/etc/systemd/system
ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service
ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket
'' + ''
# completion (cli)
installShellCompletion --bash ./contrib/completion/bash/docker

3
pkgs/applications/virtualization/qemu/default.nix
View file

@ -297,6 +297,9 @@ stdenv.mkDerivation rec {
qemu-system-i386 = "bin/qemu-system-i386";
};
# Builds in ~3h with 2 cores, and ~20m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
homepage = "http://www.qemu.org/";
description = "A generic and open source machine emulator and virtualizer";

3
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -63,6 +63,9 @@ stdenv.mkDerivation rec {
./cmake-dirs.patch
];
# Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
description = "A C++ interface for Amazon Web Services";
homepage = "https://github.com/awslabs/aws-sdk-cpp";

16
pkgs/development/libraries/libchewing/default.nix
View file

@ -1,20 +1,24 @@
{ lib, stdenv, fetchurl, sqlite }:
{ lib, stdenv, fetchFromGitHub, sqlite, cmake }:
stdenv.mkDerivation rec {
pname = "libchewing";
version = "0.5.1";
version = "unstable-2020-06-27";
src = fetchurl {
url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2";
sha256 = "0aqp2vqgxczydpn7pxi7r6xf3l1hgl710f0gbi1k8q7s2lscc24p";
src = fetchFromGitHub {
owner = "chewing";
repo = "libchewing";
rev = "452f6221fbad90c0706a3963b17e226216e40dd7";
sha256 = "sha256-w3/K2O/CU+XVzqzVCYJyq1vLgToN6iIUhJ9J7ia4p9E=";
};
buildInputs = [ sqlite ];
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Intelligent Chinese phonetic input method";
homepage = "http://chewing.im/";
license = licenses.lgpl21;
license = licenses.lgpl21Only;
maintainers = [ maintainers.ericsagnes ];
platforms = platforms.linux;
};

9
pkgs/development/libraries/qhull/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation {
name = "qhull-2016.1";
stdenv.mkDerivation rec {
pname = "qhull";
version = "2020.2";
src = fetchFromGitHub {
owner = "qhull";
repo = "qhull";
rev = "5bbc75608c817b50383a0c24c3977cc09d0bbfde";
sha256 = "0wrgqc2mih7h8fs9v5jcn9dr56afqi9bgh2w9dcvzvzvxizr9kjj";
rev = version;
sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc=";
};
nativeBuildInputs = [ cmake ];

16
pkgs/development/python-modules/btrfs/default.nix
View file

@ -1,17 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "btrfs";
version = "11";
version = "12";
src = fetchPypi {
inherit pname version;
sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx";
src = fetchFromGitHub {
owner = "knorrie";
repo = "python-btrfs";
rev = "v${version}";
sha256 = "sha256-ZQSp+pbHABgBTrCwC2YsUUXAf/StP4ny7MEhBgCRqgE=";
};
# no tests (in v12)
doCheck = false;
pythonImportsCheck = [ "btrfs" ];
meta = with lib; {
description = "Inspect btrfs filesystems";
homepage = "https://github.com/knorrie/python-btrfs";

3
pkgs/development/python-modules/pytorch/default.nix
View file

@ -297,6 +297,9 @@ in buildPythonPackage rec {
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
'';
# Builds in 2+h with 2 cores, and ~15m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
description = "Open source, prototype-to-production deep learning platform";
homepage = "https://pytorch.org/";

4
pkgs/development/tools/air/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "air";
version = "1.25";
version = "1.27.2";
src = fetchFromGitHub {
owner = "cosmtrek";
repo = "air";
rev = "v${version}";
sha256 = "sha256-on9Rb+QGFWx7/k9xD+tcaPu6YNaBBkFBHHMSWJbZpWM=";
sha256 = "sha256-VQymiDge42JBQwAHfHMF8imBC90uPout0fZRuQVOP5w=";
};
vendorSha256 = "sha256-B7AgUFjiW3P1dU88u3kswbCQJ7Qq7rgPlX+b+3Pq1L4=";

4
pkgs/development/tools/analysis/codeql/default.nix
View file

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.5.0";
version = "2.5.2";
dontConfigure = true;
dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-teZ/9+oAEqGmy2S8Q89YDe8lqvAjzV6RWJ5AnfgQ6Mc=";
sha256 = "sha256-/Pl9qDzFSL67lBEyHPqy3QfNCXzR510SgM0U8f55Dqg=";
};
nativeBuildInputs = [

6
pkgs/development/tools/bazelisk/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.7.5";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jXRTj/7GJO6rSueOmw8aNg69w43lxiDbSeZR802+kws=";
sha256 = "sha256-bD04wqmtBgdNlPGXz7/4kYQ97r9EthFfGExxOjt8u7k=";
};
vendorSha256 = "sha256-fW7KHsxhBfz947Tg+O5bdtiH6xMeKmLRHX9FWQSyxVQ=";
vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo=";
doCheck = false;

4
pkgs/development/tools/go-task/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-task";
version = "3.4.1";
version = "3.4.2";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA=";
sha256 = "sha256-632ISkBIZJBJpybuiuRHOV3CAJg1rSe3hK+W7hmW2cM=";
};
vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU=";

101
pkgs/misc/vim-plugins/overrides.nix
View file

@ -128,15 +128,23 @@ self: super: {
'';
});
completion-tabnine = super.completion-tabnine.overrideAttrs (old: {
buildInputs = [ tabnine ];
completion-buffers = super.completion-buffers.overrideAttrs (old: {
dependencies = with self; [ completion-nvim ];
});
completion-tabnine = super.completion-tabnine.overrideAttrs (old: {
dependencies = with self; [ completion-nvim ];
buildInputs = [ tabnine ];
postFixup = ''
mkdir $target/binaries
ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
'';
});
completion-treesitter = super.completion-treesitter.overrideAttrs (old: {
dependencies = with self; [ completion-nvim nvim-treesitter ];
});
cpsm = super.cpsm.overrideAttrs (old: {
buildInputs = [
python3
@ -162,11 +170,11 @@ self: super: {
});
defx-nvim = super.defx-nvim.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ];
dependencies = with self; [ nvim-yarp ];
});
deoplete-fish = super.deoplete-fish.overrideAttrs (old: {
dependencies = with super; [ deoplete-nvim vim-fish ];
dependencies = with self; [ deoplete-nvim vim-fish ];
});
deoplete-go = super.deoplete-go.overrideAttrs (old: {
@ -180,7 +188,7 @@ self: super: {
});
deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
dependencies = [ self.deoplete-nvim ];
dependencies = with self; [ deoplete-nvim ];
passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
meta = {
description = "Address-completion for khard via deoplete";
@ -200,11 +208,11 @@ self: super: {
ensime-vim = super.ensime-vim.overrideAttrs (old: {
passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ];
});
forms = super.forms.overrideAttrs (old: {
dependencies = with super; [ super.self ];
dependencies = with self; [ self.self ];
});
fruzzy =
@ -243,7 +251,7 @@ self: super: {
});
fzf-vim = super.fzf-vim.overrideAttrs (old: {
dependencies = [ self.fzfWrapper ];
dependencies = with self; [ fzfWrapper ];
});
# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
@ -261,6 +269,10 @@ self: super: {
configurePhase = "cd plugins/nvim";
});
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim ];
});
jedi-vim = super.jedi-vim.overrideAttrs (old: {
# checking for python3 support in vim would be neat, too, but nobody else seems to care
buildInputs = [ python3.pkgs.jedi ];
@ -320,7 +332,7 @@ self: super: {
});
lf-vim = super.lf-vim.overrideAttrs (old: {
dependencies = with super; [ vim-floaterm ];
dependencies = with self; [ vim-floaterm ];
});
meson = buildVimPluginFrom2Nix {
@ -339,32 +351,32 @@ self: super: {
});
ncm2 = super.ncm2.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ];
dependencies = with self; [ nvim-yarp ];
});
ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ncm2 ];
dependencies = with self; [ nvim-yarp ncm2 ];
passthru.python3Dependencies = ps: with ps; [ jedi ];
});
ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs (old: {
dependencies = with super; [ neoinclude-vim ];
dependencies = with self; [ neoinclude-vim ];
});
ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs (old: {
dependencies = with super; [ neosnippet-vim ];
dependencies = with self; [ neosnippet-vim ];
});
ncm2-syntax = super.ncm2-syntax.overrideAttrs (old: {
dependencies = with super; [ neco-syntax ];
dependencies = with self; [ neco-syntax ];
});
ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: {
dependencies = with super; [ ultisnips ];
dependencies = with self; [ ultisnips ];
});
nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
dependencies = with super; [ popfix ];
dependencies = with self; [ popfix ];
});
# Usage:
@ -396,7 +408,7 @@ self: super: {
};
skim-vim = super.skim-vim.overrideAttrs (old: {
dependencies = [ self.skim ];
dependencies = with self; [ skim ];
});
sql-nvim = super.sql-nvim.overrideAttrs (old: {
@ -436,10 +448,15 @@ self: super: {
});
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: {
dependencies = [ self.sql-nvim ];
dependencies = with self; [ sql-nvim telescope-nvim ];
});
telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
});
telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
preFixup =
let
fzy-lua-native-path = "deps/fzy-lua-native";
@ -463,6 +480,18 @@ self: super: {
meta.platforms = lib.platforms.all;
});
telescope-nvim = super.telescope-nvim.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim popup-nvim ];
});
telescope-symbols-nvim = super.telescope-symbols-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
});
telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
});
unicode-vim =
let
unicode-data = fetchurl {
@ -490,23 +519,23 @@ self: super: {
});
vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
vim-addon-async = super.vim-addon-async.overrideAttrs (old: {
dependencies = with super; [ vim-addon-signs ];
dependencies = with self; [ vim-addon-signs ];
});
vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils ];
dependencies = with self; [ vim-addon-mw-utils ];
});
vim-addon-completion = super.vim-addon-completion.overrideAttrs (old: {
dependencies = with super; [ tlib_vim ];
dependencies = with self; [ tlib_vim ];
});
vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs (old: {
dependencies = with super; [ tlib_vim ];
dependencies = with self; [ tlib_vim ];
});
vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: {
@ -514,11 +543,11 @@ self: super: {
});
vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: {
dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
dependencies = with self; [ vim-addon-other vim-addon-mw-utils ];
});
vim-addon-nix = super.vim-addon-nix.overrideAttrs (old: {
dependencies = with super; [
dependencies = with self; [
vim-addon-completion
vim-addon-goto-thing-at-cursor
vim-addon-errorformats
@ -529,23 +558,23 @@ self: super: {
});
vim-addon-sql = super.vim-addon-sql.overrideAttrs (old: {
dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
dependencies = with self; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
});
vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs (old: {
dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
dependencies = with self; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
});
vim-bazel = super.vim-bazel.overrideAttrs (old: {
dependencies = with super; [ vim-maktaba ];
dependencies = with self; [ vim-maktaba ];
});
vim-beancount = super.vim-beancount.overrideAttrs (old: {
@ -593,7 +622,7 @@ self: super: {
});
vim-codefmt = super.vim-codefmt.overrideAttrs (old: {
dependencies = with super; [ vim-maktaba ];
dependencies = with self; [ vim-maktaba ];
});
vim-dasht = super.vim-dasht.overrideAttrs (old: {
@ -604,7 +633,7 @@ self: super: {
});
vim-easytags = super.vim-easytags.overrideAttrs (old: {
dependencies = with super; [ vim-misc ];
dependencies = with self; [ vim-misc ];
patches = [
(fetchpatch {
# https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags
@ -649,7 +678,7 @@ self: super: {
});
vim-gist = super.vim-gist.overrideAttrs (old: {
dependencies = with super; [ webapi-vim ];
dependencies = with self; [ webapi-vim ];
});
vim-grammarous = super.vim-grammarous.overrideAttrs (old: {
@ -713,7 +742,7 @@ self: super: {
});
vim-snipmate = super.vim-snipmate.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
@ -751,7 +780,7 @@ self: super: {
pname = "vim2nix";
version = "1.0";
src = ./vim2nix;
dependencies = with super; [ vim-addon-manager ];
dependencies = with self; [ vim-addon-manager ];
};
vimacs = super.vimacs.overrideAttrs (old: {
@ -791,7 +820,7 @@ self: super: {
});
vimshell-vim = super.vimshell-vim.overrideAttrs (old: {
dependencies = with super; [ vimproc-vim ];
dependencies = with self; [ vimproc-vim ];
});
YankRing-vim = super.YankRing-vim.overrideAttrs (old: {

3
pkgs/servers/clickhouse/default.nix
View file

@ -70,6 +70,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Builds in 7+h with 2 cores, and ~20m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
homepage = "https://clickhouse.tech/";
description = "Column-oriented database management system";

20
pkgs/tools/filesystems/btrfs-heatmap/default.nix
View file

@ -2,25 +2,17 @@
, fetchFromGitHub
, python3
, installShellFiles
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "btrfs-heatmap";
version = "8";
version = "9";
src = fetchFromGitHub {
owner = "knorrie";
repo = "btrfs-heatmap";
rev = "v${version}";
sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh";
};
# man page is currently only in the debian branch
# https://github.com/knorrie/btrfs-heatmap/issues/11
msrc = fetchurl {
url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8";
sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q";
sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg=";
};
buildInputs = [ python3 ];
@ -29,11 +21,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
installPhase = ''
install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap
installManPage ${msrc}
runHook preInstall
install -Dm 0755 btrfs-heatmap $out/sbin/btrfs-heatmap
installManPage man/btrfs-heatmap.1
buildPythonPath ${python3.pkgs.btrfs}
patchPythonScript $out/sbin/btrfs-heatmap
runHook postInstall
'';
meta = with lib; {

3
pkgs/tools/filesystems/ceph/default.nix
View file

@ -198,6 +198,9 @@ in rec {
doCheck = false; # uses pip to install things from the internet
# Takes 7+h to build with 2 cores.
requiredSystemFeatures = [ "big-parallel" ];
meta = getMeta "Distributed storage system";
passthru.version = version;

4
pkgs/tools/filesystems/gcsfuse/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
version = "0.33.2";
version = "0.34.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-y40JWfD6selBo2IP7VgASmlNUDhXwOdQIRlRHPi3Nh0=";
sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";

6
pkgs/tools/misc/goreleaser/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.163.1";
version = "0.164.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2SDy/Mk4TkXkJKF1gFW7/FH4Y31TE2X38I0r/Ng/BjU=";
sha256 = "sha256-DGiA9Ww/8sHNRgZ7nOx60YVZaxYBH5GJf6KqilwRKrE=";
};
vendorSha256 = "sha256-+Qdxnd+IhBNfZ0R2lCfPGJSjpTw1TA6uPjykCfrYtMk=";
vendorSha256 = "sha256-y7GesJU2kDtC5S6rnduDX9gcXakNIR8MdLuPW2m1QWs=";
buildFlagsArray = [
"-ldflags="

2
pkgs/tools/misc/grub/2.0x.nix
View file

@ -154,5 +154,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.gnu ++ platforms.linux;
maintainers = [ maintainers.samueldr ];
};
})

6
pkgs/tools/misc/handlr/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "handlr";
version = "0.6.1";
version = "0.6.3";
src = fetchFromGitHub {
owner = "chmln";
repo = pname;
rev = "v${version}";
sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg";
sha256 = "sha256-OtU6sL2Bbbec0gHxk3bl5Inn+ZmNYiHgpSF0gjDuRSg=";
};
cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid";
cargoSha256 = "sha256-bX7QWV1R+pLxvghpaV10LeROv4wBVfZhHyrPCIgqETA=";
nativeBuildInputs = [ shared-mime-info ];

4
pkgs/tools/security/gitleaks/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.4.0";
version = "7.4.1";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AY9pOARFAqIOimhcwEyau2MwJCFsWu8I36P7Z0xyJH0=";
sha256 = "sha256-GoHntsyxrMzLHlyKC3JxCkLoquIjOtidcG7hTNTYGuI=";
};
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";

4
pkgs/tools/system/gdu/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gdu";
version = "4.10.1";
version = "4.11.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zU4aSvfW1ph9PrXsAErCOedPn4oeeSh8tpnUj5LRlUw=";
sha256 = "sha256-E+/Ig6+J7pJ98O+YAntBGERml2ELzkji3gworBdcSVY=";
};
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";

6
pkgs/tools/text/fastmod/default.nix
View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "fastmod";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = pname;
rev = "v${version}";
sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095";
sha256 = "sha256-Lv8hARD/aVWiWpJQmPWPeACpX15+3NogoUl5yh63E7A=";
};
cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba";
cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8=";
buildInputs = lib.optional stdenv.isDarwin Security;

8
pkgs/tools/text/languagetool/default.nix
View file

@ -2,16 +2,18 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "5.2";
version = "5.3";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "1fz3rxqg5z2jxbalraz8lwkzj0jh69zzfmf3vpwywilvl7xlhdrd";
sha256 = "1km20ajqb65vkhkrf94zy5srcss66ix8padp7ng59pa8pj11wmi2";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
installPhase = ''
runHook preInstall
mkdir -p $out/share
mv -- * $out/share/
@ -22,6 +24,8 @@ stdenv.mkDerivation rec {
makeWrapper ${jre}/bin/java $out/bin/languagetool-http-server \
--add-flags "-cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer"
runHook postInstall
'';
meta = with lib; {