Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
201cc2f89b
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
|
||||
i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
|
||||
aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
|
||||
x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
|
||||
aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
|
||||
x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0";
|
||||
i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0";
|
||||
aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0";
|
||||
x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0";
|
||||
aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0";
|
||||
}
|
||||
|
|
|
|||
78
pkgs/applications/graphics/hdrmerge/default.nix
Normal file
78
pkgs/applications/graphics/hdrmerge/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, libraw
|
||||
, exiv2
|
||||
, zlib
|
||||
, alglib
|
||||
, pkg-config
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "hdrmerge";
|
||||
version = "unstable-2020-11-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcelaya";
|
||||
repo = "hdrmerge";
|
||||
rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da";
|
||||
sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase libraw exiv2 zlib alglib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DALGLIB_DIR:PATH=${alglib}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# patch FindAlglib.cmake to respect ALGLIB_DIR
|
||||
# see https://github.com/jcelaya/hdrmerge/pull/213
|
||||
name = "patch-hdrmerge-CMake.patch";
|
||||
url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
|
||||
sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
|
||||
})
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "HDRMerge";
|
||||
genericName = "HDR raw image merge";
|
||||
desktopName = "HDRMerge";
|
||||
comment = meta.description;
|
||||
icon = "hdrmerge";
|
||||
exec = "@out@/bin/hdrmerge -F";
|
||||
categories = [ "Graphics" ];
|
||||
mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ];
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
postInstallPhase = ''
|
||||
# Make a desktop item
|
||||
mkdir -p $out/share/icons/ $out/share/applications/
|
||||
cp ../data/images/logo.png $out/share/icons/hdrmerge.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jcelaya/hdrmerge";
|
||||
description = "Combines two or more raw images into an HDR";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.paperdigits ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "97.0.1-1",
|
||||
"packageVersion": "97.0.2-1",
|
||||
"source": {
|
||||
"rev": "97.0.1-1",
|
||||
"sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j"
|
||||
"rev": "97.0.2-1",
|
||||
"sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "97.0.1",
|
||||
"sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"
|
||||
"version": "97.0.2",
|
||||
"sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ rec {
|
|||
meta = {
|
||||
description = "A web browser built from Firefox source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ eelco lovesegfault hexa ];
|
||||
maintainers = with lib.maintainers; [ lovesegfault hexa ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
|
|
@ -32,10 +32,10 @@ rec {
|
|||
|
||||
firefox-esr-91 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.6.1esr";
|
||||
version = "91.7.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5";
|
||||
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ flutter.mkFlutterApp rec {
|
|||
icon = "fluffychat";
|
||||
desktopName = "Fluffychat";
|
||||
genericName = "Chat with your friends (matrix client)";
|
||||
categories = "Chat;Network;InstantMessaging;";
|
||||
categories = [ "Chat" "Network" "InstantMessaging" ];
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -49,7 +49,7 @@ flutter.mkFlutterApp rec {
|
|||
|
||||
# replace olm dummy path
|
||||
postConfigure = ''
|
||||
M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*)
|
||||
M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*)
|
||||
ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so
|
||||
'';
|
||||
|
||||
|
|
|
|||
106
pkgs/applications/networking/n8n/node-packages.nix
generated
106
pkgs/applications/networking/n8n/node-packages.nix
generated
|
|
@ -976,13 +976,13 @@ let
|
|||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1083.0" = {
|
||||
"aws-sdk-2.1087.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1083.0";
|
||||
version = "2.1087.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
|
||||
sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
|
||||
sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
|
@ -2956,13 +2956,13 @@ let
|
|||
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
|
||||
};
|
||||
};
|
||||
"has-symbols-1.0.2" = {
|
||||
"has-symbols-1.0.3" = {
|
||||
name = "has-symbols";
|
||||
packageName = "has-symbols";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
|
||||
sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
|
||||
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz";
|
||||
sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==";
|
||||
};
|
||||
};
|
||||
"has-tostringtag-1.0.0" = {
|
||||
|
|
@ -4486,49 +4486,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.106.0" = {
|
||||
"n8n-core-0.107.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.106.0";
|
||||
version = "0.107.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
|
||||
sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.107.0.tgz";
|
||||
sha512 = "jwlEv67bPCn1Npp5SkZ11MViQgN96B2bUmSdsKPIBkJGkAPdd6BAUNAhF6qlAS53KhkbSqjuZkn71sDwbHv1cg==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.12.0" = {
|
||||
"n8n-design-system-0.13.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
|
||||
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.13.0.tgz";
|
||||
sha512 = "dnweYfFdU9RLdZhmllAlF35dFp0F8Cxw2YAVPMTYOJ2saTs992kvI+09k5iVHDdRxA92BKRXgRRfvY1p0goXcQ==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.132.1" = {
|
||||
"n8n-editor-ui-0.133.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.132.1";
|
||||
version = "0.133.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
|
||||
sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.133.0.tgz";
|
||||
sha512 = "lKi2eyx5mn5vfo5sArvsnQ+1khdkX7I1Aqml5VFgzTUhHDLZB2Pvupu+czE55l9QSGs6oqaN9a9NRblWOHc0zQ==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.163.0" = {
|
||||
"n8n-nodes-base-0.164.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.163.0";
|
||||
version = "0.164.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
|
||||
sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.164.0.tgz";
|
||||
sha512 = "5GSd0f1rQZfKt9e0S1zwn5K34TSd1lYkd3MEPKDHjvksxfNOumtZpf0rwEgb/7Uf6azw7ESqk4VXwxiVQu0sgw==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.88.0" = {
|
||||
"n8n-workflow-0.89.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.88.0";
|
||||
version = "0.89.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
|
||||
sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.89.0.tgz";
|
||||
sha512 = "hggmmjHsa3VjP5puRssH4Q8hoigqJ3W+KQeY54Qsa1rJoJEjZYy53NGOQ3QMmuPuTUvVMHe4Z/Hb6u4Bbh1wAg==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
|
@ -6340,13 +6340,13 @@ let
|
|||
sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==";
|
||||
};
|
||||
};
|
||||
"sqlstring-2.3.2" = {
|
||||
"sqlstring-2.3.3" = {
|
||||
name = "sqlstring";
|
||||
packageName = "sqlstring";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz";
|
||||
sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==";
|
||||
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz";
|
||||
sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==";
|
||||
};
|
||||
};
|
||||
"sse-channel-3.1.1" = {
|
||||
|
|
@ -6367,13 +6367,13 @@ let
|
|||
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
|
||||
};
|
||||
};
|
||||
"ssh2-1.6.0" = {
|
||||
"ssh2-1.7.0" = {
|
||||
name = "ssh2";
|
||||
packageName = "ssh2";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz";
|
||||
sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
|
||||
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz";
|
||||
sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g==";
|
||||
};
|
||||
};
|
||||
"ssh2-sftp-client-7.2.2" = {
|
||||
|
|
@ -7375,13 +7375,13 @@ let
|
|||
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
|
||||
};
|
||||
};
|
||||
"xss-1.0.10" = {
|
||||
"xss-1.0.11" = {
|
||||
name = "xss";
|
||||
packageName = "xss";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
|
||||
sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
|
||||
url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
|
||||
sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
|
||||
};
|
||||
};
|
||||
"xtend-4.0.2" = {
|
||||
|
|
@ -7480,10 +7480,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.165.1";
|
||||
version = "0.166.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
|
||||
sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.166.0.tgz";
|
||||
sha512 = "t8tRpOyrEIxaIuLzfBajDPjAMygcCapiIqHDjU8YloJalI0MnbuoQ6DgA2RdRDZElN0yew0rQR8ZxZ2nMUk8Fg==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
|
|
@ -7664,7 +7664,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1083.0" // {
|
||||
(sources."aws-sdk-2.1087.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
|
@ -8011,7 +8011,7 @@ in
|
|||
})
|
||||
sources."has-bigints-1.0.1"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."has-symbols-1.0.2"
|
||||
sources."has-symbols-1.0.3"
|
||||
sources."has-tostringtag-1.0.0"
|
||||
sources."has-unicode-2.0.1"
|
||||
sources."he-1.2.0"
|
||||
|
|
@ -8224,19 +8224,19 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
(sources."n8n-core-0.106.0" // {
|
||||
(sources."n8n-core-0.107.0" // {
|
||||
dependencies = [
|
||||
sources."qs-6.10.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.12.0"
|
||||
sources."n8n-editor-ui-0.132.1"
|
||||
(sources."n8n-nodes-base-0.163.0" // {
|
||||
sources."n8n-design-system-0.13.0"
|
||||
sources."n8n-editor-ui-0.133.0"
|
||||
(sources."n8n-nodes-base-0.164.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.88.0"
|
||||
sources."n8n-workflow-0.89.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
|
@ -8534,10 +8534,10 @@ in
|
|||
})
|
||||
sources."sprintf-js-1.1.2"
|
||||
sources."sqlite3-5.0.2"
|
||||
sources."sqlstring-2.3.2"
|
||||
sources."sqlstring-2.3.3"
|
||||
sources."sse-channel-3.1.1"
|
||||
sources."ssf-0.11.2"
|
||||
sources."ssh2-1.6.0"
|
||||
sources."ssh2-1.7.0"
|
||||
sources."ssh2-sftp-client-7.2.2"
|
||||
sources."sshpk-1.17.0"
|
||||
sources."stack-trace-0.0.10"
|
||||
|
|
@ -8695,7 +8695,7 @@ in
|
|||
sources."xmlbuilder-11.0.1"
|
||||
sources."xpath.js-1.1.0"
|
||||
sources."xregexp-2.0.0"
|
||||
(sources."xss-1.0.10" // {
|
||||
(sources."xss-1.0.11" // {
|
||||
dependencies = [
|
||||
sources."commander-2.20.3"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,21 @@
|
|||
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
|
||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
||||
{ lib
|
||||
, fetchurl
|
||||
, cups
|
||||
, libssh
|
||||
, libXpm
|
||||
, nx-libs
|
||||
, openldap
|
||||
, openssh
|
||||
, qt5
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, qttools
|
||||
, phonon
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
qt5.mkDerivation rec {
|
||||
pname = "x2goclient";
|
||||
version = "4.1.2.2";
|
||||
|
||||
|
|
@ -10,8 +24,24 @@ mkDerivation rec {
|
|||
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
||||
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
||||
buildInputs = [
|
||||
cups
|
||||
libssh
|
||||
libXpm
|
||||
nx-libs
|
||||
openldap
|
||||
openssh
|
||||
qtbase
|
||||
qtsvg
|
||||
qtx11extras
|
||||
qttools
|
||||
phonon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
|
||||
|
|
@ -26,7 +56,7 @@ mkDerivation rec {
|
|||
|
||||
installTargets = [ "install_client" "install_man" ];
|
||||
|
||||
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
|
||||
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical NoMachine NX3 remote desktop client";
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.32.28";
|
||||
version = "14.32.30";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0=";
|
||||
sha256 = "sha256-VpOoduUA0iD+nI83GSQYQDHoK2Snog0NHkHWHfpLqFM=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
let
|
||||
release_version = "14.0.0";
|
||||
candidate = "rc1"; # empty or "rcN"
|
||||
candidate = "rc2"; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
rev = ""; # When using a Git commit
|
||||
rev-version = ""; # When using a Git commit
|
||||
|
|
@ -30,7 +30,7 @@ let
|
|||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = if rev != "" then rev else "llvmorg-${version}";
|
||||
sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E=";
|
||||
sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w=";
|
||||
};
|
||||
|
||||
llvm_meta = {
|
||||
|
|
|
|||
36
pkgs/development/libraries/alglib/default.nix
Normal file
36
pkgs/development/libraries/alglib/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, stdenv, fetchurl, cmake, clang }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alglib3";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
|
||||
sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
clang
|
||||
];
|
||||
|
||||
patches = [
|
||||
./patch-alglib-CMakeLists.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Numerical analysis and data processing library";
|
||||
homepage = "https://www.alglib.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.paperdigits ];
|
||||
longDescription = ''
|
||||
ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include:
|
||||
|
||||
* Data analysis (classification/regression, statistics)
|
||||
* Optimization and nonlinear solvers
|
||||
* Interpolation and linear/nonlinear least-squares fitting
|
||||
* Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers
|
||||
* Fast Fourier Transform and many other algorithms
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
--- /dev/null
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -0,0 +1,20 @@
|
||||
+cmake_minimum_required(VERSION 2.8)
|
||||
+
|
||||
+project(alglib3 CXX)
|
||||
+
|
||||
+file(GLOB_RECURSE sources src/*.cpp)
|
||||
+file(GLOB_RECURSE headers src/*.h)
|
||||
+
|
||||
+add_library(${PROJECT_NAME} STATIC ${sources} ${headers})
|
||||
+
|
||||
+install(
|
||||
+ TARGETS ${PROJECT_NAME}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+
|
||||
+install(
|
||||
+ FILES ${headers}
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib
|
||||
+)
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coeurl";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "nheko.im";
|
||||
owner = "nheko-reborn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
|
||||
sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja pkg-config meson ];
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
, addOpenGLRunpath
|
||||
, enableGeoLocation ? true
|
||||
, withLibsecret ? true
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -158,9 +159,10 @@ stdenv.mkDerivation rec {
|
|||
bubblewrap
|
||||
libseccomp
|
||||
libmanette
|
||||
systemd
|
||||
wayland
|
||||
xdg-dbus-proxy
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
] ++ lib.optionals enableGeoLocation [
|
||||
geoclue2
|
||||
] ++ lib.optionals withLibsecret [
|
||||
|
|
@ -193,7 +195,7 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_APPLE_ICU=OFF"
|
||||
"-DUSE_OPENGL_OR_ES=OFF"
|
||||
"-DUSE_SYSTEM_MALLOC=ON"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
"-DUSE_SYSTEMD=OFF"
|
||||
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
|
||||
"-DENABLE_GLES2=ON"
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-tasks";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/iEexbBw/lBhD+7BawaYHQpDB98jxqJB4hkmUaFHJN8=";
|
||||
sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "samsungtvws";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yTRRcY3PTmhNku7kfrG2ff1i4hEow6JaiBvq0Ic19uI=";
|
||||
sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,28 +1,27 @@
|
|||
diff --git a/data/meson.build b/data/meson.build
|
||||
index f10d4ff6..2dc66fb6 100644
|
||||
index 2ae29ce5..342cac92 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -21,7 +21,7 @@ endif
|
||||
@@ -26,7 +26,7 @@ endif
|
||||
|
||||
if build_standalone
|
||||
install_data(['daemon.conf'],
|
||||
- install_dir : join_paths(sysconfdir, 'fwupd')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
|
||||
)
|
||||
install_data(['power.quirk'],
|
||||
install_data(['power.quirk', 'cfi.quirk'],
|
||||
install_dir: join_paths(datadir, 'fwupd', 'quirks.d'))
|
||||
diff --git a/data/pki/meson.build b/data/pki/meson.build
|
||||
index dcd9e128..ff137f3a 100644
|
||||
index 2a7d0f24..091981f7 100644
|
||||
--- a/data/pki/meson.build
|
||||
+++ b/data/pki/meson.build
|
||||
@@ -2,24 +2,23 @@ install_data([
|
||||
@@ -12,13 +12,13 @@ install_data([
|
||||
'GPG-KEY-Linux-Foundation-Firmware',
|
||||
'GPG-KEY-Linux-Vendor-Firmware-Service',
|
||||
],
|
||||
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
|
||||
)
|
||||
|
||||
install_data([
|
||||
'GPG-KEY-Linux-Foundation-Metadata',
|
||||
'GPG-KEY-Linux-Vendor-Firmware-Service',
|
||||
|
|
@ -30,7 +29,9 @@ index dcd9e128..ff137f3a 100644
|
|||
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -26,11 +26,11 @@ if supported_pkcs7 == '1'
|
||||
install_data([
|
||||
'LVFS-CA.pem',
|
||||
],
|
||||
|
|
@ -43,7 +44,7 @@ index dcd9e128..ff137f3a 100644
|
|||
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
|
||||
)
|
||||
-
|
||||
endif
|
||||
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
|
||||
index 02d8777b..2c89d593 100644
|
||||
--- a/data/remotes.d/meson.build
|
||||
|
|
@ -82,10 +83,10 @@ index 02d8777b..2c89d593 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7557cd4a..4c98de6d 100644
|
||||
index 394f40fa..7b602c73 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -190,6 +190,12 @@ endif
|
||||
@@ -187,6 +187,12 @@ endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
localedir = join_paths(prefix, get_option('localedir'))
|
||||
|
||||
|
|
@ -99,14 +100,14 @@ index 7557cd4a..4c98de6d 100644
|
|||
gio = dependency('gio-2.0', version : '>= 2.45.8')
|
||||
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 94f73898..5de6cc7b 100644
|
||||
index c1b483cb..047dbdd8 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
|
||||
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
|
||||
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
|
||||
option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation')
|
||||
option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
|
||||
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
|
||||
index e9f12879..a0126dbb 100644
|
||||
--- a/plugins/dell-esrt/meson.build
|
||||
|
|
@ -119,8 +120,21 @@ index e9f12879..a0126dbb 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
endif
|
||||
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
|
||||
index 3ea47456..40dbd116 100644
|
||||
--- a/plugins/msr/meson.build
|
||||
+++ b/plugins/msr/meson.build
|
||||
@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'],
|
||||
endif
|
||||
|
||||
install_data(['msr.conf'],
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd')
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
||||
)
|
||||
shared_module('fu_plugin_msr',
|
||||
fu_hash,
|
||||
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
|
||||
index 5263048c..c46fac64 100644
|
||||
index 4a0a8664..7d9ba77d 100644
|
||||
--- a/plugins/redfish/meson.build
|
||||
+++ b/plugins/redfish/meson.build
|
||||
@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish',
|
||||
|
|
@ -129,14 +143,14 @@ index 5263048c..c46fac64 100644
|
|||
install_data(['redfish.conf'],
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
|
||||
install_mode: 'rw-r-----',
|
||||
)
|
||||
|
||||
if get_option('tests')
|
||||
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
|
||||
index 646ed6cb..8d7c59aa 100644
|
||||
index 1ba9562f..c074f770 100644
|
||||
--- a/plugins/thunderbolt/meson.build
|
||||
+++ b/plugins/thunderbolt/meson.build
|
||||
@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
|
||||
@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
|
||||
)
|
||||
|
||||
install_data(['thunderbolt.conf'],
|
||||
|
|
@ -146,7 +160,7 @@ index 646ed6cb..8d7c59aa 100644
|
|||
# we use functions from 2.52 in the tests
|
||||
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
|
||||
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
|
||||
index 708586b0..f29536b1 100644
|
||||
index 04cbd51a..9a8c43de 100644
|
||||
--- a/plugins/uefi-capsule/meson.build
|
||||
+++ b/plugins/uefi-capsule/meson.build
|
||||
@@ -21,7 +21,7 @@ if host_machine.system() == 'linux'
|
||||
|
|
@ -158,7 +172,7 @@ index 708586b0..f29536b1 100644
|
|||
)
|
||||
elif host_machine.system() == 'freebsd'
|
||||
backend_srcs += 'fu-uefi-backend-freebsd.c'
|
||||
@@ -116,7 +116,7 @@ if get_option('man')
|
||||
@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man')
|
||||
endif
|
||||
|
||||
install_data(['uefi_capsule.conf'],
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, libgudev
|
||||
, polkit
|
||||
, libxmlb
|
||||
, glib
|
||||
, gusb
|
||||
, sqlite
|
||||
, libarchive
|
||||
|
|
@ -50,6 +51,9 @@
|
|||
, nixosTests
|
||||
, runCommand
|
||||
, unstableGitUpdater
|
||||
, modemmanager
|
||||
, libqmi
|
||||
, libmbim
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -112,7 +116,7 @@ let
|
|||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
version = "1.7.2";
|
||||
version = "1.7.6";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
|
@ -121,7 +125,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ=";
|
||||
sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -136,15 +140,26 @@ let
|
|||
# they are not really part of the library.
|
||||
./install-fwupdplugin-to-out.patch
|
||||
|
||||
# Fix detection of installed tests
|
||||
# https://github.com/fwupd/fwupd/issues/3880
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch";
|
||||
sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g=";
|
||||
})
|
||||
|
||||
# Installed tests are installed to different output
|
||||
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
|
||||
./installed-tests-path.patch
|
||||
|
||||
# Tests detect fwupd is installed when prefix is /usr.
|
||||
./fix-install-detection.patch
|
||||
|
||||
# EFI capsule is located in fwupd-efi now.
|
||||
./efi-app-path.patch
|
||||
|
||||
# Drop hard-coded FHS path
|
||||
# https://github.com/fwupd/fwupd/issues/4360
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch";
|
||||
sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -187,6 +202,9 @@ let
|
|||
efivar
|
||||
fwupd-efi
|
||||
protobufc
|
||||
modemmanager
|
||||
libmbim
|
||||
libqmi
|
||||
] ++ lib.optionals haveDell [
|
||||
libsmbios
|
||||
];
|
||||
|
|
@ -206,6 +224,7 @@ let
|
|||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
"-Defi_os_dir=nixos"
|
||||
"-Dplugin_modem_manager=true"
|
||||
|
||||
# We do not want to place the daemon into lib (cyclic reference)
|
||||
"--libexecdir=${placeholder "out"}/libexec"
|
||||
|
|
@ -250,6 +269,9 @@ let
|
|||
contrib/generate-version-script.py \
|
||||
meson_post_install.sh \
|
||||
po/test-deps
|
||||
|
||||
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
|
||||
--replace "gdbus" ${glib.bin}/bin/gdbus
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
@ -301,6 +323,7 @@ let
|
|||
passthru = {
|
||||
filesInstalledToEtc = [
|
||||
"fwupd/daemon.conf"
|
||||
"fwupd/msr.conf"
|
||||
"fwupd/remotes.d/lvfs-testing.conf"
|
||||
"fwupd/remotes.d/lvfs.conf"
|
||||
"fwupd/remotes.d/vendor.conf"
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
|
||||
index 4710c769..1c68fdb9 100644
|
||||
--- a/plugins/redfish/fu-self-test.c
|
||||
+++ b/plugins/redfish/fu-self-test.c
|
||||
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
|
||||
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
|
||||
if (builddir == NULL)
|
||||
return FALSE;
|
||||
- return g_str_has_prefix(builddir, "/usr");
|
||||
+ return g_str_has_prefix(builddir, "/nix");
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
|
||||
index adadbcdd..1b51bb9c 100644
|
||||
index b8ec916f0..38209b363 100644
|
||||
--- a/data/installed-tests/meson.build
|
||||
+++ b/data/installed-tests/meson.build
|
||||
@@ -65,5 +65,5 @@ configure_file(
|
||||
@@ -83,5 +83,5 @@ configure_file(
|
||||
output : 'fwupd-tests.conf',
|
||||
configuration : con2,
|
||||
install: true,
|
||||
|
|
@ -10,10 +10,10 @@ index adadbcdd..1b51bb9c 100644
|
|||
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 772b7bbe..f59302cd 100644
|
||||
index 32fe6e408..b35d741e0 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -177,8 +177,8 @@ else
|
||||
@@ -183,8 +183,8 @@ else
|
||||
datadir = join_paths(prefix, get_option('datadir'))
|
||||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||||
|
|
@ -24,6 +24,14 @@ index 772b7bbe..f59302cd 100644
|
|||
endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
localedir = join_paths(prefix, get_option('localedir'))
|
||||
@@ -484,6 +484,7 @@ gnome = import('gnome')
|
||||
i18n = import('i18n')
|
||||
|
||||
conf.set_quoted('FWUPD_PREFIX', prefix)
|
||||
+conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))
|
||||
conf.set_quoted('FWUPD_BINDIR', bindir)
|
||||
conf.set_quoted('FWUPD_LIBDIR', libdir)
|
||||
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 0a0e2853..5f68d78b 100644
|
||||
--- a/meson_options.txt
|
||||
|
|
@ -36,3 +44,16 @@ index 0a0e2853..5f68d78b 100644
|
|||
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
||||
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
|
||||
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
|
||||
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
|
||||
index c507fabc8..0cddc3248 100644
|
||||
--- a/plugins/redfish/fu-self-test.c
|
||||
+++ b/plugins/redfish/fu-self-test.c
|
||||
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
|
||||
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
|
||||
if (builddir == NULL)
|
||||
return FALSE;
|
||||
- return g_str_has_prefix(builddir, FWUPD_PREFIX);
|
||||
+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.269";
|
||||
version = "4.14.270";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3";
|
||||
sha256 = "17fj5aif5f0z0xgb321ghpv5p6drqxz0w948dr4hql4cj193r2zv";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.232";
|
||||
version = "4.19.233";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg";
|
||||
sha256 = "0dyf1xapmhly9gpygyjzj5yhn6s5xb0gss033sgllwn243q6bxmq";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.304";
|
||||
version = "4.9.305";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "099bkypbkb8an8jsl49f83kg6ic1yw9ssfc1qksaji1jparlnpi9";
|
||||
sha256 = "0yspfrqlgpsa3a591bk9c2xqq5xf70lqfgj8wrnhd42agfxanr8k";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.103";
|
||||
version = "5.10.104";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g";
|
||||
sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.26";
|
||||
version = "5.15.27";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -15,6 +15,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq";
|
||||
sha256 = "01ksvmcwljzphbdll0pd9zg8ys8jy5xy29b54pxqjs3wq3n8zj9k";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.16.12";
|
||||
version = "5.16.13";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1wnpn5w0rfniy60m2a25wjm3flvpzvs2z1s4ga01b9qhbbqisnmv";
|
||||
sha256 = "1fvz4v3mcm9yxfak6mshl764piadgz46y71wprb85b1shc09i2ig";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.182";
|
||||
version = "5.4.183";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
|
||||
sha256 = "17691h1575spgwh88mk189ars6gyjcl9nnaz585l2da8civhnjrd";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.177-rt69"; # updated by ./update-rt.sh
|
||||
version = "5.4.182-rt70"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -14,14 +14,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq";
|
||||
sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "16m1swkg54cgcgqwl6vifbpfvdf7waigbwi9brafwplb965zq5a2";
|
||||
sha256 = "193glhb0bkaa7qggkj2vpp3r6avf0sh8fasj8byww7xwkhm7cncq";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dovecot-fts-xapian";
|
||||
version = "1.5.4";
|
||||
version = "1.5.4b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grosjo";
|
||||
repo = "fts-xapian";
|
||||
rev = version;
|
||||
sha256 = "sha256-3vrcaBsarJNECwfzUOrUnjD555E2dgbFiiEJR5bN3qM=";
|
||||
sha256 = "sha256-RzwJjcUgk1XXQZpNdz86Pr9HsUaQCOSt5oSejnGVmgA=";
|
||||
};
|
||||
|
||||
buildInputs = [ dovecot xapian icu64 sqlite ];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.37.1";
|
||||
version = "0.37.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidata-inc";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rLnjWJPIf2SzWpaQxt/4zACihKptly/OJ+w0/uJBacY=";
|
||||
sha256 = "sha256-cKX8idMmh9hQVPjO8rJWlp1nhtnzwwlLkelNw+LLBag=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "sha256-YqlOzHsdkRrBdQ/mWGs2JIq5JttdRhFeug9HRbl6qlw=";
|
||||
vendorSha256 = "sha256-vaYCo+jvw3qcLQ63oA8tq6G6Gxq50VTxK6IMBcEZXqs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, rustPlatform, fetchFromGitea, testVersion, garage }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "garage";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.deuxfleurs.fr";
|
||||
owner = "Deuxfleurs";
|
||||
repo = "garage";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks=";
|
||||
sha256 = "sha256-BEFxPU4yPtctN7H+EcxJpXnf4tyqBseskls0ZA9748k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618=";
|
||||
cargoSha256 = "sha256-/mOH7VOfIHEydnJUUSts44aGb8tS1/Faxiu4pQDeobY=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testVersion { package = garage; };
|
||||
|
|
|
|||
26
pkgs/tools/networking/goflow/default.nix
Normal file
26
pkgs/tools/networking/goflow/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goflow";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dUoiuoM87Bh3ndzHG/YnwnRWnVbtPDuVdICEXcezCp8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A NetFlow/IPFIX/sFlow collector in Go";
|
||||
homepage = "https://github.com/cloudflare/goflow";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ heph2 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -62,7 +62,12 @@ in lib.makeExtensible (self: {
|
|||
sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=";
|
||||
};
|
||||
|
||||
stable = self.nix_2_6;
|
||||
nix_2_7 = common {
|
||||
version = "2.7.0";
|
||||
sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=";
|
||||
};
|
||||
|
||||
stable = self.nix_2_7;
|
||||
|
||||
unstable = lib.lowPrio (common rec {
|
||||
version = "2.7";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-03-03";
|
||||
version = "2022-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EH4PlUb0PGUwkgfk1oFPKimoJcWI/mozzzaTST1De7A=";
|
||||
sha256 = "sha256-XgInxwJfT0a5t3H5p9Q7KBUvfDRf5cOY6uAbXTJxuaY=";
|
||||
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1069,6 +1069,8 @@ with pkgs;
|
|||
|
||||
gobgp = callPackage ../tools/networking/gobgp { };
|
||||
|
||||
goflow = callPackage ../tools/networking/goflow { };
|
||||
|
||||
gofu = callPackage ../applications/misc/gofu { };
|
||||
|
||||
godns = callPackage ../tools/networking/godns { };
|
||||
|
|
@ -1293,6 +1295,8 @@ with pkgs;
|
|||
|
||||
aldo = callPackage ../applications/radio/aldo { };
|
||||
|
||||
alglib = callPackage ../development/libraries/alglib { };
|
||||
|
||||
almanah = callPackage ../applications/misc/almanah { };
|
||||
|
||||
alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
|
||||
|
|
@ -25464,6 +25468,8 @@ with pkgs;
|
|||
|
||||
haruna = libsForQt5.callPackage ../applications/video/haruna { };
|
||||
|
||||
hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
|
||||
|
||||
helix = callPackage ../applications/editors/helix { };
|
||||
|
||||
icesl = callPackage ../applications/misc/icesl { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue