Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-09-04 18:02:10 +00:00 committed by GitHub
commit 3dbb5dfa29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 964 additions and 364 deletions

View File

@ -4340,6 +4340,12 @@
githubId = 415760;
name = "Jonas Höglund";
};
firefly-cpp = {
email = "iztok@iztok-jr-fister.eu";
github = "firefly-cpp";
githubId = 1633361;
name = "Iztok Fister Jr.";
};
fishi0x01 = {
email = "fishi0x01@gmail.com";
github = "fishi0x01";
@ -6490,6 +6496,12 @@
githubId = 752510;
name = "Martin Potier";
};
jqqqqqqqqqq = {
email = "jqqqqqqqqqq@gmail.com";
github = "jqqqqqqqqqq";
githubId = 12872927;
name = "Curtis Jiang";
};
jqueiroz = {
email = "nixos@johnjq.com";
github = "jqueiroz";
@ -9686,6 +9698,12 @@
github = "numkem";
githubId = 332423;
};
nviets = {
email = "nathan.g.viets@gmail.com";
github = "nviets";
githubId = 16027994;
name = "Nathan Viets";
};
nyanloutre = {
email = "paul@nyanlout.re";
github = "nyanloutre";

View File

@ -135,7 +135,7 @@ in
# The SSH agent protocol doesn't have support for changing TTYs; however we
# can simulate this with the `exec` feature of openssh (see ssh_config(5))
# that hooks a command to the shell currently running the ssh program.
Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null"
Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1"
'';
environment.extraInit = mkIf cfg.agent.enableSSHSupport ''

View File

@ -17,9 +17,11 @@ let
GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
} // (
lib.mapAttrs (_: toString) cfg.extraConfig
) // (optionalAttrs enableRedis {
) // optionalAttrs (config.time.timeZone != null) {
PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone;
} // optionalAttrs enableRedis {
PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
});
};
manage = let
setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
@ -174,11 +176,10 @@ in
See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html)
for available options.
'';
example = literalExpression ''
{
PAPERLESS_OCR_LANGUAGE = "deu+eng";
}
'';
example = {
PAPERLESS_OCR_LANGUAGE = "deu+eng";
PAPERLESS_DBHOST = "/run/postgresql";
};
};
user = mkOption {
@ -285,12 +286,13 @@ in
'';
Restart = "on-failure";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
# gunicorn needs setuid
SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid" ];
# gunicorn needs setuid, liblapack needs mbind
SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ];
# Needs to serve web page
PrivateNetwork = false;
} // lib.optionalAttrs (cfg.port < 1024) {
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
};
environment = env // {
PATH = mkForce cfg.package.path;

View File

@ -72,6 +72,7 @@ let
"unbound"
"unifi"
"unifi-poller"
"v2ray"
"varnish"
"wireguard"
"flow"

View File

@ -0,0 +1,29 @@
{ config, lib, pkgs, options }:
with lib;
let
cfg = config.services.prometheus.exporters.v2ray;
in
{
port = 9299;
extraOpts = {
v2rayEndpoint = mkOption {
type = types.str;
default = "127.0.0.1:54321";
description = ''
v2ray grpc api endpoint
'';
};
};
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-v2ray-exporter}/bin/v2ray-exporter \
--v2ray-endpoint ${cfg.v2rayEndpoint} \
--listen ${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

View File

@ -329,6 +329,7 @@ in
"d ${stateDir hostName}/cache 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/index 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/locks 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/log 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/media 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/media_attic 0750 ${user} ${webserver.group} - -"
"d ${stateDir hostName}/media_meta 0750 ${user} ${webserver.group} - -"

View File

@ -1256,6 +1256,67 @@ let
'';
};
v2ray = {
exporterConfig = {
enable = true;
};
metricProvider = {
systemd.services.prometheus-nginx-exporter.after = [ "v2ray.service" ];
services.v2ray = {
enable = true;
config = {
stats = {};
api = {
tag = "api";
services = [ "StatsService" ];
};
inbounds = [
{
port = 1080;
listen = "127.0.0.1";
protocol = "http";
}
{
listen = "127.0.0.1";
port = 54321;
protocol = "dokodemo-door";
settings = { address = "127.0.0.1"; };
tag = "api";
}
];
outbounds = [
{
protocol = "freedom";
}
{
protocol = "freedom";
settings = {};
tag = "api";
}
];
routing = {
strategy = "rules";
settings = {
rules = [
{
inboundTag = [ "api" ];
outboundTag = "api";
type = "field";
}
];
};
};
};
};
};
exporterTest = ''
wait_for_unit("prometheus-v2ray-exporter.service")
wait_for_open_port(9299)
succeed("curl -sSf localhost:9299/scrape | grep 'v2ray_up 1'")
'';
};
varnish = {
exporterConfig = {
enable = true;

View File

@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
sourceRoot = "source/muse3";
prePatch = ''
chmod u+w $NIX_BUILD_TOP
'';
patches = [ ./fix-parallel-building.patch ];
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.38";
version = "4.0.42";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-FdgF2xxqk9n1la6Lu4g6n+3O5pgIUKSYC3KzH0yM2Ok=";
sha256 = "sha256-ZcNV6qgD736KlKz4h6xHAl3ByYzca77YXoETonRaWP8=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -3,7 +3,7 @@
}:
let
version = "14";
version = "15";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
hash = "sha512-AEuUOiVCvZh4SjghQR2j8LBIubEBzEaZqWsb93icZU9K1sc6ddUanLD0NsQhzjK6oK1EDv5GG9PmqOXo6Sf1xg==";
hash = "sha512-WxqAQiPKdMfQCw9Hxaa7K2VIGTJj+Hu9WO2ehG4yQUkHBd+l0f0siLKk/i2xqLE1ZA522rxKud6iwXDuAsjjDg==";
};
buildCommand = ''

View File

@ -1,6 +1,6 @@
{
"TrueZen-nvim": {
"date": "2022-08-31",
"date": "2022-09-02",
"new": "true-zen-nvim"
},
"compe-tmux": {

View File

@ -161,12 +161,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2022-07-20";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "aef58eaa7f328d6f5713a04198c80590bbc4ecba";
sha256 = "08xacx5n5di51929yiqz51z57ph8scvk4z9pa02r69iq4wa9grzr";
rev = "1137327cf3b3e357c308ee7a459599f7ccfcb4eb";
sha256 = "16w4069zwpws9a2fvl9nzlfzxn6sp1cays2r9d3xlk5b0q4v21qd";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2022-08-30";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "ccc3bab1507427648a0eb99eb8f3e5948027e9ef";
sha256 = "0svnq4vvb5s4yq20ilpsfki25g8d47zc57h3ddiqibkc1lsyzhmn";
rev = "18f46aca5cb6265e1468353cf782c1fda28fb9ea";
sha256 = "0w5xj8qzs9m057ms6q70h8r44lbdvag9q6ldr8xy0a8fnpd5ickl";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -442,7 +442,7 @@ final: prev:
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "d4343e8384ffb25d70a9ebc966bbf1277735567c";
sha256 = "12pgal13zxdmdb6vqbnllxjdk68p9p1c9wvwhqrrwa1jriwijap0";
sha256 = "0gmc9mnbi4g0vzw911ybkw5q2ph2jhv8hs4a126q1jk2swbc5wkk";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -570,12 +570,12 @@ final: prev:
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2022-07-23";
version = "2022-08-24";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
rev = "411d81776d996f3d6afee07469ebe58248fe9e36";
sha256 = "0a1a241c2ldkrxyil8d3x67v6f3vqqjnihh6qx8mswg6qdyv60jl";
rev = "9892a40d4cf970a2916a984544b7f984fc12f55c";
sha256 = "1dbhvbaiabc8f9p3vfch3pkail2zx234g048mywl005s90d339kz";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
@ -702,12 +702,12 @@ final: prev:
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
version = "2022-08-24";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
rev = "5ffd920e9f377f69d956cb8e4e22c90093872e19";
sha256 = "1a600an1mi31jx9q83lrr0l09q9dl9a8cibwm75kw84svlvirra2";
rev = "9595471ec75ac26c575e46b3d93e1812df393ee9";
sha256 = "09nizsrc1wakwxaxwhjbg1qz7wxps2d111v0ldr3m05nkb8h8nrm";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
@ -786,12 +786,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
version = "2022-08-10";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "8c6a2e6e472ff9b7dc0a53d9a3bd88f1fbc7da6d";
sha256 = "1nc45lp9lszxqjknrhqhjmyialfv6nqb60087snx212wm9igy661";
rev = "c41ad6e3f68c2c9f6aa268c6232cdef885107303";
sha256 = "0mdimwsiclpjn2df75lc92ryyjyql4m1x0bvpl629z33hvhlcvs0";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -918,12 +918,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2022-08-25";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "fb7b17362eb6eedc57c37bdfd364f8e7d8149e31";
sha256 = "1q0g99099qvl9s9k4vrrb99hg8qpps7k1pzgba5m6ibiqmzny70f";
rev = "938908fc8db120d907bda23f6744202f534f63e4";
sha256 = "1wvd7k7xn3lb7fzqhag0mgyjjg50v31qfcdlmbn54dwbf684ra98";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -1026,12 +1026,12 @@ final: prev:
clang_complete = buildVimPluginFrom2Nix {
pname = "clang_complete";
version = "2022-07-08";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "xavierd";
repo = "clang_complete";
rev = "813aa270bd390bf64f03dc34f98834fb726a707d";
sha256 = "1kjr2qb431xqr8bzmb5bzd98mym4s4azr0h2qlgm7cqqpmh19i0m";
rev = "e25b6a54e5cf648eb36d5be5b82c1bbb22260fde";
sha256 = "0ik55akiyivq70a0jds35f8jqvs78mzxq3b302vhyq07w44mk7vx";
};
meta.homepage = "https://github.com/xavierd/clang_complete/";
};
@ -1230,12 +1230,12 @@ final: prev:
cmp-fish = buildVimPluginFrom2Nix {
pname = "cmp-fish";
version = "2022-06-23";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "mtoohey31";
repo = "cmp-fish";
rev = "8ce7517d74c11a55bf2d0e52e4649e49cea6c7a1";
sha256 = "0nlcx39hycl15bw1vn35lcw0lmgckn396m2pwfk22lyijdqdgnlk";
rev = "8ae7bfb1b3251d433c4adf4e64396ef929fbd91f";
sha256 = "02yvzj7n8j20x6hxbgj7jy2ddhfqbccg6bg9hfl2yg67prqmz7p5";
};
meta.homepage = "https://github.com/mtoohey31/cmp-fish/";
};
@ -1494,12 +1494,12 @@ final: prev:
cmp-tabnine = buildVimPluginFrom2Nix {
pname = "cmp-tabnine";
version = "2022-08-21";
version = "2022-08-30";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-tabnine";
rev = "14e287b5b1434cef322de9cc1ec6fda13b913f45";
sha256 = "1mvydmhwx240wpbvfmm8lrb2iny08sxz18zx9z8g9bvmhi4mp1ww";
rev = "f2ea9c0824d389d588966c64c146d324138a443c";
sha256 = "0d80lyjpsxn3cny66l280q20pkljh9h92wpa3iyyhj8g49zcihmw";
};
meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
};
@ -1698,12 +1698,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
version = "2022-08-30";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "16973b9cc6e4e29a713f8556f8603585730d58db";
sha256 = "1v4061g51s67rd1kw5nvglkyy6jgpv578kqf5s1nxlrrm49fa4f5";
rev = "19c0fbd07ec559fd7bfacb7b6d99aa04b984e4da";
sha256 = "0kicvgz75178mcy5922ggrfrfdkyyjpwzcx6k5mlvw38fvccazf0";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -1770,12 +1770,12 @@ final: prev:
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
version = "2022-08-30";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
rev = "f862693a674fec84617b3bc86e8b71d4df1c05e2";
sha256 = "0xz5gzq7vxs80pgxx63bnpcs0b24xs9zg001dxphb219lqad8cii";
rev = "a61574dabc9076bac869b56c1819fa47e4d64cf0";
sha256 = "0lsimnn8ppaxq0w0sypzj20jrsfxb984q2mdxycclczp8p0hsawc";
};
meta.homepage = "https://github.com/wincent/command-t/";
};
@ -1926,12 +1926,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2022-08-07";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "08236a13164a948fe403f34fe1f593ead0a3c6fe";
sha256 = "13iqzsj4x5fyzd40119jcng5vlz35y3ylrndiqwl62qj4pk4xqjb";
rev = "a8686aa6f8760bd3cd4f219a8a4101af037c9d9b";
sha256 = "0w74571l9hnds4f57fbs0p0snfbdavy052304yazjfxlmyppfrwf";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@ -1974,24 +1974,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "828d8bfe5b95814de538fb36db9765c5a83fa1b2";
sha256 = "0bjpbd4larz41jxy3bwww58vvf2fqvw8siph8kw2nd06mlkb96qn";
rev = "446f10b15a3df79d0dd2e03af9aa51efa5202db1";
sha256 = "03wcdjar3g8ajf0bsp24fg6qnqpxqw87djg9bjc6q811kk2y9rqi";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "a6694b983faa626075e0fa9588d85b147c1e4071";
sha256 = "09armjhxqyhwhgl63r2dqqwm1xl05820da2wrwrafwr211dgjqr4";
rev = "6e91fceca1addcbda590eaefe79b40dae3390f60";
sha256 = "1yaxnnyywm0770sj6vm3ffbqyyqq9lfmfkwnn37ldjrnd1a4nb0z";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2010,12 +2010,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "699619de6b964700b89967d20b539ffe4f4abeec";
sha256 = "0ap4npxkmrx9r87qrkf10xpmmha8bw4p1chdx3wq273rmigccp1n";
rev = "ba5e0b14fa29e1eadcd527638d68231f25cd0c6a";
sha256 = "0lg6a0h4k94ipy3da5h1pfckdsw99fmc5fdddzg1wxvbbs6vfsvz";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2504,12 +2504,12 @@ final: prev:
diaglist-nvim = buildVimPluginFrom2Nix {
pname = "diaglist.nvim";
version = "2022-01-11";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "onsails";
repo = "diaglist.nvim";
rev = "6c43beac1ff07f6ef00f063090b5a6c9ed11b800";
sha256 = "1a10hmz38g3lpf1xxsk3b62vr16iaz5z5yqvk21m9bpai871fv1r";
rev = "afc124a0976d56db43cc840e62757193ccab7856";
sha256 = "04virm388yi2lrq8bi6331m7q7lj46wrlh8pd8js6q7ylkvz6qfq";
};
meta.homepage = "https://github.com/onsails/diaglist.nvim/";
};
@ -2528,12 +2528,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2022-08-29";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "f4931669d2cfe16c2bff6443fd7b12c9aa8687a5";
sha256 = "1h9ld41kf1l8j5wwics19ym1h2aivdmdawi81arfam7s6qg1n154";
rev = "adc3250d65a5a12c3ebf8f85ff483a4cb8609c41";
sha256 = "10lsi4ms24zhhx9dfxfihz656fkjjkrxj77h9nnhggsxsjpqp9nb";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2564,12 +2564,12 @@ final: prev:
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
version = "2022-08-28";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
rev = "f38eb335729162905687becdd4e200a294772ff5";
sha256 = "0bnr7m807knl0b7wx3cyvxlv7hk1pws7d1rbhfdvr8kjs5vd6p32";
rev = "9cdb3e0f0973447b940b35d3175dc780301de427";
sha256 = "159kh9g6hm51blqi5g23w463jz2hnnskppm352s8ic9h239dm3ak";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@ -2605,7 +2605,7 @@ final: prev:
owner = "editorconfig";
repo = "editorconfig-vim";
rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9";
sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v";
sha256 = "1kgxz82lkssxflylylk9z10aq6qps45z27k24i8kf29wzpf5b3lr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -2674,12 +2674,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
version = "2022-08-30";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
rev = "902196bf48b085ca8036f4d3009dfd4944f9d56e";
sha256 = "1p4zlnyzi1dyynjh63173xh7sfqyzvz9hra8ysfjs7j0s1fx8499";
rev = "c60a594cc4adbfb863d3186f730765b0e1cb85eb";
sha256 = "1b2jhm9yksmkri894sfzrqhsms06vhg3acr98qaqs9y30mabcb88";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@ -2811,7 +2811,7 @@ final: prev:
owner = "andviro";
repo = "flake8-vim";
rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a";
sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/andviro/flake8-vim/";
@ -3059,12 +3059,12 @@ final: prev:
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2022-03-26";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "f48626bf5b64067a84b644bcc56afac686046966";
sha256 = "0v2m05980r5zq77b11nghjgz0yr70a88gd7jv0d0iy2z6ah63sxv";
rev = "2ee828d864ea81900b38c375d4bc4cd3657fe6fd";
sha256 = "1sgskxl6yf6c4bls6wf3hlqww48h53m3a9wyypy6mx303k2qcl2c";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@ -3155,12 +3155,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2022-08-22";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "1e107c91c0c5e3ae72c37df8ffdd50f87fb3ebfa";
sha256 = "0qg2y796mkkisyab6br4p0d6blx8ispglpphpdlmf14hp9si56bp";
rev = "d7e0bcbe45bd9d5d106a7b2e11dc15917d272c7a";
sha256 = "1h4gxyamynwygxpqfib2a7sd1xbi6sh8ixg85j6qiaqqpahr0a4k";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -3743,12 +3743,12 @@ final: prev:
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
version = "2022-08-24";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
rev = "ec3b133414388b0bfea3f33ca0bff10538aef8ac";
sha256 = "0d04vkias6vlxjjvlf16f8znviwgym83b2bp2rrfhdp3i7q4gmyx";
rev = "5f1203f4606e3208f6dd156c03f498d9fadcf1a8";
sha256 = "07jl5vf9mbz2bi1w6xm4kvxd18g3diq5ay2yrcc1m5nfki82r3si";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@ -4222,12 +4222,12 @@ final: prev:
lua-dev-nvim = buildVimPluginFrom2Nix {
pname = "lua-dev.nvim";
version = "2022-05-12";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "folke";
repo = "lua-dev.nvim";
rev = "f5c31936fe06fcbeb59b98f69f74f9c2f91abaec";
sha256 = "0vwpi3cg0gv17w3bm2vlzspsms1rn2yjrzkq2zvf2f4slqq3rfpw";
rev = "d8b800ee7376c9299f14544325a1e76f220fce3d";
sha256 = "05m6zr4v6xr6pbwigcb7lfxx1167d7nailf8w04sscjr8w2mpv8l";
};
meta.homepage = "https://github.com/folke/lua-dev.nvim/";
};
@ -4727,12 +4727,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2022-08-23";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "b3976412a63b44a171824ac9e1b4595354d99d98";
sha256 = "006h02bvlffb6z5m7b2nxlb3rbqd32xjdkckkgzfrbyvsjviflq1";
rev = "0ae951121da29a157d80db70c32679b428afffdc";
sha256 = "1nslf2wfj0z4qq7zgqcx62gb31px6sqqb8rk1a10j3ply5bc7r67";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@ -4799,12 +4799,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2022-08-30";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "4b8c20d083e49a4464424e6363dba9349c44b7d3";
sha256 = "1w8fcvg2ig1ajaz9x4mmi92jgzc33rnqxscahcccl4h67870xsgj";
rev = "d4e771d574af2633a59496440161c0196e1c71d7";
sha256 = "0d3jki67bybyccmpb73f0m660wav69g9xzaxqzskaycmg7x4jrbn";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5699,12 +5699,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "501db1459a7a46cb0766b3c56e9a6904bbcbcc97";
sha256 = "1m46jmk3wflsfqpdkiczlfplyfvmxnvrak59rmf0cmkqsq16ysrh";
rev = "7845f31839b844653736eed6dd284c862156d679";
sha256 = "11biavpv32xh3ziw5wifav7imibq2m149fsrmhgg4l3ymspkyl0q";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -5747,12 +5747,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2022-08-30";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "6dcd228384be6fa95199db57cccf27dbd4c743a5";
sha256 = "0l2l7r4kl2j9mvjiij419hdpghv410d5jqfqrp52l74vw703j294";
rev = "b2ba68ee777fc1926fc66d533f61071ddba05ee2";
sha256 = "15bgqk8nqdb69jvccmnlhdyqzhzv46zg2y267qx55as0mcf8pxgn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -5843,12 +5843,12 @@ final: prev:
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev.nvim";
version = "2022-08-25";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
rev = "51982c916aae738b50321e23c286235f9c9fe9b9";
sha256 = "15g3823igm1k8wpkkn4mkk4xic4vrw74wpm8smm36gmy0pd04wlw";
rev = "23bfd686ccc71c0b0082c06be90e4513c21f6488";
sha256 = "1fffdyy9ypfipy7n9mab8bc7ndal145m02a664smi853zkxwh2k7";
};
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
@ -6023,12 +6023,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "b32b982d52664a0a6c5a43a5f9934f001d722d4e";
sha256 = "122rpg6611k2yi8gycxnn3ylqblqkmbi5w3jnkgin4vnspn8hd0a";
rev = "b356e3836cfaf27e19874f1b5b81eb227ef161f4";
sha256 = "0fkx8gc2h9fh172if4x7cq0baizr098g1yzyygf462wfr5ds2anf";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -6269,7 +6269,7 @@ final: prev:
owner = "python-mode";
repo = "python-mode";
rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29";
sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/python-mode/python-mode/";
@ -6589,12 +6589,12 @@ final: prev:
satellite-nvim = buildVimPluginFrom2Nix {
pname = "satellite.nvim";
version = "2022-06-26";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "satellite.nvim";
rev = "320e3c54b507486e3ed0c9dacc656fdf54b40057";
sha256 = "1qkx0mcrmqgvpx9gmncblkm7km4ap3hvkcp65dqc9nn2h4w63hvy";
rev = "25d0c59edab4892363c3cec47fc5f34769e5a242";
sha256 = "1frnkh6ny4dxia793jkmv95wvvivmyp5296sg68vbf043hwny4a3";
};
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
};
@ -7149,7 +7149,7 @@ final: prev:
owner = "codota";
repo = "tabnine-vim";
rev = "e27face391a4d9a3e43ff251010f77deddf0c88d";
sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f";
sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/codota/tabnine-vim/";
@ -7675,24 +7675,24 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
version = "2022-08-30";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
rev = "cd3b4d67112fbc8bee01ea44ba5ad1eea3894714";
sha256 = "015f8qy7s0lkhcqh4jy14m2vhxhcz9vnn7h76lbqhzrq37l2lkya";
rev = "b402342665ee06e127c304e245f03143357a58c4";
sha256 = "1q9pw0sp5qg596571yfcbq4mfrylrsrr968s35yvbgnsw4fw1d2w";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
version = "2021-12-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "8223c970677e4d88c9b6b6d81bda23daf11062bb";
sha256 = "1rzg0h0ab3jsfrimdawh8vlxa6y3j3rmk57zyapnmzpzllcswj0i";
rev = "791c2a219a9425a5817fafc2dd2dcf65c4a0abde";
sha256 = "0hp95fsh0ld6icw5dmj45w1a9f1j39z64bzshw3vqj7w2d86q87m";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -10630,12 +10630,12 @@ final: prev:
vim-nixhash = buildVimPluginFrom2Nix {
pname = "vim-nixhash";
version = "2022-02-06";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "symphorien";
repo = "vim-nixhash";
rev = "d6e3c5161ef2e3fbc4a4b68a785d958d97e25b7e";
sha256 = "1mrprl6mqapjzcya643nzvwaf01r38knjg9xnfbpvlidfq38d3cw";
rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d";
sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij";
};
meta.homepage = "https://github.com/symphorien/vim-nixhash/";
};
@ -10798,12 +10798,12 @@ final: prev:
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
version = "2022-06-20";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
rev = "360ccdc01b18cd434588c34e15e5ea382b436de8";
sha256 = "14phavx432h16bdm7m99a21xz2gb1s47fd5g8v2b5ig12l4yss92";
rev = "849c67adf24a86935b8be62860ad9acb00cf4572";
sha256 = "1f23accmz82835kxvfsksjp77w9khkbcp4064c646p90ck194lji";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@ -11602,12 +11602,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2022-08-30";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "569c72257910b5b6f5e915b46d0978f73dbfa90a";
sha256 = "0scarxqsbi91qvfi5vzn0wgbxpx4i50mq63byly4jn74pgdsha00";
rev = "a6d2976f05cf31da5f4ebceb4b6f9fe2e0ec7c34";
sha256 = "0rnqm7l264h6x6jf9644jk168bphnhpb3dbfymgpz8613psh7fza";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@ -11843,12 +11843,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2022-08-25";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
rev = "2da8d59fdc46d1af7b7105a578d1ace3924d1a7b";
sha256 = "06csh1a6kq7744gaigkahdqvlwqjga7w672cm0aw6yylwpwz27nn";
rev = "7401804603e074ae65f19d16daf312369b153028";
sha256 = "0kf67vayak8xqy0fykqxx9zkavf54vf4y7bsm42zf9ad1havhacy";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@ -12528,12 +12528,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2022-08-28";
version = "2022-08-31";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "d8f507b83d65ef1686233da18e91f16819e84beb";
sha256 = "123l773jrqy28mi03m8k1kvqf0y2yhdhs22dl7iwcr14s71qq234";
rev = "aa52fa6b2711347a8d3b364d2e64f608207d8710";
sha256 = "00gih8v5f2mjmzmsns0prw00b4izx0pl08h47hln7ljjfq5v8npn";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -12853,12 +12853,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2022-08-28";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "d4aa577d07197c4ca32f3bafb0aebb5b4b7dec9f";
sha256 = "1kvm7xgi3jdgn0xqcd1ynjysmbzdg2xmfzqmkpn87f7lyi4ihb9s";
rev = "ddae70a80590dc3ee1c2605010abd82c615c1172";
sha256 = "1jh9h18bgxy68wd2fw3q9vxjgnlh8653528qbwzdwrjlvwsz0qdf";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -12877,12 +12877,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-08-31";
version = "2022-09-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "27e5f9708c1347a3e9e6abb20eff0354f008544b";
sha256 = "1cn8swfhmp8pw0pwpwlf7hwji3f5nwzl0wv2mr0yn9bnpc1857b8";
rev = "75d9335bd79bf9de6fdde974083ae7edb16d8190";
sha256 = "1d92vj2vmnz881gqn10za5jbs47rlslkpfvbz6a5nmyjphz8fx06";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

