Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-05-31 18:01:11 +00:00 committed by GitHub
commit d6ede66f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 2199 additions and 1394 deletions

View File

@ -507,7 +507,7 @@ rec {
compareLists compare [ "a" ] []
=> 1
compareLists compare [ "a" "b" ] [ "a" "c" ]
=> 1
=> -1
*/
compareLists = cmp: a: b:
if a == []

View File

@ -355,6 +355,16 @@ with lib.maintainers; {
shortName = "Linux Kernel";
};
lumiguide = {
# Verify additions by approval of an already existing member of the team.
members = [
roelvandijk
lucus16
];
scope = "Group registration for LumiGuide employees who collectively maintain packages.";
shortName = "Lumiguide employees";
};
lumina = {
members = [
romildo

View File

@ -50,11 +50,6 @@ let
# they way through, but has the last priority behind everything else.
nixpkgs.system = lib.mkDefault system;
# Stash the value of the `system` argument. When using `nesting.children`
# we want to have the same default value behavior (immediately above)
# without any interference from the user's configuration.
nixpkgs.initialSystem = system;
_module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
};
};

View File

@ -67,6 +67,7 @@ in
imports = [
./assertions.nix
./meta.nix
(mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.")
];
options.nixpkgs = {
@ -219,14 +220,6 @@ in
Ignored when <code>nixpkgs.pkgs</code> is set.
'';
};
initialSystem = mkOption {
type = types.str;
internal = true;
description = ''
Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>.
'';
};
};
config = {

View File

@ -14,6 +14,7 @@ let
PATHS_PLUGINS = if builtins.isNull cfg.declarativePlugins then "${cfg.dataDir}/plugins" else declarativePlugins;
PATHS_LOGS = "${cfg.dataDir}/log";
SERVER_SERVE_FROM_SUBPATH = boolToString cfg.server.serveFromSubPath;
SERVER_PROTOCOL = cfg.protocol;
SERVER_HTTP_ADDR = cfg.addr;
SERVER_HTTP_PORT = cfg.port;
@ -41,9 +42,23 @@ let
USERS_AUTO_ASSIGN_ORG = boolToString cfg.users.autoAssignOrg;
USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole;
AUTH_DISABLE_LOGIN_FORM = boolToString cfg.auth.disableLoginForm;
AUTH_ANONYMOUS_ENABLED = boolToString cfg.auth.anonymous.enable;
AUTH_ANONYMOUS_ORG_NAME = cfg.auth.anonymous.org_name;
AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role;
AUTH_AZUREAD_NAME = "Azure AD";
AUTH_AZUREAD_ENABLED = boolToString cfg.auth.azuread.enable;
AUTH_AZUREAD_ALLOW_SIGN_UP = boolToString cfg.auth.azuread.allowSignUp;
AUTH_AZUREAD_CLIENT_ID = cfg.auth.azuread.clientId;
AUTH_AZUREAD_SCOPES = "openid email profile";
AUTH_AZUREAD_AUTH_URL = "https://login.microsoftonline.com/${cfg.auth.azuread.tenantId}/oauth2/v2.0/authorize";
AUTH_AZUREAD_TOKEN_URL = "https://login.microsoftonline.com/${cfg.auth.azuread.tenantId}/oauth2/v2.0/token";
AUTH_AZUREAD_ALLOWED_DOMAINS = cfg.auth.azuread.allowedDomains;
AUTH_AZUREAD_ALLOWED_GROUPS = cfg.auth.azuread.allowedGroups;
AUTH_AZUREAD_ROLE_ATTRIBUTE_STRICT = false;
AUTH_GOOGLE_ENABLED = boolToString cfg.auth.google.enable;
AUTH_GOOGLE_ALLOW_SIGN_UP = boolToString cfg.auth.google.allowSignUp;
AUTH_GOOGLE_CLIENT_ID = cfg.auth.google.clientId;
@ -484,6 +499,14 @@ in {
};
};
server = {
serveFromSubPath = mkOption {
description = "Serve Grafana from subpath specified in rootUrl setting";
default = false;
type = types.bool;
};
};
smtp = {
enable = mkEnableOption "smtp";
host = mkOption {
@ -546,6 +569,12 @@ in {
};
auth = {
disableLoginForm = mkOption {
description = "Set to true to disable (hide) the login form, useful if you use OAuth";
default = false;
type = types.bool;
};
anonymous = {
enable = mkOption {
description = "Whether to allow anonymous access.";
@ -563,6 +592,53 @@ in {
type = types.str;
};
};
azuread = {
enable = mkOption {
description = "Whether to allow Azure AD OAuth.";
default = false;
type = types.bool;
};
allowSignUp = mkOption {
description = "Whether to allow sign up with Azure AD OAuth.";
default = false;
type = types.bool;
};
clientId = mkOption {
description = "Azure AD OAuth client ID.";
default = "";
type = types.str;
};
clientSecretFile = mkOption {
description = "Azure AD OAuth client secret.";
default = null;
type = types.nullOr types.path;
};
tenantId = mkOption {
description = ''
Tenant id used to create auth and token url. Default to "common"
, let user sign in with any tenant.
'';
default = "common";
type = types.str;
};
allowedDomains = mkOption {
description = ''
To limit access to authenticated users who are members of one or more groups,
set allowedGroups to a comma- or space-separated list of group object IDs.
You can find object IDs for a specific group on the Azure portal.
'';
default = "";
type = types.str;
};
allowedGroups = mkOption {
description = ''
Limits access to users who belong to specific domains.
Separate domains with space or comma.
'';
default = "";
type = types.str;
};
};
google = {
enable = mkOption {
description = "Whether to allow Google OAuth2.";
@ -652,6 +728,10 @@ in {
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
${optionalString (cfg.auth.azuread.clientSecretFile != null) ''
GF_AUTH_AZUREAD_CLIENT_SECRET="$(<${escapeShellArg cfg.auth.azuread.clientSecretFile})"
export GF_AUTH_AZUREAD_CLIENT_SECRET
''}
${optionalString (cfg.auth.google.clientSecretFile != null) ''
GF_AUTH_GOOGLE_CLIENT_SECRET="$(<${escapeShellArg cfg.auth.google.clientSecretFile})"
export GF_AUTH_GOOGLE_CLIENT_SECRET

View File

@ -107,7 +107,7 @@ in
with subtest("gitolite server starts"):
server.wait_for_unit("gitolite-init.service")
server.wait_for_unit("sshd.service")
client.succeed("ssh gitolite@server info")
client.succeed("ssh -n gitolite@server info")
with subtest("admin can clone and configure gitolite-admin.git"):
client.succeed(

View File

@ -43,6 +43,7 @@ import ../make-test-python.nix (
tls_certificate_path = "${cert}";
tls_private_key_path = "${key}";
enable_registration = true;
enable_registration_without_verification = true;
registration_shared_secret = "supersecret-registration";
listeners = [ {

View File

@ -5,9 +5,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
apiUrl = "http://${listenAddress}:${toString listenPort}";
uid = "movies";
indexJSON = pkgs.writeText "index.json" (builtins.toJSON { inherit uid; });
moviesJSON = pkgs.runCommand "movies.json" {} ''
sed -n '1,5p;$p' ${pkgs.meilisearch.src}/datasets/movies/movies.json > $out
'';
moviesJSON = pkgs.fetchurl {
url = "https://github.com/meilisearch/meilisearch/raw/v0.23.1/datasets/movies/movies.json";
sha256 = "1r3srld63dpmg9yrmysm6xl175661j5cspi93mk5q2wf8xwn50c5";
};
in {
name = "meilisearch";
meta.maintainers = with lib.maintainers; [ Br1ght0ne ];
@ -34,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
with subtest("create index"):
machine.succeed(
"curl -XPOST ${apiUrl}/indexes --data @${indexJSON}"
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}"
)
indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes"))
assert len(indexes) == 1, "index wasn't created"
@ -42,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
with subtest("add documents"):
response = json.loads(
machine.succeed(
"curl -XPOST ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}"
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}"
)
)
update_id = response["updateId"]

View File

@ -11,6 +11,13 @@ mkDerivation {
grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml
ki18n kinit kservice xapian
];
preFixup = ''
qtWrapperArgs+=(
--prefix MANPATH : /nix/var/nix/profiles/system/sw/share/man
)
'';
meta = with lib; {
homepage = "https://apps.kde.org/help/";
description = "Help center";

View File

@ -2,22 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.17.6";
version = "0.18.0";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";
sha256 = "sha256-L9eJd1ivFhAmjKVm+HFq9fNiA/UA/x2akEfa1CrUSBo=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";
cargoSha256 = "sha256-niH8gj49Wr20Lpa6UAczQ+YHgJlkvZYKJGFH6Spk9Ho=";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
homepage = "https://github.com/sayanarijit/xplr";
homepage = "https://xplr.dev";
license = licenses.mit;
maintainers = with maintainers; [ sayanarijit suryasr007 ];
};

View File

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "100.0.2";
version = "101.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6d9922e35e496fa63833ba03d1466e075287e40e50854ddc4f4a2036d9c7ca1f35c03bc6f708a3c469e0ec3b389b3346ac754bb84df0fecb86955fc21c05e00f";
sha512 = "fffe7e0940c1443fcdc5b205677764cb4e04b29f33fcfafb2857d383700584f309806b81fc4989efb56cc12a3cca1ff7d451b647050c43e98777b5c952ed5d56";
};
meta = {
@ -28,11 +28,11 @@ rec {
firefox-esr-91 = buildMozillaMach rec {
pname = "firefox-esr";
version = "91.9.1esr";
version = "91.10.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d432d559f2c5f4b0bc66a755db7d61585e24a727cd8d18630854b3fb8633d54baf61ed65b580345b13d52b66288aa15ca8ca5cfcde8231e88108241f0b007683";
sha512 = "8344b829d7bd86250afdd4cb582e27ed5705b3ef48aec50b9a39abc17deba86c9fd721f4667f5c2155e3d7cd1d6e1f82ff8e218ced3a16a4e06bb414ee0690f8";
};
meta = {

View File

@ -18,7 +18,7 @@ let
shared_meta = lib:
with lib; {
homepage = "https://www.picotech.com/downloads/linux";
maintainers = with maintainers; [ expipiplus1 yorickvp wirew0rm ];
maintainers = with maintainers; [ expipiplus1 wirew0rm ] ++ teams.lumiguide.members;
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
};

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }:
{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }:
stdenv.mkDerivation rec {
pname = "gitolite";
@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
echo ${version} > $out/bin/VERSION
'';
passthru.tests = {
gitolite = nixosTests.gitolite;
};
meta = with lib; {
description = "Finely-grained git repository hosting";
homepage = "https://gitolite.com/gitolite/index.html";

View File

@ -97,7 +97,7 @@ in
# See https://os.phil-opp.com/testing/ for more information.
assert useSysroot -> !(args.doCheck or true);
stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoLock" ]) // lib.optionalAttrs useSysroot {
stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot {
RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
} // {
inherit buildAndTestSubdir cargoDeps;

View File

@ -23,6 +23,7 @@ in
, patches ? []
, sourceRoot ? ""
, cargoUpdateHook ? ""
, nativeBuildInputs ? []
, ...
} @ args:
@ -32,7 +33,7 @@ let hash_ =
else throw "fetchCargoTarball requires a hash for ${name}";
in stdenv.mkDerivation ({
name = "${name}-vendor.tar.gz";
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ] ++ nativeBuildInputs;
buildPhase = ''
runHook preBuild
@ -82,5 +83,5 @@ in stdenv.mkDerivation ({
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
} // (builtins.removeAttrs args [
"name" "sha256" "cargoUpdateHook"
"name" "sha256" "cargoUpdateHook" "nativeBuildInputs"
]))

View File

@ -12,20 +12,21 @@ let
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20220510";
version = "20220524";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-sqHX3APeblZai6NBgY+bnRnkzn6CGXwppiQ4pb8HTTw=";
hash = "sha256-m7Er6F0VWcdV3+oUPfhJJq80oaht15hBFtg7JQgZJI8=";
};
nativeBuildInputs = [ glib fake-dconf ];
makeFlags = [ "PREFIX=$(out)" ];
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L56
preInstall = ''
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L56
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
'';

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
version = "2022-04-29";
version = "2022-05-29";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "oFGJ29He7ZmryW/Eg+JLM9C3FzNjmKjzNtyXDHGuhwo=";
sha256 = "z8o/1Qc7XmefX9CuVr0Gq2MmKw2NlkUk+5Lz0Z593do=";
};
nativeBuildInputs = [

View File

@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
version = "42.1";
version = "42.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "MtAFaYoAuK5er5Hk5/hlnvQwCnmPyuaiK3TC1/z2pIY=";
sha256 = "6ENJYyp/XQhmzlwMVi5f6oQRoF8ickRBzZqCQgRiMiQ=";
};
patches = [

View File

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "spidermonkey";
version = "91.9.1";
version = "91.10.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha512 = "d432d559f2c5f4b0bc66a755db7d61585e24a727cd8d18630854b3fb8633d54baf61ed65b580345b13d52b66288aa15ca8ca5cfcde8231e88108241f0b007683";
sha512 = "8344b829d7bd86250afdd4cb582e27ed5705b3ef48aec50b9a39abc17deba86c9fd721f4667f5c2155e3d7cd1d6e1f82ff8e218ced3a16a4e06bb414ee0690f8";
};
outputs = [ "out" "dev" ];

View File

@ -0,0 +1,6 @@
# How to update
1. `./fetchrepo.sh`
2. `./mkrepo.sh`
3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`
4. Update the relevant argument defaults in `compose-android-packages.nix`

View File

@ -3,10 +3,10 @@
}:
{ toolsVersion ? "26.1.1"
, platformToolsVersion ? "31.0.3"
, buildToolsVersions ? [ "31.0.0" ]
, platformToolsVersion ? "33.0.1"
, buildToolsVersions ? [ "32.0.0" ]
, includeEmulator ? false
, emulatorVersion ? "30.9.0"
, emulatorVersion ? "31.3.7"
, platformVersions ? []
, includeSources ? false
, includeSystemImages ? false
@ -14,7 +14,7 @@
, abiVersions ? [ "armeabi-v7a" ]
, cmakeVersions ? [ ]
, includeNDK ? false
, ndkVersion ? "22.1.7171670"
, ndkVersion ? "24.0.8215888"
, ndkVersions ? [ndkVersion]
, useGoogleAPIs ? false
, useGoogleTVAddOns ? false
@ -120,7 +120,8 @@ rec {
};
platform-tools = import ./platform-tools.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
inherit deployAndroidPackage autoPatchelfHook pkgs lib;
os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here
package = packages.platform-tools.${platformToolsVersion};
};

View File

@ -425,16 +425,16 @@
"archives": [
{
"os": "windows",
"sha1": "1d35ead3cdfaf6e51001455f66a2db102dd647b7",
"size": 167191,
"url": "https://dl.google.com/android/repository/gvm-windows_v1_7_0.zip"
"sha1": "7be9c46e3bbf4ab107fa614e426f925584ce310b",
"size": 166975,
"url": "https://dl.google.com/android/repository/gvm-windows_v1_8_0.zip"
}
],
"displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer)",
"license": "android-sdk-license",
"name": "extras-google-Android_Emulator_Hypervisor_Driver",
"path": "extras/google/Android_Emulator_Hypervisor_Driver",
"revision": "1.7.0"
"revision": "1.8.0"
},
"extras;google;admob_ads_sdk": {
"archives": [
@ -1366,6 +1366,21 @@
},
"28": {
"google_apis_playstore": {
"arm64-v8a": {
"archives": [
{
"os": "all",
"sha1": "8901ad796ada9d40272c429427ba628de6919281",
"size": 835797733,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-28_r01.zip"
}
],
"displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-28-google_apis_playstore-arm64-v8a",
"path": "system-images/android-28/google_apis_playstore/arm64-v8a",
"revision": "28-google_apis_playstore-arm64-v8a"
},
"x86": {
"archives": [
{
@ -1562,15 +1577,15 @@
"archives": [
{
"os": "macosx",
"sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
"size": 1394878415,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip"
"sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f",
"size": 1468377491,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-darwin.zip"
},
{
"os": "linux",
"sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
"size": 1394878415,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip"
"sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f",
"size": 1468377491,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
@ -1582,29 +1597,109 @@
"x86_64": {
"archives": [
{
"os": "windows",
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip"
},
"os": "all",
"sha1": "a80de967f445b3cf71803425f4e4b21b36e11d66",
"size": 1423631458,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r09.zip"
}
],
"displayName": "Google Play Intel x86 Atom_64 System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-31-google_apis_playstore-x86_64",
"path": "system-images/android-31/google_apis_playstore/x86_64",
"revision": "31-google_apis_playstore-x86_64"
}
}
},
"32": {
"google_apis_playstore": {
"arm64-v8a": {
"archives": [
{
"os": "macosx",
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip"
"sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0",
"size": 1393496124,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-darwin.zip"
},
{
"os": "linux",
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip"
"sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0",
"size": 1393496124,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-32-google_apis_playstore-arm64-v8a",
"path": "system-images/android-32/google_apis_playstore/arm64-v8a",
"revision": "32-google_apis_playstore-arm64-v8a"
},
"x86_64": {
"archives": [
{
"os": "windows",
"sha1": "734f2fde664518688a402ad8198b10cf093c5871",
"size": 1437465460,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-windows.zip"
},
{
"os": "macosx",
"sha1": "734f2fde664518688a402ad8198b10cf093c5871",
"size": 1437465460,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-darwin.zip"
},
{
"os": "linux",
"sha1": "734f2fde664518688a402ad8198b10cf093c5871",
"size": 1437465460,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip"
}
],
"displayName": "Google Play Intel x86 Atom_64 System Image",
"license": "android-sdk-preview-license",
"name": "system-image-31-google_apis_playstore-x86_64",
"path": "system-images/android-31/google_apis_playstore/x86_64",
"revision": "31-google_apis_playstore-x86_64"
"name": "system-image-32-google_apis_playstore-x86_64",
"path": "system-images/android-32/google_apis_playstore/x86_64",
"revision": "32-google_apis_playstore-x86_64"
}
}
},
"Tiramisu": {
"google_apis_playstore": {
"arm64-v8a": {
"archives": [
{
"os": "macosx",
"sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383",
"size": 1457296537,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-darwin.zip"
},
{
"os": "linux",
"sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383",
"size": 1457296537,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-Tiramisu-google_apis_playstore-arm64-v8a",
"path": "system-images/android-Tiramisu/google_apis_playstore/arm64-v8a",
"revision": "Tiramisu-google_apis_playstore-arm64-v8a"
},
"x86_64": {
"archives": [
{
"os": "all",
"sha1": "2d2fb4c36efa836f348d6acbfc588f9eed70934e",
"size": 1438511715,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Tiramisu_r02.zip"
}
],
"displayName": "Google Play Intel x86 Atom_64 System Image",
"license": "android-sdk-preview-license",
"name": "system-image-Tiramisu-google_apis_playstore-x86_64",
"path": "system-images/android-Tiramisu/google_apis_playstore/x86_64",
"revision": "Tiramisu-google_apis_playstore-x86_64"
}
}
}
@ -3148,6 +3243,87 @@
"name": "build-tools",
"path": "build-tools/31.0.0",
"revision": "31.0.0"
},
"32.0.0": {
"archives": [
{
"os": "windows",
"sha1": "2134fdd4a00b3501b87597d100182e169eaa8c6a",
"size": 56720035,
"url": "https://dl.google.com/android/repository/210b77e4bc623bd4cdda4dae790048f227972bd2.build-tools_r32-windows.zip"
},
{
"os": "macosx",
"sha1": "27b56ee9a313f0f34f009dea343f3887d3f72b17",
"size": 52875135,
"url": "https://dl.google.com/android/repository/5219cc671e844de73762e969ace287c29d2e14cd.build-tools_r32-macosx.zip"
},
{
"os": "linux",
"sha1": "c7f2c700aafd9f7a2da187d80901481b80156719",
"size": 54940436,
"url": "https://dl.google.com/android/repository/build-tools_r32-linux.zip"
}
],
"displayName": "Android SDK Build-Tools 32",
"license": "android-sdk-license",
"name": "build-tools",
"path": "build-tools/32.0.0",
"revision": "32.0.0"
},
"32.1.0-rc1": {
"archives": [
{
"os": "windows",
"sha1": "af2abccfe48f9109ca0bddbec023234a4a68446b",
"size": 54636210,
"url": "https://dl.google.com/android/repository/21014bc1a76d38d0dcb79b3b3f49f40ea5a53c10.build-tools_r32.1-rc1-windows.zip"
},
{
"os": "linux",
"sha1": "4af23395f3a7cb4a5c01623347622f881a4772fd",
"size": 57403070,
"url": "https://dl.google.com/android/repository/build-tools_r32.1-rc1-linux.zip"
},
{
"os": "macosx",
"sha1": "38c166a60de3cb799ff1ad5b855234579d05e7b6",
"size": 59462877,
"url": "https://dl.google.com/android/repository/c165e9b235479731f416c7aea22d065819c7ce23.build-tools_r32.1-rc1-macosx.zip"
}
],
"displayName": "Android SDK Build-Tools 32.1-rc1",
"license": "android-sdk-preview-license",
"name": "build-tools",
"path": "build-tools/32.1.0-rc1",
"revision": "32.1.0-rc1"
},
"33.0.0-rc2": {
"archives": [
{
"os": "windows",
"sha1": "789aa6dfb2155b81e073108c70982f73c890a95b",
"size": 55466255,
"url": "https://dl.google.com/android/repository/830151c9e0c410f6148390f0de30bd349ba91efd.build-tools_r33-rc2-windows.zip"
},
{
"os": "linux",
"sha1": "013f98217b7af4f5677ab1a47e98da18ad57721c",
"size": 57876882,
"url": "https://dl.google.com/android/repository/build-tools_r33-rc2-linux.zip"
},
{
"os": "macosx",
"sha1": "586f8f77847ba3899b7652d6514e8c6a78ab673a",
"size": 59910819,
"url": "https://dl.google.com/android/repository/f8baa248444f0a5aca1119b48e897908a3da49d5.build-tools_r33-rc2-macosx.zip"
}
],
"displayName": "Android SDK Build-Tools 33-rc2",
"license": "android-sdk-preview-license",
"name": "build-tools",
"path": "build-tools/33.0.0-rc2",
"revision": "33.0.0-rc2"
}
},
"cmake": {
@ -3205,6 +3381,33 @@
"path": "cmake/3.18.1",
"revision": "3.18.1"
},
"3.22.1": {
"archives": [
{
"os": "macosx",
"sha1": "8604eeef9adadb626dbb70a7ff58a87e6a7b967a",
"size": 38223266,
"url": "https://dl.google.com/android/repository/cmake-3.22.1-darwin.zip"
},
{
"os": "linux",
"sha1": "fd0a48b4a758310df8c7aa51f59840ed48fe7ed8",
"size": 22308647,
"url": "https://dl.google.com/android/repository/cmake-3.22.1-linux.zip"
},
{
"os": "windows",
"sha1": "292778f32a7d5183e1c49c7897b870653f2d2c1b",
"size": 16116742,
"url": "https://dl.google.com/android/repository/cmake-3.22.1-windows.zip"
}
],
"displayName": "CMake 3.22.1",
"license": "android-sdk-preview-license",
"name": "cmake",
"path": "cmake/3.22.1",
"revision": "3.22.1"
},
"3.6.4111459": {
"archives": [
{
@ -3395,62 +3598,89 @@
"name": "cmdline-tools",
"path": "cmdline-tools/5.0",
"revision": "5.0"
}
},
"emulator": {
"30.8.4": {
},
"6.0": {
"archives": [
{
"os": "linux",
"sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a",
"size": 277522999,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip"
},
{
"os": "windows",
"sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129",
"size": 326723360,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip"
"sha1": "8d47ab9a90caa60ce8a95d7e384ec64633bc13b4",
"size": 119650630,
"url": "https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip"
},
{
"os": "macosx",
"sha1": "9811a649c516153681471f897a02398947640045",
"size": 315292647,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip"
"sha1": "bbd306940256ccb698edae47a56fb8da36d63e0b",
"size": 119650616,
"url": "https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip"
},
{
"os": "windows",
"sha1": "3098050fb2bdc7cc8a07bdef4dd13035f9f78d2a",
"size": 119629490,
"url": "https://dl.google.com/android/repository/commandlinetools-win-8092744_latest.zip"
}
],
"displayName": "Android SDK Command-line Tools",
"license": "android-sdk-license",
"name": "cmdline-tools",
"path": "cmdline-tools/6.0",
"revision": "6.0"
}
},
"emulator": {
"31.2.9": {
"archives": [
{
"os": "linux",
"sha1": "164b759748b3d2ee2616da74173867b11b18f64f",
"size": 276337192,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8316981.zip"
},
{
"os": "windows",
"sha1": "2b6768485a8e6492823a9156fa43c55092afd533",
"size": 345298639,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8316981.zip"
},
{
"os": "macosx",
"sha1": "af2d950318d8ae8cc516a1401a94f888f615aca6",
"size": 313877066,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8316981.zip"
}
],
"displayName": "Android Emulator",
"license": "android-sdk-license",
"name": "emulator",
"path": "emulator",
"revision": "30.8.4"
"revision": "31.2.9"
},
"30.9.0": {
"31.3.7": {
"archives": [
{
"os": "macosx",
"sha1": "b197e04e0543271899a1bd956a3f828e1159086b",
"size": 315330447,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip"
"sha1": "0020b44623995a5a9a5b0d114f8fd942e9d3cbed",
"size": 347204784,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8408431.zip"
},
{
"os": "linux",
"sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8",
"size": 277557089,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip"
"sha1": "46ba0c398fcd2704bee015c95e44d8f317b7b720",
"size": 293765376,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8408431.zip"
},
{
"os": "windows",
"sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed",
"size": 326205048,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip"
"sha1": "c09a35dd8c7eb7d8c53bf89c86019f5dbcd89b9d",
"size": 380137986,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8408431.zip"
}
],
"displayName": "Android Emulator",
"license": "android-sdk-preview-license",
"name": "emulator",
"path": "emulator",
"revision": "30.9.0"
"revision": "31.3.7"
}
},
"extras": {
@ -3481,32 +3711,32 @@
"path": "extras/google/auto",
"revision": "1.1"
},
"2.0-rc2": {
"2.0": {
"archives": [
{
"os": "linux",
"sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009",
"size": 6947111,
"url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip"
"os": "macosx",
"sha1": "d4d12a2173fef608ad62b94fed3a112bfa146759",
"size": 8030009,
"url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.0.zip"
},
{
"os": "macosx",
"sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736",
"size": 8593497,
"url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip"
"os": "linux",
"sha1": "77e3f80c2834e1fad33f56539ceb0215da408fab",
"size": 6895443,
"url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.0.zip"
},
{
"os": "windows",
"sha1": "471ae94176512f859580e6ac9e8b8f5010632c78",
"size": 7130894,
"url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip"
"sha1": "680418d5aca256cce151eb7f9527294e95b6bb8a",
"size": 6801703,
"url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.0.zip"
}
],
"displayName": "Android Auto Desktop Head Unit Emulator",
"license": "android-sdk-preview-license",
"license": "android-sdk-license",
"name": "extras",
"path": "extras/google/auto",
"revision": "2.0-rc2"
"revision": "2.0"
}
},
"ndk": {
@ -4265,6 +4495,195 @@
"name": "ndk",
"path": "ndk/23.0.7599858",
"revision": "23.0.7599858"
},
"23.1.7779620": {
"archives": [
{
"os": "macosx",
"sha1": "4f54966e733f92964f097887bedfdd0faa0f7042",
"size": 978956151,
"url": "https://dl.google.com/android/repository/android-ndk-r23b-darwin.zip"
},
{
"os": "linux",
"sha1": "f47ec4c4badd11e9f593a8450180884a927c330d",
"size": 725122099,
"url": "https://dl.google.com/android/repository/android-ndk-r23b-linux.zip"
},
{
"os": "windows",
"sha1": "6e3fb50022c611a2b13d02f5de5c21cc7206a298",
"size": 788638042,
"url": "https://dl.google.com/android/repository/android-ndk-r23b-windows.zip"
}
],
"displayName": "NDK (Side by side) 23.1.7779620",
"license": "android-sdk-license",
"name": "ndk",
"path": "ndk/23.1.7779620",
"revision": "23.1.7779620"
},
"24.0.7856742-rc1": {
"archives": [
{
"os": "macosx",
"sha1": "de560fe3bc8b760d598a08bc329030cf36f6a490",
"size": 950494966,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-darwin.zip"
},
{
"os": "linux",
"sha1": "4e43e498699b00cab8b07d431b65a0c1aa022313",
"size": 684615573,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-linux.zip"
},
{
"os": "windows",
"sha1": "ade5412e9ac0dd206824e9249a5fbc11c9c248bf",
"size": 690364848,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-windows.zip"
}
],
"displayName": "NDK (Side by side) 24.0.7856742",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/24.0.7856742",
"revision": "24.0.7856742-rc1"
},
"24.0.7956693-rc2": {
"archives": [
{
"os": "macosx",
"sha1": "9f95216133c78e871a31b35278dce524956579bd",
"size": 948103952,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-darwin.zip"
},
{
"os": "linux",
"sha1": "78f3006243c0bc051c7c7bfb939689032e7c41ba",
"size": 695411089,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-linux.zip"
},
{
"os": "windows",
"sha1": "d4eb40c03259094ae3ea05134ee17af717f48d6d",
"size": 661623688,
"url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-windows.zip"
}
],
"displayName": "NDK (Side by side) 24.0.7956693",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/24.0.7956693",
"revision": "24.0.7956693-rc2"
},
"24.0.8079956-rc3": {
"archives": [
{
"os": "macosx",
"sha1": "c7f3552e5bd6a76ea7fd460fe49afb4c7bdc5e39",
"size": 901524232,
"url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-darwin.zip"
},
{
"os": "linux",
"sha1": "de2a02e65c1c720336fe991dc708875539df85bf",
"size": 667835859,
"url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-linux.zip"
},
{
"os": "windows",
"sha1": "dbc9f19cc758285192c26238b4b87be207464bf2",
"size": 663173050,
"url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-windows.zip"
}
],
"displayName": "NDK (Side by side) 24.0.8079956",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/24.0.8079956",
"revision": "24.0.8079956-rc3"
},
"24.0.8215888": {
"archives": [
{
"os": "macosx",
"sha1": "fc4d0d86e3c802e8c4a6865d99cff58b336e2d5a",
"size": 901417197,
"url": "https://dl.google.com/android/repository/android-ndk-r24-darwin.zip"
},
{
"os": "linux",
"sha1": "eceb18f147282eb93615eff1ad84a9d3962fbb31",
"size": 667731974,
"url": "https://dl.google.com/android/repository/android-ndk-r24-linux.zip"
},
{
"os": "windows",
"sha1": "75f9c281c64762d18c84da465f486c60def47829",
"size": 663076813,
"url": "https://dl.google.com/android/repository/android-ndk-r24-windows.zip"
}
],
"displayName": "NDK (Side by side) 24.0.8215888",
"license": "android-sdk-license",
"name": "ndk",
"path": "ndk/24.0.8215888",
"revision": "24.0.8215888"
},
"25.0.8151533-rc1": {
"archives": [
{
"os": "macosx",
"sha1": "32024b773d65dd445cf8cf52156a331c544ee7e0",
"size": 918358459,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-darwin.zip"
},
{
"os": "linux",
"sha1": "0acca5e8faa47a6c961c358d724a93e33f8d6caf",
"size": 680831029,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-linux.zip"
},
{
"os": "windows",
"sha1": "a5486182f79696794eb1a216c11f5e29652e72d1",
"size": 676453790,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-windows.zip"
}
],
"displayName": "NDK (Side by side) 25.0.8151533",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/25.0.8151533",
"revision": "25.0.8151533-rc1"
},
"25.0.8221429-rc2": {
"archives": [
{
"os": "macosx",
"sha1": "51961d41ffe63ac664edf26b51906ec07213e088",
"size": 915502522,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-darwin.zip"
},
{
"os": "linux",
"sha1": "3b7435a1a851a4b2dadeafa466f323db9235dd9a",
"size": 677975159,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-linux.zip"
},
{
"os": "windows",
"sha1": "4fd188fdba7413c397bcaa342039d07266c954b6",
"size": 673597865,
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-windows.zip"
}
],
"displayName": "NDK (Side by side) 25.0.8221429",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/25.0.8221429",
"revision": "25.0.8221429-rc2"
}
},
"ndk-bundle": {
@ -4962,32 +5381,32 @@
}
},
"platform-tools": {
"31.0.3": {
"33.0.1": {
"archives": [
{
"os": "macosx",
"sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d",
"size": 13227985,
"url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip"
"sha1": "82f7c23e9e4acf6c86991bb23cd5d9f861f7819f",
"size": 13131422,
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-darwin.zip"
},
{
"os": "linux",
"sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef",
"size": 13302579,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip"
"sha1": "4792ee4593e8e2395ddb87a3e82d60629eb0e977",
"size": 7449306,
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-linux.zip"
},
{
"os": "windows",
"sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395",
"size": 11912013,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip"
"sha1": "e91ab59b5ddc5e387c5171b37c3813eaa2fa3846",
"size": 6331279,
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-windows.zip"
}
],
"displayName": "Android SDK Platform-Tools",
"license": "android-sdk-license",
"name": "platform-tools",
"path": "platform-tools",
"revision": "31.0.3"
"revision": "33.0.1"
}
},
"platforms": {
@ -5375,6 +5794,21 @@
"path": "platforms/android-31",
"revision": "31"
},
"32": {
"archives": [
{
"os": "all",
"sha1": "afae86ed55d29733d50996ffed832f2d1bd75b9a",
"size": 66108299,
"url": "https://dl.google.com/android/repository/platform-32_r01.zip"
}
],
"displayName": "Android SDK Platform 32",
"license": "android-sdk-license",
"name": "platforms",
"path": "platforms/android-32",
"revision": "32"
},
"4": {
"archives": [
{
@ -5500,9 +5934,51 @@
"name": "platforms",
"path": "platforms/android-9",
"revision": "9"
},
"Tiramisu": {
"archives": [
{
"os": "all",
"sha1": "2ac79862a909392d68d8ad503c45809e725d71f6",
"size": 67290653,
"url": "https://dl.google.com/android/repository/platform-Tiramisu_r02.zip"
}
],
"displayName": "Android SDK Platform Tiramisu",
"license": "android-sdk-license",
"name": "platforms",
"path": "platforms/android-Tiramisu",
"revision": "Tiramisu"
}
},
"skiaparser": {
"1": {
"archives": [
{
"os": "linux",
"sha1": "72be6f7630b28e02449a8bbadff7589688f3c3d6",
"size": 7014665,
"url": "https://dl.google.com/android/repository/skiaparser-8339467-linux.zip"
},
{
"os": "macosx",
"sha1": "53c688b0d2458bcead273791745fb27efa3b58ce",
"size": 17231541,
"url": "https://dl.google.com/android/repository/skiaparser-8339467-mac.zip"
},
{
"os": "windows",
"sha1": "8d08dc7c56531092f1704a24b3457bd0455a4be1",
"size": 10174177,
"url": "https://dl.google.com/android/repository/skiaparser-8339467-win.zip"
}
],
"displayName": "Layout Inspector image server for API 31 and T",
"license": "android-sdk-license",
"name": "skiaparser",
"path": "skiaparser/3",
"revision": "1"
},
"3": {
"archives": [
{
@ -5813,6 +6289,21 @@
"name": "sources",
"path": "sources/android-30",
"revision": "30"
},
"31": {
"archives": [
{
"os": "all",
"sha1": "2934d1b2975a8bf9fff112bd45a04f6d90db743e",
"size": 46383726,
"url": "https://dl.google.com/android/repository/sources-31_r01.zip"
}
],
"displayName": "Sources for Android 31",
"license": "android-sdk-license",
"name": "sources",
"path": "sources/android-31",
"revision": "31"
}
},
"tools": {

View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "blocksat-cli";
version = "0.4.3";
version = "0.4.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HHalq64pgjobnPwjXMi57OumHxOuf7wjuw0d6arMoAI=";
sha256 = "sha256-btwL8l5UdE9FwWXfuf1OHa8EwXDoFrh8tvOwr1yhyRg=";
};
propagatedBuildInputs = [

View File

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "13.4.5";
version = "13.4.6";
src = fetchFromGitHub {
owner = "ocrmypdf";
@ -40,7 +40,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-5IpJ55Vu9LjGgWJITkAH5fOr+MfovswWhwqbEs/RlzA=";
hash = "sha256-Hd9vsw+UEpE7juYSCiHhXtxaC58OtS/Uy20Jdp6QXPA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -11,7 +11,7 @@
meta = with lib; {
homepage = "https://openrazer.github.io/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ roelvandijk evanjs ];
maintainers = with maintainers; [ evanjs ] ++ teams.lumiguide.members;
platforms = platforms.linux;
};
}

View File

@ -1,21 +1,14 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl, callPackage }:
let
version = "0.1.5";
assets = {
x86_64-darwin = {
asset = "scala-cli-x86_64-apple-darwin.gz";
sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl";
};
x86_64-linux = {
asset = "scala-cli-x86_64-pc-linux.gz";
sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v";
};
};
pname = "scala-cli";
sources = builtins.fromJSON (builtins.readFile ./sources.json);
inherit (sources) version assets;
platforms = builtins.attrNames assets;
in
stdenv.mkDerivation {
pname = "scala-cli";
inherit version;
inherit pname version;
nativeBuildInputs = [ installShellFiles ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ coreutils zlib stdenv.cc.cc ];
@ -27,7 +20,6 @@ stdenv.mkDerivation {
url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}";
sha256 = asset.sha256;
};
unpackPhase = ''
runHook preUnpack
gzip -d < $src > scala-cli
@ -61,6 +53,7 @@ stdenv.mkDerivation {
license = licenses.asl20;
description = "Command-line tool to interact with the Scala language";
maintainers = [ maintainers.kubukoz ];
platforms = builtins.attrNames assets;
};
passthru.updateScript = callPackage ./update.nix { } { inherit platforms pname version; };
}

View File

@ -0,0 +1,13 @@
{
"version": "0.1.6",
"assets": {
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr"
},
"x86_64-linux": {
"asset": "scala-cli-x86_64-pc-linux.gz",
"sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6"
}
}
}

View File

@ -0,0 +1,37 @@
{ lib, curl, writeShellScript, jq, gnused, git, nix, coreutils }: { platforms, pname, version }:
writeShellScript "${pname}-update-script" ''
set -o errexit
PATH=${lib.makeBinPath [ curl jq gnused git nix coreutils ]}
latest_version=$(curl -s "https://api.github.com/repos/VirtusLab/scala-cli/releases?per_page=1" | jq ".[0].tag_name" --raw-output | sed 's/^v//')
if [[ "${version}" = "$latest_version" ]]; then
echo "The new version same as the old version."
exit 0
fi
nixpkgs=$(git rev-parse --show-toplevel)
sources_json="$nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json"
platform_assets=()
for platform in ${lib.concatStringsSep " " platforms}; do
asset=$(jq ".assets.\"$platform\".asset" --raw-output < $sources_json)
release_asset_url="https://github.com/Virtuslab/scala-cli/releases/download/v$latest_version/$asset"
asset_hash=$(nix-prefetch-url "$release_asset_url")
asset_object=$(jq --compact-output --null-input \
--arg asset "$asset" \
--arg sha256 "$asset_hash" \
--arg platform "$platform" \
'{asset: $asset, sha256: $sha256, platform: $platform}')
platform_assets+=($asset_object)
done
printf '%s\n' "''${platform_assets[@]}" | \
jq -s "map ( { (.platform): . | del(.platform) }) | add" | \
jq --arg version $latest_version \
'{ version: $version, assets: . }' > $sources_json
''

View File

@ -0,0 +1,141 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, autoPatchelfHook, makeWrapper, libcxx
, libX11, libXt, libXdamage, glib, gtk3, dbus-glib, openssl, nodejs, zlib
, fetchzip }:
let metadata = lib.importJSON ./meta.json;
in rec {
replay-recordreplay = stdenv.mkDerivation rec {
pname = "replay-recordreplay";
version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz"
metadata.recordreplay.url);
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ stdenv.cc.cc.lib openssl zlib ];
src = (fetchzip metadata.recordreplay);
dontBuild = true;
installPhase = ''
runHook preInstall
cp linux-recordreplay.so $out
runHook postInstall
'';
meta = with lib; {
description = "RecordReplay internal recording library";
homepage = "https://www.replay.io/";
license = lib.licenses.unfree;
maintainers = with maintainers; [ phryneas ];
platforms = [ "x86_64-linux" ];
};
};
replay-io = stdenv.mkDerivation rec {
pname = "replay-io";
version = builtins.head
(builtins.match ".*/linux-gecko-(.*).tar.bz2" metadata.replay.url);
srcs = fetchurl metadata.replay;
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = [ dbus-glib glib gtk3 libX11 libXdamage libXt ];
installPhase = ''
runHook preInstall
mkdir -p $out/opt/replay-io
cp -r * $out/opt/replay-io
mkdir $out/bin
makeWrapper $out/opt/replay-io/replay \
$out/bin/replay-io \
--set "RECORD_REPLAY_DRIVER" "${replay-recordreplay}"
runHook postInstall
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "The Time Travel Debugger for Web Development";
longDescription = ''
Replay allows you to record and replay web applications with familiar browser dev tools.
You can access the browser DevTools at any point of the recording, adding new logger
statements and inspecting the status of the DOM, variables and the current call stack.
Your recordings can be shared with other users for collaborative debugging.
'';
homepage = "https://www.replay.io/";
downloadPage = "https://www.replay.io/";
mainProgram = "replay-io";
license = lib.licenses.mpl20;
maintainers = with maintainers; [ phryneas ];
platforms = [ "x86_64-linux" ];
};
};
replay-node = stdenv.mkDerivation rec {
pname = "replay-node";
version = builtins.head
(builtins.match ".*/linux-node-(.*)" metadata.replay-node.url);
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = [ stdenv.cc.cc.lib ];
src = (fetchurl metadata.replay-node);
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/opt/replay-node
cp $src $out/opt/replay-node/node-unwrapped
chmod +x $out/opt/replay-node/node-unwrapped
makeWrapper $out/opt/replay-node/node-unwrapped \
$out/opt/replay-node/node \
--set "RECORD_REPLAY_DRIVER" "${replay-recordreplay}"
ln -s $out/opt/replay-node/node $out/bin/replay-node
runHook postInstall
'';
meta = with lib; {
description = "Event-driven I/O framework for the V8 JavaScript engine, patched for replay";
homepage = "https://github.com/RecordReplay/node";
license = licenses.mit;
maintainers = with maintainers; [ phryneas ];
platforms = platforms.linux;
mainProgram = "replay-node";
};
};
replay-node-cli = stdenv.mkDerivation {
pname = "replay-node-cli";
version = "0.1.7-" + builtins.head
(builtins.match ".*/linux-node-(.*)" metadata.replay-node.url);
src = fetchFromGitHub {
owner = "RecordReplay";
repo = "replay-node-cli";
rev = "5269c8b8e7c5c7a9618a68f883d19c11a68be837";
sha256 = "04d22q3dvs9vxpb9ps64pdxq9ziwgvnzdgsn6p9p0lzjagh0f5n0";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ stdenv.cc.cc.lib nodejs ];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/opt/replay-node-cli
cp -r * $out/opt/replay-node-cli
makeWrapper $out/opt/replay-node-cli/bin/replay-node \
$out/bin/replay-node \
--prefix "PATH" ":" "${nodejs}/bin" \
--set "RECORD_REPLAY_NODE_DIRECTORY" "${replay-node}/opt/replay-node"
runHook postInstall
'';
meta = with lib; {
description = "The Time Travel Debugger for Web Development - Node Command Line";
longDescription = ''
The Replay Node Command Line allows you to record node applications and debug them
with familiar browser dev tools.
You can access the browser DevTools at any point of the recording, adding new logger
statements and inspecting the status of variables and the current call stack.
Your recordings can be shared with other users for collaborative debugging.
'';
homepage = "https://www.replay.io/";
mainProgram = "replay-node";
license = lib.licenses.bsd3;
maintainers = with maintainers; [ phryneas ];
platforms = [ "x86_64-linux" ];
};
};
}

View File

@ -0,0 +1,15 @@
{
"replay": {
"url": "https://static.replay.io/downloads/linux-gecko-20220516-372662e7c79d-a9c63f38ea9b.tar.bz2",
"sha256": "151k0ykd2mn722zk7n902si6llcsrqnhgjb5bs4wgn9rik9advbi"
},
"recordreplay": {
"url": "https://static.replay.io/downloads/linux-recordreplay-a9c63f38ea9b.tgz",
"sha256": "032x9wiw4jcdkn0wjgr5j3pc4parrdy5n4r8bgmfxsldg5j48hmk",
"stripRoot": false
},
"replay-node": {
"url": "https://static.replay.io/downloads/linux-node-20220506-096c12cb47eb-a1d05f422dff",
"sha256": "1fbqlx01vp6llbvvz285brmz86jxc989v0cw6s06jk0657g87inq"
}
}

View File

@ -0,0 +1,32 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq gnused
set -euo pipefail
# e.g. linux-gecko-20220331-59d0a686993f-ffd8d6280276
BUILD_ID=$(curl https://static.replay.io/downloads/linux-replay.json | jq .buildId -r)
REVISION=$(echo $BUILD_ID | sed 's/^.*-//')
NODE_BUILD_ID=$(curl https://static.replay.io/downloads/linux-replay-node.json | jq .buildId -r)
REPLAY_DL=https://static.replay.io/downloads/${BUILD_ID}.tar.bz2
LIB_DL=https://static.replay.io/downloads/linux-recordreplay-${REVISION}.tgz
NODE_DL=https://static.replay.io/downloads/${NODE_BUILD_ID}
cat >"${BASH_SOURCE%/*}/meta.json" <<EOF
{
"replay": {
"url": "${REPLAY_DL}",
"sha256": "$(nix-prefetch-url --type sha256 "${REPLAY_DL}")"
},
"recordreplay": {
"url": "${LIB_DL}",
"sha256": "$(nix-prefetch-url --type sha256 --unpack "${LIB_DL}")",
"stripRoot": false
},
"replay-node": {
"url": "${NODE_DL}",
"sha256": "$(nix-prefetch-url --type sha256 "${NODE_DL}")"
}
}
EOF

View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hannesha/it87";
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ yorickvp ];
maintainers = teams.lumiguide.members;
};
}

View File

@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
"-Dalsa=${if !libOnly then "enabled" else "disabled"}"
"-Dasyncns=${if !libOnly then "enabled" else "disabled"}"
"-Davahi=${if zeroconfSupport then "enabled" else "disabled"}"
"-Dbluez5=${if !libOnly then "enabled" else "disabled"}"
"-Dbluez5=${if !libOnly && bluetoothSupport then "enabled" else "disabled"}"
# advanced bluetooth audio codecs are provided by gstreamer
"-Dbluez5-gstreamer=${if (!libOnly && bluetoothSupport && advancedBluetoothCodecs) then "enabled" else "disabled"}"
"-Ddatabase=simple"

View File

@ -5,6 +5,7 @@
, Security
, DiskArbitration
, Foundation
, nixosTests
}:
let version = "0.23.1";
@ -25,6 +26,9 @@ rustPlatform.buildRustPackage {
];
cargoSha256 = "sha256-dz+1IQZRSeMEagI2dnOtR3A8prg4UZ2Om0pd1BUhuhE=";
buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];
passthru.tests = {
meilisearch = nixosTests.meilisearch;
};
meta = with lib; {
broken = stdenv.isDarwin;
description = "Powerful, fast, and an easy to use search engine ";

View File

@ -13,6 +13,7 @@
, Security
, nghttp2
, libgit2
, cargo-edit
, withExtraFeatures ? true
, testers
, nushell
@ -29,7 +30,23 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ=";
};
cargoSha256 = "sha256-ALUp6sPcmnJy/A078umyKg8KBv23P0vv8mwoO9OU+DQ=";
cargoSha256 = "sha256-Vd8R9EsO52q840HqRzc37PirZZyTZr+Bnow5qHEacJ0=";
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
# `parquet`, for dataframe support), which by default has an impure build
# (git submodule for the `zstd` C library). The `pkg-config` feature flag
# fixes this, but it's hard to invoke this in the right place, because of
# the indirect dependencies. So add a direct dependency on `zstd-sys` here
# at the top level, along with this feature flag, to ensure that when
# `zstd-sys` is transitively invoked, it triggers a pure build using the
# system `zstd` library provided above.
depsExtraArgs = { nativeBuildInputs = [ cargo-edit ]; };
# cargo add has been merged in to cargo so the above can be removed once 1.62.0 is available in nixpkgs
# https://github.com/rust-lang/cargo/pull/10472
cargoUpdateHook = ''
cargo add zstd-sys --features pkg-config --offline
# write the change to the lockfile
cargo update --package zstd-sys --offline
'';
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
@ -41,19 +58,6 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional withExtraFeatures "extra";
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
# `parquet`, for dataframe support), which by default has an impure build
# (git submodule for the `zstd` C library). The `pkg-config` feature flag
# fixes this, but it's hard to invoke this in the right place, because of
# the indirect dependencies. So add a direct dependency on `zstd-sys` here
# at the top level, along with this feature flag, to ensure that when
# `zstd-sys` is transitively invoked, it triggers a pure build using the
# system `zstd` library provided above.
#
# (If this patch needs updating, in a nushell repo add the zstd-sys line to
# Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.)
cargoPatches = [ ./use-system-zstd-lib.diff ];
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR

View File

@ -1,32 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 6cebf66d..b6e40cd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2443,6 +2443,7 @@ dependencies = [
"rstest",
"serial_test",
"tempfile",
+ "zstd-sys",
]
[[package]]
@@ -5365,4 +5366,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index 0791d462..d520d9ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,9 @@ rayon = "1.5.1"
reedline = { version = "0.6.0", features = ["bashisms"]}
is_executable = "1.0.1"
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
+zstd-sys = { version = "2", features = [ "pkg-config" ] }
+
[dev-dependencies]
nu-test-support = { path="./crates/nu-test-support", version = "0.63.0" }
tempfile = "3.2.0"

View File

@ -1,5 +1,7 @@
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
, system ? builtins.currentSystem, crossSystem ? null, bootstrapFiles ? null
, localSystem ? { system = builtins.currentSystem; }
, crossSystem ? null
, bootstrapFiles ? null
}:
let cross = if crossSystem != null
@ -11,7 +13,7 @@ let cross = if crossSystem != null
in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin;
}
else {};
in with import pkgspath ({ inherit system; } // cross // custom-bootstrap);
in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
let
llvmPackages = llvmPackages_11;
@ -364,7 +366,7 @@ in rec {
test-pkgs = import test-pkgspath {
# if the bootstrap tools are for another platform, we should be testing
# that platform.
system = if crossSystem != null then crossSystem else system;
localSystem = if crossSystem != null then crossSystem else localSystem;
stdenvStages = args: let
args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; };

View File

@ -1,9 +1,6 @@
{ localSystem ? { system = builtins.currentSystem; }
, crossSystem ? null
}:
{ pkgs ? import ../../.. {} }:
let
pkgs = import ../../.. { inherit localSystem crossSystem; };
libc = pkgs.stdenv.cc.libc;
in with pkgs; rec {

View File

@ -9,12 +9,15 @@ lib.recurseIntoAttrs {
tempAllow pkgs.authy "2.1.0" [ "electron-9.4.4" ];
};
};
# Allow with forgetting
tempAllow = p: v: pa:
lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
# For this test we don't _really_ care about the version though,
# only about evaluation strictness
tempAllowAlike = p: v: pa: builtins.seq v builtins.seq p.version pa;
# A simplification of `tempAllow` that doesn't check the version, but
# has the same strictness characteristics. Actually checking a version
# here would add undue maintenance.
#
# Original:
# tempAllow = p: v: pa:
# lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
#
tempAllow = p: v: pa: builtins.seq v builtins.seq p.version pa;
in pkgs.hello;

View File

@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec {
description = "ESP8266 and ESP32 serial bootloader utility";
homepage = "https://github.com/espressif/esptool";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dezgeg dotlambda ];
maintainers = with maintainers; [ dezgeg dotlambda ] ++ teams.lumiguide.members;
platforms = platforms.linux;
};
}

View File

@ -1918,13 +1918,15 @@ with pkgs;
brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
stdenvBootstrapTools =
let args = { crossSystem = stdenv.hostPlatform.system; }; in
if stdenv.hostPlatform.isDarwin
then callPackage ../stdenv/darwin/make-bootstrap-tools.nix args
else if stdenv.hostPlatform.isLinux
then callPackage ../stdenv/linux/make-bootstrap-tools.nix args
else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
stdenvBootstrapTools = if stdenv.hostPlatform.isDarwin then
callPackage ../stdenv/darwin/make-bootstrap-tools.nix {
localSystem = stdenv.buildPlatform;
crossSystem =
if stdenv.buildPlatform == stdenv.hostPlatform then null else stdenv.hostPlatform;
}
else if stdenv.hostPlatform.isLinux then
callPackage ../stdenv/linux/make-bootstrap-tools.nix {}
else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
boxes = callPackage ../tools/text/boxes { };
@ -16115,6 +16117,9 @@ with pkgs;
replacement = callPackage ../development/tools/misc/replacement { };
inherit (callPackage ../development/tools/replay-io { })
replay-io replay-node-cli;
retdec = callPackage ../development/tools/analysis/retdec {
stdenv = gcc8Stdenv;
};