Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-10-09 00:04:12 +00:00 committed by GitHub
commit 9104c83926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 186 additions and 144 deletions

View File

@ -67,5 +67,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ mic92 dtzWill ];
meta.maintainers = with lib.maintainers; [ dtzWill ];
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }:
stdenv.mkDerivation rec {
pname = "wxHexEditor";
@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ wxGTK libtool python2 gettext ];
buildInputs = [ wxGTK libtool python2 gettext ]
++ lib.optionals stdenv.cc.isClang [ openmp ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = "patchShebangs .";
prePatch = ''
substituteInPlace Makefile --replace "/usr" "$out"
substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
'' + lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-lgomp" "-lomp"
'';
patches = [
@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
./missing-semicolon.patch
];
makeFlags = [ "OPTFLAGS=-fopenmp" ];
makeFlags = lib.optionals stdenv.cc.isGNU [ "OPTFLAGS=-fopenmp" ];
meta = {
description = "Hex Editor / Disk Editor for Huge Files or Devices";
@ -46,6 +50,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.wxhexeditor.org/";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ wegank ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubent";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "doitintl";
repo = "kube-no-trouble";
rev = "${version}";
sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6";
sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro=";
};
vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp";
vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk=";
ldflags = [
"-w" "-s"

View File

@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.27.0";
version = "1.27.1";
vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE=";
vendorSha256 = "sha256-2sXWf+iK1v9gv2DXhmEs8xlIRF+6EM7Y6Otd6F89zGk=";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I=";
sha256 = "sha256-GmvxKWHo0meiR1r5IlgI8jQRiDvmQafxTS9acv92EPk=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

View File

@ -1,10 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, wxGTK
, cmake
, ninja
, wrapGAppsHook
, makeWrapper
, wxGTK
, Cocoa
, unstableGitUpdater
}:
@ -23,14 +25,25 @@ stdenv.mkDerivation rec {
cmake
ninja
wrapGAppsHook
makeWrapper
];
buildInputs = [
wxGTK
] ++ lib.optionals stdenv.isDarwin [
Cocoa
];
NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
postInstall = lib.optionalString stdenv.isDarwin ''
shopt -s extglob
mkdir -p $out/{share/treesheets,bin}
mv $out/!(share) $out/share/treesheets
makeWrapper $out/{share/treesheets,bin}/treesheets \
--chdir $out/share/treesheets
'';
passthru = {
updateScript = unstableGitUpdater { };
};
@ -49,7 +62,7 @@ stdenv.mkDerivation rec {
homepage = "https://strlen.com/treesheets/";
maintainers = with maintainers; [ obadz avery ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.zlib;
};
}

View File

@ -130,6 +130,12 @@ stdenv.mkDerivation rec {
./remove-bundled-luajit.patch
];
# error: unknown type name 'NSUInteger'
postPatch = ''
substituteInPlace src/dialog_colorpicker.cpp \
--replace "NSUInteger" "size_t"
'';
NIX_CFLAGS_COMPILE = "-I${luajit52}/include";
NIX_CFLAGS_LINK = "-L${luajit52}/lib";
@ -153,7 +159,7 @@ stdenv.mkDerivation rec {
# The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
# softwares - so the resulting program will be GPL
license = licenses.bsd3;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres wegank ];
platforms = platforms.unix;
};
}

View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng=";
sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU=";
};
cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs=";
cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4=";
buildInputs = rpathLibs;

View File

@ -13,18 +13,18 @@ let
pname = "qogir-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "default" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-07-20";
version = "2022-10-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-I+eojCTR3fXcp7v5Bdie9vstmJja9HB71aQSF5jLDD4=";
sha256 = "sha256-BZhZyPnmiS5mxJp4/QnE7bTynB/cZ0QsUKFMhyd/Ox4=";
};
nativeBuildInputs = [ gtk3 jdupes ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cosmopolitan";
version = "2.1";
version = "2.1.1";
src = fetchFromGitHub {
owner = "jart";
repo = pname;
rev = version;
sha256 = "sha256-qi82iGw0Sj2pgV9O4rr/q7jyd1XG3MpTr69dXdAUH0Q=";
sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0=";
};
patches = [

View File

@ -102,4 +102,18 @@ in {
})
];
};
libressl_3_6 = generic {
version = "3.6.0";
hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
};
}

View File

@ -7,11 +7,11 @@
mkDerivation rec {
pname = "plasma-wayland-protocols";
version = "1.8.0";
version = "1.9.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-XQ+gyaC0SAAeCEJSQfI1/PuiW7xizkPAUK0dgI1X3Xo=";
sha256 = "sha256-pCdbmoVHFvpe2cK6LWl98rB0n8RaKK2WXmjQqjbF1Mg=";
};
nativeBuildInputs = [ extra-cmake-modules ];

View File

@ -1,207 +1,207 @@
{
"qt3d": {
"url": "https://invent.kde.org/qt/qt/qt3d.git",
"rev": "3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d",
"sha256": "0ia17cn59100n4qkxc1bdn36knqpdqy1dx06la4qlhvm6hzb7wpj"
"rev": "fe5fca853c09c7e03a2ff66dac21584e3307984d",
"sha256": "0z8vkr3a20sb428m5kizgj33fkrznqzhwc0mh1rdqivlcsfp4kfi"
},
"qtactiveqt": {
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
"rev": "a4211b21b09a1b98020522bc058e0ee2d6ed2e1d",
"sha256": "1gdnqhx75iwja50nhvdb8fxbdcpw18pc6xpd105kj4j62f73j1hq"
"rev": "ccc9a61d10404a4999dec61fdb513aa50f265cc3",
"sha256": "1l4h721shvc5cy5n2ykj0bhi5bgn3c8w1dmiwxh45rnb6qz971da"
},
"qtandroidextras": {
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
"rev": "45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9",
"sha256": "15b7258mjdxbqpgr9bjhysagznnx97l2948c15xjpb77sc8l0wlh"
"rev": "1d9324ce38ce5100d827942eda67fe634753655b",
"sha256": "1k00pibnadgjnvv42kfq5pynr0gljv35hri6k5gfswqw347dr6f8"
},
"qtbase": {
"url": "https://invent.kde.org/qt/qt/qtbase.git",
"rev": "aa0c6db334cf6f0887f42cbd82e4af258126bdc5",
"sha256": "0gxlqkag06fd7jbk7kjcjxxa3wxm27fa9vdd4hzq5gkq5y1hslaw"
"rev": "e44097b63d17ba3178a637df7fac51ddc51cb48b",
"sha256": "071q48qnszwqkmdpf14nqzbyqs62apfjhm0640fggv5ydgrbqw6j"
},
"qtcharts": {
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
"rev": "9a569795f0c3f41ec093e4aa5842a463e2755edb",
"sha256": "12w48q59xcr0l1s941pnsp5s8xk5knis9c1cry6kvybiq51hl77n"
"rev": "841083c263f16f8acb81e4915bf24bbed0461c9a",
"sha256": "1iic9q8qj6bz6qznfr0jdjdi3a72lb433d0k711cfz2np2i8ajz1"
},
"qtconnectivity": {
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
"rev": "42c25efeaa409f711af1bd9a8144b445741ee114",
"sha256": "0bj28j5ksr95bj9vmqcahvx3a5bc8kd9kkd6q8nsg7ak0bm0cm2p"
"rev": "01e8b04b121712ea0a2b2793ce13f4dd5e9cfcf8",
"sha256": "1mgm4dpsw7k79znw0h72h614i0lvivvbp8w67np2nqp411wghgaa"
},
"qtdatavis3d": {
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
"rev": "a32c95d27224c6c9e41d6080ea54bc937c5d1455",
"sha256": "105cdvz8y48lhyn1s5w8ckcd0vk2gq7aqnmndiq45k1c8nikn2ry"
"rev": "502612c72a2cd3b3b0c4cff926e7764d74106d33",
"sha256": "0g9y0gi78v256zv70dl3fbpwr4ihs2i99pis3x4m3br5w1p7lknq"
},
"qtdeclarative": {
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
"rev": "c47f3d7b227c9bc86ca1702ae3291a62c2116cfa",
"sha256": "0izk3zxbf1h1k88qvq8p6yaza9pkm19w4f491mbazs87qwfh3dni"
"rev": "b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a",
"sha256": "12ia5zr7ajlfxjsdc4qhwjcyyc7vwr4ihs244v40y8ym2p0hm02l"
},
"qtdoc": {
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
"rev": "a2a7f0f219ccedf1ecb2bc06760ef5439262aacd",
"sha256": "1s2jbwq83zfqg7d0mq4v60nvpg4zfa47xqgh7sglgk1s922jyj76"
"rev": "032bc4f434e1a914dfc29651533d491160d06add",
"sha256": "1r2az30pv2kvj6hif6ngmc8b2nf0rwv2rgss5mf9ks85kglvmy51"
},
"qtgamepad": {
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
"rev": "5107ddf28177112cdbf505f92bb4191a91e6521a",
"sha256": "1fyyyljhl8h4rgik3i8gi2xg5r05xd2vf4qgn4ybf3yafjsra9am"
"rev": "0a2d4651362810600d2ff7272772d5908bb8714b",
"sha256": "1qzfyarc910rg308lydaniwbr49a6wl0hwh74a5w223bl9qqi5mj"
},
"qtgraphicaleffects": {
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
"rev": "c25898224cd957491d10dbe48f2f0be66f2955de",
"sha256": "1cr3hykl79yr7x06hjfx9g6nq2wmb3q5hszby83hbzpf166h8zjf"
"rev": "e6e1e58ec28fd0f2e6426e6962cc4ccddb493349",
"sha256": "1780flyc57bvicvgp071590kmhgm4nfrfys2b0adbmnkwb3fm3ij"
},
"qtimageformats": {
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
"rev": "0ee52083683c9fcd996118ef62d9e60b5431a520",
"sha256": "0ainvxp2sw13dx44j8waa89bni8ylxkykr6mwncsspi7da9dqxq2"
"rev": "9044695f4b1acdd7ec24e7b01f6a6ca61f982a75",
"sha256": "1rzshk2s4prglwcvr2wfr7qk0m3x3gq0d2wk741ifl7gb5nidsd5"
},
"qtlocation": {
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
"rev": "73db91329ae48f685fa3fdae1c3c63b0976dc751",
"sha256": "0l8amd9fsn8agxgvxmij59i12504bmzbvyc1rz6nqhcpib4z5w7l"
"rev": "ebdf5b38da6e3fe0a183702bcca395c589c459ed",
"sha256": "17igx94c3qx0ahpnkpxip4db4413q3hcr19hcs0j4wc03vkcmafr"
},
"qtlottie": {
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
"rev": "4b3d1e824fdde2c835041464a9f85feaed0b313d",
"sha256": "02g7znswwki86723d3p23n0hwdi6brch9whx526l92sfx308z380"
"rev": "d40b67401afe7156b03c62c9a4d517b07555fe64",
"sha256": "1w9qcx7aczkf03qwm2jzjlj9k0qb8j0x4lfrj4lw7pwggb16f6p0"
},
"qtmacextras": {
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
"rev": "166cb4d6166cab60a66a074c848f6ed725e6755c",
"sha256": "09f34v5x4z3y58z6b4hriqclrf9mjncxyl4h9ph0cicam66575ms"
"rev": "c9bf2516187331033f0860976497eab0828cf25e",
"sha256": "0242gbj3rmkx4s1jzrb3kz07pl06xcfy0aqyb5xanzkg4sllrsaw"
},
"qtmultimedia": {
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
"rev": "16d9ea642bf7b9592a6c53321cc7ee9d9a3ed03f",
"sha256": "1xi2shsg0apk7rk7ccrbnjsg9j6p8svgs1pbml48ci57i36dgzfv"
"rev": "76f84c545429a1b988b79f971734ef4bc3e6643f",
"sha256": "1i1ca3n9i1rwpsxda2xm9ap3ys7a5jazbgzcwnwjb4qsxvjss6gz"
},
"qtnetworkauth": {
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
"rev": "9e698881cb07ebf04319f5cfa7b065c8bc2c1afb",
"sha256": "0207z0mv6nfgw7vhh43sx7r8z4cmvilh31x1x24d7nxj9rggnm1b"
"rev": "01315e31c5164c896a524175854c4b6df17fe166",
"sha256": "03vpynmkcb58x13mxjsjl07kh3jymcf295z5vybssqimyijlfw0m"
},
"qtpurchasing": {
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
"rev": "87021fd1e50f0aa3589a2412cfa665a6d27cc740",
"sha256": "184mpjc0vnrmxl7z0x2c1xj2adrdx12l5swpzh51q1wb45j1lvna"
"rev": "fa07915d5b7c5ba16f2e8ba32a9066fe7eed0cb1",
"sha256": "1khpg9dfd0bgmqffzi4f2sgm8hnwzq9fqfg32y857mbc85f346bv"
},
"qtquick3d": {
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
"rev": "1a8736a5834492aa8b7fc2dbc59a1eb4420a7330",
"sha256": "1byn9g46jd4krij0h1x7lfn7ac5v4rican0lppngm065is4c6c7p"
"rev": "5cf67a0a93026ffd41d2ea5a11b289f46a518376",
"sha256": "13yjb9y69by7jqw7l2qvmpi8835x7j0vxcy2slkjjw2msrj0mq2y"
},
"qtquickcontrols": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
"rev": "4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b",
"sha256": "1qkamv5p97p0lp7968cdjz4ah8mfqmrq23dikqvkwnirl3bffd83"
"rev": "e62b8b6d2f45a79652238b33f4bbe23023004ae7",
"sha256": "0598ckgkmqayq0c4c5fq6fyi098m74249qvz98m61bkk5629s24c"
},
"qtquickcontrols2": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
"rev": "59cc1cc5b3719713598a1f426d82a9d895b5dccb",
"sha256": "0i1k520080h0q85hifs5axnn4dysmvwhrsm0kxq28qgdpqjzkli6"
"rev": "74e8db97fdb9b55c4b4614b83f4bf17e00df55e9",
"sha256": "1f8hjsy3qyljyrpdjvwgq6a6ixlxyz3xjn32irzxx9vfxlp54wxf"
},
"qtquicktimeline": {
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
"rev": "2da3c0efd5016bdba26b80789773238c2886fdf6",
"sha256": "0lmyw4cxgj5kcisd2pbcpl1zynj2rfa3nsfl1n2mcz6ca650ibys"
"rev": "87ad61716a7cba5a070d8a7b1756c8b2b48d5d53",
"sha256": "02rhr3qk2k3g8ydv7w3pkkk4vdlq0jbmsbp78k1difadsxhnw563"
},
"qtremoteobjects": {
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
"rev": "89407ff20e4f76314887e2f3625f5126910031ac",
"sha256": "1qimf60hz1962l5wpdh33y6xz3h8zcnf5yj5b1i0gfyzg0c2ki5n"
"rev": "aa705010da0f658b78c1155babce7091ae44529a",
"sha256": "1lkrxjk11qwanr7l84hqxlgk9y4shgznnxhlmfkp61ysnqladilx"
},
"qtscript": {
"url": "https://invent.kde.org/qt/qt/qtscript.git",
"rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
"sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1"
"rev": "197f10dad6213ec4bb2e1a8305f19ec7475a6266",
"sha256": "1hksdl3ran5nv0q0idrdq78nk2qqmszq911fgxwfhifqakdqxyvp"
},
"qtscxml": {
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
"rev": "bb5d10f926c51aa462a56ffb331afd4f9607855c",
"sha256": "0wkwkzfv5hxkhrpmy0knlxf9c7qkals5s9c0bw71k9dz8n24d7j8"
"rev": "631fd7bcc34802b7650c2b1dc73691463954d982",
"sha256": "17r19f5s2lmj6avic2sx2hm1xlcl3gnnmigvjla6gc1wr71wbgaw"
},
"qtsensors": {
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
"rev": "bce4b6231229e953c3961f3d9858e58555a55d56",
"sha256": "15b2scai53d10c8bv6kv4k9lc3z9bixr4364yw2pkm71mwir90ga"
"rev": "35eb5ac7eaef4745a38958c3ca780d7baa2e4f30",
"sha256": "0c6p495rmfw741xp8vfjxkac3d144id0gjccgshp8xh4syld52q9"
},
"qtserialbus": {
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
"rev": "b6e22f07fb529736c9362d81de7f5c632bd1f439",
"sha256": "039kd0yk1am9s1yr39p7gwirjl3126arqf9r01xn5kcs4viizh1k"
"rev": "f9f7eee60adac72fcf6617d164e3bf61222bb5c5",
"sha256": "1ixnagxhxd54y9kn27jmhgb41zg5dzxywvai3gg7jh0v7gxr8pxp"
},
"qtserialport": {
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
"rev": "112fcd80658a52e6a2822ec79a7d724d0ad003cf",
"sha256": "1px0mm301401ha0qx5blhmcmbb17bd71q1smcdlxnl8a704n4nry"
"rev": "c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694",
"sha256": "180ypj7k36c64vgq5028hxh22vfc9bk8s4vczc1dzri8sw8pnpmm"
},
"qtspeech": {
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
"rev": "e76b23ad707077647cdb4282cf35a71776efa0f0",
"sha256": "0lnvbcx5rflx50wpbhxy7f15ax7cs4l7h44i8y9bb04njqswh0pa"
"rev": "d1273416f25a15a6edf6ea56a07602cd7d99fe48",
"sha256": "00ikp6zv96g253msfrcvxavpyw9lv2ia5pjsysmxb4vikrk7j8vr"
},
"qtsvg": {
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
"rev": "68de925ddc20dfb8900be4fa47fa5a5916836cc8",
"sha256": "0b0d70w2ycxac81dqd1yhswcn37055ra3jfqn5srk8wsbdhpjl1c"
"rev": "a9752b00a03438de8e5b080073816e12409404b7",
"sha256": "1m3bg2xb1sa0r3dv5jljk8hsj3gw71qqzk9bsa7j2jn50inb2fh5"
},
"qttools": {
"url": "https://invent.kde.org/qt/qt/qttools.git",
"rev": "672ba9d902be3634a9fef80be65227aece9e0aed",
"sha256": "05rzr6hlipzcm0vs9k721y25hzhv916hv48gr0pbrfzljyvp2yhx"
"rev": "32912a06aadfc3dcbc34e0a668ce2c78351eee6e",
"sha256": "096gdp349n94d9y5zy9k3k1xrf5g7lbla3j1cm4dala8rrnachg5"
},
"qttranslations": {
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
"rev": "0e92fc4f19928387c341533ef3d259efaa752c0f",
"sha256": "0vwkf72gpn42g54lhcbgaxbx9awpzi4a0602yhssad0v3a6zrl11"
"rev": "d4db9d8a4893a70e7ba3a6d5fe62f24f9ce745ca",
"sha256": "0srprryw0fr13d3wqpdjbcc9n6mcq1cwsdd5mdilqr7bz375qz8d"
},
"qtvirtualkeyboard": {
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
"rev": "766c1b7acbdc9ff4e35f6eb341fd446b1c20b811",
"sha256": "0bdg98h5z0lwl61860iam6ixcvgis996qj8as739wn9y6k2sv904"
"rev": "9fbb837b55887bec5d73fad142c853ef68db35b3",
"sha256": "12769162183qyxgr5p1bx2p2wlnkqg3fgz86ya9g4iznx0nagx19"
},
"qtwayland": {
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
"rev": "64fa557eb30fc1219bec50a45107ea1a983411ed",
"sha256": "14p20mv2dwc3i0qhssl7sqa0bnk14mg0kaq7ai65fqkx5b8qn5xr"
"rev": "8faf74a7966b520f0ac3eb4d88235f8ec63b31b8",
"sha256": "1khbpg9wds1gg6z7nj58hflzhy2gjaiy3v6pa930hb1r8sisp154"
},
"qtwebchannel": {
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
"rev": "da9b7b0e059447dceb828bc02d40e30d26b012f2",
"sha256": "0kyzzz17d7s9ln6j4ply6hl3y8wky5wslpabbmwsy2952g1y3l99"
"rev": "fb1ca87aa1a12048199d2aabe9015b7222d2b773",
"sha256": "1rsx3zf0xnvayanxwpr5yniiyw2a8bwifhrkw2gzdczdyasxdfw7"
},
"qtwebglplugin": {
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
"rev": "8feafc4b8e9af78175e2814523ef4f11e445fc93",
"sha256": "0ck9091bhgvhnwilfjrk9pjlf184bmhia9b92av0sg0m7yrg5wqd"
"rev": "68a322c391c2eb92876fce42b9fc23ad2f3a1ecb",
"sha256": "0rd1zr39nckqlxmmgxf4zhkrh8vb3098z33ajsizz9ld5ylwkyw7"
},
"qtwebsockets": {
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
"rev": "e5be9ba432929049da8f4788400c170bf71672da",
"sha256": "1jq11rhd0k880gabh839gs474psfc0j20sy65l1l7w1cffwi1zk2"
"rev": "a066371747a7eb9de9b1ae38fbc41b2059080802",
"sha256": "0cjy399xx15z2y00bvh7jn8m8wjpx65gwg4gwrn3r2zpdw8aqqrb"
},
"qtwebview": {
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
"rev": "429096eb954672d3727a3e8cc83832bc79cf7967",
"sha256": "0c0q3dcxz00y8wml141xk3lx91mzg4mg5qlka2k1j49cn1az6lx3"
"rev": "87577dde04ed219bda776dabca86176149736331",
"sha256": "070s9ml8ixbmd7a7b49mnc0fya4wy3mx174n50acb99mmi7ar6z3"
},
"qtwinextras": {
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
"rev": "b41efc2b32a19da9fe369e243dcf3a2a31f7cde6",
"sha256": "1prsv3z51sbq9q8v1xj4v312hai6ampdcfnik28rdh7c9mpnq99m"
"rev": "a2ef397d1833c7417138a14ae23c880ae434d8a6",
"sha256": "1jqx03wwklqak8sjjlgmi55r2l07ylsfdar1j9kb0zn1krh7d9mw"
},
"qtx11extras": {
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
"rev": "0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e",
"sha256": "13fzpipgvlxs9qw128hpnaxr8j4xi8v2fmyy39y1ghf66sfln1zn"
"rev": "982f20eb585d77e5b5c721e05a466d7161f7f2d1",
"sha256": "0zl4bdxvdx2kfjwkd0rxvh70580g6idrgj4m3pyyw7z2jbzawpv3"
},
"qtxmlpatterns": {
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
"rev": "a8edba5ad50d669aead4ddb769f171cba892d676",
"sha256": "1342b7qljjqpiq3xjwy0vblq8wqcqyp9s3751ja40n7ishhxd2yj"
"rev": "30e6c84fe2752cde8b53aff9d38c2095cd7c8761",
"sha256": "04i1282hyqqspdlvny1dz5006svq84rpqvnvlvsas83vxzhr1g1k"
}
}

View File

@ -1,7 +1,7 @@
{ lib, fetchgit, fetchFromGitHub }:
let
version = "5.15.5";
version = "5.15.6";
overrides = {
qtscript.version = "5.15.4";
};

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pytrafikverket";
version = "0.2.0.1";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RsB8b96aCIBM3aABOuuexB5fIo7H1Kq/XsGvV8b7/sA=";
hash = "sha256-LBOq1AvJrRmyWIe2w4dQbWvlRAJN6s2/lsJRI2LZK2o=";
};
propagatedBuildInputs = [

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.6.9";
version = "1.6.10";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-azAhpt6Qo/arTYeJSeQdBnqOmg2m7h+1pTsV30/pAOc=";
sha256 = "sha256-gBDHRV+5N9dcsH/55I6AcguiJSIP57fUtQJ6sMGPzyg=";
};
postPatch = ''

View File

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "1.6.1";
version = "1.6.2";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "688be16ee5d1a2f94aa4abdc6d881e8e254d173d724ac88725955fe66bdb63d4";
sha256 = "sha256-cM1VmA/ikp3AOJJMoI9o+WFIIjqHd4EPphbjR46+cco=";
};
postPatch = ''

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "sumo";
version = "2.3.4";
version = "2.3.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "SMTG-UCL";
repo = "sumo";
rev = "refs/tags/v${version}";
sha256 = "sha256-kgTTYCTq8jTNOmc92TRskbsOcnk6wTZgf0UfoctJ4M4=";
sha256 = "sha256-eGQOFTo/tg1aM/P1la3stE7RLxpACUdcJ7g1z3zSasc=";
};
nativeBuildInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.11.1";
version = "2.28.11.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ArGAbFuZBO3Nh/opI2FkrqDmzcTZPqAgzWFe9ly0PWU=";
sha256 = "sha256-/c170UgTn7ju9yz0pBrHJzhyytnmraFLEf9d/e7mDtM=";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-tabulate";
version = "0.8.11";
version = "0.9.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-F6X6O1ykU4FXePyYZejs0BGLB7K5+v8+Kwb+RIF03V4=";
hash = "sha256-SnlHRxTOoVa80hhbub3dj7nT1SJ8jQp/Ib8hyvX2Dmc=";
};
# Module doesn't have tests

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goresym";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "mandiant";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wb/qyMLhqNLpgOl9YFuByTxkUBK4GdhdWzAMcWjOG/U=";
sha256 = "sha256-j548FzbxrtJz2N5y9ItO6F+52vQ+2RVCFPUW1cqeJUA=";
};
subPackages = [ "." ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
rev = "v${version}";
sha256 = "sha256-lTfpN+BnWMENRlSjR1+iGlGMTp4BBiMDvzFjvwRpuLQ=";
sha256 = "sha256-a2LJUWRQsUnwU0DZnO5T+geeVOBXPfsBptEMnO+jnFA=";
};
cargoSha256 = "sha256-z12ecgJJYKYc5kOLyjZU/MfBuBp7aJuEmDAGleiecz0=";
cargoSha256 = "sha256-IJqM9XuJSEZadYc38TnyVrszuL5noYktnlyVu7IBE5k=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "cli11";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "CLIUtils";
repo = "CLI11";
rev = "v${version}";
sha256 = "sha256-emTIaoUyTINbAAn9tw1r3zLTQt58N8A1zoP+0y41yKo=";
sha256 = "sha256-J/hOgCDQPI0n2BGJK0+HIwlfNDVaZcxCC45uFAR7JUc=";
};
nativeBuildInputs = [ cmake ];

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.60";
version = "0.0.61";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AHKH5S+3iu+BflHnsR8kuWZKaCoyQXMa300KrvEQg5c=";
sha256 = "sha256-Gmuf8vZMP74r3CtImmD9hCTPIxaMfHGXO0C/hGAyqb0=";
};
cargoSha256 = "sha256-SO6MXLqUrFWOXW63fR/RBP7XG2cy5jAKST0nLcEkIPA=";
cargoSha256 = "sha256-jSBTou8GekqHoTTXRrhCwCWA2tjU5woKKB0g63M2VGU=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.81.2";
version = "1.82.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-wf/YQX7vrwiNWz1kjWLPSH00rB70HDW3bRuN1DUiP1Y=";
sha256 = "sha256-JIl2WeveDoAHzqJ2cqMxpWeNf4yQC9fIdfECOJywJ2A=";
};
vendorSha256 = null;

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-09-24";
version = "2022-10-07";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QroDg06vAyeFeA2Gy0iFJ5bc277EkMV1Xz92c+xrUF0=";
hash = "sha256-gO2NCQSmaJA6Bg6LKBc0qVi147KzGp2MtXizpM0v1yQ=";
};
nativeBuildInputs = [

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.7.7";
version = "2.7.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-61oq7h/e9aFCEwvrKRx1zyITw/X2obRsnyycO94tW0A=";
sha256 = "sha256-FIWhWW2jOQF4OztLov67+RuhDnpRyD7EN27Gcr4Wa90=";
};
vendorSha256 = "sha256-HZZutN6hG/wNBz1hy0S3kWd/LmaeAvn1NlB917xmCDo=";
vendorSha256 = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA=";
modRoot = "./v2";
subPackages = [

View File

@ -7,7 +7,7 @@
, harfbuzz
, openssl
, pkg-config
, makeWrapper
, makeBinaryWrapper
, biber
, icu
}:
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc=";
nativeBuildInputs = [ pkg-config makeWrapper ];
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
buildInputs = [ icu fontconfig harfbuzz openssl ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
# https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0
postInstall = ''
wrapProgram $out/bin/tectonic \
--prefix PATH "${lib.getBin biber}/bin"
--prefix PATH : "${lib.getBin biber}/bin"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace dist/appimage/tectonic.desktop \
--replace Exec=tectonic Exec=$out/bin/tectonic

View File

@ -1148,7 +1148,7 @@ with pkgs;
aefs = callPackage ../tools/filesystems/aefs { };
aegisub = callPackage ../applications/video/aegisub ({
wxGTK = wxGTK31;
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
} // (config.aegisub or {}));
@ -21285,9 +21285,10 @@ with pkgs;
inherit (callPackages ../development/libraries/libressl { })
libressl_3_4
libressl_3_5;
libressl_3_5
libressl_3_6;
libressl = libressl_3_5;
libressl = libressl_3_6;
boringssl = callPackage ../development/libraries/boringssl { };
@ -31999,7 +32000,8 @@ with pkgs;
tree = callPackage ../tools/system/tree {};
treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK31-gtk3;
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
tremc = callPackage ../applications/networking/p2p/tremc { };
@ -32530,7 +32532,9 @@ with pkgs;
wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
wxGTK = wxGTK31;
inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (llvmPackages) openmp;
wxGTK = wxGTK32;
};
xa = callPackage ../development/compilers/xa/xa.nix { };