nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 19:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-18 06:04:36 +00:00 committed by GitHub
commit 123739ed43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 95 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1pjqw0chyhmamgnbih05ach94xgz6kglx7n958y2652ps2q5fzhw";
x86_64-darwin = "0k9rinsy0zz48pxprkyxshksgh6shk1h69fkrdi2q0f4mkvzmi3a";
aarch64-linux = "0hd3kxg5pwkf0rhbq4f246x82nic24splpqj4h68qfw856p2zg7d";
armv7l-linux = "0219yagcdiv1n3xbbk1rs94n4zwfv9s70yqrc0all7jl5xl1mbwh";
x86_64-linux = "16s3hznyrz9w0cns8fk3pzk9ai5dj9y5p4n1rf3hrpg5hi9yxi5j";
x86_64-darwin = "133p032c8gv3hx4x7kxdfhz4xvkpjmjnvy02sf05dxqv5nly4xx4";
aarch64-linux = "183f674qyrlz0wqx6x48z6jhl8z30zmwsj8021hqi8px5ny99l1f";
armv7l-linux = "0rf3ybha861r5pfp6rvh21abfagaiwqlsbxm7fhphrc5382lmxbs";
}.${system};
sourceRoot = {
@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.57.0";
version = "1.57.1";
pname = "vscodium";
executableName = "codium";

21
pkgs/data/themes/yaru/default.nix
View File

@ -1,5 +1,18 @@
{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja,
python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }:
{ lib
, stdenv
, fetchFromGitHub
, meson
, sassc
, pkg-config
, glib
, ninja
, python3
, gtk3
, gnome
, gtk-engine-murrine
, humanity-icon-theme
, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
pname = "yaru";
@ -13,7 +26,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
buildInputs = [ gtk3 gnome.gnome-themes-extra ];
propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -27,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ubuntu/yaru";
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ fortuneteller2k ];
};
}

31
pkgs/development/python-modules/python-ecobee-api/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "python-ecobee-api";
version = "0.2.13";
src = fetchPypi {
inherit pname version;
sha256 = "7c39f5aac854a2fb8fb33f41b351769a92ff784bc6112e7a5c1b9e1949a0fefe";
};
propagatedBuildInputs = [
requests
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "pyecobee" ];
meta = with lib; {
description = "Python API for talking to Ecobee thermostats";
homepage = "https://github.com/nkgilley/python-ecobee-api";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

34
pkgs/misc/vscode-extensions/default.nix
View File

@ -670,6 +670,23 @@ let
};
};
ionide.ionide-fsharp = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Ionide-fsharp";
publisher = "Ionide";
version = "5.5.5";
sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
description = "Enhanced F# Language Features for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Ionide.Ionide-fsharp";
homepage = "https://ionide.io";
license = licenses.mit;
maintainers = with maintainers; [ ratsclub ];
};
};
jakebecker.elixir-ls = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "elixir-ls";
@ -1152,6 +1169,23 @@ let
};
};
svsool.markdown-memo = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "markdown-memo";
publisher = "svsool";
version = "0.3.8";
sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog";
description = "Markdown knowledge base with bidirectional [[link]]s built on top of VSCode";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=svsool.markdown-memo";
homepage = "https://github.com/svsool/vscode-memo";
license = licenses.mit;
maintainers = with maintainers; [ ratsclub ];
};
};
tamasfe.even-better-toml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "even-better-toml";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -203,7 +203,7 @@
"ebox" = ps: with ps; [ ]; # missing inputs: pyebox
"ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
"ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface
"ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api
"ecobee" = ps: with ps; [ python-ecobee-api ];
"econet" = ps: with ps; [ pyeconet ];
"ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
"eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan]

1
pkgs/servers/home-assistant/default.nix
View File

@ -350,6 +350,7 @@ in with py.pkgs; buildPythonApplication rec {
"dunehd"
"dyson"
"eafm"
"ecobee"
"econet"
"efergy"
"emonitor"

6
pkgs/tools/misc/broot/default.nix
View File

@ -14,14 +14,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.4.0";
version = "1.6.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY=";
sha256 = "sha256-H/QT/fmQI9sHjl6wMJjrfjvbOhY9VyBkAGetvcUqGrE=";
};
cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk=";
cargoHash = "sha256-5mqLVbB/dLAk3Ck7ilHhVn0CB/6Ln82SaTxZ/vkx+9k=";
nativeBuildInputs = [
installShellFiles

2
pkgs/top-level/python-packages.nix
View File

@ -5268,6 +5268,8 @@ in {
python-csxcad = callPackage ../development/python-modules/python-csxcad { };
python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { };
python-openems = callPackage ../development/python-modules/python-openems { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };