mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
261638938e
39 changed files with 3829 additions and 4416 deletions
|
|
@ -32,7 +32,7 @@ fix-misc-xml:
|
|||
.PHONY: clean
|
||||
clean:
|
||||
rm -f ${MD_TARGETS} doc-support/result .version manual-full.xml functions/library/locations.xml functions/library/generated
|
||||
rm -rf ./out/ ./highlightjs
|
||||
rm -rf ./out/ ./highlightjs ./media
|
||||
|
||||
.PHONY: validate
|
||||
validate: manual-full.xml doc-support/result
|
||||
|
|
|
|||
|
|
@ -1913,6 +1913,16 @@
|
|||
githubId = 3392199;
|
||||
name = "Calum MacRae";
|
||||
};
|
||||
cmars = {
|
||||
email = "nix@cmars.tech";
|
||||
github = "cmars";
|
||||
githubId = 23741;
|
||||
name = "Casey Marshall";
|
||||
keys = [{
|
||||
longkeyid = "rsa3072/0x6DEC2758ACD5A973";
|
||||
fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973";
|
||||
}];
|
||||
};
|
||||
cmcdragonkai = {
|
||||
email = "roger.qiu@matrix.ai";
|
||||
github = "cmcdragonkai";
|
||||
|
|
@ -4619,12 +4629,6 @@
|
|||
githubId = 1982341;
|
||||
name = "Jack Cummings";
|
||||
};
|
||||
jD91mZM2 = {
|
||||
email = "me@krake.one";
|
||||
github = "jD91mZM2";
|
||||
githubId = 12830969;
|
||||
name = "jD91mZM2";
|
||||
};
|
||||
jdagilliland = {
|
||||
email = "jdagilliland@gmail.com";
|
||||
github = "jdagilliland";
|
||||
|
|
|
|||
|
|
@ -70,6 +70,26 @@ in
|
|||
type = types.bool;
|
||||
description = "Whether the Synergy server should be started automatically.";
|
||||
};
|
||||
tls = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether TLS encryption should be used.
|
||||
|
||||
Using this requires a TLS certificate that can be
|
||||
generated by starting the Synergy GUI once and entering
|
||||
a valid product key.
|
||||
'';
|
||||
};
|
||||
|
||||
cert = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "~/.synergy/SSL/Synergy.pem";
|
||||
description = "The TLS certificate to use for encryption.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -95,7 +115,7 @@ in
|
|||
description = "Synergy server";
|
||||
wantedBy = optional cfgS.autoStart "graphical-session.target";
|
||||
path = [ pkgs.synergy ];
|
||||
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }'';
|
||||
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert=${cfgS.tls.cert}")}'';
|
||||
serviceConfig.Restart = "on-failure";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
|
|
@ -29,6 +30,14 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-ABI-breakage-from-libadwaita.patch";
|
||||
url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch";
|
||||
sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271
|
||||
description = "Two-factor authentication code generator for GNOME";
|
||||
homepage = "https://gitlab.gnome.org/World/Authenticator";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
vendorSha256 = null;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
|||
49
pkgs/applications/networking/cluster/kubebuilder/default.nix
Normal file
49
pkgs/applications/networking/cluster/kubebuilder/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, git
|
||||
, go
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a";
|
||||
};
|
||||
vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n";
|
||||
|
||||
subPackages = ["cmd" "pkg/..."];
|
||||
|
||||
preBuild = ''
|
||||
export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \
|
||||
-X main.goos=$GOOS \
|
||||
-X main.goarch=$GOARCH \
|
||||
-X main.gitCommit=v${version} \
|
||||
-X main.buildDate=v${version}")
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/kubebuilder
|
||||
wrapProgram $out/bin/kubebuilder \
|
||||
--prefix PATH : ${lib.makeBinPath [ go ]}
|
||||
'';
|
||||
|
||||
allowGoReference = true;
|
||||
nativeBuildInputs = [ makeWrapper git ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kubernetes-sigs/kubebuilder";
|
||||
description = "SDK for building Kubernetes APIs using CRDs";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmars ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ buildGoModule rec {
|
|||
sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq";
|
||||
};
|
||||
|
||||
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "kubectl plugin for retrieving resource example YAMLs";
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preBuild = ''
|
||||
FPCDIR=${fpc}/lib/fpc/${fpc.version} fpcmake -w
|
||||
lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/ubuntu/yaru";
|
||||
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.jD91mZM2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,6 +176,8 @@ let
|
|||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
isBuildPythonPackage = python.meta.platforms;
|
||||
} // lib.optionalAttrs (attrs?pname) {
|
||||
mainProgram = attrs.pname;
|
||||
} // meta;
|
||||
} // lib.optionalAttrs (attrs?checkPhase) {
|
||||
# If given use the specified checkPhase, otherwise use the setup hook.
|
||||
|
|
|
|||
|
|
@ -2,35 +2,40 @@
|
|||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, docbook-xsl-nons
|
||||
, gi-docgen
|
||||
, gtk-doc
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, sassc
|
||||
, vala
|
||||
, gobject-introspection
|
||||
, fribidi
|
||||
, gtk4
|
||||
, xvfb-run
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libadwaita";
|
||||
version = "unstable-2021-05-01";
|
||||
version = "1.0.0-alpha.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe";
|
||||
sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q";
|
||||
rev = version;
|
||||
sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook-xsl-nons
|
||||
gi-docgen
|
||||
gtk-doc
|
||||
libxml2 # for xmllint
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
@ -43,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
fribidi
|
||||
gobject-introspection
|
||||
gtk4
|
||||
];
|
||||
|
|
@ -57,6 +63,10 @@ stdenv.mkDerivation rec {
|
|||
xvfb-run meson test
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/share/{doc,gtk-doc}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to help with developing UI for mobile devices using GTK/GNOME";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libadwaita";
|
||||
|
|
|
|||
7820
pkgs/development/node-packages/node-packages.nix
generated
7820
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-client";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pvx2qb8gs2f7bb8xxq689ydxirsl3bcgsbi5qv5klc4c051dj8i";
|
||||
sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-generic-client";
|
||||
version = "0.4";
|
||||
version = "0.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-generic-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i4shx6fvwibx0hlfmd0dyq2n5lkrqwmlm0l476fdb9bw5lkaiy0";
|
||||
sha256 = "sha256-XVejBbVilq8zrmuyBUd0mNPZ4qysSg9lAe/lhbKT+qs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
23
pkgs/development/python-modules/google-re2/default.nix
Normal file
23
pkgs/development/python-modules/google-re2/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildPythonPackage, pythonOlder, fetchPypi, pybind11, re2, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-re2";
|
||||
version = "0.1.20210601";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f1ql95f97ss8i0rn1c37kgi0qrf1nq9b3q8xbq9x3gwg7xgzi71";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pybind11 re2 six
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "RE2 Python bindings";
|
||||
homepage = "https://github.com/google/re2";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ alexbakker ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/pymeteoclimatic/default.nix
Normal file
39
pkgs/development/python-modules/pymeteoclimatic/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymeteoclimatic";
|
||||
version = "0.0.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrianmo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ys0d6jy7416gbsd0pqgvm5ygzn36pjdaklqi4q56vsb13zn7y0h";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
lxml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "meteoclimatic" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper around the Meteoclimatic service";
|
||||
homepage = "https://github.com/adrianmo/pymeteoclimatic";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-igraph";
|
||||
version = "0.9.4";
|
||||
version = "0.9.6";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "igraph";
|
||||
repo = "python-igraph";
|
||||
rev = version;
|
||||
sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo=";
|
||||
sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
49
pkgs/development/tools/misc/polylith/default.nix
Normal file
49
pkgs/development/tools/misc/polylith/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib, stdenv, fetchurl, jre, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polylith";
|
||||
version = "0.1.0-alpha9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
|
||||
sha256 = "0mjn0fibj7z8wihk5frhyd5ai2bmzm909701sphjs7j9lgg0gc4k";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
||||
cat > "$out/bin/poly" <<EOF
|
||||
#!${runtimeShell}
|
||||
ARGS=""
|
||||
while [ "\$1" != "" ] ; do
|
||||
ARGS="\$ARGS \$1"
|
||||
shift
|
||||
done
|
||||
exec "${jre}/bin/java" "-jar" "${src}" \$ARGS
|
||||
EOF
|
||||
chmod a+x $out/bin/poly
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/poly help | fgrep -q '${version}'
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool used to develop Polylith based architectures in Clojure";
|
||||
homepage = "https://github.com/polyfy/polylith";
|
||||
license = licenses.epl10;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
platforms = jre.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jD91mZM2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
|
|||
in rec {
|
||||
|
||||
stable = fetchurl rec {
|
||||
version = "6.0";
|
||||
version = "6.0.1";
|
||||
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY=";
|
||||
sha256 = "sha256-Ogmh7Jyh6h1PcpWY14JxeXP09kRYZn+7dX0SLzoB2ko=";
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vscode-lldb",
|
||||
"version": "1.6.1",
|
||||
"version": "1.6.4",
|
||||
"dependencies": {
|
||||
"string-argv": "^0.3.1",
|
||||
"yaml": "^1.10.0",
|
||||
|
|
@ -9,16 +9,15 @@
|
|||
"@types/node": "^8.10.50",
|
||||
"@types/mocha": "^7.0.1",
|
||||
"@types/yauzl": "^2.9.0",
|
||||
"@types/json5": "^0.0.30",
|
||||
"typescript": "^3.7.0",
|
||||
"mocha": "^7.0.1",
|
||||
"typescript": "^4.2.4",
|
||||
"mocha": "^8.4.0",
|
||||
"source-map-support": "^0.5.12",
|
||||
"memory-streams": "^0.1.3",
|
||||
"vscode-debugprotocol": "^1.35.0",
|
||||
"vscode-debugadapter-testsupport": "^1.35.0",
|
||||
"vsce": "^1.73.0",
|
||||
"webpack": "^4.39.1",
|
||||
"webpack-cli": "^3.3.7",
|
||||
"ts-loader": "^6.2.1"
|
||||
"vscode-debugprotocol": "^1.47.0",
|
||||
"vscode-debugadapter-testsupport": "^1.47.0",
|
||||
"vsce": "=1.88.0",
|
||||
"webpack": "^5.37.1",
|
||||
"webpack-cli": "^4.7.0",
|
||||
"ts-loader": "^8.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 890abd4..157a8a1 100644
|
||||
index 37745b5..cad11a0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -16,13 +16,6 @@ endif()
|
||||
set(VERSION "${VERSION}${VERSION_SUFFIX}")
|
||||
message("Version ${VERSION}")
|
||||
|
||||
|
||||
-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files")
|
||||
-if (LLDB_PACKAGE)
|
||||
- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}")
|
||||
|
|
@ -14,15 +14,15 @@ index 890abd4..157a8a1 100644
|
|||
-endif()
|
||||
-
|
||||
set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
|
||||
|
||||
|
||||
# General OS-specific definitions
|
||||
@@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
||||
configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
|
||||
-# Run 'npm install'
|
||||
-execute_process(
|
||||
- COMMAND ${NPM} install
|
||||
- COMMAND ${NPM} ci # like install, but actually respects package-lock file.
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
- RESULT_VARIABLE Result
|
||||
-)
|
||||
|
|
@ -32,3 +32,5 @@ index 890abd4..157a8a1 100644
|
|||
-
|
||||
# Copy it back, so we can commit the lock file.
|
||||
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, callPackage
|
||||
, nodePackages, cmake, nodejs, unzip, python3
|
||||
}:
|
||||
assert lib.versionAtLeast python3.version "3.5";
|
||||
let
|
||||
publisher = "vadimcn";
|
||||
pname = "vscode-lldb";
|
||||
version = "1.6.1";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
repo = "vscode-lldb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M=";
|
||||
};
|
||||
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
|
|
@ -24,7 +23,7 @@ let
|
|||
# It will pollute the build environment of `buildRustPackage`.
|
||||
cargoPatches = [ ./reset-cargo-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-vcL/nSGhyE0INQVWxEIpYwXmnOl1soBn+mymZr1FaSM=";
|
||||
cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -71,8 +70,10 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -p $ext/{adapter,formatters}
|
||||
mv -t $ext vsix-extracted/extension/*
|
||||
cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py
|
||||
wrapProgram $ext/adapter/codelldb \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
cp -t $ext/formatters ../formatters/*.py
|
||||
ln -s ${lldb} $ext/lldb
|
||||
ln -s ${lldb.lib} $ext/lldb
|
||||
# Mark that all components are installed.
|
||||
touch $ext/platform.ok
|
||||
|
||||
|
|
@ -80,7 +81,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
# `adapter` will find python binary and libraries at runtime.
|
||||
fixupPhase = ''
|
||||
postFixup = ''
|
||||
wrapProgram $out/$installPrefix/adapter/codelldb \
|
||||
--prefix PATH : "${python3}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${python3}/lib"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Patched lldb for Rust language support.
|
||||
{ lldb_11, fetchFromGitHub }:
|
||||
{ lldb_12, fetchFromGitHub }:
|
||||
let
|
||||
llvmSrc = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
repo = "llvm-project";
|
||||
rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242";
|
||||
sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ=";
|
||||
rev = "f2e9ff34256cd8c6feaf14359f88ad3f538ed687";
|
||||
sha256 = "sha256-5UsCBu3rtt+l2HZiCswoQJPPh8T6y471TBF4AypdF9I=";
|
||||
};
|
||||
in lldb_11.overrideAttrs (oldAttrs: {
|
||||
in lldb_12.overrideAttrs (oldAttrs: {
|
||||
src = "${llvmSrc}/lldb";
|
||||
|
||||
passthru = (oldAttrs.passthru or {}) // {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
diff --git a/.cargo/config b/.cargo/config
|
||||
index c3c75e4..e69de29 100644
|
||||
--- a/.cargo/config
|
||||
+++ b/.cargo/config
|
||||
@@ -1,8 +0,0 @@
|
||||
@@ -1,14 +0,0 @@
|
||||
-[build]
|
||||
-target-dir = "build/target"
|
||||
-
|
||||
-[target.armv7-unknown-linux-gnueabihf]
|
||||
-linker = "arm-linux-gnueabihf-gcc"
|
||||
-rustflags = [
|
||||
- "-C", "link-arg=-fuse-ld=lld",
|
||||
- "-C", "link-arg=--target=armv7-unknown-linux-gnueabihf",
|
||||
-]
|
||||
-
|
||||
-[target.aarch64-unknown-linux-gnu]
|
||||
-linker = "aarch64-linux-gnu-gcc"
|
||||
-rustflags = [
|
||||
- "-C", "link-arg=-fuse-ld=lld",
|
||||
- "-C", "link-arg=--target=aarch64-unknown-linux-gnu",
|
||||
-]
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ version="$1"
|
|||
|
||||
sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile"
|
||||
srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules)
|
||||
sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile"
|
||||
sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile"
|
||||
cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
|
||||
sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"
|
||||
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@
|
|||
"met_eireann" = ps: with ps; [ pymeteireann ];
|
||||
"meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api
|
||||
"meteoalarm" = ps: with ps; [ meteoalertapi ];
|
||||
"meteoclimatic" = ps: with ps; [ ]; # missing inputs: pymeteoclimatic
|
||||
"meteoclimatic" = ps: with ps; [ pymeteoclimatic ];
|
||||
"metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
|
||||
"mfi" = ps: with ps; [ ]; # missing inputs: mficlient
|
||||
"mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor
|
||||
|
|
|
|||
|
|
@ -471,6 +471,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"meraki"
|
||||
"met"
|
||||
"met_eireann"
|
||||
"meteoclimatic"
|
||||
"microsoft_face"
|
||||
"microsoft_face_detect"
|
||||
"microsoft_face_identify"
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss-plugin-tumblr-gdpr";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GregThib";
|
||||
repo = "ttrss-tumblr-gdpr";
|
||||
rev = "v${version}";
|
||||
sha256 = "09cbghi5b6ww4i5677i39qc9rhpq70xmygp0d7x30239r3i23rpq";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/tumblr_gdpr
|
||||
|
||||
cp init.php $out/tumblr_gdpr
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for TT-RSS to workaround GDPR in Europe";
|
||||
longDescription = ''
|
||||
Plugin for TT-RSS to workaround GDPR in Europe.
|
||||
|
||||
The name of the plugin in TT-RSS is 'tumblr_gdpr'.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr";
|
||||
maintainers = with maintainers; [ das_j ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "xautolock rewrite in Rust, with a few extra features";
|
||||
homepage = "https://github.com/jD91mZM2/xidlehook";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jD91mZM2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "powerline-shell rewritten in Rust, inspired by powerline-go";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jD91mZM2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Play an image/video in your terminal";
|
||||
homepage = "https://jd91mzm2.github.io/termplay/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jD91mZM2 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildGoModule rec {
|
|||
sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw";
|
||||
};
|
||||
|
||||
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small utility to create JSON objects";
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripgrep";
|
||||
version = "12.1.1";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BurntSushi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps";
|
||||
sha256 = "0pdcjzfi0fclbzmmf701fdizb95iw427vy3m1svy6gdn2zwj3ldr";
|
||||
};
|
||||
|
||||
cargoSha256 = "1nyfxma2vwfq6r614ng8qq8vanb540a5z0ibs85wz5sjm3hp1l4f";
|
||||
cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
|
||||
|
||||
cargoBuildFlags = lib.optional withPCRE2 "--features pcre2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1003,6 +1003,8 @@ mapAliases ({
|
|||
/* Added 2021-01-02 */
|
||||
ttyrec = ovh-ttyrec;
|
||||
|
||||
tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12
|
||||
|
||||
zplugin = zinit; # Added 2021-01-30
|
||||
|
||||
posix_man_pages = man-pages-posix; # Added 2021-04-15
|
||||
|
|
|
|||
|
|
@ -19976,7 +19976,6 @@ in
|
|||
|
||||
tt-rss = callPackage ../servers/tt-rss { };
|
||||
tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { };
|
||||
tt-rss-plugin-tumblr-gdpr = callPackage ../servers/tt-rss/plugin-tumblr-gdpr { };
|
||||
tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { };
|
||||
tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { };
|
||||
|
||||
|
|
@ -24816,6 +24815,8 @@ in
|
|||
|
||||
kubectl = callPackage ../applications/networking/cluster/kubectl { };
|
||||
|
||||
kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
|
||||
|
||||
kuttl = callPackage ../applications/networking/cluster/kuttl {
|
||||
buildGoModule = buildGo115Module;
|
||||
};
|
||||
|
|
@ -26081,6 +26082,8 @@ in
|
|||
|
||||
pommed_light = callPackage ../os-specific/linux/pommed-light {};
|
||||
|
||||
polylith = callPackage ../development/tools/misc/polylith { };
|
||||
|
||||
polymake = callPackage ../applications/science/math/polymake {
|
||||
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,10 +33,23 @@ in
|
|||
### Deprecated aliases - for backward compatibility
|
||||
|
||||
mapAliases ({
|
||||
smart_open = smart-open; # added 2021-03-14
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
|
||||
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
|
||||
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}";
|
||||
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
|
||||
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
|
||||
google_api_python_client = google-api-python-client; # added 2021-03-19
|
||||
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
|
||||
HAP-python = hap-python; # added 2021-06-01
|
||||
MechanicalSoup = mechanicalsoup; # added 2021-06-01
|
||||
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
|
||||
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
|
||||
pytest-pep8 = pytestpep8; # added 2021-01-04
|
||||
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
|
||||
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
|
||||
setuptools_scm = setuptools-scm; # added 2021-06-03
|
||||
smart_open = smart-open; # added 2021-03-14
|
||||
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
|
||||
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1097,8 +1097,6 @@ in {
|
|||
|
||||
blockdiag = callPackage ../development/python-modules/blockdiag { };
|
||||
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
|
||||
|
||||
block-io = callPackage ../development/python-modules/block-io { };
|
||||
|
||||
blspy = callPackage ../development/python-modules/blspy { };
|
||||
|
|
@ -1180,8 +1178,6 @@ in {
|
|||
|
||||
btrfs = callPackage ../development/python-modules/btrfs { };
|
||||
|
||||
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
|
||||
|
||||
bugsnag = callPackage ../development/python-modules/bugsnag { };
|
||||
|
||||
bugwarrior = callPackage ../development/python-modules/bugwarrior { };
|
||||
|
|
@ -1849,8 +1845,6 @@ in {
|
|||
|
||||
desktop-notifier = callPackage ../development/python-modules/desktop-notifier { };
|
||||
|
||||
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
|
||||
|
||||
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
|
||||
|
||||
devpi-common = callPackage ../development/python-modules/devpi-common { };
|
||||
|
|
@ -2400,8 +2394,6 @@ in {
|
|||
|
||||
fasttext = callPackage ../development/python-modules/fasttext { };
|
||||
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}";
|
||||
|
||||
favicon = callPackage ../development/python-modules/favicon { };
|
||||
|
||||
fb-re2 = callPackage ../development/python-modules/fb-re2 { };
|
||||
|
|
@ -2797,8 +2789,6 @@ in {
|
|||
git-annex-adapter =
|
||||
callPackage ../development/python-modules/git-annex-adapter { };
|
||||
|
||||
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
|
||||
|
||||
gitdb = callPackage ../development/python-modules/gitdb { };
|
||||
|
||||
github3_py = callPackage ../development/python-modules/github3_py { };
|
||||
|
|
@ -2812,8 +2802,6 @@ in {
|
|||
|
||||
git-sweep = callPackage ../development/python-modules/git-sweep { };
|
||||
|
||||
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
|
||||
|
||||
glances-api = callPackage ../development/python-modules/glances-api { };
|
||||
|
||||
glasgow = callPackage ../development/python-modules/glasgow { };
|
||||
|
|
@ -2944,6 +2932,8 @@ in {
|
|||
|
||||
google-pasta = callPackage ../development/python-modules/google-pasta { };
|
||||
|
||||
google-re2 = callPackage ../development/python-modules/google-re2 { };
|
||||
|
||||
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
|
||||
|
||||
googletrans = callPackage ../development/python-modules/googletrans { };
|
||||
|
|
@ -5918,8 +5908,6 @@ in {
|
|||
inherit (pkgs) libusb1;
|
||||
};
|
||||
|
||||
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
|
||||
|
||||
pyliblo = callPackage ../development/python-modules/pyliblo { };
|
||||
|
||||
pylibmc = callPackage ../development/python-modules/pylibmc { };
|
||||
|
|
@ -5998,6 +5986,8 @@ in {
|
|||
|
||||
pymeteireann = callPackage ../development/python-modules/pymeteireann { };
|
||||
|
||||
pymeteoclimatic = callPackage ../development/python-modules/pymeteoclimatic { };
|
||||
|
||||
pymetno = callPackage ../development/python-modules/pymetno { };
|
||||
|
||||
pymitv = callPackage ../development/python-modules/pymitv { };
|
||||
|
|
@ -6016,8 +6006,6 @@ in {
|
|||
|
||||
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
|
||||
|
||||
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
|
||||
|
||||
pymsteams = callPackage ../development/python-modules/pymsteams { };
|
||||
|
||||
py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
|
||||
|
|
@ -6615,9 +6603,6 @@ in {
|
|||
|
||||
pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };
|
||||
|
||||
pytest-pep8 = self.pytestpep8; # added 2021-01-04
|
||||
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
|
||||
|
||||
pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
|
||||
|
||||
pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { };
|
||||
|
|
@ -7104,8 +7089,6 @@ in {
|
|||
|
||||
pyzufall = callPackage ../development/python-modules/pyzufall { };
|
||||
|
||||
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
|
||||
|
||||
qcelemental = callPackage ../development/python-modules/qcelemental { };
|
||||
|
||||
qcengine = callPackage ../development/python-modules/qcengine { };
|
||||
|
|
@ -7819,8 +7802,6 @@ in {
|
|||
|
||||
smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
|
||||
|
||||
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
|
||||
|
||||
smmap = callPackage ../development/python-modules/smmap { };
|
||||
|
||||
smpplib = callPackage ../development/python-modules/smpplib { };
|
||||
|
|
@ -8440,8 +8421,6 @@ in {
|
|||
|
||||
toposort = callPackage ../development/python-modules/toposort { };
|
||||
|
||||
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
|
||||
|
||||
torchgpipe = callPackage ../development/python-modules/torchgpipe { };
|
||||
|
||||
torchvision = callPackage ../development/python-modules/torchvision { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue