Browse Source

Merge staging-next into staging

nsd-state-dir
github-actions[bot] 1 year ago
committed by GitHub
parent
commit
9911b1c75b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      nixos/modules/programs/sway.nix
  2. 4
      pkgs/applications/blockchains/ethabi/default.nix
  3. 6
      pkgs/applications/blockchains/polkadot/default.nix
  4. 3292
      pkgs/applications/editors/neovim/neovide/Cargo.lock
  5. 115
      pkgs/applications/editors/neovim/neovide/default.nix
  6. 37
      pkgs/applications/editors/neovim/neovide/skia-externals.json
  7. 12
      pkgs/applications/misc/getxbook/default.nix
  8. 4
      pkgs/applications/networking/cloudflared/default.nix
  9. 4
      pkgs/applications/networking/cluster/argo/default.nix
  10. 4
      pkgs/applications/networking/instant-messengers/zulip/default.nix
  11. 6
      pkgs/applications/science/robotics/mavproxy/default.nix
  12. 4
      pkgs/applications/science/robotics/qgroundcontrol/default.nix
  13. 5
      pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
  14. 8
      pkgs/applications/version-management/gitoxide/default.nix
  15. 4
      pkgs/applications/virtualization/firecracker/default.nix
  16. 8
      pkgs/applications/window-managers/kbdd/default.nix
  17. 30
      pkgs/data/themes/arc/default.nix
  18. 13
      pkgs/desktops/xfce/applications/mousepad/default.nix
  19. 6
      pkgs/development/dotnet-modules/python-language-server/create_deps.sh
  20. 14
      pkgs/development/dotnet-modules/python-language-server/default.nix
  21. 124
      pkgs/development/dotnet-modules/python-language-server/deps.nix
  22. 16
      pkgs/development/dotnet-modules/python-language-server/manual_deps.txt
  23. 7
      pkgs/development/interpreters/evcxr/default.nix
  24. 6
      pkgs/development/libraries/cairomm/1.16.nix
  25. 8
      pkgs/development/libraries/cxxopts/default.nix
  26. 4
      pkgs/development/python-modules/buildbot/default.nix
  27. 2
      pkgs/development/python-modules/buildbot/pkg.nix
  28. 10
      pkgs/development/python-modules/buildbot/plugins.nix
  29. 2
      pkgs/development/python-modules/buildbot/worker.nix
  30. 2
      pkgs/development/python-modules/pymavlink/default.nix
  31. 6
      pkgs/development/tools/earthly/default.nix
  32. 3
      pkgs/games/frotz/default.nix
  33. 17
      pkgs/misc/vscode-extensions/default.nix
  34. 8
      pkgs/servers/minio/default.nix
  35. 4
      pkgs/servers/monitoring/do-agent/default.nix
  36. 22
      pkgs/tools/archivers/arc_unpacker/add-missing-import.patch
  37. 17
      pkgs/tools/archivers/arc_unpacker/default.nix
  38. 4
      pkgs/tools/graphics/agi/default.nix
  39. 4
      pkgs/tools/networking/croc/default.nix
  40. 4
      pkgs/tools/networking/getmail6/default.nix
  41. 8
      pkgs/top-level/all-packages.nix

21
nixos/modules/programs/sway.nix

@ -39,9 +39,8 @@ in {
Sway, the i3-compatible tiling Wayland compositor. You can manually launch
Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to
~/.config/sway/config to modify the default configuration. See
https://github.com/swaywm/sway/wiki and "man 5 sway" for more information.
Please have a look at the "extraSessionCommands" example for running
programs natively under Wayland'';
<link xlink:href="https://github.com/swaywm/sway/wiki" /> and
"man 5 sway" for more information'';
wrapperFeatures = mkOption {
type = wrapperOptions;
@ -56,16 +55,20 @@ in {
type = types.lines;
default = "";
example = ''
# SDL:
export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages
export QT_QPA_PLATFORM=wayland
# QT (needs qt5.qtwayland in systemPackages):
export QT_QPA_PLATFORM=wayland-egl
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
# Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1
'';
description = ''
Shell commands executed just before Sway is started.
Shell commands executed just before Sway is started. See
<link xlink:href="https://github.com/swaywm/sway/wiki/Running-programs-natively-under-wayland" />
and <link xlink:href="https://github.com/swaywm/wlroots/blob/master/docs/env_vars.md" />
for some useful environment variables.
'';
};
@ -95,13 +98,15 @@ in {
'';
example = literalExample ''
with pkgs; [
xwayland
i3status i3status-rust
termite rofi light
]
'';
description = ''
Extra packages to be installed system wide.
Extra packages to be installed system wide. See
<link xlink:href="https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway" /> and
<link xlink:href="https://github.com/swaywm/sway/wiki/i3-Migration-Guide#common-x11-apps-used-on-i3-with-wayland-alternatives" />
for a list of useful software.
'';
};

4
pkgs/applications/blockchains/ethabi/default.nix

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "ethabi";
@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./add-Cargo-lock.patch ];
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description = "Ethereum function call encoding (ABI) utility";
homepage = "https://github.com/rust-ethereum/ethabi";

6
pkgs/applications/blockchains/polkadot/default.nix

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-Y52VFTjRFyC38ZNt6NMtVRA2pn6Y4B/NC4EEuDvIFQQ=";
sha256 = "sha256-Ryo7Ln9nh6rlla4jnhSgqiIqHciGBTDxAjuRzE7BhDs=";
};
cargoSha256 = "sha256-0GrExza6uPF/eFWrXlM4MpCD7TMk2y+uEc5SDj/UQkg=";
cargoSha256 = "sha256-PpFphsSfVTENp1TsnQRuAqKK0hcqFLXp/tDrVSz5mIQ=";
nativeBuildInputs = [ clang ];

3292
pkgs/applications/editors/neovim/neovide/Cargo.lock
File diff suppressed because it is too large
View File

115
pkgs/applications/editors/neovim/neovide/default.nix

@ -0,0 +1,115 @@
{ rustPlatform
, runCommand
, lib
, fetchFromGitHub
, fetchgit
, makeWrapper
, pkg-config
, python2
, expat
, openssl
, SDL2
, vulkan-loader
, fontconfig
, ninja
, gn
, llvmPackages
, makeFontsConf
}:
rustPlatform.buildRustPackage rec {
pname = "neovide";
version = "20210515";
src =
let
repo = fetchFromGitHub {
owner = "Kethku";
repo = "neovide";
rev = "0b976c3d28bbd24e6c83a2efc077aa96dde1e9eb";
sha256 = "sha256-asaOxcAenKdy/yJvch3HFfgnrBnQagL02UpWYnz7sa8=";
};
in
runCommand "source" { } ''
cp -R ${repo} $out
chmod -R +w $out
# Reasons for patching Cargo.toml:
# - I got neovide built with latest compatible skia-save version 0.35.1
# and I did not try to get it with 0.32.1 working. Changing the skia
# version is time consuming, because of manual dependecy tracking and
# long compilation runs.
sed -i $out/Cargo.toml \
-e '/skia-safe/s;0.32.1;0.35.1;'
cp ${./Cargo.lock} $out/Cargo.lock
'';
cargoSha256 = "sha256-XMPRM3BAfCleS0LXQv03A3lQhlUhAP8/9PdVbAUnfG0=";
SKIA_OFFLINE_SOURCE_DIR =
let
repo = fetchFromGitHub {
owner = "rust-skia";
repo = "skia";
# see rust-skia/Cargo.toml#package.metadata skia
rev = "m86-0.35.0";
sha256 = "sha256-uTSgtiEkbE9e08zYOkRZyiHkwOLr/FbBYkr2d+NZ8J0=";
};
# The externals for skia are taken from skia/DEPS
externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json);
in
runCommand "source" { } (''
cp -R ${repo} $out
chmod -R +w $out
mkdir -p $out/third_party/externals
cd $out/third_party/externals
'' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals)));
SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja";
SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn";
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
# test needs a valid fontconfig file
FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
nativeBuildInputs = [
pkg-config
makeWrapper
python2 # skia-bindings
llvmPackages.clang # skia
];
# All tests passes but at the end cargo prints for unknown reason:
# error: test failed, to rerun pass '--bin neovide'
# Increasing the loglevel did not help. In a nix-shell environment
# the failure do not occure.
doCheck = false;
buildInputs = [
expat
openssl
SDL2
fontconfig
];
postFixup = ''
wrapProgram $out/bin/neovide \
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
postInstall = ''
for n in 16x16 32x32 48x48 256x256; do
install -m444 -D "assets/neovide-$n.png" \
"$out/share/icons/hicolor/$n/apps/neovide.png"
done
install -m444 -Dt $out/share/icons/hicolor/scalable/apps assets/neovide.svg
install -m444 -Dt $out/share/applications assets/neovide.desktop
'';
meta = with lib; {
description = "This is a simple graphical user interface for Neovim.";
homepage = "https://github.com/Kethku/neovide";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ck3d ];
platforms = platforms.linux;
};
}

37
pkgs/applications/editors/neovim/neovide/skia-externals.json

@ -0,0 +1,37 @@
{
"expat": {
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
"rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb",
"sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI="
},
"libjpeg-turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "64fc43d52351ed52143208ce6a656c03db56462b",
"sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig="
},
"icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
"rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c",
"sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE="
},
"zlib": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
"rev": "eaf99a4e2009b0e5759e6070ad1760ac1dd75461",
"sha256": "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE="
},
"harfbuzz": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "3a74ee528255cc027d84b204a87b5c25e47bff79",
"sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM="
},
"libpng": {
"url": "https://skia.googlesource.com/third_party/libpng.git",
"rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44",
"sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c="
},
"libgifcodec": {
"url": "https://skia.googlesource.com/libgifcodec",
"rev": "d06d2a6d42baf6c0c91cacc28df2542a911d05fe",
"sha256": "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI="
}
}

12
pkgs/applications/misc/getxbook/default.nix

@ -9,11 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
NIX_CFLAGS_COMPILE = builtins.toString [
"-Wno-error=format-truncation"
"-Wno-error=deprecated-declarations"
"-Wno-error=stringop-overflow"
];
NIX_CFLAGS_COMPILE = builtins.toString (
[ "-Wno-error=deprecated-declarations" ]
++ lib.optionals (!stdenv.cc.isClang) [
"-Wno-error=format-truncation"
"-Wno-error=stringop-overflow"
]
);
buildInputs = [ openssl ];

4
pkgs/applications/networking/cloudflared/default.nix

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2021.3.3";
version = "2021.5.6";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "sha256-St2WBdy76OVFlYoY1RGwQj1WsUpPtsL7yX1MFwztKgs=";
sha256 = "sha256-CwwdU5phnJGcSVXCoea3jZoSa9uoABJKL/Z1BsYUY1g=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/argo/default.nix

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-+LuBz58hTzi/hGwqX/0VMNYn/+SRYgnNefn3B3i7eEs=";
sha256 = "sha256-6w0FwVmzICsjWH7lE2ZnIhictNFTpo8pQ2Wvsyn925A=";
};
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";

4
pkgs/applications/networking/instant-messengers/zulip/default.nix

@ -5,12 +5,12 @@
let
pname = "zulip";
version = "5.6.0";
version = "5.7.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
sha256 = "19sdmkxxzaidb89m8k56p94hq2yaxwn9islzrzwb86f50hlrq46w";
sha256 = "0yfr0n84p3jp8mnnqww2dqpcj9gd7rwpygpq4v10rmrnli18qygw";
name="${pname}-${version}.AppImage";
};

6
pkgs/applications/science/robotics/mavproxy/default.nix

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.34";
version = "1.8.36";
src = fetchPypi {
inherit pname version;
sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c";
sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g";
};
postPatch = ''
@ -30,7 +30,7 @@ buildPythonApplication rec {
meta = with lib; {
description = "MAVLink proxy and command line ground station";
homepage = "https://github.com/ArduPilot/MAVProxy";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lopsided98 ];
};
}

4
pkgs/applications/science/robotics/qgroundcontrol/default.nix

@ -6,7 +6,7 @@
mkDerivation rec {
pname = "qgroundcontrol";
version = "4.1.2";
version = "4.1.3";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -63,7 +63,7 @@ mkDerivation rec {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4";
sha256 = "0fbf564vzckvy1dc8f6yd8vpnzwzsgynva13bl2ks06768rrq9fb";
fetchSubmodules = true;
};

5
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix

@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, rustPlatform
, Security
, libiconv, Security
, pkg-config, openssl
}:
@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
meta = with lib; {
description = "Sync personal and work git repositories from multiple providers";

8
pkgs/applications/version-management/gitoxide/default.nix

@ -1,4 +1,5 @@
{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl, Security }:
{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl
, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
@ -14,8 +15,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = if stdenv.isDarwin
then [ libiconv Security ]
else [ openssl ];
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;

4
pkgs/applications/virtualization/firecracker/default.nix

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv }:
let
version = "0.24.2";
version = "0.24.3";
suffix = {
x86_64-linux = "x86_64";
@ -22,7 +22,7 @@ stdenv.mkDerivation {
sourceRoot = ".";
src = dlbin {
x86_64-linux = "0l7x9sfyx52n0mwrmicdcnhm8z10q57kk1a5wf459l8lvp59xw08";
x86_64-linux = "sha256-i6NMVFoLm4hQJH7RnhfC0t+0DJCINoP5b/iCv9JyRdk=";
aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b";
};

8
pkgs/applications/window-managers/kbdd/default.nix

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "kbdd";
version = "unstable-2017-01-29";
version = "unstable-2021-04-26";
src = fetchFromGitHub {
owner = "qnikst";
repo = "kbdd";
rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3";
sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj";
rev = "3145099e1fbbe65b27678be72465aaa5b5872874";
sha256 = "1gzcjnflgdqnjgphiqpzwbcx60hm0h2cprncm7i8xca3ln5q6ba1";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = {
description = "Simple daemon and library to make per window layout using XKB";
homepage = "https://github.com/qnikst/kbdd";
license = lib.licenses.gpl3;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.wedens ];
};

30
pkgs/data/themes/arc/default.nix

@ -1,9 +1,11 @@
{ lib, stdenv
, fetchFromGitHub
, sassc
, autoreconfHook
, meson
, ninja
, pkg-config
, gtk3
, glib
, gnome
, gtk-engine-murrine
, optipng
@ -13,22 +15,24 @@
stdenv.mkDerivation rec {
pname = "arc-theme";
version = "20210127";
version = "20210412";
src = fetchFromGitHub {
owner = "jnsh";
repo = pname;
rev = version;
sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4=";
sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8=";
};
nativeBuildInputs = [
autoreconfHook
meson
ninja
pkg-config
sassc
optipng
inkscape
gtk3
glib # for glib-compile-resources
];
propagatedUserEnvPkgs = [
@ -36,23 +40,21 @@ stdenv.mkDerivation rec {
gtk-engine-murrine
];
enableParallelBuilding = true;
preBuild = ''
# Shut up inkscape's warnings about creating profile directory
export HOME="$NIX_BUILD_ROOT"
'';
configureFlags = [
"--with-cinnamon=${cinnamon.cinnamon-common.version}"
"--with-gnome-shell=${gnome.gnome-shell.version}"
"--disable-unity"
mesonFlags = [
"-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm"
"-Dvariants=light,darker,dark,lighter"
"-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
"-Dgnome_shell_version=${gnome.gnome-shell.version}"
"-Dgtk3_version=${gtk3.version}"
# You will need to patch gdm to make use of this.
"-Dgnome_shell_gresource=true"
];
postInstall = ''
install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md
'';
meta = with lib; {
description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell";
homepage = "https://github.com/jnsh/arc-theme";

13
pkgs/desktops/xfce/applications/mousepad/default.nix

@ -1,16 +1,19 @@
{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }:
{ mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }:
mkXfceDerivation {
category = "apps";
pname = "mousepad";
version = "0.5.4";
version = "0.5.5";
odd-unstable = false;
sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f";
sha256 = "1c985xb3395bn1024qhqqdnlkbn02zldsnybxsw49xqh55pa4a2n";
nativeBuildInputs = [ gobject-introspection vala ];
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ gtk3 gtksourceview4 xfconf ];
buildInputs = [ gtk3 gtksourceview4 gspell ];
# Use the GSettings keyfile backend rather than DConf
configureFlags = [ "--enable-keyfile-settings" ];
meta = {
description = "Simple text editor for Xfce";

6
pkgs/development/dotnet-modules/python-language-server/create_deps.sh

@ -4,6 +4,8 @@
# Run this script to generate deps.nix
# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout
set -euo pipefail
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
if [ -d "$1" ]; then
@ -14,13 +16,13 @@ else
fi
# Generate lockfiles in source checkout
cd $CHECKOUT_PATH/src
cd "$CHECKOUT_PATH/src"
dotnet nuget locals all --clear
dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64
# Use the lockfiles to make a file with two columns: name and version number
# for all possible package dependencies
cd $SCRIPTDIR
cd "$SCRIPTDIR"
echo "" > all_versions.txt
for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do
echo "Processing lockfile $lockfile"

14
pkgs/development/dotnet-modules/python-language-server/default.nix

@ -11,7 +11,7 @@
let deps = import ./deps.nix { inherit fetchurl; };
version = "2020-06-19";
version = "2020-10-08";
# Build the nuget source needed for the later build all by itself
# since it's a time-consuming step that only depends on ./deps.nix.
@ -49,8 +49,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "microsoft";
repo = "python-language-server";
rev = "838ba78e00173d639bd90f54d8610ec16b4ba3a2";
sha256 = "0nj8l1apcb67gqwy5i49v0f01fs4lvdfmmp4w2hvrpss9if62c1m";
rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67";
sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg";
};
buildInputs = [dotnet-sdk_3 openssl icu];
@ -62,6 +62,8 @@ stdenv.mkDerivation {
];
buildPhase = ''
runHook preBuild
mkdir home
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
@ -75,14 +77,20 @@ stdenv.mkDerivation {
pushd src/LanguageServer/Impl
dotnet publish --no-restore -c Release -r linux-x64
popd
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r output/bin/Release/linux-x64/publish $out/lib
mkdir $out/bin
makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server
runHook postInstall
'';
postFixup = ''

124
pkgs/development/dotnet-modules/python-language-server/deps.nix

@ -46,18 +46,6 @@ in [
sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Ref";
version = "3.0.1";
sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
version = "3.0.3";
sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
version = "3.1.8";
@ -72,8 +60,8 @@ in [
(fetchNuGet {
name = "Microsoft.CodeCoverage";
version = "16.5.0";
sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf";
version = "16.7.1";
sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4";
})
(fetchNuGet {
@ -84,38 +72,8 @@ in [
(fetchNuGet {
name = "Microsoft.Extensions.FileSystemGlobbing";
version = "3.1.2";
sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m";
})
(fetchNuGet {
name = "Microsoft.NetCore.App.Host.linux-x64";
version = "3.0.3";
sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4";
})
(fetchNuGet {
name = "Microsoft.NetCore.App.Host.linux-x64";
version = "3.1.8";
sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs";
})
(fetchNuGet {
name = "Microsoft.NetCore.App.Ref";
version = "3.0.0";
sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw";
})
(fetchNuGet {
name = "Microsoft.NetCore.App.Ref";
version = "3.1.0";
sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y";
})
(fetchNuGet {
name = "Microsoft.NetCore.App.Runtime.linux-x64";
version = "3.0.3";
sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v";
sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y";
})
(fetchNuGet {
@ -138,8 +96,8 @@ in [
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "2.0.0";
sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
version = "3.0.0";
sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51";
})
(fetchNuGet {
@ -156,44 +114,38 @@ in [
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.5.0";
sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq";
version = "16.7.1";
sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8";
})
(fetchNuGet {
name = "Microsoft.TestPlatform.ObjectModel";
version = "16.5.0";
sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw";
version = "16.7.1";
sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0";
})
(fetchNuGet {
name = "Microsoft.TestPlatform.TestHost";
version = "16.5.0";
sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v";
version = "16.7.1";
sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs";
})
(fetchNuGet {
name = "Microsoft.VisualStudio.Threading";
version = "16.4.33";
sha256 = "09djx2xz22w48csd0bkpwi1rgpjpaj3mml16wfy8jlsnc66swmnh";
version = "16.5.132";
sha256 = "05lngndl6hg4v3vk9l1n1g2lbfjb7jnr5dnkjld9wx3vamdfcfxw";
})
(fetchNuGet {
name = "Microsoft.VisualStudio.Threading";
version = "16.4.45";
sha256 = "16p61kxsnwanp3nac0gkarl7a94c02qyqjzdkijl5va9k3fa97m6";
version = "16.6.13";
sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l";
})
(fetchNuGet {
name = "Microsoft.VisualStudio.Threading.Analyzers";
version = "16.4.45";
sha256 = "12m0f037pz3ynm69810p4c96nrlnqihx6w4qyrs0kqsxiajf16jc";
})
(fetchNuGet {
name = "Microsoft.VisualStudio.Validation";
version = "15.3.15";
sha256 = "1v3r2rlichlvxjrmj1grii1blnl9lp9npg2p6q3q4j6lamskxa9r";
version = "16.6.13";
sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18";
})
(fetchNuGet {
@ -210,8 +162,8 @@ in [
(fetchNuGet {
name = "Microsoft.Win32.Registry";
version = "4.5.0";
sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q";
version = "4.6.0";
sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s";
})
(fetchNuGet {
@ -222,20 +174,20 @@ in [
(fetchNuGet {
name = "MSTest.TestAdapter";
version = "2.1.0";
sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz";
version = "2.1.2";
sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5";
})
(fetchNuGet {
name = "MSTest.TestFramework";
version = "2.1.0";
sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p";
version = "2.1.2";
sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z";
})
(fetchNuGet {
name = "Nerdbank.Streams";
version = "2.4.60";
sha256 = "01554nbs6dj4fjd59b95kaw84j27kfb5y5ixjbl23nh62kpgrd3r";
version = "2.5.76";
sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv";
})
(fetchNuGet {
@ -276,8 +228,8 @@ in [
(fetchNuGet {
name = "NSubstitute";
version = "4.2.1";
sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy";
version = "4.2.2";
sha256 = "1zi1z5i61c2nq8p3jwbkca28yaannrvv6g6q5mmz1775apmfyh79";
})
(fetchNuGet {
@ -600,8 +552,8 @@ in [
(fetchNuGet {
name = "StreamJsonRpc";
version = "2.3.103";
sha256 = "0z8ahxkbbrzsn56ylzlciriiid4bslf6y1rk49wzahwpvzlik1iw";
version = "2.5.46";
sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf";
})
(fetchNuGet {
@ -804,14 +756,8 @@ in [
(fetchNuGet {
name = "System.IO.Pipelines";
version = "4.5.3";
sha256 = "1z44vn1qp866lkx78cfqdd4vs7xn1hcfn7in6239sq2kgf5qiafb";
})
(fetchNuGet {
name = "System.IO.Pipelines";
version = "4.6.0";
sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh";
version = "4.7.0";
sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4";
})
(fetchNuGet {
@ -1080,8 +1026,8 @@ in [
(fetchNuGet {
name = "System.Security.AccessControl";
version = "4.5.0";
sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0";
version = "4.6.0";
sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf";
})
(fetchNuGet {
@ -1146,8 +1092,8 @@ in [
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "4.5.0";
sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86";
version = "4.6.0";
sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm";
})
(fetchNuGet {

16
pkgs/development/dotnet-modules/python-language-server/manual_deps.txt

@ -1,14 +1,2 @@
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3
Microsoft.AspNetCore.App.Ref 3.0.1
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2
Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3
Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2
Microsoft.NetCore.App.Ref 3.1.0
Microsoft.NetCore.App.Ref 3.0.0
Microsoft.NetCore.App.Runtime.linux-x64 3.1.3
Microsoft.NetCore.App.Runtime.linux-x64 3.1.2
Microsoft.NetCore.App.Runtime.linux-x64 3.0.2
Microsoft.NetCore.App.Runtime.linux-x64 3.0.3
Microsoft.NetCore.App.Host.linux-x64 3.1.3
Microsoft.NetCore.App.Host.linux-x64 3.0.2
Microsoft.NetCore.App.Host.linux-x64 3.0.3
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8
Microsoft.NetCore.App.Runtime.linux-x64 3.1.8

7
pkgs/development/interpreters/evcxr/default.nix

@ -1,4 +1,5 @@
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv
, gcc, cmake, libiconv, CoreServices, Security }:
rustPlatform.buildRustPackage rec {
pname = "evcxr";
@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec {
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
nativeBuildInputs = [ pkg-config makeWrapper cmake ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin
[ libiconv CoreServices Security ];
postInstall = let
wrap = exe: ''
wrapProgram $out/bin/${exe} \

6
pkgs/development/libraries/cairomm/1.16.nix

@ -8,6 +8,7 @@
, cairo
, fontconfig
, libsigcxx30
, ApplicationServices
}:
stdenv.mkDerivation rec {
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [
boost # for tests
fontconfig
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [
@ -47,7 +50,8 @@ stdenv.mkDerivation rec {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
doCheck = true;
# Tests fail on Darwin, possibly because of sandboxing.
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "A 2D graphics library with support for multiple output devices";

8
pkgs/development/libraries/cxxopts/default.nix

@ -12,11 +12,17 @@ stdenv.mkDerivation rec {
};
buildInputs = lib.optional enableUnicodeHelp [ icu.dev ];
cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ];
cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ]
++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"
# Due to -Wsuggest-override, remove when cxxopts is updated
++ lib.optional stdenv.isDarwin "-DCXXOPTS_ENABLE_WARNINGS=OFF";
nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ];
doCheck = true;
# Conflict on case-insensitive filesystems.
dontUseCmakeBuildDir = true;
meta = with lib; {
homepage = "https://github.com/jarro2783/cxxopts";
description = "Lightweight C++ GNU-style option parser library";

4
pkgs/development/python-modules/buildbot/default.nix

@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.1.0";
version = "3.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "1b9m9l8bz2slkrq0l5z8zd8pd0js5w4k7dam8bdp00kv3aln4si9";
sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/buildbot/pkg.nix

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0bv1qq4cf24cklxfqfnkhjb6w4xqcp3afdcan75n6v7mnwqxyyvr";
sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1a40fbmbf4gb0hgpr40yr9fb17ynxwi6vj8hvv3mm1fm9nqiggm1";
sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1fcm4h489sb5a1hk82y1a8575s4k6qd82qkfbm2q5gd14bdvysb0";
sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1qw9g2maixlcm5l1kpmc721b2p4b7adw5rsimlqcjz96mjya7acj";
sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1q0fm2h4alcck6g8fwwd42jsmkw3gdy9xmw1p78xnvk5dgs6cf9c";
sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0n8q607rl1qs012gpkxpq1n7ny8306n4vr3hjlz96pm60a7j7904";
sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy";
};
buildInputs = [ buildbot-pkg ];

2
pkgs/development/python-modules/buildbot/worker.nix

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "0n5p9x9gz276nv1m8vn3d74jfbd35gff332cjxxqvabk06iqcjp6";
sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m";
};
propagatedBuildInputs = [ twisted future ];

2
pkgs/development/python-modules/pymavlink/default.nix

@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python MAVLink interface and utilities";
homepage = "https://github.com/ArduPilot/pymavlink";
license = with licenses; [ lgpl3Only mit ];
license = with licenses; [ lgpl3Plus mit ];
maintainers = with maintainers; [ lopsided98 ];
};
}

6
pkgs/development/tools/earthly/default.nix

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.5.11";
version = "0.5.12";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv";
sha256 = "sha256-jG4KaDCzx0PAJu6Hr+xnKsAdz97LmGUF0El3rSiLQPo=";
};
vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k";
vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";
postInstall = ''
mv $out/bin/debugger $out/bin/earthly-debugger

3
pkgs/games/frotz/default.nix

@ -5,6 +5,8 @@
, libsndfile
, libvorbis
, ncurses
, which
, pkg-config
, lib, stdenv }:
stdenv.mkDerivation rec {
@ -19,6 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo=";
};
nativeBuildInputs = [ which pkg-config ];
buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ];
preBuild = ''
makeFlagsArray+=(

17
pkgs/misc/vscode-extensions/default.nix

@ -926,6 +926,23 @@ let
};