colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nixpkgs/staging-next' into staging

Browse Source 
Conflicts:
	pkgs/servers/search/groonga/default.nix
This commit is contained in:
Alyssa Ross 2021-12-02 14:52:44 +00:00
commit f404068903
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
180 changed files with 2169 additions and 1378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/labeler.yml vendored
View File

@ -143,6 +143,8 @@
- doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/vim/**/*
- pkgs/misc/vim-plugins/**/*
- nixos/modules/programs/neovim.nix
- pkgs/applications/editors/neovim/**/*
"6.topic: xfce":
- nixos/doc/manual/configuration/xfce.xml

14
.github/workflows/editorconfig.yml vendored
View File

@ -17,30 +17,26 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo 'PR_DIFF<<EOF' >> $GITHUB_ENV
gh api \
repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \
| jq '.[] | select(.status != "removed") | .filename' \
>> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
> "$HOME/changed_files"
- name: print list of changed files
run: |
cat "$HOME/changed_files"
- uses: actions/checkout@v2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
if: env.PR_DIFF
- uses: cachix/install-nix-action@v16
if: env.PR_DIFF
with:
# nixpkgs commit is pinned so that it doesn't break
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
- name: install editorconfig-checker
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
if: env.PR_DIFF
- name: Checking EditorConfig
if: env.PR_DIFF
run: |
echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size
cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size
- if: ${{ failure() }}
run: |
echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."

2
maintainers/maintainer-list.nix
View File

@ -8923,7 +8923,7 @@
name = "pasqui23";
};
patryk27 = {
email = "wychowaniec.patryk@gmail.com";
email = "pwychowaniec@pm.me";
github = "Patryk27";
githubId = 3395477;
name = "Patryk Wychowaniec";

2
nixos/doc/manual/configuration/renaming-interfaces.section.md
View File

@ -26,7 +26,7 @@ we assign the name `wan` to the interface with MAC address
```nix
systemd.network.links."10-wan" = {
matchConfig.MACAddress = "52:54:00:12:01:01";
matchConfig.PermanentMACAddress = "52:54:00:12:01:01";
linkConfig.Name = "wan";
};
```

2
nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml
View File

@ -32,7 +32,7 @@
</para>
<programlisting language="bash">
systemd.network.links.&quot;10-wan&quot; = {
matchConfig.MACAddress = &quot;52:54:00:12:01:01&quot;;
matchConfig.PermanentMACAddress = &quot;52:54:00:12:01:01&quot;;
linkConfig.Name = &quot;wan&quot;;
};
</programlisting>

13
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -24,7 +24,7 @@
</section>
<section xml:id="sec-release-22.05-incompatibilities">
<title>Backward Incompatibilities</title>
<itemizedlist spacing="compact">
<itemizedlist>
<listitem>
<para>
<literal>pkgs.ghc</literal> now refers to
@ -46,6 +46,17 @@
<literal>haskellPackages.callPackage</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.emacsPackages.orgPackages</literal> is removed
because org elpa is deprecated. The packages in the top level
of <literal>pkgs.emacsPackages</literal>, such as org and
org-contrib, refer to the ones in
<literal>pkgs.emacsPackages.elpaPackages</literal> and
<literal>pkgs.emacsPackages.nongnuPackages</literal> where the
new versions will release.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

5
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin
instead to ensure cross compilation keeps working (or switch to
`haskellPackages.callPackage`).
* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
The packages in the top level of `pkgs.emacsPackages`, such as org and
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
## Other Notable Changes {#sec-release-22.05-notable-changes}

21
nixos/lib/eval-config.nix
View File

@ -51,23 +51,28 @@ let
};
};
in rec {
# Merge the option definitions in all modules, forming the full
# system configuration.
inherit (lib.evalModules {
noUserModules = lib.evalModules {
inherit prefix check;
modules = baseModules ++ extraModules ++ [ pkgsModule ] ++ modules;
modules = baseModules ++ extraModules ++ [ pkgsModule ];
args = extraArgs;
specialArgs =
{ modulesPath = builtins.toString ../modules; } // specialArgs;
}) config options _module type;
};
# These are the extra arguments passed to every module. In
# particular, Nixpkgs is passed through the "pkgs" argument.
extraArgs = extraArgs_ // {
inherit baseModules extraModules modules;
inherit noUserModules baseModules extraModules modules;
};
in rec {
# Merge the option definitions in all modules, forming the full
# system configuration.
inherit (noUserModules.extendModules { inherit modules; })
config options _module type;
inherit extraArgs;
inherit (_module.args) pkgs;
}

94
nixos/lib/test-driver/test-driver.py
View File

