Merge master into staging-next
This commit is contained in:
commit
182a2100db
|
@ -15,11 +15,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav";
|
||||
x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40";
|
||||
aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6";
|
||||
aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k";
|
||||
armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl";
|
||||
x86_64-linux = "01b6w97miai191b2d1lr7cwv36vjvwv1hjggr0g9gfr5j99yzdw3";
|
||||
x86_64-darwin = "1vf6sdm19r1d6a6ljz3jlvqddgyrdqcxpha4x80ar3kwddy254kb";
|
||||
aarch64-linux = "1i48lck395i6lzcxwzfhijs5d141wnxbxg5rzgprm2hgkqx836nr";
|
||||
aarch64-darwin = "02xvb41i8ri8l9w8cxxviz63mkskkmxn6rwprpbglpbpxncsxgbn";
|
||||
armv7l-linux = "0s0zlql652fwfz94bqmnrl77agd8gf6i5w1y09jpvcc33wv0zlgw";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.71.2.22258";
|
||||
version = "1.72.1.22284";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
@ -70,6 +70,8 @@ let
|
|||
inherit executable luaversion sourceVersion;
|
||||
luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; };
|
||||
|
||||
tests = callPackage ./tests { inherit (luaPackages) wrapLua; };
|
||||
|
||||
inherit luaAttr;
|
||||
};
|
||||
|
||||
|
|
16
pkgs/development/interpreters/lua-5/tests/assert.sh
Normal file
16
pkgs/development/interpreters/lua-5/tests/assert.sh
Normal file
|
@ -0,0 +1,16 @@
|
|||
# Always failing assertion with a message.
|
||||
#
|
||||
# Example:
|
||||
# fail "It should have been but it wasn't to be"
|
||||
function fail() {
|
||||
echo "$1"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
function assertStringEqual {
|
||||
|
||||
if ! diff <(echo "$1") <(echo "$2") ; then
|
||||
fail "Strings differ"
|
||||
fi
|
||||
}
|
50
pkgs/development/interpreters/lua-5/tests/default.nix
Normal file
50
pkgs/development/interpreters/lua-5/tests/default.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
{ lua
|
||||
, hello
|
||||
, wrapLua
|
||||
, lib, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, pkgs
|
||||
}:
|
||||
let
|
||||
|
||||
runTest = lua: { name, command }:
|
||||
pkgs.runCommandLocal "test-${lua.name}" ({
|
||||
nativeBuildInputs = [lua];
|
||||
meta.platforms = lua.meta.platforms;
|
||||
}) (''
|
||||
source ${./assert.sh}
|
||||
''
|
||||
+ command
|
||||
+ "touch $out"
|
||||
);
|
||||
|
||||
wrappedHello = hello.overrideAttrs(oa: {
|
||||
propagatedBuildInputs = [
|
||||
wrapLua
|
||||
lua.pkgs.cjson
|
||||
];
|
||||
postFixup = ''
|
||||
wrapLuaPrograms
|
||||
'';
|
||||
});
|
||||
in
|
||||
pkgs.recurseIntoAttrs ({
|
||||
|
||||
checkAliases = runTest lua {
|
||||
name = "check-aliases";
|
||||
command = ''
|
||||
generated=$(lua -e 'print(package.path)')
|
||||
golden_LUA_PATH='./share/lua/${lua.luaversion}/?.lua;./?.lua;./?/init.lua'
|
||||
|
||||
assertStringEqual "$generated" "$golden_LUA_PATH"
|
||||
'';
|
||||
};
|
||||
|
||||
checkWrapping = pkgs.runCommandLocal "test-${lua.name}" ({
|
||||
}) (''
|
||||
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
|
||||
touch $out
|
||||
'');
|
||||
|
||||
})
|
||||
|
|
@ -60,6 +60,8 @@ let
|
|||
passthru = lua.passthru // {
|
||||
interpreter = "${env}/bin/lua";
|
||||
inherit lua;
|
||||
luaPath = lua.pkgs.lib.genLuaPathAbsStr env;
|
||||
luaCpath = lua.pkgs.lib.genLuaCPathAbsStr env;
|
||||
env = stdenv.mkDerivation {
|
||||
name = "interactive-${lua.name}-environment";
|
||||
nativeBuildInputs = [ env ];
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.21";
|
||||
version = "2.0.22";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WObnE5/xOtbX0c3VjVQbec2TDSDKoUe68GFax7dt7WY=";
|
||||
hash = "sha256-RFyQvg7CF5Fa+DnOo0PoDtGPJMOx0Md8I+gshMH2Fvs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-E/ci0+AyOwzjoQc1jA4eIWnbWpO2j/zyDhAwu6Fv1w0=";
|
||||
sha256 = "sha256-F9+ssNkTmkNczyCVI04gSR1Vb3rbl97diRtAVm4xZVM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "6.3.0";
|
||||
version = "6.5.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY=";
|
||||
sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mne-python";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
# PyPI dist insufficient to run tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "mne-tools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug=";
|
||||
sha256 = "sha256-IqZYkPomS/AjZrPDZapPaZ1jhtrzAvi5MOd9rYrSdKo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.409";
|
||||
version = "0.0.413";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ijkmPyz29p8+YUbx9zPj0hSbpTLJiOXOFEzlJI6hI6I=";
|
||||
sha256 = "sha256-TpLvIaaZMNMZ4MAVjGA4jMVf1RxcHRUmMUsfoFBTSik=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1pgR6ghuPSFI3KXOyjNmmiVKJU2y4RCRBpFRY5Yt59A=";
|
||||
vendorSha256 = "sha256-ZnT9IaL6j2EzKk2RRftB4qELIi4nXKC/2zBOhInFYHA=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -9,16 +9,17 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3005";
|
||||
version = "3005.1";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ=";
|
||||
hash = "sha256-+hTF2HP4Y7UJUBIdfiOiRJUCdFSQx8SMDPBFQGz+V8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
distro
|
||||
jinja2
|
||||
jmespath
|
||||
markupsafe
|
||||
msgpack
|
||||
psutil
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector-contrib";
|
||||
version = "0.61.0";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xJCxMWAp5qg00kUWssVyy+uLpDQ/CZjO4TXXoDosXxA=";
|
||||
sha256 = "sha256-pNpCh2oe8hptXlDJsrfJOae8s6K4101lUFXFpXMdEmY=";
|
||||
};
|
||||
# proxy vendor to avoid hash missmatches between linux and macOS
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0=";
|
||||
vendorSha256 = "sha256-sNJOPHGyppdoqYeiBL9LdC5UWHw50CWWp3FS9JlIM+4=";
|
||||
|
||||
subPackages = [ "cmd/otelcontribcol" ];
|
||||
|
||||
|
|
|
@ -12,17 +12,17 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.61.0";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs=";
|
||||
sha256 = "sha256-0algZcP8KfqLsAoKkDuYdlq+tMG0K3bb0G/z0lqM+iE=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcorecol";
|
||||
vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4=";
|
||||
vendorSha256 = "sha256-G+xbkPeD0F32Zngp/u3gALBR1tJ/moNzTZ6vCBTyUoY=";
|
||||
|
||||
preBuild = ''
|
||||
# set the build version, can't be done via ldflags
|
||||
|
|
|
@ -8636,7 +8636,9 @@ with pkgs;
|
|||
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
|
||||
enableNpm = false;
|
||||
};
|
||||
nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { };
|
||||
nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { };
|
||||
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix {
|
||||
enableNpm = false;
|
||||
|
|
Loading…
Reference in a new issue