Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-04 13:00:24 +00:00 committed by GitHub
commit 065a1dcee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 327 additions and 106 deletions

View file

@ -59,6 +59,16 @@ Follow these steps to backport a change into a release branch in compliance with
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Generating 21.11 Release Notes
Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.
Steps for updating 21.11 Release notes:
1. Edit `nixos/doc/manual/release-notes/rl-2111.section.md` with the desired changes
2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2111.section.xml`
3. Include changes to `rl-2111.section.md` and `rl-2111.section.xml` in the same commit.
## Reviewing contributions
See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).

View file

@ -23,5 +23,8 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Added a release notes entry if the change is major or breaking
- [21.11 Release Notes](./CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

View file

@ -3561,6 +3561,12 @@
githubId = 1943632;
name = "fro_ozen";
};
frogamic = {
email = "frogamic@protonmail.com";
github = "frogamic";
githubId = 10263813;
name = "Dominic Shelton";
};
Frostman = {
email = "me@slukjanov.name";
github = "Frostman";
@ -7105,6 +7111,12 @@
githubId = 5047140;
name = "Victor Collod";
};
musfay = {
email = "musfay@protonmail.com";
github = "musfay";
githubId = 33374965;
name = "Mustafa Çalışkan";
};
mupdt = {
email = "nix@pdtpartners.com";
github = "mupdt";

View file

@ -56,7 +56,7 @@
<itemizedlist>
<listitem>
<para>
Gnome: 3.36 -> 3.40, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.40/">release notes</link>
GNOME: 3.36 -> 40, see its <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">release notes</link>
</para>
</listitem>
<listitem>

View file

@ -122,6 +122,15 @@ in
'';
};
sftpServerExecutable = mkOption {
type = types.str;
example = "internal-sftp";
description = ''
The sftp server executable. Can be a path or "internal-sftp" to use
the sftp server built into the sshd binary.
'';
};
sftpFlags = mkOption {
type = with types; listOf str;
default = [];
@ -386,6 +395,7 @@ in
};
services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
services.openssh.sftpServerExecutable = mkDefault "${cfgc.package}/libexec/sftp-server";
environment.etc = authKeysFiles //
{ "ssh/moduli".source = cfg.moduliFile;
@ -505,7 +515,7 @@ in
''}
${optionalString cfg.allowSFTP ''
Subsystem sftp ${cfgc.package}/libexec/sftp-server ${concatStringsSep " " cfg.sftpFlags}
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}
''}
PermitRootLogin ${cfg.permitRootLogin}

View file

@ -89,7 +89,7 @@ in {
# create database
services.mysql = mkIf cfg.createDatabase {
enable = true;
package = mkDefault pkgs.mysql;
package = mkDefault pkgs.mariadb;
ensureUsers = [{
name = "engelsystem";
ensurePermissions = { "engelsystem.*" = "ALL PRIVILEGES"; };

View file

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "micro";
version = "2.0.8";
version = "2.0.9";
src = fetchFromGitHub {
owner = "zyedidia";
repo = pname;
rev = "v${version}";
sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci";
sha256 = "sha256-8QtucdamxVwHuuhQhVQuvTNbqY5p97LKSB23617p4ow=";
};
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "cmd/micro" ];
vendorSha256 = "19iqvl63g9y6gkzfmv87rrgj4c4y6ngh467ss94rzrhaybj2b2d8";
vendorSha256 = "sha256-bkD125ePdKcVgmNilOMZgUK6A8KWxaBOGKs8AvvIboI=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];

View file

@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer
'';
# Fixes an upstream issue where headers with templates were included in an extern-C scope
# which caused the build to fail
patches = [ ./move-extern-c.patch ];
meta = with lib; {
homepage = "https://nufraw.sourceforge.io/";
description = "Utility to read and manipulate raw images from digital cameras";

View file

@ -0,0 +1,21 @@
diff --git a/uf_glib.h b/uf_glib.h
index c1a17bd..8a10800 100644
--- a/uf_glib.h
+++ b/uf_glib.h
@@ -13,13 +13,13 @@
#ifndef _UF_GLIB_H
#define _UF_GLIB_H
+#include <glib.h>
+#include <glib/gstdio.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-#include <glib.h>
-#include <glib/gstdio.h>
-
// g_win32_locale_filename_from_utf8 is needed only on win32
#ifdef _WIN32
#define uf_win32_locale_filename_from_utf8(__some_string__) \

View file

@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
version = "4.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
sha256 = "0cbxgss9j0bvsp3czjx1kpm9id7c5xxmjfnvjyk3pfd69ygif2kl";
sha256 = "09z37lv57nbp0l1ax28558jk5jv91lb22bgaclirvdyz2qp47xhj";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);

View file

@ -18,22 +18,22 @@
}
},
"beta": {
"version": "91.0.4472.77",
"sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
"sha256bin64": "1fmarrvkvfj0hgnz4qqx7b45pwkdpagfj2s2hznnanq5q5p9vay0",
"version": "92.0.4515.40",
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
"sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf",
"deps": {
"gn": {
"version": "2021-04-06",
"version": "2021-05-07",
"url": "https://gn.googlesource.com/gn",
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
}
}
},
"dev": {
"version": "92.0.4515.40",
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
"sha256bin64": "12kfzgg0fhlrvr3ci1gzsn5rzdwr4dc2k3sj45j4dn7wnrjlpmbx",
"version": "93.0.4530.5",
"sha256": "0xxnn9fbwgmfk0zz5an35na1zprhas487pbg2qpgg76g50zxnsx5",
"sha256bin64": "14fzmfhaiish91byg7knr9nf2cigklfvy145vc7qhg17b6gzba25",
"deps": {
"gn": {
"version": "2021-05-07",

View file

@ -2,29 +2,40 @@
buildGoModule rec {
pname = "starboard";
version = "0.10.1";
version = "0.10.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cDqZo0GTpvvkEiccP42u9X2ydHkSBuoD8Zfp+i+/qjo=";
sha256 = "sha256-SJogepww3IJt+NAkJ0G/lLgZ3rMWDTC+jHIrzzkzJGA=";
};
vendorSha256 = "sha256-noK4fF9wCP1dYfDgmJVZehcF+eunzP+d9n1SiPO9UEU=";
vendorSha256 = "sha256-vNsYGlcVIj/cDijCFz8fG5Ht/s7koM62GV8zkOyA/fA=";
subPackages = [ "cmd/starboard" ];
# Don't build and check the integration tests
excludedPackages = "itest";
doCheck = false;
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
'';
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X main.version=v${version}"
];
preCheck = ''
# Remove test that requires networking
rm pkg/plugin/aqua/client/client_integration_test.go
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/starboard --help
$out/bin/starboard version | grep "v${version}"
runHook postInstallCheck
'';
meta = with lib; {
homepage = "https://github.com/aquasecurity/starboard";
changelog = "https://github.com/aquasecurity/starboard/releases/tag/v${version}";
description = "Kubernetes-native security tool kit";
longDescription = ''
Starboard integrates security tools into the Kubernetes environment, so
@ -35,7 +46,6 @@ buildGoModule rec {
plug-in that make security reports available through familiar Kubernetes
tools.
'';
homepage = src.meta.homepage;
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
};

View file

@ -36,15 +36,15 @@ stdenv.mkDerivation {
buildPhase = ''
mkdir -p usbdk/x86 usbdk/amd64
(cd usbdk/x86; ${p7zip}/bin/7z x ${src_usbdk_x86})
(cd usbdk/amd64; ${p7zip}/bin/7z x ${src_usbdk_amd64})
(cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86})
(cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64})
mkdir -p vdagent/x86 vdagent/amd64
(cd vdagent/x86; ${p7zip}/bin/7z x ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86)
(cd vdagent/amd64; ${p7zip}/bin/7z x ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
(cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86)
(cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
mkdir -p qxlwddm
(cd qxlwddm; ${p7zip}/bin/7z x ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64)
(cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64)
'';
installPhase =

View file

@ -0,0 +1,28 @@
{ stdenvNoCC, fetchFromGitLab, lib }:
stdenvNoCC.mkDerivation {
pname = "quintom-cursor-theme";
version = "unstable-2019-10-24";
src = fetchFromGitLab {
owner = "Burning_Cube";
repo = "quintom-cursor-theme";
rev = "d23e57333e816033cf20481bdb47bb1245ed5d4d";
hash = "sha256-Sec2DSnWYal6wzYzP9W+DDuTKHsFHWdRYyMzliMU5bU=A";
};
installPhase = ''
mkdir -p $out/share/icons
for theme in "Quintom_Ink" "Quintom_Snow"; do
cp -r "$theme Cursors/$theme" $out/share/icons/
done
'';
meta = with lib; {
description = "A cursor theme designed to look decent";
homepage = "https://gitlab.com/Burning_Cube/quintom-cursor-theme";
platforms = platforms.unix;
license = with licenses; [ cc-by-sa-40 gpl3Only ];
maintainers = with maintainers; [ frogamic ];
};
}

View file

@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "40.1";
version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi";
sha256 = "O9cUg/YMDY9yQ5E7kmJe8Vx3iS/uP5MifqXw+XsMWqs=";
};
patches = [

View file

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.6";
sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16";
version = "8.0.7";
sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";
});
in base.withExtensions ({ all, ... }: with all; ([

View file

@ -1,20 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
libyamlcpp, gtest }:
libyamlcpp, gtest, capnproto, pkg-config }:
stdenv.mkDerivation rec {
pname = "librime";
version = "1.5.3";
version = "1.7.2";
src = fetchFromGitHub {
owner = "rime";
repo = "librime";
repo = pname;
rev = version;
sha256 = "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv";
sha256 = "023c7bpfnyf8wlrssn89ziwsjccflyanrxlaqmwcbx8a5dvipk01";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest ];
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ];
meta = with lib; {
homepage = "https://rime.im/";

View file

@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtest
}:
stdenv.mkDerivation rec {
pname = "xtl";
version = "0.7.2";
src = fetchFromGitHub {
owner = "xtensor-stack";
repo = "xtl";
rev = version;
sha256 = "177ym67sz544wdylksfkkpi6bqn34kagycfnb3cv0nkmpipqj9lg";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_TESTS=ON" ];
doCheck = true;
checkInputs = [ gtest ];
checkTarget = "xtest";
meta = with lib; {
description = "Basic tools (containers, algorithms) used by other quantstack packages";
homepage = "https://github.com/xtensor-stack/xtl";
license = licenses.bsd3;
maintainers = with maintainers; [ cpcloud ];
platforms = platforms.all;
};
}

View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.1.0";
version = "2.1.1";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig";
sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4";
};
dontUnpack = true;

View file

@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.35.0";
version = "1.35.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-McgLJoOS8h8C7mcbLaF0hiMkfthpDRUKyB5Effzk2ds=";
sha256 = "sha256-MJ3RG60rWbcfQxhj34k99AFg8TsPd3ECEw/x2+xU1js=";
};
patches = [

View file

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.23.1.4602-280ab6053";
version = "1.23.2.4625-a83d2d0f9";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic";
sha256 = "17md53saxl7x45kgj9wdf7jr61ncnapa418c1lf37qbdqmid343c";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli";
sha256 = "1nisjz4g924di73zjkgwx7nk3gkbykj6bkkgzmlm84dq3rgqnisk";
};
outputs = [ "out" "basedb" ];

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.30.0";
version = "1.31.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-7KuQC9L9Tp4s0E2iOlhgmezzjys1UhpHEe0gaYcy8oM=";
sha256 = "sha256-2CK/W8h0xfReqYt4a3qQ88Ydr8u9Ky6DfttJJaGu9kM=";
};
goPackagePath = "github.com/exoscale/cli";

View file

@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "1mrhzg07dm11dirxhwdpxz9rch65z631abss0khdi944l3zv8lq4";
sha256 = "1f86pkjsp8lrmk8ap40wh9zbzb2ni49vc2cjsdjbj4pkkwivihpv";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "0m8zbjzr9a4f13z4szhqs5296lmyqrfmxr7pyvy8mrap3fqxvv02";
sha256 = "1l47lq2wq8y0adrjij3w5ki1mm1f00503ks398flfmbzyav6bad3";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "342.0.0";
version = "343.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

View file

@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "fcitx5";
version = "5.0.4";
version = "5.0.8";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5";
repo = pname;
rev = version;
sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr";
};
prePatch = ''

View file

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "fcitx5-configtool";
version = "5.0.4";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-configtool";
repo = pname;
rev = version;
sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE=";
sha256 = "0w6cgg57ldk02j3fs7mm8pn5inblcjyr20d3xl5qbyawwccjsn2m";
};
cmakeFlags = [

View file

@ -4,9 +4,11 @@
, extra-cmake-modules
, fcitx5
, gobject-introspection
, glib
, gtk2
, gtk3
, gtk4
, fmt
, pcre
, libuuid
, libselinux
@ -24,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-gtk";
version = "5.0.3";
version = "5.0.7";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-gtk";
repo = pname;
rev = version;
sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4=";
sha256 = "0vcikqrxv1xxcdaiz3axgm7rpab4w8aciw838sbpa9l20dp8cnyq";
};
cmakeFlags = [
@ -39,8 +41,10 @@ stdenv.mkDerivation rec {
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
buildInputs = [
glib
gtk3
gtk4
fmt
gobject-introspection
fcitx5
pcre
@ -57,6 +61,11 @@ stdenv.mkDerivation rec {
libXtst
] ++ lib.optional withGTK2 gtk2;
NIX_CFLAGS_COMPILE = lib.concatMapStringsSep " " (s: "-isystem ${s}") [
"${glib.dev}/include/gio-unix-2.0"
"${glib.dev}/include/glib-2.0"
];
nativeBuildInputs = [
cmake
extra-cmake-modules

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-lua";
version = "5.0.4";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-lua";
rev = version;
sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI=";
sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc";
};
nativeBuildInputs = [

View file

@ -1,5 +1,4 @@
{ lib, stdenv
, fetchurl
, fetchFromGitHub
, pkg-config
, cmake
@ -12,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
version = "5.0.4";
version = "5.0.6";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-rime";
repo = pname;
rev = version;
sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8=";
sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g";
};
cmakeFlags = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-extra";
version = "5.0.2";
version = "5.0.4";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-extra";
repo = pname;
rev = version;
sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
sha256 = "1rhm9jyqxlsgjsn3f5n9jwm5qjcgg87widp0bv1xa9cc23mydrqv";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-other";
version = "5.0.3";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-other";
repo = pname;
rev = version;
sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw=";
sha256 = "0z34y05sbb2qavpa6banv7xvlsmpymmm828265r8bf7r995wx8lz";
};
nativeBuildInputs = [

View file

@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
homepage = "http://www.maier-komor.de/mbuffer.html";
homepage = "https://www.maier-komor.de/mbuffer.html";
description = "A tool for buffering data streams with a large set of unique features";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ tokudan ];
platforms = lib.platforms.linux; # Maybe other non-darwin Unix
};

View file

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, libxml2, systemd }:
stdenv.mkDerivation {
pname = "qdl";
version = "unstable-2021-05-06";
src = fetchFromGitHub {
owner = "andersson";
repo = "qdl";
rev = "2021b303a81ca1bcf21b7f1f23674b5c8747646f";
sha256 = "0akrdca4jjdkfdya36vy1y5vzimrc4pp5jm24rmlw8hbqxvj72ri";
};
buildInputs = [ systemd libxml2 ];
installPhase = ''
runHook preInstall
install -Dm755 ./qdl -t $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/andersson/qdl";
description = "Tool for flashing images to Qualcomm devices";
license = licenses.bsd3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.linux;
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nebula";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "slackhq";
repo = pname;
rev = "v${version}";
sha256 = "08pjzlqck9524phsmqjwg6237vj1mmwsynkxivnahv1vhwyy9awz";
sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU=";
};
vendorSha256 = "1g6wk5sydxbzpx62k4bdq4qnyk98mn1pljgi5hbffj01ipd82kq8";
vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg=";
doCheck = false;

View file

@ -1,21 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "libtorrent-jesec";
version = "0.13.8-r1";
version = "0.13.8-r2";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
sha256 = "sha256-eIXVTbVOCRHcxSsLPvIm9F60t2upk5ORpDSOOYqTCJ4=";
};
patches = [
(fetchpatch {
name = "test-fallback";
url = "https://github.com/jesec/libtorrent/commit/a38205ce06aadc9908478ec3a9c8aefd9be06344.patch";
sha256 = "sha256-2TyQ9zYWZw6bzAfVZzTOQSkfIZnDU8ykgpRAFXscEH0=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl zlib ];
# https://github.com/jesec/libtorrent/issues/1
doCheck = false;
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
'';
checkInputs = [ gtest ];
meta = with lib; {

View file

@ -16,13 +16,13 @@ let
in
stdenv.mkDerivation rec {
pname = "rtorrent-jesec";
version = "0.9.8-r13";
version = "0.9.8-r14";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo=";
};
nativeBuildInputs = [ cmake ];

View file

@ -50,11 +50,10 @@ common =
];
buildInputs =
[ curl openssl sqlite xz bzip2 nlohmann_json
[ curl libsodium openssl sqlite xz bzip2 nlohmann_json
brotli boost editline
]
++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gtest lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "0.3.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "1gfzard6bh78xxgjk14c9zmdplppkcjqxhvfazcbv8qppjl2pbbd";
sha256 = "0g60qwdxk6pmkzj0zz9iyc8b0bzh751fj2yyz0vilkgcjq47xjk8";
};
buildInputs =
@ -17,7 +17,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
vendorSha256 = "15163v484rv08rn439y38r9spyqn3lf4q4ly8xr18nnf4bs3h6y2";
vendorSha256 = "0agmnl5d00hm854sj1iipng36pf7hcc26iwcmpcr1rsmc7v522z4";
subPackages = [ "cmd/cosign" ];

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.1.5";
version = "0.2.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
sha256 = "1hg8a1vxrkl2737dhb46ikzhnfz87zf9pvs370l9j8h7zz1mcq66";
sha256 = "sha256-PwKfsIwGw4aUu8DF9VeuFzafp116E3jetsN4bS5YtRY=";
};
cargoSha256 = "00azv55r4ldpr6gfn77ny9rzm3yqlpimvgzx2cwkwnhgmfcq2l1j";
cargoSha256 = "sha256-6IRjfYntKQXrrl7ix+e6PEQX1bmiAW8Kd79mczCpaUY=";
nativeBuildInputs = [
gpgme # for gpgme-config

View file

@ -0,0 +1,39 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kiterunner";
version = "1.0.2";
src = fetchFromGitHub {
owner = "assetnote";
repo = pname;
rev = "v${version}";
sha256 = "084jywgqjj2hpaprdcb9a7i8hihphnfil0sx3wrlvjpa8sk0z1mw";
};
vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}")
'';
subPackages = [ "./cmd/kiterunner" ];
# Test data is missing in the repo
doCheck = false;
meta = with lib; {
description = "Contextual content discovery tool";
longDescription = ''
Kiterunner is a tool that is capable of not only performing traditional
content discovery at lightning fast speeds, but also bruteforcing routes
and endpoints in modern applications.
'';
homepage = "https://github.com/assetnote/kiterunner";
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "opencc";
version = "1.0.6";
version = "1.1.2";
src = fetchFromGitHub {
owner = "BYVoid";
repo = "OpenCC";
rev = "ver.${version}";
sha256 = "1ygj2ygxsva72hs6cm0a6wdd2rp71k4nm0pd7cb20y2srdlzvdqk";
sha256 = "1a15p9idznh23b44r7rw2zjnirbxjs5pyq3k6xkz0k64cdh2zq6h";
};
nativeBuildInputs = [ cmake python ];
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src
'';
# Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools".
enableParallelBuilding = false;
meta = with lib; {
homepage = "https://github.com/BYVoid/OpenCC";
license = licenses.asl20;

View file

@ -6097,6 +6097,8 @@ in
kismet = callPackage ../applications/networking/sniffers/kismet { };
kiterunner = callPackage ../tools/security/kiterunner { };
klick = callPackage ../applications/audio/klick { };
klystrack = callPackage ../applications/audio/klystrack { };
@ -18600,6 +18602,8 @@ in
xsimd = callPackage ../development/libraries/xsimd { };
xtl = callPackage ../development/libraries/xtl { };
xvidcore = callPackage ../development/libraries/xvidcore { };
xxHash = callPackage ../development/libraries/xxHash {};
@ -22201,6 +22205,8 @@ in
qogir-theme = callPackage ../data/themes/qogir { };
quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { };
redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
route159 = callPackage ../data/fonts/route159 { };
@ -30915,6 +30921,8 @@ in
py-wmi-client = callPackage ../tools/networking/py-wmi-client { };
qdl = callPackage ../tools/misc/qdl { };
rargs = callPackage ../tools/misc/rargs { };
rauc = callPackage ../tools/misc/rauc { };

View file

@ -13677,10 +13677,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
version = "9.17";
version = "9.19";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.17.tar.gz";
sha256 = "13dxjhr03dhh1f5bbxbb3jiwdv7jby96qqb97l3arf5x043yd9hd";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz";
sha256 = "15qs99sl3ckzqwpqk4kawhamdm6160bzxyikf3blym4fn1k6s1a5";
};
meta = {
homepage = "https://mojolicious.org";