Merge master into staging-next
This commit is contained in:
commit
065a1dcee6
10
.github/CONTRIBUTING.md
vendored
10
.github/CONTRIBUTING.md
vendored
|
@ -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]`.
|
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.
|
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
|
## Reviewing contributions
|
||||||
|
|
||||||
See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).
|
See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).
|
||||||
|
|
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
@ -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 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 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/`)
|
- [ ] 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).
|
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
|
||||||
|
|
|
@ -3561,6 +3561,12 @@
|
||||||
githubId = 1943632;
|
githubId = 1943632;
|
||||||
name = "fro_ozen";
|
name = "fro_ozen";
|
||||||
};
|
};
|
||||||
|
frogamic = {
|
||||||
|
email = "frogamic@protonmail.com";
|
||||||
|
github = "frogamic";
|
||||||
|
githubId = 10263813;
|
||||||
|
name = "Dominic Shelton";
|
||||||
|
};
|
||||||
Frostman = {
|
Frostman = {
|
||||||
email = "me@slukjanov.name";
|
email = "me@slukjanov.name";
|
||||||
github = "Frostman";
|
github = "Frostman";
|
||||||
|
@ -7105,6 +7111,12 @@
|
||||||
githubId = 5047140;
|
githubId = 5047140;
|
||||||
name = "Victor Collod";
|
name = "Victor Collod";
|
||||||
};
|
};
|
||||||
|
musfay = {
|
||||||
|
email = "musfay@protonmail.com";
|
||||||
|
github = "musfay";
|
||||||
|
githubId = 33374965;
|
||||||
|
name = "Mustafa Çalışkan";
|
||||||
|
};
|
||||||
mupdt = {
|
mupdt = {
|
||||||
email = "nix@pdtpartners.com";
|
email = "nix@pdtpartners.com";
|
||||||
github = "mupdt";
|
github = "mupdt";
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<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>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
|
|
|
@ -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 {
|
sftpFlags = mkOption {
|
||||||
type = with types; listOf str;
|
type = with types; listOf str;
|
||||||
default = [];
|
default = [];
|
||||||
|
@ -386,6 +395,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
|
services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
|
||||||
|
services.openssh.sftpServerExecutable = mkDefault "${cfgc.package}/libexec/sftp-server";
|
||||||
|
|
||||||
environment.etc = authKeysFiles //
|
environment.etc = authKeysFiles //
|
||||||
{ "ssh/moduli".source = cfg.moduliFile;
|
{ "ssh/moduli".source = cfg.moduliFile;
|
||||||
|
@ -505,7 +515,7 @@ in
|
||||||
''}
|
''}
|
||||||
|
|
||||||
${optionalString cfg.allowSFTP ''
|
${optionalString cfg.allowSFTP ''
|
||||||
Subsystem sftp ${cfgc.package}/libexec/sftp-server ${concatStringsSep " " cfg.sftpFlags}
|
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}
|
||||||
''}
|
''}
|
||||||
|
|
||||||
PermitRootLogin ${cfg.permitRootLogin}
|
PermitRootLogin ${cfg.permitRootLogin}
|
||||||
|
|
|
@ -89,7 +89,7 @@ in {
|
||||||
# create database
|
# create database
|
||||||
services.mysql = mkIf cfg.createDatabase {
|
services.mysql = mkIf cfg.createDatabase {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = mkDefault pkgs.mysql;
|
package = mkDefault pkgs.mariadb;
|
||||||
ensureUsers = [{
|
ensureUsers = [{
|
||||||
name = "engelsystem";
|
name = "engelsystem";
|
||||||
ensurePermissions = { "engelsystem.*" = "ALL PRIVILEGES"; };
|
ensurePermissions = { "engelsystem.*" = "ALL PRIVILEGES"; };
|
||||||
|
|
|
@ -2,20 +2,20 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "micro";
|
pname = "micro";
|
||||||
version = "2.0.8";
|
version = "2.0.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zyedidia";
|
owner = "zyedidia";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci";
|
sha256 = "sha256-8QtucdamxVwHuuhQhVQuvTNbqY5p97LKSB23617p4ow=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
subPackages = [ "cmd/micro" ];
|
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}" ];
|
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}" ];
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
|
||||||
substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer
|
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; {
|
meta = with lib; {
|
||||||
homepage = "https://nufraw.sourceforge.io/";
|
homepage = "https://nufraw.sourceforge.io/";
|
||||||
description = "Utility to read and manipulate raw images from digital cameras";
|
description = "Utility to read and manipulate raw images from digital cameras";
|
||||||
|
|
21
pkgs/applications/graphics/nufraw/move-extern-c.patch
Normal file
21
pkgs/applications/graphics/nufraw/move-extern-c.patch
Normal 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__) \
|
|
@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nnn";
|
pname = "nnn";
|
||||||
version = "4.0";
|
version = "4.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jarun";
|
owner = "jarun";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0cbxgss9j0bvsp3czjx1kpm9id7c5xxmjfnvjyk3pfd69ygif2kl";
|
sha256 = "09z37lv57nbp0l1ax28558jk5jv91lb22bgaclirvdyz2qp47xhj";
|
||||||
};
|
};
|
||||||
|
|
||||||
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
|
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
|
||||||
|
|
|
@ -18,22 +18,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"beta": {
|
"beta": {
|
||||||
"version": "91.0.4472.77",
|
"version": "92.0.4515.40",
|
||||||
"sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
|
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
|
||||||
"sha256bin64": "1fmarrvkvfj0hgnz4qqx7b45pwkdpagfj2s2hznnanq5q5p9vay0",
|
"sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-04-06",
|
"version": "2021-05-07",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
|
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
|
||||||
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
|
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dev": {
|
"dev": {
|
||||||
"version": "92.0.4515.40",
|
"version": "93.0.4530.5",
|
||||||
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
|
"sha256": "0xxnn9fbwgmfk0zz5an35na1zprhas487pbg2qpgg76g50zxnsx5",
|
||||||
"sha256bin64": "12kfzgg0fhlrvr3ci1gzsn5rzdwr4dc2k3sj45j4dn7wnrjlpmbx",
|
"sha256bin64": "14fzmfhaiish91byg7knr9nf2cigklfvy145vc7qhg17b6gzba25",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-05-07",
|
"version": "2021-05-07",
|
||||||
|
|
|
@ -2,29 +2,40 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "starboard";
|
pname = "starboard";
|
||||||
version = "0.10.1";
|
version = "0.10.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aquasecurity";
|
owner = "aquasecurity";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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 = [
|
preCheck = ''
|
||||||
"-ldflags="
|
# Remove test that requires networking
|
||||||
"-s"
|
rm pkg/plugin/aqua/client/client_integration_test.go
|
||||||
"-w"
|
'';
|
||||||
"-X main.version=v${version}"
|
|
||||||
];
|
doInstallCheck = true;
|
||||||
|
installCheckPhase = ''
|
||||||
|
runHook preInstallCheck
|
||||||
|
$out/bin/starboard --help
|
||||||
|
$out/bin/starboard version | grep "v${version}"
|
||||||
|
runHook postInstallCheck
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
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";
|
description = "Kubernetes-native security tool kit";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Starboard integrates security tools into the Kubernetes environment, so
|
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
|
plug-in that make security reports available through familiar Kubernetes
|
||||||
tools.
|
tools.
|
||||||
'';
|
'';
|
||||||
homepage = src.meta.homepage;
|
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jk ];
|
maintainers = with maintainers; [ jk ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -36,15 +36,15 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
mkdir -p usbdk/x86 usbdk/amd64
|
mkdir -p usbdk/x86 usbdk/amd64
|
||||||
(cd usbdk/x86; ${p7zip}/bin/7z x ${src_usbdk_x86})
|
(cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86})
|
||||||
(cd usbdk/amd64; ${p7zip}/bin/7z x ${src_usbdk_amd64})
|
(cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64})
|
||||||
|
|
||||||
mkdir -p vdagent/x86 vdagent/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/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 ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
|
(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
|
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 =
|
installPhase =
|
||||||
|
|
28
pkgs/data/icons/quintom-cursor-theme/default.nix
Normal file
28
pkgs/data/icons/quintom-cursor-theme/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -35,11 +35,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-initial-setup";
|
pname = "gnome-initial-setup";
|
||||||
version = "40.1";
|
version = "40.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi";
|
sha256 = "O9cUg/YMDY9yQ5E7kmJe8Vx3iS/uP5MifqXw+XsMWqs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -4,8 +4,8 @@ let
|
||||||
generic = (import ./generic.nix) _args;
|
generic = (import ./generic.nix) _args;
|
||||||
|
|
||||||
base = callPackage generic (_args // {
|
base = callPackage generic (_args // {
|
||||||
version = "8.0.6";
|
version = "8.0.7";
|
||||||
sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16";
|
sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";
|
||||||
});
|
});
|
||||||
|
|
||||||
in base.withExtensions ({ all, ... }: with all; ([
|
in base.withExtensions ({ all, ... }: with all; ([
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
|
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
|
||||||
libyamlcpp, gtest }:
|
libyamlcpp, gtest, capnproto, pkg-config }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "librime";
|
pname = "librime";
|
||||||
version = "1.5.3";
|
version = "1.7.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rime";
|
owner = "rime";
|
||||||
repo = "librime";
|
repo = pname;
|
||||||
rev = version;
|
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; {
|
meta = with lib; {
|
||||||
homepage = "https://rime.im/";
|
homepage = "https://rime.im/";
|
||||||
|
|
33
pkgs/development/libraries/xtl/default.nix
Normal file
33
pkgs/development/libraries/xtl/default.nix
Normal 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;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,14 +1,14 @@
|
||||||
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
||||||
let
|
let
|
||||||
pname = "composer";
|
pname = "composer";
|
||||||
version = "2.1.0";
|
version = "2.1.1";
|
||||||
in
|
in
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://getcomposer.org/download/${version}/composer.phar";
|
url = "https://getcomposer.org/download/${version}/composer.phar";
|
||||||
sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig";
|
sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -12,11 +12,11 @@ let
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "matrix-synapse";
|
pname = "matrix-synapse";
|
||||||
version = "1.35.0";
|
version = "1.35.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-McgLJoOS8h8C7mcbLaF0hiMkfthpDRUKyB5Effzk2ds=";
|
sha256 = "sha256-MJ3RG60rWbcfQxhj34k99AFg8TsPd3ECEw/x2+xU1js=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -12,16 +12,16 @@
|
||||||
# server, and the FHS userenv and corresponding NixOS module should
|
# server, and the FHS userenv and corresponding NixOS module should
|
||||||
# automatically pick up the changes.
|
# automatically pick up the changes.
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.23.1.4602-280ab6053";
|
version = "1.23.2.4625-a83d2d0f9";
|
||||||
pname = "plexmediaserver";
|
pname = "plexmediaserver";
|
||||||
|
|
||||||
# Fetch the source
|
# Fetch the source
|
||||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||||
sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic";
|
sha256 = "17md53saxl7x45kgj9wdf7jr61ncnapa418c1lf37qbdqmid343c";
|
||||||
} else fetchurl {
|
} else fetchurl {
|
||||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||||
sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli";
|
sha256 = "1nisjz4g924di73zjkgwx7nk3gkbykj6bkkgzmlm84dq3rgqnisk";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "basedb" ];
|
outputs = [ "out" "basedb" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "exoscale-cli";
|
pname = "exoscale-cli";
|
||||||
version = "1.30.0";
|
version = "1.31.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "exoscale";
|
owner = "exoscale";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7KuQC9L9Tp4s0E2iOlhgmezzjys1UhpHEe0gaYcy8oM=";
|
sha256 = "sha256-2CK/W8h0xfReqYt4a3qQ88Ydr8u9Ky6DfttJJaGu9kM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/exoscale/cli";
|
goPackagePath = "github.com/exoscale/cli";
|
||||||
|
|
|
@ -21,18 +21,18 @@ let
|
||||||
sources = name: system: {
|
sources = name: system: {
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
||||||
sha256 = "1mrhzg07dm11dirxhwdpxz9rch65z631abss0khdi944l3zv8lq4";
|
sha256 = "1f86pkjsp8lrmk8ap40wh9zbzb2ni49vc2cjsdjbj4pkkwivihpv";
|
||||||
};
|
};
|
||||||
|
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||||
sha256 = "0m8zbjzr9a4f13z4szhqs5296lmyqrfmxr7pyvy8mrap3fqxvv02";
|
sha256 = "1l47lq2wq8y0adrjij3w5ki1mm1f00503ks398flfmbzyav6bad3";
|
||||||
};
|
};
|
||||||
}.${system};
|
}.${system};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "google-cloud-sdk";
|
pname = "google-cloud-sdk";
|
||||||
version = "342.0.0";
|
version = "343.0.0";
|
||||||
|
|
||||||
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
||||||
|
|
||||||
|
|
|
@ -41,13 +41,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5";
|
pname = "fcitx5";
|
||||||
version = "5.0.4";
|
version = "5.0.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
|
sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
|
|
@ -19,13 +19,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "fcitx5-configtool";
|
pname = "fcitx5-configtool";
|
||||||
version = "5.0.4";
|
version = "5.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-configtool";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE=";
|
sha256 = "0w6cgg57ldk02j3fs7mm8pn5inblcjyr20d3xl5qbyawwccjsn2m";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -4,9 +4,11 @@
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
, fcitx5
|
, fcitx5
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
|
, glib
|
||||||
, gtk2
|
, gtk2
|
||||||
, gtk3
|
, gtk3
|
||||||
, gtk4
|
, gtk4
|
||||||
|
, fmt
|
||||||
, pcre
|
, pcre
|
||||||
, libuuid
|
, libuuid
|
||||||
, libselinux
|
, libselinux
|
||||||
|
@ -24,13 +26,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5-gtk";
|
pname = "fcitx5-gtk";
|
||||||
version = "5.0.3";
|
version = "5.0.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-gtk";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4=";
|
sha256 = "0vcikqrxv1xxcdaiz3axgm7rpab4w8aciw838sbpa9l20dp8cnyq";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -39,8 +41,10 @@ stdenv.mkDerivation rec {
|
||||||
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
|
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
gtk4
|
gtk4
|
||||||
|
fmt
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
fcitx5
|
fcitx5
|
||||||
pcre
|
pcre
|
||||||
|
@ -57,6 +61,11 @@ stdenv.mkDerivation rec {
|
||||||
libXtst
|
libXtst
|
||||||
] ++ lib.optional withGTK2 gtk2;
|
] ++ 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 = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5-lua";
|
pname = "fcitx5-lua";
|
||||||
version = "5.0.4";
|
version = "5.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-lua";
|
repo = "fcitx5-lua";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI=";
|
sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchurl
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, cmake
|
, cmake
|
||||||
|
@ -12,13 +11,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5-rime";
|
pname = "fcitx5-rime";
|
||||||
version = "5.0.4";
|
version = "5.0.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-rime";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8=";
|
sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5-table-extra";
|
pname = "fcitx5-table-extra";
|
||||||
version = "5.0.2";
|
version = "5.0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-table-extra";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
|
sha256 = "1rhm9jyqxlsgjsn3f5n9jwm5qjcgg87widp0bv1xa9cc23mydrqv";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fcitx5-table-other";
|
pname = "fcitx5-table-other";
|
||||||
version = "5.0.3";
|
version = "5.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fcitx";
|
owner = "fcitx";
|
||||||
repo = "fcitx5-table-other";
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw=";
|
sha256 = "0z34y05sbb2qavpa6banv7xvlsmpymmm828265r8bf7r995wx8lz";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
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";
|
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 ];
|
maintainers = with lib.maintainers; [ tokudan ];
|
||||||
platforms = lib.platforms.linux; # Maybe other non-darwin Unix
|
platforms = lib.platforms.linux; # Maybe other non-darwin Unix
|
||||||
};
|
};
|
||||||
|
|
29
pkgs/tools/misc/qdl/default.nix
Normal file
29
pkgs/tools/misc/qdl/default.nix
Normal 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;
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "nebula";
|
pname = "nebula";
|
||||||
version = "1.3.0";
|
version = "1.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "slackhq";
|
owner = "slackhq";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "08pjzlqck9524phsmqjwg6237vj1mmwsynkxivnahv1vhwyy9awz";
|
sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1g6wk5sydxbzpx62k4bdq4qnyk98mn1pljgi5hbffj01ipd82kq8";
|
vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,31 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libtorrent-jesec";
|
pname = "libtorrent-jesec";
|
||||||
version = "0.13.8-r1";
|
version = "0.13.8-r2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "libtorrent";
|
repo = "libtorrent";
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ openssl zlib ];
|
buildInputs = [ openssl zlib ];
|
||||||
|
|
||||||
# https://github.com/jesec/libtorrent/issues/1
|
doCheck = true;
|
||||||
doCheck = false;
|
preCheck = ''
|
||||||
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||||
|
'';
|
||||||
checkInputs = [ gtest ];
|
checkInputs = [ gtest ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -16,13 +16,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rtorrent-jesec";
|
pname = "rtorrent-jesec";
|
||||||
version = "0.9.8-r13";
|
version = "0.9.8-r14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesec";
|
owner = "jesec";
|
||||||
repo = "rtorrent";
|
repo = "rtorrent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
|
sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -50,11 +50,10 @@ common =
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ curl openssl sqlite xz bzip2 nlohmann_json
|
[ curl libsodium openssl sqlite xz bzip2 nlohmann_json
|
||||||
brotli boost editline
|
brotli boost editline
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isDarwin [ Security ]
|
++ lib.optionals stdenv.isDarwin [ Security ]
|
||||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
|
||||||
++ lib.optionals is24 [ libarchive gtest lowdown ]
|
++ lib.optionals is24 [ libarchive gtest lowdown ]
|
||||||
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
|
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
|
||||||
++ lib.optional withLibseccomp libseccomp
|
++ lib.optional withLibseccomp libseccomp
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cosign";
|
pname = "cosign";
|
||||||
version = "0.3.1";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sigstore";
|
owner = "sigstore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1gfzard6bh78xxgjk14c9zmdplppkcjqxhvfazcbv8qppjl2pbbd";
|
sha256 = "0g60qwdxk6pmkzj0zz9iyc8b0bzh751fj2yyz0vilkgcjq47xjk8";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
vendorSha256 = "15163v484rv08rn439y38r9spyqn3lf4q4ly8xr18nnf4bs3h6y2";
|
vendorSha256 = "0agmnl5d00hm854sj1iipng36pf7hcc26iwcmpcr1rsmc7v522z4";
|
||||||
|
|
||||||
subPackages = [ "cmd/cosign" ];
|
subPackages = [ "cmd/cosign" ];
|
||||||
|
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "gpg-tui";
|
pname = "gpg-tui";
|
||||||
version = "0.1.5";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "orhun";
|
owner = "orhun";
|
||||||
repo = "gpg-tui";
|
repo = "gpg-tui";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1hg8a1vxrkl2737dhb46ikzhnfz87zf9pvs370l9j8h7zz1mcq66";
|
sha256 = "sha256-PwKfsIwGw4aUu8DF9VeuFzafp116E3jetsN4bS5YtRY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "00azv55r4ldpr6gfn77ny9rzm3yqlpimvgzx2cwkwnhgmfcq2l1j";
|
cargoSha256 = "sha256-6IRjfYntKQXrrl7ix+e6PEQX1bmiAW8Kd79mczCpaUY=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gpgme # for gpgme-config
|
gpgme # for gpgme-config
|
||||||
|
|
39
pkgs/tools/security/kiterunner/default.nix
Normal file
39
pkgs/tools/security/kiterunner/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opencc";
|
pname = "opencc";
|
||||||
version = "1.0.6";
|
version = "1.1.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "BYVoid";
|
owner = "BYVoid";
|
||||||
repo = "OpenCC";
|
repo = "OpenCC";
|
||||||
rev = "ver.${version}";
|
rev = "ver.${version}";
|
||||||
sha256 = "1ygj2ygxsva72hs6cm0a6wdd2rp71k4nm0pd7cb20y2srdlzvdqk";
|
sha256 = "1a15p9idznh23b44r7rw2zjnirbxjs5pyq3k6xkz0k64cdh2zq6h";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake python ];
|
nativeBuildInputs = [ cmake python ];
|
||||||
|
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
|
||||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src
|
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; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/BYVoid/OpenCC";
|
homepage = "https://github.com/BYVoid/OpenCC";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
|
|
|
@ -6097,6 +6097,8 @@ in
|
||||||
|
|
||||||
kismet = callPackage ../applications/networking/sniffers/kismet { };
|
kismet = callPackage ../applications/networking/sniffers/kismet { };
|
||||||
|
|
||||||
|
kiterunner = callPackage ../tools/security/kiterunner { };
|
||||||
|
|
||||||
klick = callPackage ../applications/audio/klick { };
|
klick = callPackage ../applications/audio/klick { };
|
||||||
|
|
||||||
klystrack = callPackage ../applications/audio/klystrack { };
|
klystrack = callPackage ../applications/audio/klystrack { };
|
||||||
|
@ -18600,6 +18602,8 @@ in
|
||||||
|
|
||||||
xsimd = callPackage ../development/libraries/xsimd { };
|
xsimd = callPackage ../development/libraries/xsimd { };
|
||||||
|
|
||||||
|
xtl = callPackage ../development/libraries/xtl { };
|
||||||
|
|
||||||
xvidcore = callPackage ../development/libraries/xvidcore { };
|
xvidcore = callPackage ../development/libraries/xvidcore { };
|
||||||
|
|
||||||
xxHash = callPackage ../development/libraries/xxHash {};
|
xxHash = callPackage ../development/libraries/xxHash {};
|
||||||
|
@ -22201,6 +22205,8 @@ in
|
||||||
|
|
||||||
qogir-theme = callPackage ../data/themes/qogir { };
|
qogir-theme = callPackage ../data/themes/qogir { };
|
||||||
|
|
||||||
|
quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { };
|
||||||
|
|
||||||
redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
|
redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
|
||||||
|
|
||||||
route159 = callPackage ../data/fonts/route159 { };
|
route159 = callPackage ../data/fonts/route159 { };
|
||||||
|
@ -30915,6 +30921,8 @@ in
|
||||||
|
|
||||||
py-wmi-client = callPackage ../tools/networking/py-wmi-client { };
|
py-wmi-client = callPackage ../tools/networking/py-wmi-client { };
|
||||||
|
|
||||||
|
qdl = callPackage ../tools/misc/qdl { };
|
||||||
|
|
||||||
rargs = callPackage ../tools/misc/rargs { };
|
rargs = callPackage ../tools/misc/rargs { };
|
||||||
|
|
||||||
rauc = callPackage ../tools/misc/rauc { };
|
rauc = callPackage ../tools/misc/rauc { };
|
||||||
|
|
|
@ -13677,10 +13677,10 @@ let
|
||||||
|
|
||||||
Mojolicious = buildPerlPackage {
|
Mojolicious = buildPerlPackage {
|
||||||
pname = "Mojolicious";
|
pname = "Mojolicious";
|
||||||
version = "9.17";
|
version = "9.19";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.17.tar.gz";
|
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz";
|
||||||
sha256 = "13dxjhr03dhh1f5bbxbb3jiwdv7jby96qqb97l3arf5x043yd9hd";
|
sha256 = "15qs99sl3ckzqwpqk4kawhamdm6160bzxyikf3blym4fn1k6s1a5";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://mojolicious.org";
|
homepage = "https://mojolicious.org";
|
||||||
|
|
Loading…
Reference in a new issue