@ -171,7 +171,7 @@ class Logger:
yield
self.drain_log_queue()
toc = time.time()
self.log("({:.2f} seconds)".format(toc - tic))
self.log("(finished: {}, in {:.2f} seconds)".format(message, toc - tic))
self.xml.endElement("nest")
@ -490,23 +490,24 @@ class Machine:
return rootlog.nested(msg, my_attrs)
def wait_for_monitor_prompt(self) -> str:
assert self.monitor is not None
answer = ""
while True:
undecoded_answer = self.monitor.recv(1024)
if not undecoded_answer:
break
answer += undecoded_answer.decode()
if answer.endswith("(qemu) "):
break
return answer
with self.nested("waiting for monitor prompt"):
assert self.monitor is not None
answer = ""
while True:
undecoded_answer = self.monitor.recv(1024)
if not undecoded_answer:
break
answer += undecoded_answer.decode()
if answer.endswith("(qemu) "):
break
return answer
def send_monitor_command(self, command: str) -> str:
message = ("{}\n".format(command)).encode()
self.log("sending monitor command: {}".format(command))
assert self.monitor is not None
self.monitor.send(message)
return self.wait_for_monitor_prompt()
with self.nested("sending monitor command: {}".format(command)):
message = ("{}\n".format(command)).encode()
assert self.monitor is not None
self.monitor.send(message)
return self.wait_for_monitor_prompt()
def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
"""Wait for a systemd unit to get into "active" state.
@ -533,7 +534,12 @@ class Machine:
return state == "active"
retry(check_active)
with self.nested(
"waiting for unit {}{}".format(
unit, f" with user {user}" if user is not None else ""
)
):
retry(check_active)
def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
@ -597,9 +603,14 @@ class Machine:
break
return "".join(output_buffer)
def execute(self, command: str, check_return: bool = True) -> Tuple[int, str]:
def execute(
self, command: str, check_return: bool = True, timeout: Optional[int] = 900
) -> Tuple[int, str]:
self.connect()
if timeout is not None:
command = "timeout {} sh -c {}".format(timeout, shlex.quote(command))
out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n"
assert self.shell
self.shell.send(out_command.encode())
@ -629,12 +640,12 @@ class Machine:
pass_fds=[self.shell.fileno()],
)
def succeed(self, *commands: str) -> str:
def succeed(self, *commands: str, timeout: Optional[int] = None) -> str:
"""Execute each command and check that it succeeds."""
output = ""
for command in commands:
with self.nested("must succeed: {}".format(command)):
(status, out) = self.execute(command)
(status, out) = self.execute(command, timeout=timeout)
if status != 0:
self.log("output: {}".format(out))
raise Exception(
@ -643,12 +654,12 @@ class Machine:
output += out
return output
def fail(self, *commands: str) -> str:
def fail(self, *commands: str, timeout: Optional[int] = None) -> str:
"""Execute each command and check that it fails."""
output = ""
for command in commands:
with self.nested("must fail: {}".format(command)):
(status, out) = self.execute(command)
(status, out) = self.execute(command, timeout=timeout)
if status == 0:
raise Exception(
"command `{}` unexpectedly succeeded".format(command)
@ -664,14 +675,14 @@ class Machine:
def check_success(_: Any) -> bool:
nonlocal output
status, output = self.execute(command)
status, output = self.execute(command, timeout=timeout)
return status == 0
with self.nested("waiting for success: {}".format(command)):
retry(check_success, timeout)
return output
def wait_until_fails(self, command: str) -> str:
def wait_until_fails(self, command: str, timeout: int = 900) -> str:
"""Wait until a command returns failure.
Throws an exception on timeout.
"""
@ -679,7 +690,7 @@ class Machine:
def check_failure(_: Any) -> bool:
nonlocal output
status, output = self.execute(command)
status, output = self.execute(command, timeout=timeout)
return status != 0
with self.nested("waiting for failure: {}".format(command)):
@ -752,7 +763,8 @@ class Machine:
status, _ = self.execute("nc -z localhost {}".format(port))
return status != 0
retry(port_is_closed)
with self.nested("waiting for TCP port {} to be closed"):
retry(port_is_closed)
def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
return self.systemctl("start {}".format(jobname), user)
@ -886,20 +898,20 @@ class Machine:
retry(screen_matches)
def wait_for_console_text(self, regex: str) -> None:
self.log("waiting for {} to appear on console".format(regex))
# Buffer the console output, this is needed
# to match multiline regexes.
console = io.StringIO()
while True:
try:
console.write(self.last_lines.get())
except queue.Empty:
self.sleep(1)
continue
console.seek(0)
matches = re.search(regex, console.read())
if matches is not None:
return
with self.nested("waiting for {} to appear on console".format(regex)):
# Buffer the console output, this is needed
# to match multiline regexes.
console = io.StringIO()
while True:
try:
console.write(self.last_lines.get())
except queue.Empty:
self.sleep(1)
continue
console.seek(0)
matches = re.search(regex, console.read())
if matches is not None:
return
def send_key(self, key: str) -> None:
key = CHAR_TO_KEY.get(key, key)
@ -1014,7 +1026,7 @@ class Machine:
)
return any(pattern.search(name) for name in names)
with self.nested("Waiting for a window to appear"):
with self.nested("waiting for a window to appear"):
retry(window_is_visible)
def sleep(self, secs: int) -> None:

9
nixos/modules/services/misc/home-assistant.nix
View File

@ -24,6 +24,8 @@ let
availableComponents = cfg.package.availableComponents;
explicitComponents = cfg.package.extraComponents;
usedPlatforms = config:
if isAttrs config then
optional (config ? platform) config.platform
@ -42,10 +44,13 @@ let
# } ];
useComponentPlatform = component: elem component (usedPlatforms cfg.config);
# Returns whether component is used in config
useExplicitComponent = component: elem component explicitComponents;
# Returns whether component is used in config or explicitly passed into package
useComponent = component:
hasAttrByPath (splitString "." component) cfg.config
|| useComponentPlatform component;
|| useComponentPlatform component
|| useExplicitComponent component;
# List of components used in config
extraComponents = filter useComponent availableComponents;

9
nixos/modules/services/networking/charybdis.nix
View File

@ -85,14 +85,21 @@ in
"d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"
];
environment.etc."charybdis/ircd.conf".source = configFile;
systemd.services.charybdis = {
description = "Charybdis IRC daemon";
wantedBy = [ "multi-user.target" ];
reloadIfChanged = true;
restartTriggers = [
configFile
];
environment = {
BANDB_DBPATH = "${cfg.statedir}/ban.db";
};
serviceConfig = {
ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";
ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile /etc/charybdis/ircd.conf";
ExecReload = "${coreutils}/bin/kill -HUP $MAINPID";
Group = cfg.group;
User = cfg.user;
};

2
nixos/modules/services/torrent/transmission.nix
View File

@ -67,7 +67,7 @@ in
description = "";
};
options.message-level = mkOption {
type = types.ints.between 0 2;
type = types.ints.between 0 3;
default = 2;
description = "Set verbosity of transmission messages.";
};

15
nixos/modules/services/x11/desktop-managers/gnome.xml
View File

@ -126,21 +126,6 @@
</programlisting>
</section>
<section xml:id="sec-gnome-gdm">
<title>GDM</title>
<para>
If you want to use GNOME Wayland session on Nvidia hardware, you need to enable:
</para>
<programlisting>
<xref linkend="opt-services.xserver.displayManager.gdm.nvidiaWayland"/> = true;
</programlisting>
<para>
as the default configuration will forbid this.
</para>
</section>
<section xml:id="sec-gnome-icons-and-gtk-themes">
<title>Icons and GTK Themes</title>

32
nixos/modules/system/activation/top-level.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, modules, baseModules, specialArgs, ... }:
{ config, lib, pkgs, extendModules, noUserModules, ... }:
with lib;
@ -11,16 +11,10 @@ let
# you can provide an easy way to boot the same configuration
# as you use, but with another kernel
# !!! fix this
children = mapAttrs (childName: childConfig:
(import ../../../lib/eval-config.nix {
inherit lib baseModules specialArgs;
system = config.nixpkgs.initialSystem;
modules =
(optionals childConfig.inheritParentConfig modules)
++ [ ./no-clone.nix ]
++ [ childConfig.configuration ];
}).config.system.build.toplevel
) config.specialisation;
children =
mapAttrs
(childName: childConfig: childConfig.configuration.system.build.toplevel)
config.specialisation;
systemBuilder =
let
@ -169,7 +163,11 @@ in
</screen>
'';
type = types.attrsOf (types.submodule (
{ ... }: {
local@{ ... }: let
extend = if local.config.inheritParentConfig
then extendModules
else noUserModules.extendModules;
in {
options.inheritParentConfig = mkOption {
type = types.bool;
default = true;
@ -178,7 +176,15 @@ in
options.configuration = mkOption {
default = {};
description = "Arbitrary NixOS configuration options.";
description = ''
Arbitrary NixOS configuration.
Anything you can add to a normal NixOS configuration, you can add
here, including imports and config values, although nested
specialisations will be ignored.
'';
visible = "shallow";
inherit (extend { modules = [ ./no-clone.nix ]; }) type;
};
})
);

406
nixos/modules/virtualisation/amazon-ec2-amis.nix Normal file
View File

@ -0,0 +1,406 @@
let self = {
"14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470";
"14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c";
"14.04".ap-northeast-1.x86_64-linux.pv-s3 = "ami-8fc4f68e";
"14.04".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-da280888";
"14.04".ap-southeast-1.x86_64-linux.pv-ebs = "ami-7a9dbc28";
"14.04".ap-southeast-1.x86_64-linux.pv-s3 = "ami-c4290996";
"14.04".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-ab523e91";
"14.04".ap-southeast-2.x86_64-linux.pv-ebs = "ami-6769055d";
"14.04".ap-southeast-2.x86_64-linux.pv-s3 = "ami-15533f2f";
"14.04".eu-central-1.x86_64-linux.hvm-ebs = "ami-ba0234a7";
"14.04".eu-west-1.x86_64-linux.hvm-ebs = "ami-96cb63e1";
"14.04".eu-west-1.x86_64-linux.pv-ebs = "ami-b48c25c3";
"14.04".eu-west-1.x86_64-linux.pv-s3 = "ami-06cd6571";
"14.04".sa-east-1.x86_64-linux.hvm-ebs = "ami-01b90e1c";
"14.04".sa-east-1.x86_64-linux.pv-ebs = "ami-69e35474";
"14.04".sa-east-1.x86_64-linux.pv-s3 = "ami-61b90e7c";
"14.04".us-east-1.x86_64-linux.hvm-ebs = "ami-58ba3a30";
"14.04".us-east-1.x86_64-linux.pv-ebs = "ami-9e0583f6";
"14.04".us-east-1.x86_64-linux.pv-s3 = "ami-9cbe3ef4";
"14.04".us-west-1.x86_64-linux.hvm-ebs = "ami-0bc3d74e";
"14.04".us-west-1.x86_64-linux.pv-ebs = "ami-8b1703ce";
"14.04".us-west-1.x86_64-linux.pv-s3 = "ami-27ccd862";
"14.04".us-west-2.x86_64-linux.hvm-ebs = "ami-3bf1bf0b";
"14.04".us-west-2.x86_64-linux.pv-ebs = "ami-259bd515";
"14.04".us-west-2.x86_64-linux.pv-s3 = "ami-07094037";
"14.12".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-24435f25";
"14.12".ap-northeast-1.x86_64-linux.pv-ebs = "ami-b0425eb1";
"14.12".ap-northeast-1.x86_64-linux.pv-s3 = "ami-fed3c6ff";
"14.12".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-6c765d3e";
"14.12".ap-southeast-1.x86_64-linux.pv-ebs = "ami-6a765d38";
"14.12".ap-southeast-1.x86_64-linux.pv-s3 = "ami-d1bf9183";
"14.12".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-af86f395";
"14.12".ap-southeast-2.x86_64-linux.pv-ebs = "ami-b386f389";
"14.12".ap-southeast-2.x86_64-linux.pv-s3 = "ami-69c5ae53";
"14.12".eu-central-1.x86_64-linux.hvm-ebs = "ami-4a497a57";
"14.12".eu-central-1.x86_64-linux.pv-ebs = "ami-4c497a51";
"14.12".eu-central-1.x86_64-linux.pv-s3 = "ami-60f2c27d";
"14.12".eu-west-1.x86_64-linux.hvm-ebs = "ami-d126a5a6";
"14.12".eu-west-1.x86_64-linux.pv-ebs = "ami-0126a576";
"14.12".eu-west-1.x86_64-linux.pv-s3 = "ami-deda5fa9";
"14.12".sa-east-1.x86_64-linux.hvm-ebs = "ami-2d239e30";
"14.12".sa-east-1.x86_64-linux.pv-ebs = "ami-35239e28";
"14.12".sa-east-1.x86_64-linux.pv-s3 = "ami-81e3519c";
"14.12".us-east-1.x86_64-linux.hvm-ebs = "ami-0c463a64";
"14.12".us-east-1.x86_64-linux.pv-ebs = "ami-ac473bc4";
"14.12".us-east-1.x86_64-linux.pv-s3 = "ami-00e18a68";
"14.12".us-west-1.x86_64-linux.hvm-ebs = "ami-ca534a8f";
"14.12".us-west-1.x86_64-linux.pv-ebs = "ami-3e534a7b";
"14.12".us-west-1.x86_64-linux.pv-s3 = "ami-2905196c";
"14.12".us-west-2.x86_64-linux.hvm-ebs = "ami-fb9dc3cb";
"14.12".us-west-2.x86_64-linux.pv-ebs = "ami-899dc3b9";
"14.12".us-west-2.x86_64-linux.pv-s3 = "ami-cb7f2dfb";
"15.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-58cac236";
"15.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-39c8c057";
"15.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-5ac9c134";
"15.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-03cec66d";
"15.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-2fc2094c";
"15.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-9ec308fd";
"15.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-95c00bf6";
"15.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-bfc00bdc";
"15.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-996c4cfa";
"15.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3f6e4e5c";
"15.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-066d4d65";
"15.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-cc6e4eaf";
"15.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-3f8c6b50";
"15.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-5b836434";
"15.09".eu-central-1.x86_64-linux.pv-ebs = "ami-118c6b7e";
"15.09".eu-central-1.x86_64-linux.pv-s3 = "ami-2c977043";
"15.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-9cf04aef";
"15.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-2bea5058";
"15.09".eu-west-1.x86_64-linux.pv-ebs = "ami-c9e852ba";
"15.09".eu-west-1.x86_64-linux.pv-s3 = "ami-c6f64cb5";
"15.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-6e52df02";
"15.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-1852df74";
"15.09".sa-east-1.x86_64-linux.pv-ebs = "ami-4368e52f";
"15.09".sa-east-1.x86_64-linux.pv-s3 = "ami-f15ad79d";
"15.09".us-east-1.x86_64-linux.hvm-ebs = "ami-84a6a0ee";
"15.09".us-east-1.x86_64-linux.hvm-s3 = "ami-06a7a16c";
"15.09".us-east-1.x86_64-linux.pv-ebs = "ami-a4a1a7ce";
"15.09".us-east-1.x86_64-linux.pv-s3 = "ami-5ba8ae31";
"15.09".us-west-1.x86_64-linux.hvm-ebs = "ami-22c8bb42";
"15.09".us-west-1.x86_64-linux.hvm-s3 = "ami-a2ccbfc2";
"15.09".us-west-1.x86_64-linux.pv-ebs = "ami-10cebd70";
"15.09".us-west-1.x86_64-linux.pv-s3 = "ami-fa30429a";
"15.09".us-west-2.x86_64-linux.hvm-ebs = "ami-ce57b9ae";
"15.09".us-west-2.x86_64-linux.hvm-s3 = "ami-2956b849";
"15.09".us-west-2.x86_64-linux.pv-ebs = "ami-005fb160";
"15.09".us-west-2.x86_64-linux.pv-s3 = "ami-cd55bbad";
"16.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-40619d21";
"16.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-ce629eaf";
"16.03".ap-northeast-1.x86_64-linux.pv-ebs = "ami-ef639f8e";
"16.03".ap-northeast-1.x86_64-linux.pv-s3 = "ami-a1609cc0";
"16.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-deca00b0";
"16.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-a3b77dcd";
"16.03".ap-northeast-2.x86_64-linux.pv-ebs = "ami-7bcb0115";
"16.03".ap-northeast-2.x86_64-linux.pv-s3 = "ami-a2b77dcc";
"16.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0dff9562";
"16.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-13f69c7c";
"16.03".ap-south-1.x86_64-linux.pv-ebs = "ami-0ef39961";
"16.03".ap-south-1.x86_64-linux.pv-s3 = "ami-e0c8a28f";
"16.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-5e964a3d";
"16.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-4d964a2e";
"16.03".ap-southeast-1.x86_64-linux.pv-ebs = "ami-ec9b478f";
"16.03".ap-southeast-1.x86_64-linux.pv-s3 = "ami-999b47fa";
"16.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-9f7359fc";
"16.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-987359fb";
"16.03".ap-southeast-2.x86_64-linux.pv-ebs = "ami-a2705ac1";
"16.03".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a3705ac0";
"16.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-17a45178";
"16.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-f9a55096";
"16.03".eu-central-1.x86_64-linux.pv-ebs = "ami-c8a550a7";
"16.03".eu-central-1.x86_64-linux.pv-s3 = "ami-6ea45101";
"16.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-b5b3d5c6";
"16.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-c986e0ba";
"16.03".eu-west-1.x86_64-linux.pv-ebs = "ami-b083e5c3";
"16.03".eu-west-1.x86_64-linux.pv-s3 = "ami-3c83e54f";
"16.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-f6eb7f9a";
"16.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-93e773ff";
"16.03".sa-east-1.x86_64-linux.pv-ebs = "ami-cbb82ca7";
"16.03".sa-east-1.x86_64-linux.pv-s3 = "ami-abb82cc7";
"16.03".us-east-1.x86_64-linux.hvm-ebs = "ami-c123a3d6";
"16.03".us-east-1.x86_64-linux.hvm-s3 = "ami-bc25a5ab";
"16.03".us-east-1.x86_64-linux.pv-ebs = "ami-bd25a5aa";
"16.03".us-east-1.x86_64-linux.pv-s3 = "ami-a325a5b4";
"16.03".us-west-1.x86_64-linux.hvm-ebs = "ami-748bcd14";
"16.03".us-west-1.x86_64-linux.hvm-s3 = "ami-a68dcbc6";
"16.03".us-west-1.x86_64-linux.pv-ebs = "ami-048acc64";
"16.03".us-west-1.x86_64-linux.pv-s3 = "ami-208dcb40";
"16.03".us-west-2.x86_64-linux.hvm-ebs = "ami-8263a0e2";
"16.03".us-west-2.x86_64-linux.hvm-s3 = "ami-925c9ff2";
"16.03".us-west-2.x86_64-linux.pv-ebs = "ami-5e61a23e";
"16.03".us-west-2.x86_64-linux.pv-s3 = "ami-734c8f13";
# 16.09.1508.3909827
"16.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-68453b0f";
"16.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-f9bec09e";
"16.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-254a3442";
"16.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-ef473988";
"16.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-18ae7f76";
"16.09".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-9eac7df0";
"16.09".ap-northeast-2.x86_64-linux.pv-ebs = "ami-57aa7b39";
"16.09".ap-northeast-2.x86_64-linux.pv-s3 = "ami-5cae7f32";
"16.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-b3f98fdc";
"16.09".ap-south-1.x86_64-linux.hvm-s3 = "ami-98e690f7";
"16.09".ap-south-1.x86_64-linux.pv-ebs = "ami-aef98fc1";
"16.09".ap-south-1.x86_64-linux.pv-s3 = "ami-caf88ea5";
"16.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-80fb51e3";
"16.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-2df3594e";
"16.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-37f05a54";
"16.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-27f35944";
"16.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-57ece834";
"16.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-87f4f0e4";
"16.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-d8ede9bb";
"16.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a6ebefc5";
"16.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-9f863bfb";
"16.09".ca-central-1.x86_64-linux.hvm-s3 = "ami-ea85388e";
"16.09".ca-central-1.x86_64-linux.pv-ebs = "ami-ce8a37aa";
"16.09".ca-central-1.x86_64-linux.pv-s3 = "ami-448a3720";
"16.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-1b884774";
"16.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-b08c43df";
"16.09".eu-central-1.x86_64-linux.pv-ebs = "ami-888946e7";
"16.09".eu-central-1.x86_64-linux.pv-s3 = "ami-06874869";
"16.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-1ed3e76d";
"16.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-73d1e500";
"16.09".eu-west-1.x86_64-linux.pv-ebs = "ami-44c0f437";
"16.09".eu-west-1.x86_64-linux.pv-s3 = "ami-f3d8ec80";
"16.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-2c9c9648";
"16.09".eu-west-2.x86_64-linux.hvm-s3 = "ami-6b9e940f";
"16.09".eu-west-2.x86_64-linux.pv-ebs = "ami-f1999395";
"16.09".eu-west-2.x86_64-linux.pv-s3 = "ami-bb9f95df";
"16.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-a11882cd";
"16.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-7726bc1b";
"16.09".sa-east-1.x86_64-linux.pv-ebs = "ami-9725bffb";
"16.09".sa-east-1.x86_64-linux.pv-s3 = "ami-b027bddc";
"16.09".us-east-1.x86_64-linux.hvm-ebs = "ami-854ca593";
"16.09".us-east-1.x86_64-linux.hvm-s3 = "ami-2241a834";
"16.09".us-east-1.x86_64-linux.pv-ebs = "ami-a441a8b2";
"16.09".us-east-1.x86_64-linux.pv-s3 = "ami-e841a8fe";
"16.09".us-east-2.x86_64-linux.hvm-ebs = "ami-3f41645a";
"16.09".us-east-2.x86_64-linux.hvm-s3 = "ami-804065e5";
"16.09".us-east-2.x86_64-linux.pv-ebs = "ami-f1466394";
"16.09".us-east-2.x86_64-linux.pv-s3 = "ami-05426760";
"16.09".us-west-1.x86_64-linux.hvm-ebs = "ami-c2efbca2";
"16.09".us-west-1.x86_64-linux.hvm-s3 = "ami-d71042b7";
"16.09".us-west-1.x86_64-linux.pv-ebs = "ami-04e8bb64";
"16.09".us-west-1.x86_64-linux.pv-s3 = "ami-31e9ba51";
"16.09".us-west-2.x86_64-linux.hvm-ebs = "ami-6449f504";
"16.09".us-west-2.x86_64-linux.hvm-s3 = "ami-344af654";
"16.09".us-west-2.x86_64-linux.pv-ebs = "ami-6d4af60d";
"16.09".us-west-2.x86_64-linux.pv-s3 = "ami-de48f4be";
# 17.03.885.6024dd4067
"17.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-dbd0f7bc";
"17.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-7cdff81b";
"17.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-c59a48ab";
"17.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-0b944665";
"17.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-4f413220";
"17.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-864033e9";
"17.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-e08c3383";
"17.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-c28f30a1";
"17.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-fca9a69f";
"17.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3daaa55e";
"17.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-9b00bdff";
"17.03".ca-central-1.x86_64-linux.hvm-s3 = "ami-e800bd8c";
"17.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-5450803b";
"17.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-6e2efe01";
"17.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-10754c76";
"17.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-11734a77";
"17.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-ff1d099b";
"17.03".eu-west-2.x86_64-linux.hvm-s3 = "ami-fe1d099a";
"17.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-d95d3eb5";
"17.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-fca2c190";
"17.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0940c61f";
"17.03".us-east-1.x86_64-linux.hvm-s3 = "ami-674fc971";
"17.03".us-east-2.x86_64-linux.hvm-ebs = "ami-afc2e6ca";
"17.03".us-east-2.x86_64-linux.hvm-s3 = "ami-a1cde9c4";
"17.03".us-west-1.x86_64-linux.hvm-ebs = "ami-587b2138";
"17.03".us-west-1.x86_64-linux.hvm-s3 = "ami-70411b10";
"17.03".us-west-2.x86_64-linux.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.x86_64-linux.hvm-s3 = "ami-5139ae31";
# 17.09.2681.59661f21be6
"17.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-a30192da";
"17.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-295a414d";
"17.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-8c0eb9f1";
"17.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-266cfe49";
"17.09".us-east-1.x86_64-linux.hvm-ebs = "ami-40bee63a";
"17.09".us-east-2.x86_64-linux.hvm-ebs = "ami-9d84aff8";
"17.09".us-west-1.x86_64-linux.hvm-ebs = "ami-d14142b1";
"17.09".us-west-2.x86_64-linux.hvm-ebs = "ami-3eb40346";
"17.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-ca8207ae";
"17.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-84bccff8";
"17.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0dc5386f";
"17.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-89b921ef";
"17.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-179b3b79";
"17.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-4762202b";
"17.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-4e376021";
# 18.03.132946.1caae7247b8
"18.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-065c46ec";
"18.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-64f31903";
"18.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-5a8d3d27";
"18.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-09faf9e2";
"18.03".us-east-1.x86_64-linux.hvm-ebs = "ami-8b3538f4";
"18.03".us-east-2.x86_64-linux.hvm-ebs = "ami-150b3170";
"18.03".us-west-1.x86_64-linux.hvm-ebs = "ami-ce06ebad";
"18.03".us-west-2.x86_64-linux.hvm-ebs = "ami-586c3520";
"18.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-aca72ac8";
"18.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-aa0b4d40";
"18.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-d0f254b2";
"18.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-456511a8";
"18.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-3366d15d";
"18.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-163e1f7a";
"18.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-6a390b05";
# 18.09.910.c15e342304a
"18.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0f412186fb8a0ec97";
"18.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0dada3805ce43c55e";
"18.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-074df85565f2e02e2";
"18.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-07c9b884e679df4f8";
"18.09".us-east-1.x86_64-linux.hvm-ebs = "ami-009c9c3f1af480ff3";
"18.09".us-east-2.x86_64-linux.hvm-ebs = "ami-08199961085ea8bc6";
"18.09".us-west-1.x86_64-linux.hvm-ebs = "ami-07aa7f56d612ddd38";
"18.09".us-west-2.x86_64-linux.hvm-ebs = "ami-01c84b7c368ac24d1";
"18.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-04f66113f76198f6c";
"18.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0892c7e24ebf2194f";
"18.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-010730f36424b0a2c";
"18.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0cdba8e998f076547";
"18.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0400a698e6a9f4a15";
"18.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-0e4a8a47fd6db6112";
"18.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0880a678d3f555313";
# 19.03.172286.8ea36d73256
"19.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fe40176548ff0940";
"19.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-03a40fd3a02fe95ba";
"19.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-0436f9da0f20a638e";
"19.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0022b8ea9efde5de4";
"19.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0efc58fb70ae9a217";
"19.03".us-east-2.x86_64-linux.hvm-ebs = "ami-0abf711b1b34da1af";
"19.03".us-west-1.x86_64-linux.hvm-ebs = "ami-07d126e8838c40ec5";
"19.03".us-west-2.x86_64-linux.hvm-ebs = "ami-03f8a737546e47fb0";
"19.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-03f9fd0ef2e035ede";
"19.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0cff66114c652c262";
"19.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-054c73a7f8d773ea9";
"19.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-00db62688900456a4";
"19.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0485cdd1a5fdd2117";
"19.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
"19.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0303deb1b5890f878";
# 19.09.2243.84af403f54f
"19.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-071082f0fa035374f";
"19.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
"19.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-09566799591d1bfed";
"19.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-015f8efc2be419b79";
"19.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-07fc0a32d885e01ed";
"19.09".us-east-1.x86_64-linux.hvm-ebs = "ami-03330d8b51287412f";
"19.09".us-east-2.x86_64-linux.hvm-ebs = "ami-0518b4c84972e967f";
"19.09".us-west-1.x86_64-linux.hvm-ebs = "ami-06ad07e61a353b4a6";
"19.09".us-west-2.x86_64-linux.hvm-ebs = "ami-0e31e30925cf3ce4e";
"19.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-07df50fc76702a36d";
"19.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f71ae5d4b0b78d95";
"19.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-057bbf2b4bd62d210";
"19.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-02a62555ca182fb5b";
"19.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0219dde0e6b7b7b93";
"19.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-066f7f2a895c821a1";
"19.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-055b2348db2827ff1";
"19.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-018aab68377227e06";
# 20.03.1554.94e39623a49
"20.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-02c34db5766cc7013";
"20.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e32bd8c7853883f1";
"20.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-061edb1356c1d69fd";
"20.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0a1a94722dcbff94c";
"20.03".eu-north-1.x86_64-linux.hvm-ebs = "ami-02699abfacbb6464b";
"20.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0c5e7760748b74e85";
"20.03".us-east-2.x86_64-linux.hvm-ebs = "ami-030296bb256764655";
"20.03".us-west-1.x86_64-linux.hvm-ebs = "ami-050be818e0266b741";
"20.03".us-west-2.x86_64-linux.hvm-ebs = "ami-06562f78dca68eda2";
"20.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-02365684a173255c7";
"20.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dbf353e168d155f7";
"20.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-04c0f3a75f63daddd";
"20.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-093d9cc49c191eb6c";
"20.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0087df91a7b6ebd45";
"20.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0a1a6b569af04af9d";
"20.03".ap-east-1.x86_64-linux.hvm-ebs = "ami-0d18fdd309cdefa86";
"20.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-09859378158ae971d";
# 20.03.2351.f8248ab6d9e-aarch64-linux
"20.03".eu-west-1.aarch64-linux.hvm-ebs = "ami-0a4c46dfdfe921aab";
"20.03".eu-west-2.aarch64-linux.hvm-ebs = "ami-0b47871912b7d36f9";
"20.03".eu-west-3.aarch64-linux.hvm-ebs = "ami-01031e1aa505b8935";
"20.03".eu-central-1.aarch64-linux.hvm-ebs = "ami-0bb4669de1f477fd1";
# missing "20.03".eu-north-1.aarch64-linux.hvm-ebs = "ami-";
"20.03".us-east-1.aarch64-linux.hvm-ebs = "ami-01d2de16a1878271c";
"20.03".us-east-2.aarch64-linux.hvm-ebs = "ami-0eade0158b1ff49c0";
"20.03".us-west-1.aarch64-linux.hvm-ebs = "ami-0913bf30cb9a764a4";
"20.03".us-west-2.aarch64-linux.hvm-ebs = "ami-073449580ff8e82b5";
"20.03".ca-central-1.aarch64-linux.hvm-ebs = "ami-050f2e923c4d703c0";
"20.03".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0d11ef6705a9a11a7";
"20.03".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-05446a2f818cd3263";
"20.03".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0c057f010065d2453";
"20.03".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-0e90eda7f24eb33ab";
"20.03".ap-south-1.aarch64-linux.hvm-ebs = "ami-03ba7e9f093f568bc";
"20.03".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a8344c6ce6d0c902";
# 20.09.2016.19db3e5ea27
"20.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0057cb7d614329fa2";
"20.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
"20.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e8985c3ea42f87fe";
"20.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-0eed77c38432886d2";
"20.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-0be5bcadd632bea14";
"20.09".us-east-1.x86_64-linux.hvm-ebs = "ami-0a2cce52b42daccc8";
"20.09".us-east-2.x86_64-linux.hvm-ebs = "ami-09378bf487b07a4d8";
"20.09".us-west-1.x86_64-linux.hvm-ebs = "ami-09b4337b2a9e77485";
"20.09".us-west-2.x86_64-linux.hvm-ebs = "ami-081d3bb5fbee0a1ac";
"20.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-020c24c6c607e7ac7";
"20.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-08f648d5db009e67d";
"20.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0be390efaccbd40f9";
"20.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0c3311601cbe8f927";
"20.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0020146701f4d56cf";
"20.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0117e2bd876bb40d1";
"20.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-0c42f97e5b1fda92f";
"20.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-021637976b094959d";
# 20.09.2016.19db3e5ea27-aarch64-linux
"20.09".eu-west-1.aarch64-linux.hvm-ebs = "ami-00a02608ff45ff8f9";
"20.09".eu-west-2.aarch64-linux.hvm-ebs = "ami-0e991d0f8dca21e20";
"20.09".eu-west-3.aarch64-linux.hvm-ebs = "ami-0d18eec4dc48c6f3b";
"20.09".eu-central-1.aarch64-linux.hvm-ebs = "ami-01691f25d08f48c9e";
"20.09".eu-north-1.aarch64-linux.hvm-ebs = "ami-09bb5aabe567ec6f4";
"20.09".us-east-1.aarch64-linux.hvm-ebs = "ami-0504bd006f9eaae42";
"20.09".us-east-2.aarch64-linux.hvm-ebs = "ami-00f0f8f2ab2d695ad";
"20.09".us-west-1.aarch64-linux.hvm-ebs = "ami-02d147d2cb992f878";
"20.09".us-west-2.aarch64-linux.hvm-ebs = "ami-07f40006cf4d4820e";
"20.09".ca-central-1.aarch64-linux.hvm-ebs = "ami-0e5f563919a987894";
"20.09".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-083e35d1acecae5c1";
"20.09".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-052cdc008b245b067";
"20.09".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-05e137f373bd72c0c";
"20.09".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-020791fe4c32f851a";
"20.09".ap-south-1.aarch64-linux.hvm-ebs = "ami-0285bb96a0f2c3955";
"20.09".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a55ab650c32be058";
# 21.05.740.aa576357673
"21.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-048dbc738074a3083";
"21.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0234cf81fec68315d";
"21.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-020e459baf709107d";
"21.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0857d5d1309ab8b77";
"21.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-05403e3ae53d3716f";
"21.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0d3002ba40b5b9897";
"21.05".us-east-2.x86_64-linux.hvm-ebs = "ami-069a0ca1bde6dea52";
"21.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0b415460a84bcf9bc";
"21.05".us-west-2.x86_64-linux.hvm-ebs = "ami-093cba49754abd7f8";
"21.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-065c13e1d52d60b33";
"21.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-04f570c70ff9b665e";
"21.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-02a3d1df595df5ef6";
"21.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-027836fddb5c56012";
"21.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0edacd41dc7700c39";
"21.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-0b279b5bb55288059";
"21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc";
"21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6";
latest = self."21.05";
}; in self

380
nixos/modules/virtualisation/ec2-amis.nix
View File

@ -1,371 +1,9 @@
let self = {
"14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470";
"14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c";
"14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e";
"14.04".ap-southeast-1.hvm-ebs = "ami-da280888";
"14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28";
"14.04".ap-southeast-1.pv-s3 = "ami-c4290996";
"14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91";
"14.04".ap-southeast-2.pv-ebs = "ami-6769055d";
"14.04".ap-southeast-2.pv-s3 = "ami-15533f2f";
"14.04".eu-central-1.hvm-ebs = "ami-ba0234a7";
"14.04".eu-west-1.hvm-ebs = "ami-96cb63e1";
"14.04".eu-west-1.pv-ebs = "ami-b48c25c3";
"14.04".eu-west-1.pv-s3 = "ami-06cd6571";
"14.04".sa-east-1.hvm-ebs = "ami-01b90e1c";
"14.04".sa-east-1.pv-ebs = "ami-69e35474";
"14.04".sa-east-1.pv-s3 = "ami-61b90e7c";
"14.04".us-east-1.hvm-ebs = "ami-58ba3a30";
"14.04".us-east-1.pv-ebs = "ami-9e0583f6";
"14.04".us-east-1.pv-s3 = "ami-9cbe3ef4";
"14.04".us-west-1.hvm-ebs = "ami-0bc3d74e";
"14.04".us-west-1.pv-ebs = "ami-8b1703ce";
"14.04".us-west-1.pv-s3 = "ami-27ccd862";
"14.04".us-west-2.hvm-ebs = "ami-3bf1bf0b";
"14.04".us-west-2.pv-ebs = "ami-259bd515";
"14.04".us-west-2.pv-s3 = "ami-07094037";
"14.12".ap-northeast-1.hvm-ebs = "ami-24435f25";
"14.12".ap-northeast-1.pv-ebs = "ami-b0425eb1";
"14.12".ap-northeast-1.pv-s3 = "ami-fed3c6ff";
"14.12".ap-southeast-1.hvm-ebs = "ami-6c765d3e";
"14.12".ap-southeast-1.pv-ebs = "ami-6a765d38";
"14.12".ap-southeast-1.pv-s3 = "ami-d1bf9183";
"14.12".ap-southeast-2.hvm-ebs = "ami-af86f395";
"14.12".ap-southeast-2.pv-ebs = "ami-b386f389";
"14.12".ap-southeast-2.pv-s3 = "ami-69c5ae53";
"14.12".eu-central-1.hvm-ebs = "ami-4a497a57";
"14.12".eu-central-1.pv-ebs = "ami-4c497a51";
"14.12".eu-central-1.pv-s3 = "ami-60f2c27d";
"14.12".eu-west-1.hvm-ebs = "ami-d126a5a6";
"14.12".eu-west-1.pv-ebs = "ami-0126a576";
"14.12".eu-west-1.pv-s3 = "ami-deda5fa9";
"14.12".sa-east-1.hvm-ebs = "ami-2d239e30";
"14.12".sa-east-1.pv-ebs = "ami-35239e28";
"14.12".sa-east-1.pv-s3 = "ami-81e3519c";
"14.12".us-east-1.hvm-ebs = "ami-0c463a64";
"14.12".us-east-1.pv-ebs = "ami-ac473bc4";
"14.12".us-east-1.pv-s3 = "ami-00e18a68";
"14.12".us-west-1.hvm-ebs = "ami-ca534a8f";
"14.12".us-west-1.pv-ebs = "ami-3e534a7b";
"14.12".us-west-1.pv-s3 = "ami-2905196c";
"14.12".us-west-2.hvm-ebs = "ami-fb9dc3cb";
"14.12".us-west-2.pv-ebs = "ami-899dc3b9";
"14.12".us-west-2.pv-s3 = "ami-cb7f2dfb";
"15.09".ap-northeast-1.hvm-ebs = "ami-58cac236";
"15.09".ap-northeast-1.hvm-s3 = "ami-39c8c057";
"15.09".ap-northeast-1.pv-ebs = "ami-5ac9c134";
"15.09".ap-northeast-1.pv-s3 = "ami-03cec66d";
"15.09".ap-southeast-1.hvm-ebs = "ami-2fc2094c";
"15.09".ap-southeast-1.hvm-s3 = "ami-9ec308fd";
"15.09".ap-southeast-1.pv-ebs = "ami-95c00bf6";
"15.09".ap-southeast-1.pv-s3 = "ami-bfc00bdc";
"15.09".ap-southeast-2.hvm-ebs = "ami-996c4cfa";
"15.09".ap-southeast-2.hvm-s3 = "ami-3f6e4e5c";
"15.09".ap-southeast-2.pv-ebs = "ami-066d4d65";
"15.09".ap-southeast-2.pv-s3 = "ami-cc6e4eaf";
"15.09".eu-central-1.hvm-ebs = "ami-3f8c6b50";
"15.09".eu-central-1.hvm-s3 = "ami-5b836434";
"15.09".eu-central-1.pv-ebs = "ami-118c6b7e";
"15.09".eu-central-1.pv-s3 = "ami-2c977043";
"15.09".eu-west-1.hvm-ebs = "ami-9cf04aef";
"15.09".eu-west-1.hvm-s3 = "ami-2bea5058";
"15.09".eu-west-1.pv-ebs = "ami-c9e852ba";
"15.09".eu-west-1.pv-s3 = "ami-c6f64cb5";
"15.09".sa-east-1.hvm-ebs = "ami-6e52df02";
"15.09".sa-east-1.hvm-s3 = "ami-1852df74";
"15.09".sa-east-1.pv-ebs = "ami-4368e52f";
"15.09".sa-east-1.pv-s3 = "ami-f15ad79d";
"15.09".us-east-1.hvm-ebs = "ami-84a6a0ee";
"15.09".us-east-1.hvm-s3 = "ami-06a7a16c";
"15.09".us-east-1.pv-ebs = "ami-a4a1a7ce";
"15.09".us-east-1.pv-s3 = "ami-5ba8ae31";
"15.09".us-west-1.hvm-ebs = "ami-22c8bb42";
"15.09".us-west-1.hvm-s3 = "ami-a2ccbfc2";
"15.09".us-west-1.pv-ebs = "ami-10cebd70";
"15.09".us-west-1.pv-s3 = "ami-fa30429a";
"15.09".us-west-2.hvm-ebs = "ami-ce57b9ae";
"15.09".us-west-2.hvm-s3 = "ami-2956b849";
"15.09".us-west-2.pv-ebs = "ami-005fb160";
"15.09".us-west-2.pv-s3 = "ami-cd55bbad";
"16.03".ap-northeast-1.hvm-ebs = "ami-40619d21";
"16.03".ap-northeast-1.hvm-s3 = "ami-ce629eaf";
"16.03".ap-northeast-1.pv-ebs = "ami-ef639f8e";
"16.03".ap-northeast-1.pv-s3 = "ami-a1609cc0";
"16.03".ap-northeast-2.hvm-ebs = "ami-deca00b0";
"16.03".ap-northeast-2.hvm-s3 = "ami-a3b77dcd";
"16.03".ap-northeast-2.pv-ebs = "ami-7bcb0115";
"16.03".ap-northeast-2.pv-s3 = "ami-a2b77dcc";
"16.03".ap-south-1.hvm-ebs = "ami-0dff9562";
"16.03".ap-south-1.hvm-s3 = "ami-13f69c7c";
"16.03".ap-south-1.pv-ebs = "ami-0ef39961";
"16.03".ap-south-1.pv-s3 = "ami-e0c8a28f";
"16.03".ap-southeast-1.hvm-ebs = "ami-5e964a3d";
"16.03".ap-southeast-1.hvm-s3 = "ami-4d964a2e";
"16.03".ap-southeast-1.pv-ebs = "ami-ec9b478f";
"16.03".ap-southeast-1.pv-s3 = "ami-999b47fa";
"16.03".ap-southeast-2.hvm-ebs = "ami-9f7359fc";
"16.03".ap-southeast-2.hvm-s3 = "ami-987359fb";
"16.03".ap-southeast-2.pv-ebs = "ami-a2705ac1";
"16.03".ap-southeast-2.pv-s3 = "ami-a3705ac0";
"16.03".eu-central-1.hvm-ebs = "ami-17a45178";
"16.03".eu-central-1.hvm-s3 = "ami-f9a55096";
"16.03".eu-central-1.pv-ebs = "ami-c8a550a7";
"16.03".eu-central-1.pv-s3 = "ami-6ea45101";
"16.03".eu-west-1.hvm-ebs = "ami-b5b3d5c6";
"16.03".eu-west-1.hvm-s3 = "ami-c986e0ba";
"16.03".eu-west-1.pv-ebs = "ami-b083e5c3";
"16.03".eu-west-1.pv-s3 = "ami-3c83e54f";
"16.03".sa-east-1.hvm-ebs = "ami-f6eb7f9a";
"16.03".sa-east-1.hvm-s3 = "ami-93e773ff";
"16.03".sa-east-1.pv-ebs = "ami-cbb82ca7";
"16.03".sa-east-1.pv-s3 = "ami-abb82cc7";
"16.03".us-east-1.hvm-ebs = "ami-c123a3d6";
"16.03".us-east-1.hvm-s3 = "ami-bc25a5ab";
"16.03".us-east-1.pv-ebs = "ami-bd25a5aa";
"16.03".us-east-1.pv-s3 = "ami-a325a5b4";
"16.03".us-west-1.hvm-ebs = "ami-748bcd14";
"16.03".us-west-1.hvm-s3 = "ami-a68dcbc6";
"16.03".us-west-1.pv-ebs = "ami-048acc64";
"16.03".us-west-1.pv-s3 = "ami-208dcb40";
"16.03".us-west-2.hvm-ebs = "ami-8263a0e2";
"16.03".us-west-2.hvm-s3 = "ami-925c9ff2";
"16.03".us-west-2.pv-ebs = "ami-5e61a23e";
"16.03".us-west-2.pv-s3 = "ami-734c8f13";
# 16.09.1508.3909827
"16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f";
"16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e";
"16.09".ap-northeast-1.pv-ebs = "ami-254a3442";
"16.09".ap-northeast-1.pv-s3 = "ami-ef473988";
"16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76";
"16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0";
"16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39";
"16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32";
"16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc";
"16.09".ap-south-1.hvm-s3 = "ami-98e690f7";
"16.09".ap-south-1.pv-ebs = "ami-aef98fc1";
"16.09".ap-south-1.pv-s3 = "ami-caf88ea5";
"16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3";
"16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e";
"16.09".ap-southeast-1.pv-ebs = "ami-37f05a54";
"16.09".ap-southeast-1.pv-s3 = "ami-27f35944";
"16.09".ap-southeast-2.hvm-ebs = "ami-57ece834";
"16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4";
"16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb";
"16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5";
"16.09".ca-central-1.hvm-ebs = "ami-9f863bfb";
"16.09".ca-central-1.hvm-s3 = "ami-ea85388e";
"16.09".ca-central-1.pv-ebs = "ami-ce8a37aa";
"16.09".ca-central-1.pv-s3 = "ami-448a3720";
"16.09".eu-central-1.hvm-ebs = "ami-1b884774";
"16.09".eu-central-1.hvm-s3 = "ami-b08c43df";
"16.09".eu-central-1.pv-ebs = "ami-888946e7";
"16.09".eu-central-1.pv-s3 = "ami-06874869";
"16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d";
"16.09".eu-west-1.hvm-s3 = "ami-73d1e500";
"16.09".eu-west-1.pv-ebs = "ami-44c0f437";
"16.09".eu-west-1.pv-s3 = "ami-f3d8ec80";
"16.09".eu-west-2.hvm-ebs = "ami-2c9c9648";
"16.09".eu-west-2.hvm-s3 = "ami-6b9e940f";
"16.09".eu-west-2.pv-ebs = "ami-f1999395";
"16.09".eu-west-2.pv-s3 = "ami-bb9f95df";
"16.09".sa-east-1.hvm-ebs = "ami-a11882cd";
"16.09".sa-east-1.hvm-s3 = "ami-7726bc1b";
"16.09".sa-east-1.pv-ebs = "ami-9725bffb";
"16.09".sa-east-1.pv-s3 = "ami-b027bddc";
"16.09".us-east-1.hvm-ebs = "ami-854ca593";
"16.09".us-east-1.hvm-s3 = "ami-2241a834";
"16.09".us-east-1.pv-ebs = "ami-a441a8b2";
"16.09".us-east-1.pv-s3 = "ami-e841a8fe";
"16.09".us-east-2.hvm-ebs = "ami-3f41645a";
"16.09".us-east-2.hvm-s3 = "ami-804065e5";
"16.09".us-east-2.pv-ebs = "ami-f1466394";
"16.09".us-east-2.pv-s3 = "ami-05426760";
"16.09".us-west-1.hvm-ebs = "ami-c2efbca2";
"16.09".us-west-1.hvm-s3 = "ami-d71042b7";
"16.09".us-west-1.pv-ebs = "ami-04e8bb64";
"16.09".us-west-1.pv-s3 = "ami-31e9ba51";
"16.09".us-west-2.hvm-ebs = "ami-6449f504";
"16.09".us-west-2.hvm-s3 = "ami-344af654";
"16.09".us-west-2.pv-ebs = "ami-6d4af60d";
"16.09".us-west-2.pv-s3 = "ami-de48f4be";
# 17.03.885.6024dd4067
"17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc";
"17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b";
"17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab";
"17.03".ap-northeast-2.hvm-s3 = "ami-0b944665";
"17.03".ap-south-1.hvm-ebs = "ami-4f413220";
"17.03".ap-south-1.hvm-s3 = "ami-864033e9";
"17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383";
"17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1";
"17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f";
"17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e";
"17.03".ca-central-1.hvm-ebs = "ami-9b00bdff";
"17.03".ca-central-1.hvm-s3 = "ami-e800bd8c";
"17.03".eu-central-1.hvm-ebs = "ami-5450803b";
"17.03".eu-central-1.hvm-s3 = "ami-6e2efe01";
"17.03".eu-west-1.hvm-ebs = "ami-10754c76";
"17.03".eu-west-1.hvm-s3 = "ami-11734a77";
"17.03".eu-west-2.hvm-ebs = "ami-ff1d099b";
"17.03".eu-west-2.hvm-s3 = "ami-fe1d099a";
"17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5";
"17.03".sa-east-1.hvm-s3 = "ami-fca2c190";
"17.03".us-east-1.hvm-ebs = "ami-0940c61f";
"17.03".us-east-1.hvm-s3 = "ami-674fc971";
"17.03".us-east-2.hvm-ebs = "ami-afc2e6ca";
"17.03".us-east-2.hvm-s3 = "ami-a1cde9c4";
"17.03".us-west-1.hvm-ebs = "ami-587b2138";
"17.03".us-west-1.hvm-s3 = "ami-70411b10";
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
# 17.09.2681.59661f21be6
"17.09".eu-west-1.hvm-ebs = "ami-a30192da";
"17.09".eu-west-2.hvm-ebs = "ami-295a414d";
"17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1";
"17.09".eu-central-1.hvm-ebs = "ami-266cfe49";
"17.09".us-east-1.hvm-ebs = "ami-40bee63a";
"17.09".us-east-2.hvm-ebs = "ami-9d84aff8";
"17.09".us-west-1.hvm-ebs = "ami-d14142b1";
"17.09".us-west-2.hvm-ebs = "ami-3eb40346";
"17.09".ca-central-1.hvm-ebs = "ami-ca8207ae";
"17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8";
"17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f";
"17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef";
"17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79";
"17.09".sa-east-1.hvm-ebs = "ami-4762202b";
"17.09".ap-south-1.hvm-ebs = "ami-4e376021";
# 18.03.132946.1caae7247b8
"18.03".eu-west-1.hvm-ebs = "ami-065c46ec";
"18.03".eu-west-2.hvm-ebs = "ami-64f31903";
"18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27";
"18.03".eu-central-1.hvm-ebs = "ami-09faf9e2";
"18.03".us-east-1.hvm-ebs = "ami-8b3538f4";
"18.03".us-east-2.hvm-ebs = "ami-150b3170";
"18.03".us-west-1.hvm-ebs = "ami-ce06ebad";
"18.03".us-west-2.hvm-ebs = "ami-586c3520";
"18.03".ca-central-1.hvm-ebs = "ami-aca72ac8";
"18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40";
"18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2";
"18.03".ap-northeast-1.hvm-ebs = "ami-456511a8";
"18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d";
"18.03".sa-east-1.hvm-ebs = "ami-163e1f7a";
"18.03".ap-south-1.hvm-ebs = "ami-6a390b05";
# 18.09.910.c15e342304a
"18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97";
"18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e";
"18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2";
"18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8";
"18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3";
"18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6";
"18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38";
"18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1";
"18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c";
"18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f";
"18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c";
"18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547";
"18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15";
"18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112";
"18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313";
# 19.03.172286.8ea36d73256
"19.03".eu-west-1.hvm-ebs = "ami-0fe40176548ff0940";
"19.03".eu-west-2.hvm-ebs = "ami-03a40fd3a02fe95ba";
"19.03".eu-west-3.hvm-ebs = "ami-0436f9da0f20a638e";
"19.03".eu-central-1.hvm-ebs = "ami-0022b8ea9efde5de4";
"19.03".us-east-1.hvm-ebs = "ami-0efc58fb70ae9a217";
"19.03".us-east-2.hvm-ebs = "ami-0abf711b1b34da1af";
"19.03".us-west-1.hvm-ebs = "ami-07d126e8838c40ec5";
"19.03".us-west-2.hvm-ebs = "ami-03f8a737546e47fb0";
"19.03".ca-central-1.hvm-ebs = "ami-03f9fd0ef2e035ede";
"19.03".ap-southeast-1.hvm-ebs = "ami-0cff66114c652c262";
"19.03".ap-southeast-2.hvm-ebs = "ami-054c73a7f8d773ea9";
"19.03".ap-northeast-1.hvm-ebs = "ami-00db62688900456a4";
"19.03".ap-northeast-2.hvm-ebs = "ami-0485cdd1a5fdd2117";
"19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
"19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";
# 19.09.2243.84af403f54f
"19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f";
"19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
"19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed";
"19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79";
"19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed";
"19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f";
"19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f";
"19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6";
"19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e";
"19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d";
"19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95";
"19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210";
"19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b";
"19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93";
"19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1";
"19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
"19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
# 20.03.1554.94e39623a49
"20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
"20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
"20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
"20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
"20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
"20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
"20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
"20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
"20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
"20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
"20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
"20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
"20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
"20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
"20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
"20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
"20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
# 20.09.2016.19db3e5ea27
"20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2";
"20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
"20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe";
"20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2";
"20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14";
"20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8";
"20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8";
"20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485";
"20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac";
"20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7";
"20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d";
"20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9";
"20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927";
"20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf";
"20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1";
"20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f";
"20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d";
# 21.05.740.aa576357673
"21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083";
"21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d";
"21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d";
"21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77";
"21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f";
"21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897";
"21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52";
"21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc";
"21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8";
"21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33";
"21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e";
"21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6";
"21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012";
"21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39";
"21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059";
"21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc";
"21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6";
latest = self."21.05";
}; in self
# Compatibility shim
let
lib = import ../../../lib;
inherit (lib) mapAttrs;
everything = import ./amazon-ec2-amis.nix;
doAllVersions = mapAttrs (versionName: doRegion);
doRegion = mapAttrs (regionName: systems: systems.x86_64-linux);
in
doAllVersions everything

7
nixos/tests/home-assistant.nix
View File

@ -24,6 +24,11 @@ in {
services.home-assistant = {
inherit configDir;
enable = true;
package = (pkgs.home-assistant.override {
extraComponents = [ "zha" ];
}).overrideAttrs (oldAttrs: {
doInstallCheck = false;
});
config = {
homeassistant = {
name = "Home";
@ -87,6 +92,8 @@ in {
with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"):
hass.wait_for_open_port(80)
hass.succeed("curl --fail http://localhost:80/description.xml")
with subtest("Check extra components are considered in systemd unit hardening"):
hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB")
with subtest("Print log to ease debugging"):
output_log = hass.succeed("cat ${configDir}/home-assistant.log")
print("\n### home-assistant.log ###\n")

11
pkgs/applications/audio/musikcube/default.nix
View File

@ -4,6 +4,7 @@
, boost
, curl
, fetchFromGitHub
, fetchpatch
, ffmpeg
, lame
, libev
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35";
};
patches = [
# Fix pending upstream inclusion for ncuurses-6.3 support:
# https://github.com/clangen/musikcube/pull/474
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch";
sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid";
})
];
nativeBuildInputs = [
cmake
pkg-config

6
pkgs/applications/audio/ncspot/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.9.0";
version = "0.9.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "07qqs5q64zaxl3b2091vjihqb35fm0136cm4zibrgpx21akmbvr2";
sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo=";
};
cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0";
cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo=";
nativeBuildInputs = [ pkg-config ];

33
pkgs/applications/editors/emacs/elisp-packages/org-packages.nix
View File

@ -1,33 +0,0 @@
/*
# Updating
To update the list of packages from Org (ELPA),
1. Run `./update-org`.
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages
3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
*/
{ lib }:
self: let
generateOrg = lib.makeOverridable ({
generated ? ./org-generated.nix
}: let
imported = import generated {
inherit (self) callPackage;
};
super = imported;
overrides = {
};
in super // overrides);
in generateOrg { }

4
pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
View File

@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix
nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace
git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages

4
pkgs/applications/editors/emacs/elisp-packages/update-org
View File

@ -1,4 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell --show-trace ./emacs2nix.nix -i bash
exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix

4
pkgs/applications/editors/neovim/default.nix
View File

@ -32,13 +32,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";
sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888=";
};
patches = [

5
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -3,6 +3,7 @@
, bundlerEnv, ruby
, nodejs
, nodePackages
, python3
, python3Packages
, callPackage
}:
@ -17,7 +18,7 @@ let
, wrapperArgs ? []
, manifestRc ? null
, withPython2 ? false
, withPython3 ? true, python3Env ? null
, withPython3 ? true, python3Env ? python3
, withNodeJs ? false
, rubyEnv ? null
, vimAlias ? false
@ -59,7 +60,7 @@ let
--replace 'Name=Neovim' 'Name=WrappedNeovim'
''
+ optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH
''
+ optionalString (rubyEnv != null) ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "15.8.4";
version = "15.8.7";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616";
sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3";
};
nativeBuildInputs = [

4
pkgs/applications/graphics/hydrus/default.nix
View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "463";
version = "464";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-GT5aIMskOVn4eAd4612YYA8uAQC8tuJzpEHNhc7pMuc=";
sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA=";
};
nativeBuildInputs = [

6
pkgs/applications/graphics/pinta/default.nix
View File

@ -11,7 +11,7 @@ let
in
buildDotnetPackage rec {
baseName = "Pinta";
version = "1.6";
version = "1.7.1";
outputFiles = [ "bin/*" ];
buildInputs = [ gtksharp mono-addins gettext ];
@ -21,7 +21,7 @@ buildDotnetPackage rec {
owner = "PintaProject";
repo = "Pinta";
rev = version;
sha256 = "0vgswy981c7ys4q7js5k85sky7bz8v32wsfq3br4j41vg92pw97d";
sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc=";
};
# Remove version information from nodes <Reference Include="... Version=... ">
@ -74,6 +74,8 @@ buildDotnetPackage rec {
--replace _Comment Comment \
--replace _GenericName GenericName \
--replace _X-GNOME-FullName X-GNOME-FullName
substitute xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml \
--replace _p p
xbuild /target:CompileTranslations Pinta.Install.proj
xbuild /target:Install Pinta.Install.proj

8
pkgs/applications/misc/dozenal/default.nix
View File

@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
patches = [ ./lua-header.patch ];
preBuild = "cd dozenal";
buildInputs = [ ncurses hdate lua5_2 ];
# Parallel builds fail due to no dependencies between subdirs.
# As a result some subdirs are atempted to build twice:
# ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory
# Let's disable parallelism until it's fixed upstream:
# https://gitlab.com/dgoodmaniii/dozenal/-/issues/8
enableParallelBuilding = false;
# I remove gdozdc, as I didn't figure all it's dependency yet.
postInstall = "rm $out/bin/gdozdc";

4
pkgs/applications/misc/dunst/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dunst";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw";
sha256 = "LGLo+K0FxQQ3hrPYwvjApcOnNliZ5j0T6yEtcxZAFOU=";
};
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,15 +31,15 @@
}
},
"dev": {
"version": "98.0.4710.4",
"sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m",
"sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg",
"version": "98.0.4736.0",
"sha256": "1bakzvzx0604k20p16lxmbl0s8za6fy4akng35c1kzf350jznq7n",
"sha256bin64": "09adpl6b43fzlms081c1bs3vrlwrm3kq0mfcqff4q33i0wb5wl25",
"deps": {
"gn": {
"version": "2021-11-16",
"version": "2021-11-24",
"url": "https://gn.googlesource.com/gn",
"rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e",
"sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f"
"rev": "b79031308cc878488202beb99883ec1f2efd9a6d",
"sha256": "1fdn48y0nvs2qm67qvp1i75d9278ddi5v3bpxgjf28zrh9yragwd"
}
}
},

14
pkgs/applications/networking/cluster/kubeval/default.nix
View File

@ -1,17 +1,21 @@
{ lib, fetchFromGitHub, buildGoModule, makeWrapper }:
{ lib
, fetchFromGitHub
, buildGoModule
, makeWrapper
}:
buildGoModule rec {
pname = "kubeval";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "instrumenta";
repo = "kubeval";
rev = version;
sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0=";
rev = "v${version}";
sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
};
vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4=";
vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24=";
doCheck = false;

35
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -259,6 +259,15 @@
"vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c",
"version": "3.6.0"
},
"dhall": {
"owner": "awakesecurity",
"provider-source-address": "registry.terraform.io/awakesecurity/dhall",
"repo": "terraform-provider-dhall",
"rev": "v0.0.1",
"sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa",
"vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n",
"version": "0.0.1"
},
"digitalocean": {
"owner": "digitalocean",
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
@ -371,10 +380,10 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.18.0",
"sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp",
"rev": "v4.18.2",
"sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7",
"vendorSha256": null,
"version": "4.18.0"
"version": "4.18.2"
},
"gitlab": {
"owner": "gitlabhq",
@ -572,10 +581,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
"repo": "terraform-provider-kubernetes",
"rev": "v2.6.1",
"sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g",
"rev": "v2.7.0",
"sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi",
"vendorSha256": null,
"version": "2.6.1"
"version": "2.7.0"
},
"launchdarkly": {
"owner": "terraform-providers",
@ -699,10 +708,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/nomad",
"repo": "terraform-provider-nomad",
"rev": "v1.4.15",
"sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1",
"vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb",
"version": "1.4.15"
"rev": "v1.4.16",
"sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw",
"vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j",
"version": "1.4.16"
},
"ns1": {
"owner": "terraform-providers",
@ -1120,10 +1129,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vault",
"repo": "terraform-provider-vault",
"rev": "v3.0.0",
"sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z",
"rev": "v3.0.1",
"sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4",
"vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx",
"version": "3.0.0"
"version": "3.0.1"
},
"vcd": {
"owner": "terraform-providers",

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.24.0"; # Please backport all updates to the stable channel.
version = "5.25.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy";
sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a";
};
nativeBuildInputs = [

1
pkgs/applications/science/astronomy/celestia/default.nix
View File

@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
description = "Real-time 3D simulation of space";
changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = platforms.linux;
};
}

4
pkgs/applications/science/biology/fastp/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "fastp";
version = "0.23.1";
version = "0.23.2";
src = fetchFromGitHub {
owner = "OpenGene";
repo = "fastp";
rev = "v${version}";
sha256 = "sha256-vRJlNtg2JabBAUaX91Y04z8MdyxEnreBAlIHn7VB+u4=";
sha256 = "sha256-W1mXTfxD7/gHJhao6qqbNcyM3t2cfrUYiBYPJi/O1RI=";
};
buildInputs = [ zlib libdeflate isa-l ];

11
pkgs/applications/science/biology/mrtrix/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, python, makeWrapper
, eigen, fftw, libtiff, libpng, zlib, ants, bc
, qt5, libGL, libGLU, libX11, libXext
, withGui ? true }:
, withGui ? true, less }:
stdenv.mkDerivation rec {
pname = "mrtrix";
version = "3.0.2";
version = "unstable-2021-11-25";
src = fetchFromGitHub {
owner = "MRtrix3";
repo = "mrtrix3";
rev = version;
sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3";
rev = "994498557037c9e4f7ba67f255820ef84ea899d9";
sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8=";
fetchSubmodules = true;
};
@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
substituteInPlace ./run_tests \
--replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
substituteInPlace ./build \
--replace '"less -RX "' '"${less}/bin/less -RX "'
'';
configurePhase = ''

6
pkgs/applications/science/logic/coq/default.nix
View File

@ -7,7 +7,7 @@
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
, customOCamlPackages ? null
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
, buildIde ? true
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
, csdp ? null
@ -45,6 +45,7 @@ let
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
"8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17";
"8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@ -62,10 +63,11 @@ let
'' else "";
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
else with versions; switch coq-version [
{ case = range "8.14" "8.14"; out = ocamlPackages_4_12; }
{ case = range "8.11" "8.13"; out = ocamlPackages_4_10; }
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
] ocamlPackages_4_10;
] ocamlPackages_4_12;
ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ optional (!versionAtLeast "8.13") ocamlPackages.num

55
pkgs/applications/science/math/maxima/default.nix
View File

@ -1,24 +1,30 @@
{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook
, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
{ lib
, stdenv
, fetchurl
, fetchpatch
, texinfo
, perl
, python3
, makeWrapper
, autoreconfHook
, rlwrap ? null
, tk ? null
, gnuplot ? null
, lisp-compiler
}:
let
name = "maxima";
version = "5.45.0";
lisp-compiler = if ecl-fasl then ecl else sbcl;
searchPath =
lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
# Allow to remove some executables from the $PATH of the wrapped binary
searchPath = lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
in
stdenv.mkDerivation ({
inherit version;
name = "${name}-${version}";
stdenv.mkDerivation rec {
pname = "maxima";
version = "5.45.1";
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng=";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w=";
};
nativeBuildInputs = [
@ -49,7 +55,7 @@ stdenv.mkDerivation ({
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima
''
+ (lib.optionalString ecl-fasl ''
+ (lib.optionalString (lisp-compiler.pname == "ecl") ''
cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
'')
;
@ -67,12 +73,13 @@ stdenv.mkDerivation ({
sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
})
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
# see https://trac.sagemath.org/ticket/13364#comment:93
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
})
] ++ lib.optionals ecl-fasl [
] ++ lib.optionals (lisp-compiler.pname == "ecl") [
# build fasl, needed for ECL support
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
@ -97,13 +104,13 @@ stdenv.mkDerivation ({
enableParallelBuilding = true;
passthru = {
ecl = ecl;
inherit lisp-compiler;
};
meta = {
meta = with lib; {
description = "Computer algebra system";
homepage = "http://maxima.sourceforge.net";
license = lib.licenses.gpl2;
license = licenses.gpl2Plus;
longDescription = ''
Maxima is a fairly complete computer algebra system written in
@ -111,7 +118,7 @@ stdenv.mkDerivation ({
DOE-MACSYMA and licensed under the GPL. Its abilities include
symbolic integration, 3D plotting, and an ODE solver.
'';
platforms = lib.platforms.unix;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.unix;
};
})
}

16
pkgs/applications/science/math/sage/default.nix
View File

@ -15,7 +15,7 @@ let
sagelib = self.callPackage ./sagelib.nix {
inherit flint arb;
inherit sage-src env-locations pynac singular;
ecl = maxima-ecl.ecl;
inherit (maxima) lisp-compiler;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@ -48,9 +48,8 @@ let
# the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix {
inherit pari_data;
inherit singular maxima-ecl;
inherit singular maxima;
inherit three;
ecl = maxima-ecl.ecl;
cysignals = python3.pkgs.cysignals;
mathjax = nodePackages.mathjax;
};
@ -61,22 +60,21 @@ let
sagelib = python3.pkgs.sagelib;
sage_docbuild = python3.pkgs.sage_docbuild;
inherit env-locations;
inherit python3 singular palp flint pynac pythonEnv maxima-ecl;
ecl = maxima-ecl.ecl;
inherit python3 singular palp flint pynac pythonEnv maxima;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
# The documentation for sage, building it takes a lot of ram.
sagedoc = callPackage ./sagedoc.nix {
inherit sage-with-env;
inherit python3 maxima-ecl;
inherit python3 maxima;
};
# sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run.
sage-with-env = callPackage ./sage-with-env.nix {
inherit python3 pythonEnv;
inherit sage-env;
inherit pynac singular maxima-ecl;
inherit pynac singular maxima;
inherit three;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
@ -118,8 +116,8 @@ let
singular = pkgs.singular.override { inherit flint; };
maxima-ecl = pkgs.maxima-ecl.override {
ecl = pkgs.ecl.override {
maxima = pkgs.maxima.override {
lisp-compiler = pkgs.ecl.override {
# "echo syntax error | ecl > /dev/full 2>&1" segfaults in
# ECL. We apply a patch to fix it (write_error.patch), but it
# only works if threads are disabled. sage 9.2 tests this

9
pkgs/applications/science/math/sage/env-locations.nix
View File

@ -2,13 +2,12 @@
, pari_data
, pari
, singular
, maxima-ecl
, maxima
, conway_polynomials
, graphs
, elliptic_curves
, polytopes_db
, gap
, ecl
, combinatorial_designs
, jmol
, mathjax
@ -30,14 +29,14 @@ writeTextFile rec {
export SINGULAR_SO='${singular}/lib/libSingular.so'
export GAP_SO='${gap}/lib/libgap.so'
export SINGULAR_EXECUTABLE='${singular}/bin/Singular'
export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas'
export MAXIMA_PREFIX="${maxima-ecl}"
export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas'
export MAXIMA_PREFIX="${maxima}"
export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials'
export GRAPHS_DATA_DIR='${graphs}/share/graphs'
export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
export GAP_ROOT_DIR='${gap}/share/gap/build-dir'
export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/'
export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar

7
pkgs/applications/science/math/sage/sage-env.nix
View File

@ -15,8 +15,7 @@
, pkg-config
, pari
, gap
, ecl
, maxima-ecl
, maxima
, singular
, fflas-ffpack
, givaro
@ -77,8 +76,8 @@ let
pkg-config
pari
gap
ecl
maxima-ecl
maxima.lisp-compiler
maxima
singular
giac
palp

4
pkgs/applications/science/math/sage/sage-with-env.nix
View File

@ -9,7 +9,7 @@
, singular
, gap
, giac
, maxima-ecl
, maxima
, pari
, gmp
, gfan
@ -42,7 +42,7 @@ let
pari
gmp
gfan
maxima-ecl
maxima
eclib
flintqs
ntl

4
pkgs/applications/science/math/sage/sagedoc.nix
View File

@ -1,7 +1,7 @@
{ stdenv
, sage-with-env
, python3
, maxima-ecl
, maxima
, tachyon
, jmol
, cddlib
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sage-with-env.env.lib
python3
maxima-ecl
maxima
tachyon
jmol
cddlib

6
pkgs/applications/science/math/sage/sagelib.nix
View File

@ -10,7 +10,7 @@
, cypari2
, cysignals
, cython
, ecl
, lisp-compiler
, eclib
, ecm
, flint
@ -74,7 +74,7 @@ buildPythonPackage rec {
jupyter_core
pkg-config
pip # needed to query installed packages
ecl
lisp-compiler
];
buildInputs = [
@ -92,7 +92,7 @@ buildPythonPackage rec {
arb
brial
cliquer
ecl
lisp-compiler
eclib
ecm
fflas-ffpack

31
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -1,21 +1,37 @@
{ lib, stdenv, fetchFromGitHub
, wrapGAppsHook, cmake, gettext
, maxima, wxGTK, gnome }:
{ lib
, stdenv
, fetchFromGitHub
, wrapGAppsHook
, cmake
, gettext
, maxima
, wxGTK
, gnome
}:
stdenv.mkDerivation rec {
pname = "wxmaxima";
version = "21.05.2";
version = "21.11.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA=";
sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk=";
};
buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ];
buildInputs = [
wxGTK
maxima
# So it won't embed svg files into headers.
gnome.adwaita-icon-theme
];
nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
nativeBuildInputs = [
wrapGAppsHook
cmake
gettext
];
preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
@ -25,6 +41,7 @@ stdenv.mkDerivation rec {
description = "Cross platform GUI for the computer algebra system Maxima";
license = licenses.gpl2;
homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;
};
}

28
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
View File

@ -1,28 +0,0 @@
{ lib, stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.33.0";
src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
};
buildInputs = [ pythonPackages.python ];
dontBuild = true;
installPhase = ''
install -Dm755 -t $out/bin git-filter-repo
install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
'';
meta = with lib; {
homepage = "https://github.com/newren/git-filter-repo";
description = "Quickly rewrite git repository history (filter-branch replacement)";
license = licenses.mit;
inherit (pythonPackages.python.meta) platforms;
maintainers = [ maintainers.marsam ];
};
}

6
pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix
View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "git-quickfix";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "siedentop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY=";
sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg=";
};
nativeBuildInputs = [ pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q=";
cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE=";
meta = with lib; {
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";

12
pkgs/applications/virtualization/podman-compose/default.nix
View File

@ -1,19 +1,15 @@
{ lib, buildPythonApplication, fetchFromGitHub, pyyaml }:
buildPythonApplication rec {
version = "0.2.0pre-2021-05-18";
version = "0.1.8";
pname = "podman-compose";
# "This project is still under development." -- README.md
#
# As of May 2021, the latest release (0.1.5) has fewer than half of all
# commits. This project seems to have no release management, so the last
# commit is the best one until proven otherwise.
src = fetchFromGitHub {
repo = "podman-compose";
owner = "containers";
rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe";
sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp";
rev = version;
sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304=";
};
propagatedBuildInputs = [ pyyaml ];
@ -21,7 +17,7 @@ buildPythonApplication rec {
meta = {
description = "An implementation of docker-compose with podman backend";
homepage = "https://github.com/containers/podman-compose";
license = lib.licenses.gpl2;
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members;
};

3
pkgs/applications/virtualization/qemu/default.nix
View File

@ -229,8 +229,7 @@ stdenv.mkDerivation rec {
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
postInstall = ''
cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
chmod a+x -- $out/libexec/emit-kvm-warnings
install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then
makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \
$out/bin/qemu-kvm \

4
pkgs/applications/window-managers/i3/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "i3";
version = "4.20";
version = "4.20.1";
src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI=";
sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93";
};
nativeBuildInputs = [

4
pkgs/data/themes/flat-remix-gtk/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "flat-remix-gtk";
version = "20201129";
version = "20211130";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU=";
sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8";
};
dontBuild = true;

4
pkgs/data/themes/matcha/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
version = "2021-09-24";
version = "2021-11-29";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15";
sha256 = "10fgz09h25cmnvz0bzx5qadv7cqnl1bdd6hj7w0rcbsws4c2j17q";
};
buildInputs = [ gdk-pixbuf librsvg ];

23
pkgs/data/themes/materia-theme/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
@ -11,30 +12,20 @@
stdenv.mkDerivation rec {
pname = "materia-theme";
version = "20200916";
version = "20210322";
src = fetchFromGitHub {
owner = "nana-4";
repo = pname;
rev = "v${version}";
sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74";
sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl";
};
nativeBuildInputs = [
meson
ninja
sassc
];
nativeBuildInputs = [ meson ninja sassc ];
buildInputs = [
gnome.gnome-themes-extra
gdk-pixbuf
librsvg
];
buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontBuild = true;

1
pkgs/desktops/gnome/extensions/manuallyPackaged.nix
View File

@ -14,6 +14,7 @@
"no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { };
"paperwm@hedning:matrix.org" = callPackage ./paperwm { };
"pidgin@muffinmad" = callPackage ./pidgin-im-integration { };
"pop-shell@system76.com" = callPackage ./pop-shell { };
"sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { };
"system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { };
"taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { };

36
pkgs/desktops/gnome/extensions/pop-shell/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pop-shell";
version = "unstable-2021-11-30";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3";
sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk=";
};
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
buildInputs = [ gjs ];
patches = [
./fix-gjs.patch
];
makeFlags = [ "XDG_DATA_HOME=$(out)/share" ];
passthru = {
extensionUuid = "pop-shell@system76.com";
extensionPortalSlug = "pop-shell";
};
meta = with lib; {
description = "Keyboard-driven layer for GNOME Shell";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = [ maintainers.genofire ];
homepage = "https://github.com/pop-os/shell";
};
}

67
pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch Normal file
View File

@ -0,0 +1,67 @@
diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts
index 9522499..9911530 100644
--- a/src/color_dialog/src/main.ts
+++ b/src/color_dialog/src/main.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/gjs
+#!/usr/bin/env gjs
imports.gi.versions.Gtk = '3.0';
@@ -84,4 +84,4 @@ function launch_color_dialog() {
Gtk.init(null);
-launch_color_dialog()
\ No newline at end of file
+launch_color_dialog()
diff --git a/src/extension.ts b/src/extension.ts
index 7417c46..00d5829 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> {
return true
}
- const ipc = utils.async_process_ipc(["gjs", path])
+ const ipc = utils.async_process_ipc([path])
if (ipc) {
const generator = (stdout: any, res: any) => {
diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts
index f298ec7..87a6bc4 100644
--- a/src/floating_exceptions/src/main.ts
+++ b/src/floating_exceptions/src/main.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/gjs
+#!/usr/bin/env gjs
imports.gi.versions.Gtk = '3.0'
@@ -329,4 +329,4 @@ function main() {
Gtk.main()
}
-main()
\ No newline at end of file
+main()
diff --git a/src/panel_settings.ts b/src/panel_settings.ts
index 83ff56c..1bc1e98 100644
--- a/src/panel_settings.ts
+++ b/src/panel_settings.ts
@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) {
color_selector_item.add_child(color_button);
color_button.connect('button-press-event', () => {
let path = Me.dir.get_path() + "/color_dialog/main.js";
- let resp = GLib.spawn_command_line_async(`gjs ${path}`);
+ let resp = GLib.spawn_command_line_async(path);
if (!resp) {
return null;
@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) {
});
return color_selector_item;
-}
\ No newline at end of file
+}

3
pkgs/development/compilers/ecl/default.nix
View File

@ -28,7 +28,8 @@ let
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit (s) version;
pname = s.baseName;
inherit nativeBuildInputs propagatedBuildInputs;
src = fetchurl {

22
pkgs/development/compilers/ghc/8.10.7.nix
View File

@ -130,6 +130,24 @@ let
targetCC = builtins.head toolsForTarget;
# Sometimes we have to dispatch between the bintools wrapper and the unwrapped
# derivation for certain tools depending on the platform.
bintoolsFor = {
# GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
# part of the bintools wrapper (due to codesigning requirements), but not on
# x86_64-darwin.
install_name_tool =
if stdenv.targetPlatform.isAarch64
then targetCC.bintools
else targetCC.bintools.bintools;
# Same goes for strip.
strip =
# TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
then targetCC.bintools
else targetCC.bintools.bintools;
};
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
@ -207,10 +225,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool"
export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool"
export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool"
'' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt"

22
pkgs/development/compilers/ghc/9.0.1.nix
View File

@ -125,6 +125,24 @@ let
targetCC = builtins.head toolsForTarget;
# Sometimes we have to dispatch between the bintools wrapper and the unwrapped
# derivation for certain tools depending on the platform.
bintoolsFor = {
# GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
# part of the bintools wrapper (due to codesigning requirements), but not on
# x86_64-darwin.
install_name_tool =
if stdenv.targetPlatform.isAarch64
then targetCC.bintools
else targetCC.bintools.bintools;
# Same goes for strip.
strip =
# TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
then targetCC.bintools
else targetCC.bintools.bintools;
};
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
@ -173,10 +191,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool"
export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool"
export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool"
'' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt"

22
pkgs/development/compilers/ghc/9.2.1.nix
View File

@ -126,6 +126,24 @@ let
targetCC = builtins.head toolsForTarget;
# Sometimes we have to dispatch between the bintools wrapper and the unwrapped
# derivation for certain tools depending on the platform.
bintoolsFor = {
# GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
# part of the bintools wrapper (due to codesigning requirements), but not on
# x86_64-darwin.
install_name_tool =
if stdenv.targetPlatform.isAarch64
then targetCC.bintools
else targetCC.bintools.bintools;
# Same goes for strip.
strip =
# TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
then targetCC.bintools
else targetCC.bintools.bintools;
};
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
@ -173,10 +191,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool"
export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool"
export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool"
'' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt"

22
pkgs/development/compilers/ghc/head.nix
View File

@ -139,6 +139,24 @@ let
targetCC = builtins.head toolsForTarget;
# Sometimes we have to dispatch between the bintools wrapper and the unwrapped
# derivation for certain tools depending on the platform.
bintoolsFor = {
# GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
# part of the bintools wrapper (due to codesigning requirements), but not on
# x86_64-darwin.
install_name_tool =
if stdenv.targetPlatform.isAarch64
then targetCC.bintools
else targetCC.bintools.bintools;
# Same goes for strip.
strip =
# TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
then targetCC.bintools
else targetCC.bintools.bintools;
};
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
@ -187,10 +205,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool"
export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool"
export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool"
'' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt"

2
pkgs/development/compilers/julia/1.6-bin.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "High-level, high-performance dynamic language for technical computing.";
description = "High-level, high-performance, dynamic language for technical computing";
homepage = "https://julialang.org";
# Bundled and linked with various GPL code, although Julia itself is MIT.
license = lib.licenses.gpl2Plus;

37
pkgs/development/compilers/julia/1.0-bin.nix → pkgs/development/compilers/julia/1.7-bin.nix
View File

@ -1,43 +1,43 @@
{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }:
{ autoPatchelfHook, fetchurl, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "julia-bin";
version = "1.0.5";
version = "1.7.0";
src = {
x86_64-linux = fetchurl {
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx";
sha256 = "0h0d9kfg00vglg2qmcx0k8c2gzn445i0xbsfw6wy1idf72kg76bj";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
# Julia’s source files are in different locations for source and binary
# releases. Thus we temporarily create symlinks to allow us to share patches
# releases. Thus we temporarily create a symlink to allow us to share patches
# with source releases.
prePatch = ''
ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib
ln -s share/julia/test
'';
patches = [
# Source release Nix patch(es) relevant for binary releases as well.
./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch
./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch
];
postPatch = ''
# Revert symlink hack.
rm stdlib test
rm test
# Julia fails to pick up our Certification Authority root certificates, but
# it provides its own so we can simply disable the test. Patching in the
# dynamic path to ours require us to rebuild the Julia system image.
substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \
--replace '@test ca_roots_path() != bundled_ca_roots()' \
'@test_skip ca_roots_path() != bundled_ca_roots()'
'';
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ autoPatchelfHook ];
installPhase = ''
runHook preInstall
cp -r . $out
# Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is
# only necessary on v1.0.x and a cleaner solution is welcome, but after
# staring at `strace` for a few hours this is as clean as I could make it.
wrapProgram $out/bin/julia \
--suffix LD_LIBRARY_PATH : $out/lib
runHook postInstall
'';
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
dontStrip = true;
doInstallCheck = true;
installCheckInputs = [ openssl ];
preInstallCheck = ''
# Some tests require read/write access to $HOME.
export HOME="$TMPDIR"
@ -62,19 +61,11 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "High-level, high-performance dynamic language for technical computing";
description = "High-level, high-performance, dynamic language for technical computing";
homepage = "https://julialang.org";
# Bundled and linked with various GPL code, although Julia itself is MIT.
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ninjin raskin ];
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [
# Built with libgit2 v0.27.2:
# https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version
# https://nvd.nist.gov/vuln/detail/CVE-2020-12278
"CVE-2020-12278"
# https://nvd.nist.gov/vuln/detail/CVE-2020-12279
"CVE-2020-12279"
];
};
}

87
pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch
View File

@ -1,87 +0,0 @@
From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Mon, 15 Mar 2021 05:55:18 +0000
Subject: [PATCH 2/3] nix: Skip tests that require network access
Necessary as the Nix build sandbox does not permit network access.
---
stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++-----------------
test/file.jl | 4 ++--
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl
index 6145f87616..9cc7a001e5 100644
--- a/stdlib/Sockets/test/runtests.jl
+++ b/stdlib/Sockets/test/runtests.jl
@@ -151,33 +151,33 @@ defaultport = rand(2000:4000)
end
@testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin
- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1"
- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1"
- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1"
- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1"
- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1"
- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1"
- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1"
+ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1"
+ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1"
+ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1"
+ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1"
+ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1"
+ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1"
+ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1"
end
@testset "getnameinfo on some valid IP addresses" begin
@test !isempty(getnameinfo(ip"::")::String)
- @test !isempty(getnameinfo(ip"0.0.0.0")::String)
- @test !isempty(getnameinfo(ip"10.1.0.0")::String)
- @test !isempty(getnameinfo(ip"10.1.0.255")::String)
- @test !isempty(getnameinfo(ip"10.1.255.1")::String)
- @test !isempty(getnameinfo(ip"255.255.255.255")::String)
- @test !isempty(getnameinfo(ip"255.255.255.0")::String)
- @test !isempty(getnameinfo(ip"192.168.0.1")::String)
- @test !isempty(getnameinfo(ip"::1")::String)
+ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String)
+ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String)
+ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String)
+ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String)
+ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String)
+ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String)
+ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String)
+ @test_skip !isempty(getnameinfo(ip"::1")::String)
end
@testset "getaddrinfo" begin
- let localhost = getnameinfo(ip"127.0.0.1")::String
- @test !isempty(localhost) && localhost != "127.0.0.1"
- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr})
- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0"
- @test try
+ let localhost = getnameinfo(ip"::")::String
+ @test_skip !isempty(localhost) && localhost != "127.0.0.1"
+ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr})
+ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0"
+ @test_skip try
getaddrinfo(localhost, IPv6)::IPv6 != ip"::"
catch ex
isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost
diff --git a/test/file.jl b/test/file.jl
index e86476f975..579276f82c 100644
--- a/test/file.jl
+++ b/test/file.jl
@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER)
else
@test_throws ErrorException symlink(file, "ba\0d")
end
-@test_throws ArgumentError download("good", "ba\0d")
-@test_throws ArgumentError download("ba\0d", "good")
+@test_skip @test_throws ArgumentError download("good", "ba\0d")
+@test_skip @test_throws ArgumentError download("ba\0d", "good")
###################
# walkdir #
--
2.29.3

30
pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch Normal file
View File

@ -0,0 +1,30 @@
From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Thu, 8 Apr 2021 04:37:44 +0000
Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox
Disabled by default due to lack of networking in the Nix sandbox. This
greatly speeds up the build process on a multi-core system.
---
test/runtests.jl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/runtests.jl b/test/runtests.jl
index 2f9cd058bb..2f8c19fa32 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests)
import LinearAlgebra
cd(@__DIR__) do
n = 1
- if net_on
- n = min(Sys.CPU_THREADS, length(tests))
+ if net_on || haskey(ENV, "NIX_BUILD_CORES")
+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS
+ n = min(x, Sys.CPU_THREADS, length(tests))
n > 1 && addprocs_with_testenv(n)
LinearAlgebra.BLAS.set_num_threads(1)
end
--
2.29.3

9
pkgs/development/coq-modules/compcert/default.nix
View File

@ -106,6 +106,15 @@ compcert.overrideAttrs (o:
})
];
}
{ cases = [ (isEq "8.14") "3.10" ];
out = [
# Support for Coq 8.14.1
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch";
sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94";
})
];
}
] [];
}
)

1
pkgs/development/coq-modules/serapi/default.nix
View File

@ -28,7 +28,6 @@ in
inherit version release;
defaultVersion = with versions; switch coq.version [
{ case = isEq "8.14"; out = "8.14+rc1+0.14.0"; }
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
{ case = isEq "8.12"; out = "8.12.0+0.12.1"; }
{ case = isEq "8.11"; out = "8.11.0+0.11.1"; }

29
pkgs/development/interpreters/lush/default.nix
View File

@ -1,29 +0,0 @@
{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
baseName = "lush";
version = "2.0.1";
name = "${baseName}-${version}";
src = fetchurl {
url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz";
sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
};
buildInputs = [
libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd
intltool gettext zlib
];
hardeningDisable = [ "pic" ];
NIX_LDFLAGS=" -lz ";
meta = {
description = "Lisp Universal SHell";
license = lib.licenses.gpl2Plus ;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
};
}

4
pkgs/development/interpreters/lush/default.upstream
View File

@ -1,4 +0,0 @@
url https://sourceforge.net/projects/lush/files/lush2/
version_link '[.]tar[.]gz/download$'
SF_redirect
minimize_overwrite

12
pkgs/development/interpreters/ruby/default.nix
View File

@ -252,18 +252,18 @@ let
in {
ruby_2_7 = generic {
version = rubyVersion "2" "7" "4" "";
version = rubyVersion "2" "7" "5" "";
sha256 = {
src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh";
git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p";
src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97";
git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh";
};
};
ruby_3_0 = generic {
version = rubyVersion "3" "0" "2" "";
version = rubyVersion "3" "0" "3" "";
sha256 = {
src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah";
git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r";
src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im";
git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim";
};
};
}

4
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -1,12 +1,12 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
"2.7.4" = ops useRailsExpress [
"2.7.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"3.0.2" = ops useRailsExpress [
"3.0.3" = ops useRailsExpress [
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
];

1
pkgs/development/libraries/boost/generic.nix
View File

@ -137,6 +137,7 @@ stdenv.mkDerivation {
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
maintainers = with maintainers; [ hjones2199 ];
};
preConfigure = optionalString useMpi ''

6
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.68.0";
version = "1.69.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-T49E9pGetJqO5qj014efioZtlHM9ZAxH9WzwVmk85XM=";
hash = "sha256-yW6MXDb7kiI24akJrEPHeb4bI8jEldBcPYx+5+dwJR0=";
};
patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-jAL8siaMonTMYE88kK7E6RQesPahCLr082dHJovmoo0=";
hash = "sha256-76TraZCJhppPhkdQfAf1XqOoK7RS+VoYIp2keTn4es4=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/libxc/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_FORTRAN=ON"
"-DBUILD_SHARED_LIBS=ON"
# needed for tests to link
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
# Force compilation of higher derivatives
"-DDISABLE_VXC=0"
"-DDISABLE_FXC=0"
@ -27,10 +29,6 @@ stdenv.mkDerivation rec {
"-DDISABLE_LXC=0"
];
preCheck = ''
export LD_LIBRARY_PATH=$(pwd)
'';
doCheck = true;
meta = with lib; {

4
pkgs/development/libraries/nss/default.nix
View File

@ -27,7 +27,7 @@ let
# It will rebuild itself using the version of this package (NSS) and if
# an update is required do the required changes to the expression.
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
version = "3.72";
version = "3.73";
in
stdenv.mkDerivation rec {
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "bqYKn/ET5JPqKrJfQep1qfvRCveQPyb3A9rIaAcy0C4=";
sha256 = "1rfqjq02rfv0ycdmvic51pi093rg33zb8kpqkvddf44vv9l3lvan";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

2
pkgs/development/libraries/science/astronomy/cfitsio/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt";
license = licenses.mit;
maintainers = [ maintainers.xbreak ];
maintainers = with maintainers; [ xbreak hjones2199 ];
platforms = with platforms; linux ++ darwin;
};
}

9
pkgs/development/libraries/spdk/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, ncurses
, python3
, cunit
@ -24,6 +23,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg=";
};
patches = [
# Backport of upstream patch for ncurses-6.3 support.
# Will be in next release after 21.10.
./ncurses-6.3.patch
];
nativeBuildInputs = [
python3
];
@ -36,6 +41,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
enableParallelBuilding = true;
configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.

48
pkgs/development/libraries/spdk/ncurses-6.3.patch Normal file
View File

@ -0,0 +1,48 @@
Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300
--- a/app/spdk_top/spdk_top.c
+++ b/app/spdk_top/spdk_top.c
@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali
- mvwprintw(win, row, col, tmp_str);
+ mvwprintw(win, row, col, "%s", tmp_str);
@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64,
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d",
@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info)
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
@@ -2111 +2111 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time);
+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time);
@@ -2118 +2118 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time);
+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time);
@@ -2124 +2124 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
@@ -2137 +2137 @@ show_core(uint8_t current_page)
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
@@ -2214 +2214 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL,
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s",
@@ -2216 +2216 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name);
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name);
@@ -2231 +2231 @@ show_poller(uint8_t current_page)
- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period);
+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period);
@@ -2264 +2264 @@ print_bottom_error_message(char *msg)
- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg);
+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg);
@@ -2434 +2434 @@ show_stats(pthread_t *data_thread)
- mvprintw(g_max_row - 1, 1, current_page_str);
+ mvprintw(g_max_row - 1, 1, "%s", current_page_str);

17
pkgs/development/libraries/spdk/spdk-dpdk-meson.patch
View File

@ -1,17 +0,0 @@
1. dpdk built with meson generates rte_build_config.h rather than rte_config.h.
2. dpdk configured with libbsd requires that dependents link with libbsd.
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -140,6 +140,9 @@ endif
-ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h))
-ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h))
+ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_build_config.h))
+ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_build_config.h))
ENV_LINKER_ARGS += -lnuma
endif
+ifneq (,$(shell grep -e "define RTE_USE_LIBBSD 1" $(DPDK_INC_DIR)/rte_build_config.h))
+ENV_LINKER_ARGS += -lbsd
+endif
endif

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc=";
sha256 = "sha256-U+2R/TlMwRj+FEuO1aOox7dt3RXlDjazjoG7IfN8um8=";
};
propagatedBuildInputs = [ pyvex ];

4
pkgs/development/python-modules/angr/default.nix
View File

@ -44,14 +44,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA=";
sha256 = "sha256-UMPJZUtfcUTiL0Ha+p1M09yhLwaCuBLpam4KUgtYvnw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak=";
sha256 = "sha256-ZWu9Kk/d6Qz9IEDUkuaB0f5cZV0HnZAaEDnYSoiKMDI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.10651";
version = "9.0.10689";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w=";
sha256 = "sha256-kye8muKTm79lVhOBJeHnI4apJBsUVtNtGYpNiykXFDs=";
};
checkInputs = [

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.10651";
version = "9.0.10689";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg=";
sha256 = "sha256-s3h+SnqCi29B0/BwUHp08x7n4tej+u5aI4exGpeKbxc=";
};
# Use upstream z3 implementation

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.10651";
version = "9.0.10689";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk=";
sha256 = "sha256-sZVdDEs+9UqPHWiCxrZpHp3UiB1hX8dTZxR3TXrIsTQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/cloudsplaining/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cloudsplaining";
version = "0.4.6";
version = "0.4.8";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "salesforce";
repo = pname;
rev = version;
sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw=";
sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/md-toc/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.0.1";
version = "8.1.0";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk=";
sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo=";
};
propagatedBuildInputs = [
@ -28,11 +28,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3"
'';
pytestFlagsArray = [
"md_toc/tests/*.py"
];

19
pkgs/development/python-modules/meshtastic/default.nix
View File

@ -15,12 +15,14 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.2.40";
version = "1.2.43";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "be8464037d0c8085350065b38e7a7b028db15f2524764dec0e3548ea5b53500f";
sha256 = "sha256-nGbULY/QJUv3sk8vYXvh/fhkab/vB3lGGhXRTjt8anI=";
};
propagatedBuildInputs = [
@ -35,18 +37,13 @@ buildPythonPackage rec {
timeago
];
postPatch = ''
# https://github.com/meshtastic/Meshtastic-python/pull/87
substituteInPlace setup.py \
--replace 'with open("README.md", "r") as fh:' "" \
--replace "long_description = fh.read()" "" \
--replace "long_description=long_description," 'long_description="",'
'';
# Project only provides PyPI releases which don't contain the tests
# https://github.com/meshtastic/Meshtastic-python/issues/86
doCheck = false;
pythonImportsCheck = [ "meshtastic" ];
pythonImportsCheck = [
"meshtastic"
];
meta = with lib; {
description = "Python API for talking to Meshtastic devices";

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.20.12";
version = "1.20.17";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-J0EqIMSQEvev8sZ1XLgxPD68xlgPtlRTW/yBPyrekFQ=";
sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc=";
};
propagatedBuildInputs = [

60
pkgs/development/python-modules/open-meteo/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "open-meteo";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-open-meteo";
rev = "v${version}";
sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
aresponses
pydantic
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version for the pyproject.toml
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" "" \
--replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"'
'';
pythonImportsCheck = [
"open_meteo"
];
meta = with lib; {
description = "Python client for the Open-Meteo API";
homepage = "https://github.com/frenck/python-open-meteo";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/pre-commit/default.nix
View File

@ -1,47 +1,47 @@
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, aspy-yaml
, cached-property
, cfgv
, fetchPypi
, identify
, importlib-metadata
, importlib-resources
, nodeenv
, python
, six
, pythonOlder
, pyyaml
, toml
, virtualenv
}:
buildPythonPackage rec {
pname = "pre-commit";
version = "2.15.0";
version = "2.16.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "pre_commit";
sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac=";
sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U=";
};
patches = [
./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
./languages-use-the-hardcoded-path-to-python-binaries.patch
];
propagatedBuildInputs = [
aspy-yaml
cached-property
cfgv
identify
nodeenv
six
pyyaml
toml
virtualenv
] ++ lib.optional (pythonOlder "3.8") importlib-metadata
++ lib.optional (pythonOlder "3.7") importlib-resources;
] ++ lib.optional (pythonOlder "3.8") [
importlib-metadata
] ++ lib.optional (pythonOlder "3.7") [
importlib-resources
];
# slow and impure
doCheck = false;
@ -55,7 +55,9 @@ buildPythonPackage rec {
--subst-var-by nodeenv ${nodeenv}
'';
pythonImportsCheck = [ "pre_commit" ];
pythonImportsCheck = [
"pre_commit"
];
meta = with lib; {
description = "A framework for managing and maintaining multi-language pre-commit hooks";

15
pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
View File

@ -1,15 +0,0 @@
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
index 299144e..6d12543 100755
--- a/pre_commit/resources/hook-tmpl
+++ b/pre_commit/resources/hook-tmpl
@@ -25,8 +25,8 @@ ARGS.append('--')
ARGS.extend(sys.argv[1:])
DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?'
-if os.access(INSTALL_PYTHON, os.X_OK):
- CMD = [INSTALL_PYTHON, '-mpre_commit']
+if os.access('@pre-commit@/bin/pre-commit', os.X_OK):
+ CMD = ['@pre-commit@/bin/pre-commit']
elif which('pre-commit'):
CMD = ['pre-commit']
else:

6
pkgs/development/python-modules/pytenable/default.nix
View File

@ -14,17 +14,18 @@
, responses
, restfly
, semver
, typing-extensions
}:
buildPythonPackage rec {
pname = "pytenable";
version = "1.3.3";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tenable";
repo = "pyTenable";
rev = version;
sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq";
sha256 = "sha256-JdI0nAX/leTnYgGId2ct04u1a+z7eU2UY6pk2cUM4fg=";
};
propagatedBuildInputs = [
@ -40,6 +41,7 @@ buildPythonPackage rec {
requests
requests-pkcs12
restfly
typing-extensions
];
checkInputs = [

4
pkgs/development/python-modules/python-gvm/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-gvm";
version = "21.10.0";
version = "21.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA=";
sha256 = "sha256-H3cM+4YA6obYbo7qm7BhLlQxW4DKV6A3X0ZKsXWPDBs=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.10651";
version = "9.0.10689";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4=";
sha256 = "sha256-BP0yRsp0I6QNN6lCpF6MwBw/BXTXCsNbmzfpKNMS0fQ=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/qcs-api-client/default.nix
View File

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.20.1";
version = "0.20.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rlDquNKWnmP8d3pxmFfViDN++8x59h6bGXBJv//q/dk=";
sha256 = "sha256-3PzjCdH0Mxw1GvtqvEMyAaYt96QX0zoXwK3azF2ey+U=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/rdkit/default.nix
View File

@ -4,7 +4,7 @@
, fetchzip
, cmake
, boost
, catch
, catch2
, inchi
, cairo
, eigen
@ -75,7 +75,7 @@ buildPythonPackage rec {
buildInputs = [
boost
catch
catch2
inchi
eigen
cairo
@ -107,7 +107,7 @@ buildPythonPackage rec {
'';
cmakeFlags = [
"-DCATCH_DIR=${catch}/include/catch"
"-DCATCH_DIR=${catch2}/include/catch2"
"-DINCHI_LIBRARY=${inchi}/lib/libinchi.so"
"-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so"
"-DINCHI_INCLUDE_DIR=${inchi}/include/inchi"

6
pkgs/development/python-modules/tailscale/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tailscale";
version = "0.1.2";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-tailscale";
rev = "v${version}";
sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1";
sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8=";
};
nativeBuildInputs = [
@ -54,7 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for the Tailscale API";
homepage = "https://github.com/frenck/python-wled";
homepage = "https://github.com/frenck/python-tailscale";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/twitterapi/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "twitterapi";
version = "2.7.7";
version = "2.7.9.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "geduldig";
repo = "TwitterAPI";
rev = "v${version}";
sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI=";
sha256 = "sha256-3Ho8iw//X+eB7B/Q9TJGeoxAYjUJ96qsI1T3WYqZOpM=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/vehicle/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "vehicle";
version = "0.2.0";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-vehicle";
rev = "v${version}";
sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg";
sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo=";
};
nativeBuildInputs = [
@ -54,7 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client providing RDW vehicle information";
homepage = "https://github.com/frenck/python-wled";
homepage = "https://github.com/frenck/python-vehicle";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

Some files were not shown because too many files have changed in this diff Show More