Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6e1c7f74c7
49 changed files with 887 additions and 464 deletions
27
pkgs/applications/misc/emoji-picker/default.nix
Normal file
27
pkgs/applications/misc/emoji-picker/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "emoji-picker";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bcongdon";
|
||||
repo = "ep";
|
||||
rev = version;
|
||||
hash = "sha256-ElUsmuJ43kOsu4cGvNytM+xHTfuzMo0jcG8Z1cIeHJs=";
|
||||
};
|
||||
|
||||
patches = [./xsys.patch];
|
||||
|
||||
vendorHash = "sha256-Xeh5JKIBiyOXRGVx9udoUNs+Wv49BMyFvmnAbDfG3rA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI Emoji Picker";
|
||||
homepage = "https://github.com/bcongdon/ep";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
mainProgram = "ep";
|
||||
};
|
||||
}
|
||||
63
pkgs/applications/misc/emoji-picker/xsys.patch
Normal file
63
pkgs/applications/misc/emoji-picker/xsys.patch
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
diff --git a/go.mod b/go.mod
|
||||
index ce4c67d..fcd88f6 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,12 +1,22 @@
|
||||
module github.com/bcongdon/ep
|
||||
|
||||
-go 1.12
|
||||
+go 1.17
|
||||
|
||||
require (
|
||||
github.com/atotto/clipboard v0.1.2
|
||||
github.com/bcongdon/emoji-ordering v0.0.0-20201127221446-8e57a6480ccf
|
||||
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591
|
||||
github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893
|
||||
- github.com/stretchr/testify v1.6.1 // indirect
|
||||
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392
|
||||
)
|
||||
+
|
||||
+require (
|
||||
+ github.com/gdamore/encoding v1.0.0 // indirect
|
||||
+ github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
|
||||
+ github.com/mattn/go-runewidth v0.0.9 // indirect
|
||||
+ github.com/rivo/uniseg v0.2.0 // indirect
|
||||
+ github.com/stretchr/testify v1.6.1 // indirect
|
||||
+ golang.org/x/sys v0.1.0 // indirect
|
||||
+ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 // indirect
|
||||
+ golang.org/x/text v0.3.3 // indirect
|
||||
+)
|
||||
diff --git a/go.sum b/go.sum
|
||||
index 3479558..cf61f93 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -10,7 +10,6 @@ github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7N
|
||||
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
|
||||
github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
|
||||
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||
-github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
|
||||
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
|
||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
@@ -28,19 +27,17 @@ golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 h1:xYJJ3S178yv++9zXV/hnr2
|
||||
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
-golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
|
||||
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg=
|
||||
golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
||||
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
, pkgs
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, patchelf
|
||||
|
||||
# build time
|
||||
, autoconf
|
||||
|
|
@ -101,7 +102,7 @@
|
|||
# WARNING: NEVER set any of the options below to `true` by default.
|
||||
# Set to `!privacySupport` or `false`.
|
||||
|
||||
, crashreporterSupport ? !privacySupport
|
||||
, crashreporterSupport ? !privacySupport, curl
|
||||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, mlsAPISupport ? geolocationSupport
|
||||
|
|
@ -263,7 +264,7 @@ buildStdenv.mkDerivation ({
|
|||
which
|
||||
wrapGAppsHook
|
||||
]
|
||||
++ lib.optionals crashreporterSupport [ dump_syms ]
|
||||
++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
|
||||
++ lib.optionals pgoSupport [ xvfb-run ]
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
|
|
@ -534,6 +535,10 @@ buildStdenv.mkDerivation ({
|
|||
}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString crashreporterSupport ''
|
||||
patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
# Some basic testing
|
||||
|
|
|
|||
30
pkgs/applications/networking/cluster/inframap/default.nix
Normal file
30
pkgs/applications/networking/cluster/inframap/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "inframap";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cycloidio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ol2FkCP7Wq7FcwOaDw9d20v4jkNIfewdMErz/kJR0/g=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/cycloidio/inframap/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-fD/u0gYfbhyYWjXtBDtL7zWRu7b7mzpLPEjB+ictP6o=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read your tfstate or HCL to generate a graph specific for each provider, showing only the resources that are most important/relevant.";
|
||||
homepage = "https://github.com/cycloidio/inframap";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
|
|
@ -74,7 +74,7 @@ let
|
|||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -83,7 +83,7 @@ env.mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1ji9351vcvydkcrdwqx22j1nhl9vysd6ajvghaqxdirvqypiygj0";
|
||||
sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,18 +10,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calcmysky";
|
||||
version = "0.1.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "10110111";
|
||||
repo = "CalcMySky";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48=";
|
||||
hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
buildInputs = [ glm eigen qtbase ];
|
||||
|
||||
cmakeFlags = [ "-DQT_VERSION=6" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib;{
|
||||
|
|
|
|||
|
|
@ -3,13 +3,15 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, perl
|
||||
, wrapGAppsHook
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qtlocation
|
||||
, qtpositioning
|
||||
, qtmultimedia
|
||||
, qtscript
|
||||
, qtserialport
|
||||
, qttranslations
|
||||
, qtwayland
|
||||
, qtwebengine
|
||||
, calcmysky
|
||||
, qxlsx
|
||||
|
|
@ -19,28 +21,30 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stellarium";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE=";
|
||||
sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
perl
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtcharts
|
||||
qtlocation
|
||||
qtpositioning
|
||||
qtmultimedia
|
||||
qtscript
|
||||
qtserialport
|
||||
qttranslations
|
||||
qtwayland
|
||||
qtwebengine
|
||||
calcmysky
|
||||
qxlsx
|
||||
|
|
@ -54,6 +58,12 @@ stdenv.mkDerivation rec {
|
|||
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free open-source planetarium";
|
||||
homepage = "https://stellarium.org/";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.1.4";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA=";
|
||||
sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA=";
|
||||
sha256 = "sha256-Hy2QRGuXSidUrJ7kb1AhkaLeaevhhleGE8QvnNZf/L0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM=";
|
||||
cargoSha256 = "sha256-5EJGUi74hrd3vifJ3r2vO0Qq2YEt0stXSi+RAGTme2I=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "closure-compiler";
|
||||
version = "20221004";
|
||||
version = "20221102";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
|
||||
sha256 = "sha256-r2m5nfNWg5aGJBRLVZwmgilpgc4epLWY4qx34pRIi6Q=";
|
||||
sha256 = "sha256-xaVAmt2GVywRVB7n6mqKqsYlfEAjRZEnfspf9c1Qluc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ let
|
|||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.27.1";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lwLzMUMHwheZHrjPttdk6TFsjt8SymHkBMtXTbr/nYE=";
|
||||
sha256 = "sha256-i6osx4j1YVAYaVVdEQ4ImfaIvXw5jPYmgpEYz6XGkY8=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-kEM6eCWTI+XKs58cVhNfjJsIwC3r1ATy1sFbjtorgGY=";
|
||||
vendorSha256 = "sha256-NIqsYAnW9elprKWjqmNIsF452thuWT1i8YNPUuuwjVs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,8 @@
|
|||
let
|
||||
pio-pkgs = pkgs:
|
||||
let
|
||||
python = pkgs.python3.override {
|
||||
packageOverrides = self: super: {
|
||||
platformio = self.callPackage ./core.nix { inherit version src; };
|
||||
};
|
||||
};
|
||||
python = pkgs.python3;
|
||||
platformio = python.pkgs.callPackage ./core.nix { inherit version src; };
|
||||
in
|
||||
(with pkgs; [
|
||||
zlib
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
|
||||
substituteInPlace setup.py \
|
||||
--replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \
|
||||
--replace 'aiofiles==0.8.*' 'aiofiles==22.1.*' \
|
||||
--replace 'wsproto==' 'wsproto>='
|
||||
'';
|
||||
|
||||
|
|
@ -147,6 +148,5 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
homepage = "https://platformio.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mog makefu ];
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@
|
|||
, writeText
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-libav
|
||||
, gst-vaapi
|
||||
, gtk3
|
||||
, dconf
|
||||
, buildPackages
|
||||
|
|
@ -51,6 +54,7 @@ let
|
|||
inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
|
||||
patches = [
|
||||
./patches/qtbase-qmake-pkg-config.patch
|
||||
./patches/qtbase-tzdir.patch
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -66,7 +70,7 @@ let
|
|||
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
|
||||
qtlottie = callPackage ./modules/qtlottie.nix { };
|
||||
qtmultimedia = callPackage ./modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base;
|
||||
inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
};
|
||||
qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
|
||||
qtpositioning = callPackage ./modules/qtpositioning.nix { };
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
, alsa-lib
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-libav
|
||||
, gst-vaapi
|
||||
, libpulseaudio
|
||||
, wayland
|
||||
, elfutils
|
||||
|
|
@ -20,5 +23,6 @@ qtModule {
|
|||
pname = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ];
|
||||
buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ];
|
||||
propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
|
||||
}
|
||||
|
|
|
|||
48
pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch
Normal file
48
pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
index 627a4a81..a5f50acc 100644
|
||||
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
|
||||
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
|
||||
static QTzTimeZoneHash loadTzTimeZones()
|
||||
{
|
||||
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
+ // Try TZDIR first, in case we're running on NixOS.
|
||||
+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
|
||||
+ // Fallback to traditional paths in case we are not on NixOS.
|
||||
+ if (!QFile::exists(path))
|
||||
+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
if (!QFile::exists(path))
|
||||
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
|
||||
|
||||
@@ -727,18 +731,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
|
||||
if (!tzif.open(QIODevice::ReadOnly))
|
||||
return ret;
|
||||
} else {
|
||||
- // Open named tz, try modern path first, if fails try legacy path
|
||||
- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
|
||||
+ // Try TZDIR first, in case we're running on NixOS
|
||||
+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
|
||||
if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
|
||||
+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
|
||||
- auto check = validatePosixRule(ianaId);
|
||||
- if (check.isValid) {
|
||||
- ret.m_hasDst = check.hasDst;
|
||||
- ret.m_posixRule = ianaId;
|
||||
+ tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
|
||||
+ if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
|
||||
+ auto check = validatePosixRule(ianaId);
|
||||
+ if (check.isValid) {
|
||||
+ ret.m_hasDst = check.hasDst;
|
||||
+ ret.m_posixRule = ianaId;
|
||||
+ }
|
||||
+ return ret;
|
||||
}
|
||||
- return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY=";
|
||||
hash = "sha256-XBIBI/39l0JOJOX5GChTJ+Snwb9jjfofmM4cAdsV8lg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.19.1";
|
||||
version = "0.19.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "hbldh";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0=";
|
||||
hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jjFYJ6EF4G43EOKCdkE1KQqaV2aGD+HMh1tOxHWUn8k=";
|
||||
hash = "sha256-IaDnQCZJZipiPW6lOLrdxw7QfPx/zlwaizkBxv8I2V8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.11.3";
|
||||
version = "2.13.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-noAGxYaQW9XBlHcHN25V/b2ScpnvjSnKdWVkAY0KbiY=";
|
||||
hash = "sha256-a0R8CefN6gtIYqtNdCW9QKJulsbDnH6dFuUfTp8jUnA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.22.2";
|
||||
version = "3.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-l8HB0gfWM0ABHiIE5Ej6PMvZ7MRRAumUOj5lmSoTbmI=";
|
||||
hash = "sha256-1RHzpCRYU2dUxZLa+zzopHd+xfnq7eWF6HDIkVk+2NY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
version = "3.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
|
|
@ -35,14 +35,8 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
backoff
|
||||
botocore
|
||||
graphql-core
|
||||
requests
|
||||
requests-toolbelt
|
||||
urllib3
|
||||
websockets
|
||||
yarl
|
||||
];
|
||||
|
||||
|
|
@ -54,7 +48,32 @@ buildPythonPackage rec {
|
|||
pytest-console-scripts
|
||||
pytestCheckHook
|
||||
vcrpy
|
||||
];
|
||||
] ++ passthru.optional-dependencies.all;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
aiohttp
|
||||
botocore
|
||||
requests
|
||||
requests-toolbelt
|
||||
urllib3
|
||||
websockets
|
||||
];
|
||||
aiohttp = [
|
||||
aiohttp
|
||||
];
|
||||
requests = [
|
||||
requests
|
||||
requests-toolbelt
|
||||
urllib3
|
||||
];
|
||||
websockets = [
|
||||
websockets
|
||||
];
|
||||
botocore = [
|
||||
botocore
|
||||
];
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C/awtoADq46XMGd+KwTtd1qv257FXkr6YUc/yqCQvHA=";
|
||||
hash = "sha256-q1Cywisxk51vavMz2EwcDQdsBozLJydaWKfuH1SdUFY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.6.4";
|
||||
version = "1.6.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SwGRMYtJ6C91sOlnZl6UclR8jrWex8wqBoOBITZInGk=";
|
||||
hash = "sha256-LVWhHSHiixjZjakXgGnEIcJkQ0+VU3Xhlh8uY76Prxg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mastodon-py";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcy";
|
||||
repo = "Mastodon.py";
|
||||
rev = version;
|
||||
sha256 = "044iqydw69a6xpz2hdjv1fc6a9b7bqdpnh3b33xqbks9d2415ddm";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-C1xkdM47WS31Eh8VXHd49x2QeizZAuvAcSnHGiZPLCE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "moderngl";
|
||||
version = "5.7.0";
|
||||
version = "5.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NDTZ4comjJY/dEvrTdxHR88fQ1lZU2zSWZ43f7YqvT8=";
|
||||
hash = "sha256-sfmCY5Yny1HgZfEN10AE1Ev1EVQ6JE51646DXjoQxyA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,6 +45,9 @@ buildPythonPackage rec {
|
|||
pbr
|
||||
];
|
||||
|
||||
# tests hang for unknown reason and time the build out
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
eventlet
|
||||
fixtures
|
||||
|
|
@ -57,7 +60,10 @@ buildPythonPackage rec {
|
|||
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
|
||||
export LD_PRELOAD=${libredirect}/lib/libredirect.so
|
||||
|
||||
stestr run
|
||||
stestr run -e <(echo "
|
||||
oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn
|
||||
oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n
|
||||
")
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "oslo_concurrency" ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysolcast";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "mcaulifn";
|
||||
repo = "solcast";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iK3WCpl7K/PUccNkOQK7q4k7JjwHAEydU47c8tb4wvc=";
|
||||
hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -12,21 +12,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-fuzzy";
|
||||
version = "unstable-2021-03-31";
|
||||
version = "unstable-2022-11-07";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "92ad3c382ac19707086204ac6cdf6e81353345a7";
|
||||
sha256 = "0q89p385nsg3lymlsqm3mw6y45vgrk6w9p30igbm59b7r9mkgdj8";
|
||||
rev = "d8c45c259d62955004379592e45bc64c8e002fc3";
|
||||
hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ networkx numpy scipy ];
|
||||
checkInputs = [ matplotlib nose pytestCheckHook ];
|
||||
|
||||
# test error: "ValueError: could not convert string to float: '2.6.2'"
|
||||
disabledTestPaths = [ "skfuzzy/control/tests/test_controlsystem.py" ];
|
||||
pythonImportsCheck = [ "skfuzzy" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.19.2";
|
||||
version = "3.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Ldw3mqCYKo+yMGv7gofb895JOfP/AAthJd2uNzAqLkA=";
|
||||
sha256 = "sha256-iWDKF4FZJPL6wHxVbvj2zlY0sqpBMXki9e7uuysX1o0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stevedore";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-miMRGm5hInDFkf0x/zMhxrXz1fPauxQnMXpatgj8Jho=";
|
||||
sha256 = "sha256-AlGKjw1tKb6KRFt/KsY3U/8p6PKi+qAXd1aNVQDXd6Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,38 +2,40 @@
|
|||
, astroid
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, crossplane
|
||||
, fetchFromGitHub
|
||||
, jellyfish
|
||||
, jproperties
|
||||
, luhn
|
||||
, lxml
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-Levenshtein
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whispers";
|
||||
version = "1.5.3";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
owner = "adeptex";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o=";
|
||||
hash = "sha256-vY8ruemRYJ05YtJAYX3TFlp+pRwF7Tkp7eft9e+HrgA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astroid
|
||||
beautifulsoup4
|
||||
crossplane
|
||||
jellyfish
|
||||
jproperties
|
||||
luhn
|
||||
lxml
|
||||
python-Levenshtein
|
||||
pyyaml
|
||||
];
|
||||
|
||||
|
|
|
|||
37
pkgs/development/tools/coder/default.nix
Normal file
37
pkgs/development/tools/coder/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "coder";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RqdnX0oYUmJAzF3FAKHOUNMY5m8FN63c4Z/VBfJrupI=";
|
||||
};
|
||||
|
||||
# integration tests require network access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-3SStGCDpo+AS4PM9mbXM0EjsJ/3CVFQyb/NRK9RSZ3A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd coder \
|
||||
--bash <($out/bin/coder completion bash) \
|
||||
--fish <($out/bin/coder completion fish) \
|
||||
--zsh <($out/bin/coder completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remote development environments on your infrastructure provisioned with Terraform";
|
||||
homepage = "https://coder.com";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
43
pkgs/development/tools/devbox/default.nix
Normal file
43
pkgs/development/tools/devbox/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TxHfgi3/Q4aa5of29OGTs1Qy5PPIK4Gcwd11KJ70NIc=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X go.jetpack.io/devbox/build.Version=${version}"
|
||||
];
|
||||
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-XeoQI5Rel0qP9cjguPqne7pfNdQJKN+uHRZGnrIGtHk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd devbox \
|
||||
--bash <($out/bin/devbox completion bash) \
|
||||
--fish <($out/bin/devbox completion fish) \
|
||||
--zsh <($out/bin/devbox completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Instant, easy, predictable shells and containers.";
|
||||
homepage = "https://www.jetpack.io/devbox";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
97
pkgs/development/tools/fastddsgen/default.nix
Normal file
97
pkgs/development/tools/fastddsgen/default.nix
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk11, git, perl, cmake }:
|
||||
let
|
||||
pname = "fastddsgen";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-DDS-Gen";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-P0Fj8znhky8mTebnoNyojKDdnDowQaGXpX5L0CHcEeU=";
|
||||
};
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
pname = "${pname}-deps";
|
||||
inherit src version;
|
||||
nativeBuildInputs = [ gradle openjdk11 perl ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d);
|
||||
gradle --no-daemon -x submodulesUpdate assemble
|
||||
'';
|
||||
|
||||
# perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-wnnoyaO1QndAYrqmYu1fO6OJrP1NQs8IX4uh37dVntY=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
nativeBuildInputs = [ gradle openjdk11 ];
|
||||
|
||||
# use our offline deps
|
||||
postPatch = ''
|
||||
sed -ie '1i\
|
||||
pluginManagement {\
|
||||
repositories {\
|
||||
maven { url "${deps}" }\
|
||||
}\
|
||||
}' thirdparty/idl-parser/settings.gradle
|
||||
sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" build.gradle
|
||||
sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" thirdparty/idl-parser/build.gradle
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
||||
# Run gradle with daemon to make installPhase faster
|
||||
gradle --offline -x submodulesUpdate assemble
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
gradle --offline -x submodulesUpdate install --install_path=$out
|
||||
|
||||
# Override the default start script to use absolute java path
|
||||
cat <<EOF >$out/bin/fastddsgen
|
||||
#!${runtimeShell}
|
||||
exec ${openjdk11}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@"
|
||||
EOF
|
||||
chmod a+x "$out/bin/fastddsgen"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast-DDS IDL code generator tool";
|
||||
homepage = "https://github.com/eProsima/Fast-DDS-Gen";
|
||||
license = licenses.asl20;
|
||||
longDescription = ''
|
||||
eProsima Fast DDS-Gen is a Java application that generates
|
||||
eProsima Fast DDS C++ or Python source code using the data types
|
||||
defined in an IDL (Interface Definition Language) file. This
|
||||
generated source code can be used in any Fast DDS application in
|
||||
order to define the data type of a topic, which will later be
|
||||
used to publish or subscribe.
|
||||
'';
|
||||
maintainers = with maintainers; [ wentasah ];
|
||||
platforms = openjdk11.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,27 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-mockery";
|
||||
version = "2.9.2";
|
||||
version = "2.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vektra";
|
||||
repo = "mockery";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+r9he3rlANGusv0vIZPSninaouMftRsfJWnm3VngcXU=";
|
||||
sha256 = "sha256-FgDjuiBFzOaT8GlJYI7xNfxC9uhyZtBAIBFXZgW0BDU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
|
||||
preCheck = ''
|
||||
substituteInPlace ./pkg/generator_test.go --replace 0.0.0-dev ${version}
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "github.com/vektra/mockery/v2/pkg/config.SemVer=v${version}"
|
||||
];
|
||||
|
||||
CGO_ENABLED = false;
|
||||
|
||||
vendorSha256 = "sha256-+40n7OoP8TLyjj4ehBHOD6/SqzJMCHsISE0FrXUL3Q8=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vektra/mockery";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "12.12.1";
|
||||
version = "12.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6h/TV9Ddv+1pYPV7ZvOfEOOvbocRpLXdeR6EchTvV/A=";
|
||||
sha256 = "sha256-bGg0UqqplJpsJ2xOHmu6y8ixGxdDkWwZyRrgzrNBlIY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2022-10-29";
|
||||
version = "unstable-2022-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "448d830de4867c32eaa57911a392e47c81d1a0e0";
|
||||
sha256 = "sha256-Ce6WO01gN8Ip5smAyGNEg87vyFXFDIq6ilHTbEStm/c=";
|
||||
rev = "40d66ee25a12657c36b9cef67293fc4c296a144f";
|
||||
sha256 = "sha256-f+xUifb7TlaXONNQfFZpnuYDTxgkelL+Knc+X8vc3Gg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DR/k6g2uWCOhM20qROybsH4gTvH+Kd+jaDHGZ4loK7g=";
|
||||
cargoSha256 = "sha256-qRFJJX/5hgveGAQtW0HJYAPZjHRlTHalvqSRdEjtYiU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.15";
|
||||
version = "0.9.16";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jPvQKc5jDWHIOmJPpgsR9usYzjjCKlSL04N6Opgyiac=";
|
||||
sha256 = "sha256-V4rCtqt3HmvAtanithYAJv9FMt/g2R5JCJUwKITnoV4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tmBgmIwFW/0+WQUEJFf6rFtRhoGn41BvZUIng8MsxQM=";
|
||||
cargoHash = "sha256-IGxKIgV7UtPrNAFEzKNJfPiSZ8lW2S2M7AJ7sigCWzQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage workspace-hack packages to speed up builds in large workspaces.";
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ferretdb";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b12188yIEv2Ne0jhrPh6scvJyu+SipYvySe81Z+gYrc=";
|
||||
sha256 = "sha256-oSNE7JJwni+X5AiAmHLuxVI9gMh3AT84xejWgmJSlzk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > internal/util/version/gen/version.txt
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-Tm7uuvs/OyhO1cjtwtiaokjyXF1h01Ev88ofT9gpWXs=";
|
||||
vendorSha256 = "sha256-H/EXUPNMTD6mgcUFupxL5wTLHvAlH5L6bv2GmvsbKms=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,32 +1,32 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "405.0.0";
|
||||
version = "408.0.1";
|
||||
googleCloudSdkPkgs = {
|
||||
x86_64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-x86_64.tar.gz";
|
||||
sha256 = "07vy2driy3484g8k4kq7w7da37wqvp357nzdqcnk2rdxd7jm8pq0";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-408.0.1-linux-x86_64.tar.gz";
|
||||
sha256 = "0m8zbyavvzdg2bjiafz3qdl50ss0fx4z3gf06mvcx9hzikzw31yl";
|
||||
};
|
||||
x86_64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-darwin-x86_64.tar.gz";
|
||||
sha256 = "1k8fa1hgs1iircqkvq2m4v394p315ii0g6ij851vxmha06fn0mf3";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-408.0.1-darwin-x86_64.tar.gz";
|
||||
sha256 = "1d4shdqaqhah28qcdalgqhc2hlh8p12ymslp2kdq3g6g34hlka2r";
|
||||
};
|
||||
aarch64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-arm.tar.gz";
|
||||
sha256 = "0qxyi93q7xxxvjj2nrdc1bh47rravi6ah13bscaami2fw1xc6w4s";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-408.0.1-linux-arm.tar.gz";
|
||||
sha256 = "0djaq9i9dfggg3fzlqkghb0ccicxc5n78phxfa2mda9vvgvn2zn3";
|
||||
};
|
||||
aarch64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-darwin-arm.tar.gz";
|
||||
sha256 = "133hr5qlp07whzm640mr87z29gcx51pxnm4gqbknwaz2kfw5m4d5";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-408.0.1-darwin-arm.tar.gz";
|
||||
sha256 = "0sf9j37i5pch37iz470hwqw3pcwlzw3kiryfqr4nisavm9f1i624";
|
||||
};
|
||||
i686-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-405.0.0-linux-x86.tar.gz";
|
||||
sha256 = "0qxcs4pxv3vjc3na54yzqhc12gxbi9w80rb1nvxn6r39v8d195hk";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-408.0.1-linux-x86.tar.gz";
|
||||
sha256 = "01y2g92qkbvaj93js49i8z8hjw3qhabj092zn8ngcfnvlcmb9x49";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
|
|||
|
||||
# Version of Google Cloud SDK from
|
||||
# https://cloud.google.com/sdk/docs/release-notes
|
||||
VERSION="405.0.0"
|
||||
VERSION="408.0.1"
|
||||
|
||||
function genMainSrc() {
|
||||
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pgmetrics";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidloop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cvx3Lc4FH6RX9UrjX7L3FSt+CcAWieBRTFT1CsLkdFg=";
|
||||
sha256 = "sha256-+LLAZeK4sV7oEeN3zNqWBkbCLaaGgJMLidZqlTQeymo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY=";
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.10.4";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z67imUrs/NUoBfbqIBmfTNMb1+X1NpYX4KxB5jU4C9c=";
|
||||
sha256 = "sha256-lqFoqLqFp019rJX2WYEEG0FozgrRP35UDE7BRReh1Y4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk=";
|
||||
vendorSha256 = "sha256-owksab5MgRomiBp5p48VILJj+CmgCLDkB1sOHRNA3uQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, ninja
|
||||
, wrapQtAppsHook
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
|
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
|
@ -33,13 +34,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=misleading-indentation"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI Firewall Management Application";
|
||||
homepage = "https://github.com/fwbuilder/fwbuilder";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
longDescription = ''
|
||||
Firewall Builder is a GUI firewall management application for iptables,
|
||||
PF, Cisco ASA/PIX/FWSM, Cisco router ACL and more. Firewall configuration
|
||||
data is stored in a central file that can scale to hundreds of firewalls
|
||||
managed from a single UI.
|
||||
'';
|
||||
homepage = "https://github.com/fwbuilder/fwbuilder";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.elatov ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.7.8";
|
||||
version = "2.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FIWhWW2jOQF4OztLov67+RuhDnpRyD7EN27Gcr4Wa90=";
|
||||
sha256 = "sha256-cAXIb8C14cpBKLpvQfJT2JbSy7Jf3SL4XyXVISoI8vE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA=";
|
||||
|
|
|
|||
|
|
@ -16623,6 +16623,8 @@ with pkgs;
|
|||
|
||||
coan = callPackage ../development/tools/analysis/coan { };
|
||||
|
||||
coder = callPackage ../development/tools/coder { };
|
||||
|
||||
compile-daemon = callPackage ../development/tools/compile-daemon { };
|
||||
|
||||
complexity = callPackage ../development/tools/misc/complexity { };
|
||||
|
|
@ -16729,6 +16731,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
devbox = callPackage ../development/tools/devbox { };
|
||||
|
||||
libcxx = llvmPackages.libcxx;
|
||||
libcxxabi = llvmPackages.libcxxabi;
|
||||
|
||||
|
|
@ -16918,6 +16922,8 @@ with pkgs;
|
|||
|
||||
faas-cli = callPackage ../development/tools/faas-cli { };
|
||||
|
||||
fastddsgen = callPackage ../development/tools/fastddsgen { };
|
||||
|
||||
findbugs = callPackage ../development/tools/analysis/findbugs { };
|
||||
|
||||
findnewest = callPackage ../development/tools/misc/findnewest { };
|
||||
|
|
@ -21967,7 +21973,7 @@ with pkgs;
|
|||
inherit newScope;
|
||||
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3 ninja;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
|
||||
inherit buildPackages;
|
||||
cmake = cmake.overrideAttrs (attrs: {
|
||||
patches = attrs.patches ++ [
|
||||
|
|
@ -25479,8 +25485,7 @@ with pkgs;
|
|||
go-migrate = callPackage ../development/tools/go-migrate { };
|
||||
|
||||
go-mockery = callPackage ../development/tools/go-mockery {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
gomacro = callPackage ../development/tools/gomacro { };
|
||||
|
|
@ -27571,7 +27576,7 @@ with pkgs;
|
|||
inherit (gnome2) libglade;
|
||||
};
|
||||
|
||||
calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { };
|
||||
calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
|
||||
|
||||
calcurse = callPackage ../applications/misc/calcurse { };
|
||||
|
||||
|
|
@ -28008,6 +28013,8 @@ with pkgs;
|
|||
|
||||
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
|
||||
|
||||
emoji-picker = callPackage ../applications/misc/emoji-picker {};
|
||||
|
||||
exploitdb = callPackage ../tools/security/exploitdb { };
|
||||
|
||||
evilwm = callPackage ../applications/window-managers/evilwm {
|
||||
|
|
@ -29551,6 +29558,8 @@ with pkgs;
|
|||
|
||||
imhex = callPackage ../applications/editors/imhex { };
|
||||
|
||||
inframap = callPackage ../applications/networking/cluster/inframap {};
|
||||
|
||||
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
|
||||
|
||||
inklingreader = callPackage ../tools/misc/inklingreader { };
|
||||
|
|
@ -36197,7 +36206,7 @@ with pkgs;
|
|||
|
||||
sq = callPackage ../development/tools/sq { };
|
||||
|
||||
stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { };
|
||||
stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
|
||||
|
||||
stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ in
|
|||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qxlsx = callPackage ../development/libraries/qxlsx { };
|
||||
|
||||
poppler = callPackage ../development/libraries/poppler {
|
||||
lcms = pkgs.lcms2;
|
||||
qt6Support = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue