Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-10-20 00:01:37 +00:00 committed by GitHub
commit 5808494271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 79 additions and 90 deletions

View file

@ -214,9 +214,9 @@ in runCommand
# source-code itself).
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; rec {
stable = [ meutraa ];
beta = [ meutraa ];
canary = [ meutraa ];
stable = [ meutraa fabianhjr ];
beta = [ meutraa fabianhjr ];
canary = [ meutraa fabianhjr ];
dev = canary;
}."${channel}";
};

View file

@ -9,8 +9,8 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)"
sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l";
version = "2020.3.1.25"; # "Android Studio Arctic Fox (2020.3.1)"
sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";
};
betaVersion = {
version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1"

View file

@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "themechanger";
version = "0.10.1";
version = "0.10.2";
format = "other";
src = fetchFromGitHub {
owner = "ALEX11BR";
repo = "ThemeChanger";
rev = "v${version}";
sha256 = "1bxxn5bmdwaxfvyh6z2rxklwnxgvv6kh5y9m8r1k7d0n4msx1x2h";
sha256 = "00z1npm3lpvf0wc9z2v58pc4nxxh8x9m158kxf1k0qlz536jrzqr";
};
nativeBuildInputs = [

View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "94.0.4606.81",
"sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh",
"sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz",
"version": "95.0.4638.54",
"sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
"sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",
"deps": {
"gn": {
"version": "2021-08-11",
@ -12,15 +12,15 @@
}
},
"chromedriver": {
"version": "94.0.4606.61",
"sha256_linux": "1l7ls8qqqd9q3a20a459q40jd9djzf67s8qfdmfj44vwgidiw0fj",
"sha256_darwin": "1b43agdd6vw5zarrbbk1sgmdr6n3d9cdl4dcikk304yplh58d49v"
"version": "95.0.4638.17",
"sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q",
"sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8"
}
},
"beta": {
"version": "95.0.4638.49",
"sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz",
"sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6",
"version": "95.0.4638.54",
"sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
"sha256bin64": "06d0kjnrv8z74icc6nahllxbwn3xxwn0vgc7ss47402zrqig8lch",
"deps": {
"gn": {
"version": "2021-08-11",

View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.17.2";
sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
manifestsSha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj";
version = "0.18.3";
sha256 = "0nvvjc0ml1irn7vxyq4m43qimp128cx8hczk21y5m39i2rg4yzx4";
manifestsSha256 = "1qgw9ij0b85vvdx03wmbbwanhq1hf69wphy58lsqwf33rdq0bb1m";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@ -23,7 +23,7 @@ buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-glifJ0V3RwS7E6EWZsCa88m0MK883RhPSXCsAmMggVs=";
vendorSha256 = "0vgi5cnvmc98xa2ibpgvvqlc90hf3gj3v17yqncid596ig3dnqsc";
nativeBuildInputs = [ installShellFiles ];

View file

@ -20,11 +20,11 @@ setKV () {
setKV version ${VERSION}
setKV sha256 ${SHA256}
setKV manifestsSha256 ${SPEC_SHA256}
setKV vendorSha256 ""
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
cd ../../../../../
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f3)
set -e
cd - > /dev/null

View file

@ -1,20 +1,15 @@
{ lib, stdenv, bitlbee }:
{ lib, runCommandLocal, bitlbee }:
with lib;
plugins:
stdenv.mkDerivation {
inherit bitlbee plugins;
name = "bitlbee-plugins";
plugins: runCommandLocal "bitlbee-plugins" {
inherit plugins;
buildInputs = [ bitlbee plugins ];
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/lib/bitlbee
for plugin in $plugins; do
for thing in $(ls $plugin/lib/bitlbee); do
ln -s $plugin/lib/bitlbee/$thing $out/lib/bitlbee/
done
} ''
mkdir -p $out/lib/bitlbee
for plugin in $plugins; do
for thing in $(ls $plugin/lib/bitlbee); do
ln -s $plugin/lib/bitlbee/$thing $out/lib/bitlbee/
done
'';
}
done
''

View file

@ -183,7 +183,7 @@ stdenv.mkDerivation rec {
Just the build products, optionally with the i18n linked in
the libraries are passed via an env var in the wrapper, default.nix
'';
homepage = "https://www.kicad-pcb.org/";
homepage = "https://www.kicad.org/";
license = lib.licenses.agpl3;
platforms = lib.platforms.all;
};

View file

@ -277,7 +277,7 @@ stdenv.mkDerivation rec {
then "Open Source Electronics Design Automation suite"
else "Open Source EDA suite, development build")
+ (if (!with3d) then ", without 3D models" else "");
homepage = "https://www.kicad-pcb.org/";
homepage = "https://www.kicad.org/";
longDescription = ''
KiCad is an open source software suite for Electronic Design Automation.
The Programs handle Schematic Capture, and PCB Layout with Gerber output.

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz";
};

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fjaraskupan";
version = "1.0.1";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "elupus";
repo = pname;
rev = version;
sha256 = "0r6l9cbl41ddg4mhw9g9rly9r7s70sscg1ysb99bsi8z6xml9za3";
sha256 = "sha256-nUrgV4keJpYRkKZE+udvmPdCW3O3YQTS1ye40IdA7vA=";
};
propagatedBuildInputs = [

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.9.0";
version = "2.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "bedd376807ab3dde08f2d92caa0e4e5ad7c2ccfc7069561e80964b998a0d8f51";
sha256 = "e34d506596ebb6e285d8500342587e8ec0bd31924f290f1f39cc4ea2e4f1abfb";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.1.0";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "8ad50ce9145c3b477536752785635295c318b2b123bc9d251020cc1cfe98b131";
sha256 = "c6811f8bde6019b18f5f0d154078000405af6fd38836713c05cbb9c1512f181a";
};
propagatedBuildInputs = [ google-api-core proto-plus ];

View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.5.0";
version = "3.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "49c91574e04d52fc7c0fade95dd5e6ccb51190ab8b419352d008a617c7799879";
sha256 = "32c73dd13e64ec16d38462305cef9c0add887e815c312ba5bb3c57077903f2a6";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "millheater";
version = "0.6.2";
version = "0.7.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
rev = version;
sha256 = "sha256-CG0hQN4m8EE+j5yUqODJX8/DLTVWS9tSPADSDHl6K9o=";
sha256 = "sha256-WMw07mNvQdrqm5cf3+YWRZsZQ59vOqYSps26scPFpNI=";
};
propagatedBuildInputs = [

View file

@ -107,11 +107,13 @@ formatExtRuntimeDeps() {
declare jqQuery
jqQuery=$(cat <<'EOF'
.runtimeDependencies \
| map(select(.platforms[] | in({"linux": null}))) \
| map(select(.architectures[] | in({"x86_64": null}))) \
| .[] | {(.id + "-" + (.architectures[0]) + "-" + (.platforms[0])): \
{installPath, binaries, urls: [.url, .fallbackUrl]}}
.runtimeDependencies
| map(select(.platforms[] | in({"linux": null})))
| map(select(.architectures[] | in({"x86_64": null})))
| .[] | {
(.id + "__" + (.architectures[0]) + "-" + (.platforms[0])):
{installPath, binaries, urls: [.url, .fallbackUrl] | map(select(. != null))}
}
EOF
)

View file

@ -18,13 +18,12 @@ let
rtDepsBinSrcs = builtins.mapAttrs (k: v:
let
# E.g: "OmniSharp-x86_64-linux"
kSplit = builtins.split "(-)" k;
kSplit = builtins.split "(__)" k;
name = builtins.elemAt kSplit 0;
arch = builtins.elemAt kSplit 2;
platform = builtins.elemAt kSplit 4;
system = builtins.elemAt kSplit 2;
in
{
inherit name arch platform;
inherit name system;
installPath = v.installPath;
binaries = v.binaries;
bin-src = fetchurl {
@ -35,11 +34,8 @@ let
)
rtDepsSrcsFromJson;
arch = "x86_64";
platform = "linux";
rtDepBinSrcByName = bSrcName:
rtDepsBinSrcs."${bSrcName}-${arch}-${platform}";
rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}";
omnisharp = rtDepBinSrcByName "OmniSharp";
vsdbg = rtDepBinSrcByName "Debugger";
@ -50,8 +46,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csharp";
publisher = "ms-dotnettools";
version = "1.23.2";
sha256 = "0ydaiy8jfd1bj50bqiaz5wbl7r6qwmbz9b29bydimq0rdjgapaar";
version = "1.23.15";
sha256 = "0b74jr45zl7lzirjgj8s2lbf3viy9pbwlgjh055rcwmy77wcml1x";
};
nativeBuildInputs = [

View file

@ -1,37 +1,36 @@
{
"OmniSharp-x86_64-linux": {
"installPath": ".omnisharp/1.37.1",
"OmniSharp__x86_64-linux": {
"installPath": ".omnisharp/1.37.15",
"binaries": [
"./mono.linux-x86_64",
"./run"
],
"urls": [
"https://download.visualstudio.microsoft.com/download/pr/46933d64-075c-4f9f-b205-da4a839e2e3c/4bba2c3f40106056b53721c164ff86fa/omnisharp-linux-x64-1.37.1.zip",
"https://roslynomnisharp.blob.core.windows.net/releases/1.37.1/omnisharp-linux-x64-1.37.1.zip"
"https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip",
"https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x64-1.37.15.zip"
],
"sha256": "0yzxkbq0fyq2bv0s7qmycxl0w54lla0vykg1a5lpv9j38k062vvz"
"sha256": "0pchywkxy8niq0i6gq2r43cmf58blfhhj8w8zyibf0m9h09h165s"
},
"Debugger-x86_64-linux": {
"Debugger__x86_64-linux": {
"installPath": ".debugger",
"binaries": [
"./vsdbg-ui",
"./vsdbg"
],
"urls": [
"https://download.visualstudio.microsoft.com/download/pr/292d2e01-fb93-455f-a6b3-76cddad4f1ef/2e9b8bc5431d8f6c56025e76eaabbdff/coreclr-debug-linux-x64.zip",
"https://vsdebugger.blob.core.windows.net/coreclr-debug-1-22-2/coreclr-debug-linux-x64.zip"
"https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip",
"https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip"
],
"sha256": "1lhyjq6g6lc1b4n4z57g0ssr5msqgsmrl8yli8j9ah5s3jq1lrda"
"sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk"
},
"Razor-x86_64-linux": {
"Razor__x86_64-linux": {
"installPath": ".razor",
"binaries": [
"./rzls"
],
"urls": [
"https://download.visualstudio.microsoft.com/download/pr/757f5246-2b09-43fe-9a8d-840cfd15092b/2b6d8eee0470acf725c1c7a09f8b6475/razorlanguageserver-linux-x64-6.0.0-alpha.1.20418.9.zip",
"https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20418.9.zip"
"https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip"
],
"sha256": "1hksxq867anb9h040497phszq64f6krg4a46w0xqrm6crj8znqr5"
"sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b"
}
}

View file

@ -6,11 +6,11 @@ declare scriptDir
scriptDir=$(cd "$(dirname "$0")"; pwd)
1>&2 echo "scriptDir='$scriptDir'"
. "$scriptDir/update-bin-srcs-lib.sh"
. "$scriptDir/../_maintainers/update-bin-srcs-lib.sh"
declare extPublisher="ms-dotnettools"
declare extName="csharp"
declare defaultExtVersion="1.23.2"
declare defaultExtVersion="1.23.15"
declare extVersion="${1:-$defaultExtVersion}"
formatExtRuntimeDeps \
@ -19,7 +19,3 @@ formatExtRuntimeDeps \
| jqStreamToJson \
| tee "$scriptDir/rt-deps-bin-srcs.json" \
| jq '.'
# TODO: Unfortunatly no simple json to nix implementation available.
# This would allow us to dump to './rt-deps-bin-srcs.nix' instead.
# jsonToNix

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.11.9";
version = "0.11.10";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zqRjMCyFT7knI1/zH+RF1pA/OKaDhJZLLjWJhfmqopE=";
sha256 = "sha256-kt1qv4x48qXzlqvV2nfFXkYzgeC4m+rA7NA+coznNno=";
};
cargoSha256 = "sha256-W/ZMDbHC1VsllTSxCt77n4eb8Xgfj9YNx5NG5u+D+qA=";
cargoSha256 = "sha256-itncLfIjNwwAO393gZ5xyRnig/N0JEovBQvOIAC4e9g=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -1,17 +1,17 @@
{ lib
, fetchFromGitHub
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "btop";
version = "1.0.16";
version = "1.0.18";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-navmEd77+LOvCpjPe6dReOYGO1wGRO3OGIv8mC05Kec=";
sha256 = "sha256-TUrCSpwbUP28COHAAFIdR5Kw18I35nBkiKU62IHCN4o=";
};
installFlags = [ "PREFIX=$(out)" ];
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A monitor of resources";
homepage = "https://github.com/aristocratos/btop";
changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ rmcgibbo ];