View File

@ -538,6 +538,21 @@ let
};
};
catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "catppuccin-vsc";
publisher = "catppuccin";
version = "2.1.0";
sha256 = "sha256-1pX9NQxW2Rm9p912Pn7QmLmXPI7EmiXTnCLWsIQNFhY=";
};
meta = with lib; {
description = "Soothing pastel theme for VSCode";
license = licenses.mit;
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc";
maintainers = with maintainers; [ nullx76 ];
};
};
chenglou92.rescript-vscode = callPackage ./rescript { };
christian-kohler.path-intellisense = buildVscodeMarketplaceExtension {

View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, wrapQtAppsHook
, extra-cmake-modules
, cmake
, kio
, ki18n
, kxmlgui
, kconfig
, karchive
, kcoreaddons
, kconfigwidgets
, nix-update-script
}:
stdenv.mkDerivation rec {
pname = "mangareader";
version = "2.0.4";
src = fetchFromGitHub {
owner = "g-fb";
repo = pname;
rev = version;
hash = "sha256-j5b2O5OgDRaaxNssknTTgVscudk1+mFlGQN5KE6CwcU=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
wrapQtAppsHook
];
buildInputs = [
kio
ki18n
kxmlgui
kconfig
karchive
kcoreaddons
kconfigwidgets
];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "Qt manga reader for local files";
homepage = "https://github.com/g-fb/mangareader";
changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
platforms = platforms.linux;
license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ];
maintainers = with maintainers; [ zendo ];
};
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "binance";
version = "1.36.0";
version = "1.39.0";
src = fetchurl {
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo=";
sha256 = "sha256-6VQerIzX2u8QGUsa8kvu6Qud3OEn9lrZkQddfkZ1X0g=";
};
nativeBuildInputs = [

View File

@ -2,19 +2,18 @@
, cmake, pkg-config, zip, gettext, perl
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
, qrencode, libuuid, libyubikey, yubikey-personalization
, curl, openssl, file
, curl, openssl, file, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "pwsafe";
version = "1.14.0"; # do NOT update to 3.x Windows releases
# nixpkgs-update: no auto update
version = "1.15.0"; # do NOT update to 3.x Windows releases
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-s3IXe4gTwUOzQslNfWrcN/srrG9Jv02zfkGgiZN3C1s=";
hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ=";
};
nativeBuildInputs = [
@ -53,6 +52,12 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x
url = src.gitRepoUrl;
};
meta = with lib; {
description = "A password database utility";
longDescription = ''

View File

@ -1,18 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, testers, spicetify-cli }:
buildGoModule rec {
pname = "spicetify-cli";
version = "2.11.1";
version = "2.13.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho=";
sha256 = "sha256-XsYZoJDSaAp+oMTy5YWM9aM+TCNkqF5WXBhU/axcEVk=";
};
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";
ldflags = [
"-s -w"
"-X 'main.version=${version}'"
];
# used at runtime, but not installed by default
postInstall = ''
cp -r ${src}/jsHelper $out/bin/jsHelper
@ -23,6 +28,11 @@ buildGoModule rec {
$out/bin/spicetify-cli --help > /dev/null
'';
passthru.tests.version = testers.testVersion {
package = spicetify-cli;
command = "spicetify-cli -v";
};
meta = with lib; {
description = "Command-line tool to customize Spotify client";
homepage = "https://github.com/spicetify/spicetify-cli/";

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace build.sh \
--replace 'curl ${emojiJSON.url}' 'cat emoji-en-US.json'
--replace 'curl ${emojiJSON.url}' 'cat ${emojiJSON}'
'';
buildPhase = ''

View File

@ -24,13 +24,13 @@
, libvpx
}:
stdenv.mkDerivation rec {
version = "2.6.0";
version = "2.7.0";
pname = "baresip";
src = fetchFromGitHub {
owner = "baresip";
repo = "baresip";
rev = "v${version}";
sha256 = "sha256-YcXLRhW7PyvK0R1+7DOjmtxg+Ajq9u7fvZFQO7DJapQ=";
sha256 = "sha256-ouevompKkWn5CXuDcPuKiTE9GrIXBs/NFsNu6GHgReE=";
};
postPatch = ''
patchShebangs modules/ctrl_dbus/gen.sh
@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/baresip/baresip";
maintainers = with lib.maintainers; [ elohmeier raskin ];
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
};
}

View File

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.29.1.3";
version = "2.30.0.89";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY=";
sha256 = "sha256-ALydB6bTxaYsBk0BrTKG8Yan4n/jvxT8T7fSMFel+CQ=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];

View File

@ -16,7 +16,7 @@
let
# Use specific package versions required by paperless-ngx
py = python3.override {
python = python3.override {
packageOverrides = self: super: {
django = super.django_4;
@ -51,7 +51,7 @@ let
path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ];
in
py.pkgs.pythonPackages.buildPythonApplication rec {
python.pkgs.pythonPackages.buildPythonApplication rec {
pname = "paperless-ngx";
version = "1.8.0";
@ -63,7 +63,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
format = "other";
propagatedBuildInputs = with py.pkgs.pythonPackages; [
propagatedBuildInputs = with python.pkgs.pythonPackages; [
aioredis
arrow
asgiref
@ -169,7 +169,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
# Compile manually because `pythonRecompileBytecodeHook` only works for
# files in `python.sitePackages`
postBuild = ''
${py.interpreter} -OO -m compileall src
${python.interpreter} -OO -m compileall src
'';
installPhase = ''
@ -181,7 +181,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
--prefix PATH : "${path}"
'';
checkInputs = with py.pkgs.pythonPackages; [
checkInputs = with python.pkgs.pythonPackages; [
pytest-django
pytest-env
pytest-sugar
@ -207,6 +207,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
'';
passthru = {
inherit python;
# PYTHONPATH of all dependencies used by the package
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
inherit path;

View File

@ -1,9 +1,39 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
, graphviz, llvmPackages, z3
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, ninja
, pkg-config
, python3Packages
, boost
, rapidjson
, qtbase
, qtsvg
, igraph
, spdlog
, wrapQtAppsHook
, graphviz
, llvmPackages
, z3
, fmt_8
}:
stdenv.mkDerivation rec {
let
# no stable hal release yet with recent spdlog/fmt support, remove
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
spdlog' = spdlog.override {
fmt_8 = fmt_8.overrideAttrs (_: rec {
version = "8.0.1";
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = version;
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
};
});
};
in stdenv.mkDerivation rec {
version = "3.3.0";
pname = "hal-hardware-analyzer";
@ -34,7 +64,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ]
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog' graphviz wrapQtAppsHook z3 ]
++ (with python3Packages; [ python pybind11 ])
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

View File

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "uarmsolver";
version = "0.2.4";
src = fetchFromGitHub {
owner = "firefly-cpp";
repo = "uARMSolver";
rev = version;
sha256 = "17px69z0kw0z6cip41c45i6srbw56b0md92i9vbqyzinx8b75mzw";
};
nativeBuildInputs = [ cmake ];
installPhase = ''
install -D -t $out/bin uARMSolver
'';
meta = with lib; {
description = "universal Association Rule Mining Solver";
homepage = "https://github.com/firefly-cpp/uARMSolver";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ firefly-cpp ];
};
}

View File

@ -21,13 +21,12 @@ stdenv.mkDerivation rec {
cp -a contrib/git-* $out/bin/
'';
wrapperPath = with lib; makeBinPath [
inotify-tools
wrapperPath = with lib; makeBinPath ([
coreutils
git
gnugrep
gnused
];
] ++ lib.optionals stdenv.isLinux [ inotify-tools ]);
postFixup = ''
wrap_path="${wrapperPath}":$out/bin

View File

@ -14,4 +14,5 @@
obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture;
};
obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix {};
obs-hyperion = callPackage ./obs-hyperion/default.nix {};
}

View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL
, qtbase }:
stdenv.mkDerivation rec {
pname = "obs-hyperion";
version = "1.0.1";
src = fetchFromGitLab {
owner = "hyperion-project";
repo = "hyperion-obs-plugin";
rev = "v${version}";
sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ obs-studio libGL qtbase ];
meta = with lib; {
description = "OBS Studio plugin to connect to a Hyperion.ng server";
license = licenses.mit;
maintainers = with maintainers; [ algram ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromGitHub
, czmq
, libusb1
, ncurses
}:
stdenv.mkDerivation rec {
pname = "orbuculum";
version = "2.0.0";
src = fetchFromGitHub {
owner = "orbcode";
repo = pname;
rev = "V${version}";
sha256 = "sha256-aMMXfrBQQ9oOx17MUKmqe5vdTpxhBGM5mVfAel0y0a0=";
};
buildInputs = [
czmq
libusb1
ncurses
];
installFlags = [
"INSTALL_ROOT=$(out)/"
];
postInstall = ''
mkdir -p $out/etc/udev/rules.d/
cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/
'';
meta = with lib; {
description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace";
homepage = "https://orbcode.org";
changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md";
license = licenses.bsd3;
maintainers = with maintainers; [ newam ];
platforms = platforms.linux;
};
}

View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, aws-c-cal
, aws-c-common
@ -7,18 +8,19 @@
, aws-c-io
, aws-c-sdkutils
, cmake
, nix
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-auth";
version = "0.6.14";
version = "0.6.16";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
sha256 = "sha256-Wi1vW0EYgtOltPI5FMhY5je2ZMF9R5ch4nIjENva+FU=";
sha256 = "sha256-JUCnrnJnXDCsdw9UcmujoxZ+cE9PDmqQNHYyvjSVBpw=";
};
nativeBuildInputs = [
@ -42,6 +44,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "C99 library implementation of AWS client-side authentication";
homepage = "https://github.com/awslabs/aws-c-auth";

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }:
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, nix, openssl, Security }:
stdenv.mkDerivation rec {
pname = "aws-c-cal";
version = "0.5.18";
version = "0.5.19";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sT5ahf8MuIhqDV6RrRU+RgsLdwVUDEFWRZJpzQJOPGA=";
sha256 = "sha256-VEjefo+y8bizCxvJmzx+dZ1BE9eT1cR3Tkfn1eVQI/0=";
};
nativeBuildInputs = [ cmake ];
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "AWS Crypto Abstraction Layer ";
homepage = "https://github.com/awslabs/aws-c-cal";

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }:
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, nix, s2n-tls, libexecinfo }:
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
version = "0.2.12";
version = "0.2.14";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-I4DqsPmHsZsReoqAH0WMU5/XlM4LiaxpJrVVYdXnMZY=";
sha256 = "sha256-QUrDIeQjsmf8TKu4UoSZi0eNw7Yg/2HIvXo7Y0FLY6w=";
};
nativeBuildInputs = [ cmake ];
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS:BOOL=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "C99 implementation of the vnd.amazon.eventstream content-type";
homepage = "https://github.com/awslabs/aws-c-event-stream";

View File

@ -5,18 +5,19 @@
, aws-c-compression
, aws-c-io
, cmake
, nix
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.6.19";
version = "0.6.20";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
sha256 = "sha256-ErwsRYz0D5ktlDaXIDvTXkxO7MM0N4RAA5IBqPbNfAc=";
sha256 = "sha256-eHsk/ME/kVGm8gxkR9NcJUkfbvI+4u5S4y4Tw29hEnY=";
};
nativeBuildInputs = [
@ -35,6 +36,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications";
homepage = "https://github.com/awslabs/aws-c-http";

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }:
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, nix, s2n-tls, Security }:
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.11.2";
version = "0.13.3";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HMsCFvwWgWwU3YBuZsmOSsMnEvzAVV9jEZyEEBwRcYg=";
sha256 = "sha256-lrSAWw5T4RAbk0JaNi5Vmh7qcjxOS8a1jdFMpaItrhI=";
};
nativeBuildInputs = [ cmake ];
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "AWS SDK for C module for IO and TLS";
homepage = "https://github.com/awslabs/aws-c-io";

View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, aws-c-cal
, aws-c-common
@ -6,18 +7,19 @@
, aws-c-http
, aws-c-io
, cmake
, nix
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.7.11";
version = "0.7.12";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "sha256-+vxn9Fq8eZ53cRR31hnLf1cxZ2zY03lt2RuEop+ciu0=";
sha256 = "sha256-0u3t0m5GQ7wxxLI8rY7j9AMliPzrAR9J/c/7DcT43WU=";
};
nativeBuildInputs = [
@ -37,6 +39,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "C99 implementation of the MQTT 3.1.1 specification";
homepage = "https://github.com/awslabs/aws-c-mqtt";

View File

@ -8,18 +8,19 @@
, aws-c-io
, aws-checksums
, cmake
, nix
, s2n-tls
}:
stdenv.mkDerivation rec {
pname = "aws-c-s3";
version = "0.1.43";
version = "0.1.46";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
sha256 = "sha256-I4pPNjaRNHPzVZVgY0qm8S+Tdvtklx/N3EKu0SAm5c8=";
sha256 = "sha256-OUrMdIWWnk+yAJTVJ/UlUNFABLlTkmYac5g125Zq+fQ=";
};
nativeBuildInputs = [
@ -41,6 +42,10 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
];
passthru.tests = {
inherit nix;
};
meta = with lib; {
description = "C99 library implementation for communicating with the S3 service";
homepage = "https://github.com/awslabs/aws-c-s3";

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "belr";
version = "5.1.12";
version = "5.1.55";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cimg";
version = "3.1.4";
version = "3.1.6";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g=";
hash = "sha256-NZwivsTYgirZXuS25buGHL3uk75shRGMH4c3YdS7Mgg=";
};
outputs = [ "out" "doc" ];

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "kpmcore";
# NOTE: When changing this version, also change the version of `partition-manager`.
version = "22.04.3";
version = "22.08.0";
src = fetchurl {
url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";
hash = "sha256-LmKglUgXhLOBLSpzfXvK/UXFqY3L+p/EoHbZTSKlGhM=";
hash = "sha256-Ws20hKX2iDdke5yBBKXukVUD4OnLf1OmwlhW+jUXL24=";
};
nativeBuildInputs = [ extra-cmake-modules ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libharu";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "libharu";
repo = pname;
rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
rev = "v${version}";
hash = "sha256-85o9pb2zJVYbM0SHxCNgJuDkcsHuFuwFe6B6xivoUUg=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja }:
{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtlsSupport ? true, mbedtls }:
stdenv.mkDerivation rec {
pname = "nng";
@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k=";
};
nativeBuildInputs = [ cmake ninja ];
nativeBuildInputs = [ cmake ninja ]
++ lib.optionals mbedtlsSupport [ mbedtls ];
cmakeFlags = [ "-G Ninja" ];
buildInputs = lib.optional mbedtlsSupport [ mbedtls ];
cmakeFlags = [ "-G Ninja" "-DNNG_ENABLE_TLS=ON" ]
++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" ];
meta = with lib; {
homepage = "https://nng.nanomsg.org/";
@ -21,5 +25,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
mainProgram = "nngcat";
platforms = platforms.unix;
maintainers = with maintainers; [ nviets ];
};
}

View File

@ -6,15 +6,14 @@
buildDunePackage rec {
pname = "index";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y";
sha256 = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4=";
};
minimalOCamlVersion = "4.08";
useDune2 = true;
buildInputs = [
stdlib-shims

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-cdn";
version = "3.7.1";
version = "3.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-GAY4o9lr+1m8g1T7EhL5jLjEdfMWC/1vJ3UC4PQzvjI=";
hash = "sha256-wbVkoNu9ffMpuivUGg+PAya099xMbU0Ehvl0++ud+WE=";
};
propagatedBuildInputs = [

View File

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.9.7";
version = "1.9.8";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-q8dnOSoN9Gu9yl/UJNRXeTBBKTnfJhHwqN6+QVTlexI=";
sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4=";
};
# needs packages which are not available in nixpkgs

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bincopy";
version = "17.10.2";
version = "17.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-d1l+kqyGkBvctfKRHxCpve/8mLa7nTfDwXzxgJznce4=";
sha256 = "sha256-HDSqwrCXf2U0uzfa4Vb9Euu9ZSm6eFD9bcMf6eieicY=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, rustPlatform
, setuptools-rust
}:
buildPythonPackage rec {
pname = "cryptg";
version = "0.3.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "cher-nov";
repo = pname;
rev = "v${version}";
hash = "sha256-IhzwQrWu8k308ZZhWz4Z3FHAkSLTXiCydyiy0MPN8NI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
hash = "sha256-M2ySVqfgpgHktLh4t5Sh1UTBCzajlQiDku4O9azHJwk=";
};
nativeBuildInputs = with rustPlatform;[
setuptools-rust
cargoSetupHook
rust.rustc
rust.cargo
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "cryptg" ];
meta = with lib; {
description = "Official Telethon extension to provide much faster cryptography for Telegram API requests";
homepage = "https://github.com/cher-nov/cryptg";
license = licenses.cc0;
maintainers = with maintainers; [ nickcao ];
};
}

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "django-configurations";
version = "2.3.2";
version = "2.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677";
sha256 = "sha256-IrmWTmtlfa/Ho1QQoRXSDxRRFJqCc3rcbDMew2WIgZY=";
};
buildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "geventhttpclient";
version = "2.0";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-SegzLaon80HeCNk4h4KJs7dzaVzblvIpZRjC1uPr7JI=";
hash = "sha256-gTWoUgCxcN73KT0B3RVXkx/NG+wax4xSrXzt0iNoubo=";
};
propagatedBuildInputs = [
@ -36,6 +36,8 @@ buildPythonPackage rec {
urllib3
];
__darwinAllowLocalNetworking = true;
disabledTests = [
# socket.gaierror: [Errno -3] Temporary failure in name resolution
"test_client_simple"

View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "google-cloud-compute";
version = "1.4.0";
version = "1.5.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0sgp0xa9cfmgyb1dwdy1f4q9dfr3lgsgm7vbiks9xmiaf0fr221m";
sha256 = "sha256-1crkhcf56U6DAx9xVG2e9hCxQ04OjQq2QgLs434cCv0=";
};
propagatedBuildInputs = [

View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "keyrings.google-artifactregistry-auth";
version = "1.0.0";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gvoX5SP0A39Ke0VRlplETJF8gIP+QzK6xNReRxM8UnA=";
sha256 = "sha256-vrA3+/awws4R2BAxn9wYDKuIZdqioWsQnDr3MYL/5E0=";
};
buildInputs = [

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.17.3";
version = "0.17.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-j49NrZJMDw8m5ZGP4DXxk7uzF+0BxDjs4coEkMDUP+0=";
sha256 = "sha256-DFajAD5mnXLQmJGRv4j2mWhtIj77nZNSQhbesX4qMys=";
};
propagatedBuildInputs = [

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "mkdocs-swagger-ui-tag";
version = "0.4.0";
version = "0.4.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4fPn+WDHMAo3cywrMs/EoSFoBEnMYdofAeAkgwOIAb4=";
sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs=";
};
propagatedBuildInputs = [ mkdocs beautifulsoup4 ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "3.1.0";
version = "3.2.1";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = version;
sha256 = "sha256-QnvV/sAxdl8V5nV1hk8sRrL6nn015dAy6cXAiy2Tmbs=";
sha256 = "sha256-BBDCk/vWm9Y2oGw0aujqlueaB+ww7F2YP2cw5VqIzfQ=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymavlink";
version = "2.4.34";
version = "2.4.35";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2JPBjEXiJWDJJPwS7SjNr3L4Ct+U44QaJiiv8MtSnEk=";
sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU=";
};
propagatedBuildInputs = [ future lxml ];

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-confluencebuilder";
version = "1.8.0";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-u+sjhj/2fu8fLGRb2zgnNI+y7wIIUYTMJhRekrdtMeU=";
hash = "sha256-aj+8/ZOWpT1zBdCTit6Zo/XhnzFisLk/rrg5l6sPmkw=";
};
propagatedBuildInputs = [

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.13.5";
version = "3.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1+BycZ1fFEfbqoHs/TDnGZXc8IRzWzy2pZ2YkTOPMaA=";
sha256 = "sha256-T+pjf2KmHabbu8poV6dxAvau5C6h89Fp2uYAuO+34/Y=";
};
propagatedBuildInputs = [ numpy ];

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.19";
version = "4.3.20";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yIH/uUvUfcoh7VAzKFRKVrsxWFFXXuuyf7Nxv/c1hEo=";
sha256 = "sha256-dO0ClFRw3eot0hRHwYXauzFp5aUyjSayXPNUfZSbjgQ=";
};
# Module doesn't have tests

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "versioneer";
version = "0.24";
version = "0.25";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G426nlHi8OBMfoVFIW7s3qLWPhvVVpRI7mbFSffneC8=";
hash = "sha256-mo1axyDGbgmawguk+8LPAKXyuxYU3on0TIKTWsUQuuE=";
};
# Couldn't get tests to work because, for instance, they used virtualenv and

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "zwave-me-ws";
version = "0.2.4";
version = "0.2.5.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Z-Wave-Me";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x7P6fOYTe/u0GKUsO62cNVz2i/hVjUb8t8Bigijxgk0=";
sha256 = "sha256-BcUUDn7PCpFRtQ3QDx0W3qXB4JmvRxMFoWoCeA8bS6o=";
};
nativeBuildInputs = [

View File

@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec {
# `shutil.get_terminal_size` instead.
# (https://github.com/pallets/click/pull/2130)
./support-click-8-1.patch
# Werkzeug >= 2.1.0 breaks the `sam local start-lambda` command because
# aws-sam-cli uses a "WERKZEUG_RUN_MAIN" hack to suppress flask output.
# (https://github.com/cs01/gdbgui/issues/425)
./use_forward_compatible_log_silencing.patch
];
# fix over-restrictive version bounds

View File

@ -0,0 +1,19 @@
diff --git a/samcli/local/services/base_local_service.py b/samcli/local/services/base_local_service.py
index 7b1ab95895d1..76812f02e00a 100644
--- a/samcli/local/services/base_local_service.py
+++ b/samcli/local/services/base_local_service.py
@@ -56,9 +56,11 @@ class BaseLocalService:
LOG.debug("Localhost server is starting up. Multi-threading = %s", multi_threaded)
- # This environ signifies we are running a main function for Flask. This is true, since we are using it within
- # our cli and not on a production server.
- os.environ["WERKZEUG_RUN_MAIN"] = "true"
+ # Suppress flask dev server output in a forward-compatible way
+ # Source: https://github.com/cs01/gdbgui/issues/425#issuecomment-1119836533
+ import flask.cli
+
+ flask.cli.show_server_banner = lambda *args: None
self._app.run(threaded=multi_threaded, host=self.host, port=self.port)

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.84.0";
version = "0.85.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-14S0Y1ax0bg7nD4iCEujwLIZSjpWYaLWidpYVwQB0dw=";
sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns=";
};
vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s=";
vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

View File

@ -2,16 +2,18 @@
buildGoModule rec {
pname = "gojq";
version = "0.12.8";
version = "0.12.9";
src = fetchFromGitHub {
owner = "itchyny";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WcPvsThYgXwYXwXyylOqopTZOfsXmDU4wbhEdS3neA8=";
sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q=";
};
vendorSha256 = "sha256-fFW+gWdGMxDApcyR6dy0491WvQcVMAJ5dgMQqgNmOkw=";
proxyVendor = true;
vendorSha256 = "sha256-kq9vfmST8M69yiWqzsM/ORG7F7ERtEv9dyfy8u3sWYk=";
ldflags = [ "-s" "-w" ];

View File

@ -1,33 +1,35 @@
{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python
{ stdenv, lib, fetchFromGitHub, cmake, ninja, python
, withGocode ? true, gocode
, withGodef ? true, godef
, withGotools? true, gotools
, withTypescript ? true, nodePackages
, abseil-cpp, boost, llvmPackages
, fixDarwinDylibNames, Cocoa
}:
stdenv.mkDerivation {
pname = "ycmd";
version = "unstable-2020-02-22";
version = "unstable-2022-08-15";
disabled = !python.isPy3k;
# required for third_party directory creation
src = fetchFromGitHub {
owner = "Valloric";
owner = "ycm-core";
repo = "ycmd";
rev = "9a6b86e3a156066335b678c328f226229746bae5";
sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA=";
rev = "323d4b60f077bd07945f25a60c4584843ca851fb";
sha256 = "sha256-5IpXMQc3QIkKJkUrOPSRzciLvL1nhQw6wlP+pVnIucE=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ]
nativeBuildInputs = [ cmake ninja ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost llvmPackages.libclang ]
buildInputs = with python.pkgs; with llvmPackages; [ abseil-cpp boost libllvm.all libclang.all ]
++ [ jedi jedi-language-server pybind11 ]
++ lib.optional stdenv.isDarwin Cocoa;
buildPhase = ''
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
${python.interpreter} build.py --system-libclang --clang-completer --system-boost
export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true"
${python.interpreter} build.py --system-libclang --clang-completer --ninja
'';
dontConfigure = true;
@ -50,7 +52,7 @@ stdenv.mkDerivation {
" ycmd/__main__.py
mkdir -p $out/lib/ycmd
cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/
cp -r ycmd/ CORE_VERSION *.so* *.dylib* $out/lib/ycmd/
mkdir -p $out/bin
ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
@ -82,15 +84,14 @@ stdenv.mkDerivation {
# python won't be thrown off by argv[0]
postFixup = ''
substituteInPlace $out/lib/ycmd/ycmd/__main__.py \
--replace $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd \
--replace __file__ "'$out/lib/ycmd/ycmd/__main__.py'"
'';
meta = with lib; {
description = "A code-completion and comprehension server";
homepage = "https://github.com/Valloric/ycmd";
homepage = "https://github.com/ycm-core/ycmd";
license = licenses.gpl3;
maintainers = with maintainers; [ rasendubi cstrahan lnl7 ];
maintainers = with maintainers; [ rasendubi cstrahan lnl7 siriobalmelli ];
platforms = platforms.all;
};
}

View File

@ -1,4 +1,5 @@
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net
, fetchFromGitHub, fetchpatch, python3 }:
stdenv.mkDerivation rec {
pname = "chocolate-doom";
@ -21,11 +22,19 @@ stdenv.mkDerivation rec {
})
];
outputs = [ "out" "man" ];
postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
patchShebangs --build man/{simplecpp,docgen}
'';
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
# for documentation
python3
];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
enableParallelBuilding = true;

View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.2.2";
version = "16.3.1";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A=";
sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];

View File

@ -18,13 +18,13 @@
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "5.2.2";
version = "5.5.4";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "v${version}";
sha256 = "sha256-YEAYoZF1Lf0ykB13cuRf5sOR1HIxwdcibyJLgP3g4Jk=";
sha256 = "sha256-y4J0589FgNahRmoPkVtHYtc6/OIfUi9bhz6BZrSeWVI=";
};
nativeBuildInputs = [

View File

@ -35,13 +35,14 @@ stdenvNoCC.mkDerivation rec {
sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA=";
};
icons = fetchFromGitHub {
owner = "itchio";
repo = pname;
rev = "v${version}";
hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog=";
sparseCheckout = "release/images/itch-icons";
};
icons = let sparseCheckout = "/release/images/itch-icons"; in
fetchFromGitHub {
owner = "itchio";
repo = pname;
rev = "v${version}";
hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog=";
inherit sparseCheckout;
} + sparseCheckout;
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
@ -68,7 +69,7 @@ stdenvNoCC.mkDerivation rec {
install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/"
install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/"
for icon in $icons/release/images/itch-icons/icon*.png
for icon in $icons/icon*.png
do
iconsize="''${icon#$icons/icon}"
iconsize="''${iconsize%.png}"

View File

@ -103,6 +103,13 @@ in
];
multiPkgs = pkgs: [ libGL ];
runScript = "runescape-launcher";
extraInstallCommands = ''
mkdir -p "$out/share/applications"
cp ${runescape}/share/applications/runescape-launcher.desktop "$out/share/applications"
cp -r ${runescape}/share/icons "$out/share/icons"
substituteInPlace "$out/share/applications/runescape-launcher.desktop" \
--replace "/usr/bin/runescape-launcher" "RuneScape"
'';
meta = with lib; {
description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3";

View File

@ -64,7 +64,7 @@ in
description = "Custom launcher for FFXIV";
homepage = "https://github.com/goatcorp/FFXIVQuickLauncher";
license = licenses.gpl3;
maintainers = with maintainers; [ ashkitten ];
maintainers = with maintainers; [ ashkitten sersorrel ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
version = "22.34.24023";
version = "22.35.24055";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
sha256 = "sha256-stiFH1eNi+SlgL/Y2p5p+zLN8XeES/77yaG5fFpJges=";
sha256 = "sha256-MOWlhzhEGYyHGk6N+H7O2BLho4YFyvcCbj/zafhzLEw=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -4,12 +4,12 @@
with python3Packages; buildPythonApplication rec {
pname = "synadm";
version = "0.35";
version = "0.36";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fZAlQF2n93w69I1+dwfLnoh1O+uNHYNe0/1dRQgIpX4=";
sha256 = "sha256-OMXUbfAC927qJw0B5sq1lGJQRkFAUdohIOkCYUbZumI=";
};
postPatch = ''

View File

@ -1,95 +1,73 @@
{ lib, python3, mautrix-telegram, fetchFromGitHub
{ lib
, python3
, fetchFromGitHub
, withE2BE ? true
, withHQthumbnails ? false
}:
let
python = python3.override {
packageOverrides = self: super: {
asyncpg = super.asyncpg.overridePythonAttrs (oldAttrs: rec {
version = "0.25.0";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA=";
};
});
mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
version = "0.16.3";
src = oldAttrs.src.override {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU=";
};
});
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.25.0a7";
version = "1.25.0a20";
pname = "tulir-telethon";
src = oldAttrs.src.override {
inherit pname version;
sha256 = "sha256-+wHRrBluM0ejdHjIvSk28wOIfCfIyibBcmwG/ksbiac=";
sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc=";
};
});
};
};
# officially supported database drivers
dbDrivers = with python.pkgs; [
psycopg2
aiosqlite
# sqlite driver is already shipped with python by default
];
in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram";
version = "0.11.3";
version = "0.12.0";
disabled = python.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mautrix";
repo = "telegram";
rev = "v${version}";
sha256 = "sha256-PfER/wqJ607w0xVrFZadzmxYyj72O10c2lIvCW7LT8Y=";
sha256 = "sha256-SUwiRrTY8NgOGQ643prsm3ZklOlwX/59m/u1aewFuik=";
};
patches = [ ./0001-Re-add-entrypoint.patch ];
propagatedBuildInputs = with python.pkgs; ([
Mako
aiohttp
mautrix
sqlalchemy
CommonMark
ruamel-yaml
python-magic
CommonMark
aiohttp
yarl
mautrix
tulir-telethon
telethon-session-sqlalchemy
pillow
lxml
setuptools
prometheus-client
] ++ lib.optionals withE2BE [
asyncpg
Mako
# optional
cryptg
cchardet
aiodns
brotli
pillow
qrcode
phonenumbers
prometheus-client
aiosqlite
] ++ lib.optionals withHQthumbnails [
moviepy
] ++ lib.optionals withE2BE [
python-olm
pycryptodome
unpaddedbase64
]) ++ dbDrivers;
]);
# Tests are broken and throw the following for every test:
# TypeError: 'Mock' object is not subscriptable
#
# The tests were touched the last time in 2019 and upstream CI doesn't even build
# those, so it's safe to assume that this part of the software is abandoned.
# has no tests
doCheck = false;
checkInputs = with python.pkgs; [
pytest
pytest-mock
pytest-asyncio
];
meta = with lib; {
homepage = "https://github.com/mautrix/telegram";
description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nyanloutre ma27 ];
maintainers = with maintainers; [ nyanloutre ma27 nickcao ];
};
}

View File

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "v2ray-exporter";
version = "0.6.0";
src = fetchFromGitHub {
owner = "wi1dcard";
repo = "v2ray-exporter";
rev = "v${version}";
sha256 = "12mzng3cw24fyyh8zjfi26gh853k5blzg3zbxcccnv5lryh2r0yi";
};
vendorSha256 = "sha256-+jrD+QatTrMaAdbxy5mpCm8lF37XDIy1GFyEiUibA2k=";
meta = with lib; {
description = "Prometheus exporter for V2Ray daemon";
homepage = "https://github.com/wi1dcard/v2ray-exporter";
license = licenses.mit;
maintainers = with maintainers; [ jqqqqqqqqqq ];
};
}

View File

@ -0,0 +1,33 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "ferretdb";
version = "0.5.2";
src = fetchFromGitHub {
owner = "FerretDB";
repo = "FerretDB";
rev = "v${version}";
sha256 = "sha256-WSdscZ1/Dix83RE95Iv61rdaSBWx1GMi6qOIPNus+ZI=";
};
postPatch = ''
echo ${version} > internal/util/version/gen/version.txt
'';
vendorSha256 = "sha256-fGmGE08w9w2QnBVdMZ2IKo8Zq3euJGCBVTTHNKYFY3U=";
CGO_ENABLED = 0;
subPackages = [ "cmd/ferretdb" ];
meta = with lib; {
description = "A truly Open Source MongoDB alternative";
homepage = "https://github.com/FerretDB/FerretDB";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
};
}

View File

@ -2,10 +2,10 @@
roundcubePlugin rec {
pname = "carddav";
version = "4.3.0";
version = "4.4.3";
src = fetchzip {
url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/carddav-v${version}.tar.gz";
sha256 = "1jk1whx155svfalf1kq8vavn7jsswmzx4ax5zbj01783rqyxkkd5";
sha256 = "0xm2x6r0j8dpkybxq28lbwpbmxaa52z8jnw3yaszvmx04zsr5mn8";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dokuwiki";
version = "2020-07-29";
version = "2022-07-31";
src = fetchFromGitHub {
owner = "splitbrain";
repo = pname;
rev = "release_stable_${version}";
sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk";
sha256 = "sha256-FreJsajdfoefQHo6rBzkImDUvR3Zb7rBQTYhYvyRJC4=";
};
preload = writeText "preload.php" ''

View File

@ -1,30 +1,33 @@
{ lib
, fetchFromGitHub
, buildGoModule
, gitUpdater
, testers
, boulder
}:
buildGoModule rec {
pname = "boulder";
version = "2022-07-11";
version = "2022-08-29";
src = fetchFromGitHub {
owner = "letsencrypt";
repo = "boulder";
rev = "release-${version}";
sha256 = "sha256-fDKB7q2e+qdHt+t/BQWX7LkpyiZQtZSHp/x5uv0/c7c=";
leaveDotGit = true;
postFetch = ''
cd $out
git rev-parse HEAD > $out/COMMIT
git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = [ "cmd/boulder" ];
patches = [ ./no-build-id-test.patch ];
ldflags = [
"-s"
"-w"
@ -32,22 +35,54 @@ buildGoModule rec {
];
preBuild = ''
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=$(cat COMMIT)\""
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${src.rev} +$(cat COMMIT)\""
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\""
'';
preCheck = ''
# Test all targets.
unset subPackages
# Disable tests that require additional services.
rm -rf \
cmd/admin-revoker/main_test.go \
cmd/bad-key-revoker/main_test.go \
cmd/cert-checker/main_test.go \
cmd/contact-auditor/main_test.go \
cmd/expiration-mailer/main_test.go \
cmd/expiration-mailer/send_test.go \
cmd/id-exporter/main_test.go \
cmd/rocsp-tool/client_test.go \
db/map_test.go \
db/multi_test.go \
db/rollback_test.go \
log/log_test.go \
ocsp/updater/updater_test.go \
ra/ra_test.go \
rocsp/rocsp_test.go \
sa/database_test.go \
sa/model_test.go \
sa/precertificates_test.go \
sa/rate_limits_test.go \
sa/sa_test.go \
test/load-generator/acme/directory_test.go \
va/caa_test.go \
va/dns_test.go \
va/http_test.go \
va/tlsalpn_test.go \
va/va_test.go
'';
postInstall = ''
for i in $($out/bin/boulder --list); do
ln -s $out/bin/boulder $out/bin/$i
done
'';
# There are no tests for cmd/boulder.
doCheck = false;
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "release-";
passthru.tests.version = testers.testVersion {
package = boulder;
command = "boulder --version";
inherit version;
};
meta = with lib; {

View File

@ -0,0 +1,15 @@
diff --git i/core/util_test.go w/core/util_test.go
index 8979edff..cfae13a4 100644
--- i/core/util_test.go
+++ w/core/util_test.go
@@ -56,10 +56,6 @@ func TestSerialUtils(t *testing.T) {
fmt.Println(badSerial)
}
-func TestBuildID(t *testing.T) {
- test.AssertEquals(t, "Unspecified", GetBuildID())
-}
-
const JWK1JSON = `{
"kty": "RSA",
"n": "vuc785P8lBj3fUxyZchF_uZw6WtbxcorqgTyq-qapF5lrO1U82Tp93rpXlmctj6fyFHBVVB5aXnUHJ7LZeVPod7Wnfl8p5OyhlHQHC8BnzdzCqCMKmWZNX5DtETDId0qzU7dPzh0LP0idt5buU7L9QNaabChw3nnaL47iu_1Di5Wp264p2TwACeedv2hfRDjDlJmaQXuS8Rtv9GnRWyC9JBu7XmGvGDziumnJH7Hyzh3VNu-kSPQD3vuAFgMZS6uUzOztCkT0fpOalZI6hqxtWLvXUMj-crXrn-Maavz8qRhpAyp5kcYk3jiHGgQIi7QSK2JIdRJ8APyX9HlmTN5AQ",

View File

@ -21,13 +21,13 @@
mkDerivation rec {
pname = "fcitx5-configtool";
version = "5.0.14";
version = "5.0.15";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-nfVdYW//ehjTFvb5ciu7ajoUB5NPZ/BkLkChJiBJPWY=";
sha256 = "sha256-VTvJpQrACZ6xoXkfTqhVK2MUy9i7Snn9zVCK3dayVz0=";
};
cmakeFlags = [

View File

@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
postFixup =
''
rm "$out/bin/libinput-gestures-setup"
substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out"
substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
chmod +x "$out/share/applications/libinput-gestures.desktop"
wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}"

View File

@ -5,30 +5,42 @@
, bash
, coreutils
, gawk
, gnugrep
, gnum4
, makeWrapper
, pacman
, util-linux
, chrootPath ? [
"/usr/local/sbin"
"/usr/local/bin"
"/usr/bin"
"/usr/bin/site_perl"
"/usr/bin/vendor_perl"
"/usr/bin/core_perl"
]
}:
resholve.mkDerivation rec {
pname = "arch-install-scripts";
version = "24";
version = "26";
src = fetchFromGitHub {
owner = "archlinux";
repo = "arch-install-scripts";
rev = "v${version}";
sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq";
hash = "sha256-TRo1ANKSt3njw4HdBMUymMJDpTkL/i5/hdSqxHZnuYw=";
};
nativeBuildInputs = [ asciidoc gnum4 ];
preBuild = ''
postPatch = ''
substituteInPlace ./Makefile \
--replace "PREFIX = /usr/local" "PREFIX ?= /usr/local"
# https://github.com/archlinux/arch-install-scripts/pull/10
substituteInPlace ./common \
--replace "print '%s' \"\$1\"" "printf '%s' \"\$1\""
substituteInPlace ./pacstrap.in \
--replace "cp -a" "cp -LR --no-preserve=mode" \
--replace "unshare pacman" "unshare ${pacman}/bin/pacman" \
--replace 'gnupg "$newroot/etc/pacman.d/"' 'gnupg "$newroot/etc/pacman.d/" && chmod 700 "$newroot/etc/pacman.d/gnupg"'
echo "export PATH=${lib.strings.makeSearchPath "" chrootPath}:\$PATH" >> ./common
'';
installFlags = [ "PREFIX=$(out)" ];
@ -50,7 +62,7 @@ resholve.mkDerivation rec {
interpreter = "${bash}/bin/bash";
# packages resholve should resolve executables from
inputs = [ coreutils gawk util-linux ];
inputs = [ coreutils gawk gnugrep pacman util-linux ];
# TODO: no good way to resolve mount/umount in Nix builds for now
# see https://github.com/abathur/resholve/issues/29
@ -58,11 +70,7 @@ resholve.mkDerivation rec {
external = [ "mount" "umount" ];
};
# TODO: remove the execer lore override below after
# https://github.com/abathur/binlore/issues/1
execer = [
"cannot:${util-linux}/bin/unshare"
];
keep = [ "$setup" "$pid_unshare" "$mount_unshare" "${pacman}/bin/pacman" ];
};
};
@ -73,7 +81,7 @@ resholve.mkDerivation rec {
'';
homepage = "https://github.com/archlinux/arch-install-scripts";
license = licenses.gpl2Only;
maintainers = with maintainers; [ yayayayaka ];
maintainers = with maintainers; [ samlukeyes123 ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,25 @@
{ lib, fetchzip, stdenv }:
stdenv.mkDerivation rec {
pname = "cyberchef";
version = "9.46.0";
src = fetchzip {
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
sha256 = "sha256-4IqXp7fYgXwIuciUklrQoRD2XagatdhQ3l6ghjgTCR8=";
stripRoot = false;
};
installPhase = ''
mkdir -p "$out/share/cyberchef"
mv "CyberChef_v${version}.html" index.html
mv * "$out/share/cyberchef"
'';
meta = with lib; {
description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.";
homepage = "https://gchq.github.io/CyberChef";
maintainers = with maintainers; [ sebastianblunt ];
license = licenses.asl20;
};
}

View File

@ -21,10 +21,11 @@
}:
# daemon and client are not build monolithic
assert monolithic || (!monolithic && (enableDaemon || client));
assert monolithic || (!monolithic && (enableDaemon || client || httpServer));
stdenv.mkDerivation rec {
pname = "amule"
+ lib.optionalString httpServer "-web"
+ lib.optionalString enableDaemon "-daemon"
+ lib.optionalString client "-gui";
version = "2.3.3";
@ -53,8 +54,18 @@ stdenv.mkDerivation rec {
"-DBUILD_DAEMON=${if enableDaemon then "ON" else "OFF"}"
"-DBUILD_REMOTEGUI=${if client then "ON" else "OFF"}"
"-DBUILD_WEBSERVER=${if httpServer then "ON" else "OFF"}"
# building only the daemon fails when these are not set... this is
# due to mistakes in the Amule cmake code, but it does not cause
# extra code to be built...
"-Dwx_NEED_GUI=ON"
"-Dwx_NEED_ADV=ON"
"-Dwx_NEED_NET=ON"
];
postPatch = ''
echo "find_package(Threads)" >> cmake/options.cmake
'';
# aMule will try to `dlopen' libupnp and libixml, so help it
# find them.
postInstall = lib.optionalString monolithic ''
@ -79,7 +90,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
# cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project.
broken = enableDaemon || stdenv.isDarwin;
broken = stdenv.isDarwin;
};
}

View File

@ -22,6 +22,9 @@ mkDerivation rec {
substituteInPlace pinentry-kwallet \
--replace '/usr/bin/env mksh' ${mksh}/bin/mksh
substituteInPlace kwalletcli_getpin \
--replace '/usr/bin/env mksh' ${mksh}/bin/mksh
'';
makeFlags = [ "KDE_VER=5" ];
@ -35,9 +38,11 @@ mkDerivation rec {
'';
postInstall = ''
wrapProgram $out/bin/pinentry-kwallet \
--prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \
--set-default PINENTRY pinentry-qt
for program in pinentry-kwallet kwalletcli_getpin; do
wrapProgram $out/bin/$program \
--prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \
--set-default PINENTRY pinentry-qt
done
'';
meta = with lib; {

View File

@ -3,8 +3,8 @@ let
common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
in rec {
new-engine = common rec {
version = "A59";
sha256 = "0m6hkj33vr75mrpjpdc0l38xv64kq73ph2mr2v9bs3wx4qlvg606";
version = "A60";
sha256 = "sha256-E99Mf2T6Bg4NsFXzFn4kNf602DmtiyBk6Vcj6JfOPR0=";
installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ];
};
old-engine = common rec {

View File

@ -2186,6 +2186,8 @@ with pkgs;
crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
cyberchef = callPackage ../tools/misc/cyberchef { };
cw = callPackage ../tools/admin/cw { };
ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
@ -2212,6 +2214,11 @@ with pkgs;
client = true;
};
amule-web = amule.override {
monolithic = false;
httpServer = true;
};
antennas = nodePackages.antennas;
apg = callPackage ../tools/security/apg { };
@ -8740,6 +8747,8 @@ with pkgs;
mandoc = callPackage ../tools/misc/mandoc { };
mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { };
mangohud = callPackage ../tools/graphics/mangohud {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
mangohud32 = pkgsi686Linux.mangohud;
@ -22747,6 +22756,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
ferretdb = callPackage ../servers/nosql/ferretdb { };
felix = callPackage ../servers/felix { };
felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
@ -23495,6 +23506,7 @@ with pkgs;
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { };
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
inherit (darwin.apple_sdk.frameworks) Security;
@ -25806,6 +25818,8 @@ with pkgs;
orbitron = callPackage ../data/fonts/orbitron { };
orbuculum = callPackage ../development/embedded/orbuculum { };
orchis-theme = callPackage ../data/themes/orchis-theme { };
orion = callPackage ../data/themes/orion {};
@ -34338,6 +34352,8 @@ with pkgs;
sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { };
### SCIENCE/MATH
_4ti2 = callPackage ../applications/science/math/4ti2 { };

View File

@ -2115,6 +2115,8 @@ in {
cryptacular = callPackage ../development/python-modules/cryptacular { };
cryptg = callPackage ../development/python-modules/cryptg { };
cryptography = callPackage ../development/python-modules/cryptography {
inherit (pkgs.darwin) libiconv;
inherit (pkgs.darwin.apple_sdk.frameworks) Security;