dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haskell-updates

Browse Source
This commit is contained in:
sternenseemann 2021-12-01 17:31:16 +01:00
commit 0f5a723dd1
83 changed files with 1703 additions and 912 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 - doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/vim/**/* - pkgs/applications/editors/vim/**/*
- pkgs/misc/vim-plugins/**/* - pkgs/misc/vim-plugins/**/*
- nixos/modules/programs/neovim.nix
- pkgs/applications/editors/neovim/**/*
"6.topic: xfce": "6.topic: xfce":
- nixos/doc/manual/configuration/xfce.xml - nixos/doc/manual/configuration/xfce.xml

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 ```nix
systemd.network.links."10-wan" = { systemd.network.links."10-wan" = {
matchConfig.MACAddress = "52:54:00:12:01:01"; matchConfig.PermanentMACAddress = "52:54:00:12:01:01";
linkConfig.Name = "wan"; linkConfig.Name = "wan";
}; };
``` ```

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

@ -32,7 +32,7 @@
</para> </para>
<programlisting language="bash"> <programlisting language="bash">
systemd.network.links.&quot;10-wan&quot; = { 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;; linkConfig.Name = &quot;wan&quot;;
}; };
</programlisting> </programlisting>

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

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

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

@ -85,14 +85,21 @@ in
"d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -" "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"
]; ];
environment.etc."charybdis/ircd.conf".source = configFile;
systemd.services.charybdis = { systemd.services.charybdis = {
description = "Charybdis IRC daemon"; description = "Charybdis IRC daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
reloadIfChanged = true;
restartTriggers = [
configFile
];
environment = { environment = {
BANDB_DBPATH = "${cfg.statedir}/ban.db"; BANDB_DBPATH = "${cfg.statedir}/ban.db";
}; };
serviceConfig = { 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; Group = cfg.group;
User = cfg.user; User = cfg.user;
}; };

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

@ -126,21 +126,6 @@
</programlisting> </programlisting>
</section> </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"> <section xml:id="sec-gnome-icons-and-gtk-themes">
<title>Icons and GTK Themes</title> <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; with lib;
@ -11,16 +11,10 @@ let
# you can provide an easy way to boot the same configuration # you can provide an easy way to boot the same configuration
# as you use, but with another kernel # as you use, but with another kernel
# !!! fix this # !!! fix this
children = mapAttrs (childName: childConfig: children =
(import ../../../lib/eval-config.nix { mapAttrs
inherit lib baseModules specialArgs; (childName: childConfig: childConfig.configuration.system.build.toplevel)
system = config.nixpkgs.initialSystem; config.specialisation;
modules =
(optionals childConfig.inheritParentConfig modules)
++ [ ./no-clone.nix ]
++ [ childConfig.configuration ];
}).config.system.build.toplevel
) config.specialisation;
systemBuilder = systemBuilder =
let let
@ -169,7 +163,11 @@ in
</screen> </screen>
''; '';
type = types.attrsOf (types.submodule ( type = types.attrsOf (types.submodule (
{ ... }: { local@{ ... }: let
extend = if local.config.inheritParentConfig
then extendModules
else noUserModules.extendModules;
in {
options.inheritParentConfig = mkOption { options.inheritParentConfig = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -178,7 +176,15 @@ in
options.configuration = mkOption { options.configuration = mkOption {
default = {}; 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 = { # Compatibility shim
"14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; let
"14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; lib = import ../../../lib;
"14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; inherit (lib) mapAttrs;
"14.04".ap-southeast-1.hvm-ebs = "ami-da280888"; everything = import ./amazon-ec2-amis.nix;
"14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28"; doAllVersions = mapAttrs (versionName: doRegion);
"14.04".ap-southeast-1.pv-s3 = "ami-c4290996"; doRegion = mapAttrs (regionName: systems: systems.x86_64-linux);
"14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91"; in
"14.04".ap-southeast-2.pv-ebs = "ami-6769055d"; doAllVersions everything
"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

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

@ -4,6 +4,7 @@
, boost , boost
, curl , curl
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, ffmpeg , ffmpeg
, lame , lame
, libev , libev
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35"; 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 = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config

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

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

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

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

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

@ -3,6 +3,7 @@
, bundlerEnv, ruby , bundlerEnv, ruby
, nodejs , nodejs
, nodePackages , nodePackages
, python3
, python3Packages , python3Packages
, callPackage , callPackage
}: }:
@ -17,7 +18,7 @@ let
, wrapperArgs ? [] , wrapperArgs ? []
, manifestRc ? null , manifestRc ? null
, withPython2 ? false , withPython2 ? false
, withPython3 ? true, python3Env ? null , withPython3 ? true, python3Env ? python3
, withNodeJs ? false , withNodeJs ? false
, rubyEnv ? null , rubyEnv ? null
, vimAlias ? false , vimAlias ? false
@ -59,7 +60,7 @@ let
--replace 'Name=Neovim' 'Name=WrappedNeovim' --replace 'Name=Neovim' 'Name=WrappedNeovim'
'' ''
+ optionalString withPython3 '' + optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH
'' ''
+ optionalString (rubyEnv != null) '' + optionalString (rubyEnv != null) ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby 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 { stdenv.mkDerivation rec {
pname = "drawio"; pname = "drawio";
version = "15.8.4"; version = "15.8.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616"; sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
patches = [ ./lua-header.patch ]; patches = [ ./lua-header.patch ];
preBuild = "cd dozenal"; preBuild = "cd dozenal";
buildInputs = [ ncurses hdate lua5_2 ]; 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. # I remove gdozdc, as I didn't figure all it's dependency yet.
postInstall = "rm $out/bin/gdozdc"; postInstall = "rm $out/bin/gdozdc";

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

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

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

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

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

@ -7,7 +7,7 @@
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
, customOCamlPackages ? null , 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 , buildIde ? true
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
, csdp ? null , csdp ? null
@ -45,6 +45,7 @@ let
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
"8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17";
"8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl";
}; };
releaseRev = v: "V${v}"; releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@ -62,10 +63,11 @@ let
'' else ""; '' else "";
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
else with versions; switch coq-version [ 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.11" "8.13"; out = ocamlPackages_4_10; }
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
] ocamlPackages_4_10; ] ocamlPackages_4_12;
ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ optional (!versionAtLeast "8.13") ocamlPackages.num ++ 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 { lib
, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false , stdenv
, fetchurl
, fetchpatch
, texinfo
, perl
, python3
, makeWrapper
, autoreconfHook
, rlwrap ? null
, tk ? null
, gnuplot ? null
, lisp-compiler
}: }:
let let
name = "maxima"; # Allow to remove some executables from the $PATH of the wrapped binary
version = "5.45.0"; searchPath = lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
lisp-compiler = if ecl-fasl then ecl else sbcl;
searchPath =
lib.makeBinPath
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
in in
stdenv.mkDerivation ({ stdenv.mkDerivation rec {
inherit version; pname = "maxima";
name = "${name}-${version}"; version = "5.45.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng="; sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -49,7 +55,7 @@ stdenv.mkDerivation ({
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima 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/" cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
'') '')
; ;
@ -67,12 +73,13 @@ stdenv.mkDerivation ({
sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; 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 { (fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
}) })
] ++ lib.optionals ecl-fasl [ ] ++ lib.optionals (lisp-compiler.pname == "ecl") [
# build fasl, needed for ECL support # build fasl, needed for ECL support
(fetchpatch { (fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; 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; enableParallelBuilding = true;
passthru = { passthru = {
ecl = ecl; inherit lisp-compiler;
}; };
meta = { meta = with lib; {
description = "Computer algebra system"; description = "Computer algebra system";
homepage = "http://maxima.sourceforge.net"; homepage = "http://maxima.sourceforge.net";
license = lib.licenses.gpl2; license = licenses.gpl2Plus;
longDescription = '' longDescription = ''
Maxima is a fairly complete computer algebra system written in 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 DOE-MACSYMA and licensed under the GPL. Its abilities include
symbolic integration, 3D plotting, and an ODE solver. symbolic integration, 3D plotting, and an ODE solver.
''; '';
maintainers = with maintainers; [ doronbehar ];
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
}) }

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

@ -15,7 +15,7 @@ let
sagelib = self.callPackage ./sagelib.nix { sagelib = self.callPackage ./sagelib.nix {
inherit flint arb; inherit flint arb;
inherit sage-src env-locations pynac singular; inherit sage-src env-locations pynac singular;
ecl = maxima-ecl.ecl; inherit (maxima) lisp-compiler;
linbox = pkgs.linbox.override { withSage = true; }; linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config 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`. # the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix { env-locations = callPackage ./env-locations.nix {
inherit pari_data; inherit pari_data;
inherit singular maxima-ecl; inherit singular maxima;
inherit three; inherit three;
ecl = maxima-ecl.ecl;
cysignals = python3.pkgs.cysignals; cysignals = python3.pkgs.cysignals;
mathjax = nodePackages.mathjax; mathjax = nodePackages.mathjax;
}; };
@ -61,22 +60,21 @@ let
sagelib = python3.pkgs.sagelib; sagelib = python3.pkgs.sagelib;
sage_docbuild = python3.pkgs.sage_docbuild; sage_docbuild = python3.pkgs.sage_docbuild;
inherit env-locations; inherit env-locations;
inherit python3 singular palp flint pynac pythonEnv maxima-ecl; inherit python3 singular palp flint pynac pythonEnv maxima;
ecl = maxima-ecl.ecl;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
}; };
# The documentation for sage, building it takes a lot of ram. # The documentation for sage, building it takes a lot of ram.
sagedoc = callPackage ./sagedoc.nix { sagedoc = callPackage ./sagedoc.nix {
inherit sage-with-env; 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. # 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 { sage-with-env = callPackage ./sage-with-env.nix {
inherit python3 pythonEnv; inherit python3 pythonEnv;
inherit sage-env; inherit sage-env;
inherit pynac singular maxima-ecl; inherit pynac singular maxima;
inherit three; inherit three;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
}; };
@ -118,8 +116,8 @@ let
singular = pkgs.singular.override { inherit flint; }; singular = pkgs.singular.override { inherit flint; };
maxima-ecl = pkgs.maxima-ecl.override { maxima = pkgs.maxima.override {
ecl = pkgs.ecl.override { lisp-compiler = pkgs.ecl.override {
# "echo syntax error | ecl > /dev/full 2>&1" segfaults in # "echo syntax error | ecl > /dev/full 2>&1" segfaults in
# ECL. We apply a patch to fix it (write_error.patch), but it # ECL. We apply a patch to fix it (write_error.patch), but it
# only works if threads are disabled. sage 9.2 tests this # 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_data
, pari , pari
, singular , singular
, maxima-ecl , maxima
, conway_polynomials , conway_polynomials
, graphs , graphs
, elliptic_curves , elliptic_curves
, polytopes_db , polytopes_db
, gap , gap
, ecl
, combinatorial_designs , combinatorial_designs
, jmol , jmol
, mathjax , mathjax
@ -30,14 +29,14 @@ writeTextFile rec {
export SINGULAR_SO='${singular}/lib/libSingular.so' export SINGULAR_SO='${singular}/lib/libSingular.so'
export GAP_SO='${gap}/lib/libgap.so' export GAP_SO='${gap}/lib/libgap.so'
export SINGULAR_EXECUTABLE='${singular}/bin/Singular' export SINGULAR_EXECUTABLE='${singular}/bin/Singular'
export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas' export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas'
export MAXIMA_PREFIX="${maxima-ecl}" export MAXIMA_PREFIX="${maxima}"
export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials' export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials'
export GRAPHS_DATA_DIR='${graphs}/share/graphs' export GRAPHS_DATA_DIR='${graphs}/share/graphs'
export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
export GAP_ROOT_DIR='${gap}/share/gap/build-dir' 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 COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar 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 , pkg-config
, pari , pari
, gap , gap
, ecl , maxima
, maxima-ecl
, singular , singular
, fflas-ffpack , fflas-ffpack
, givaro , givaro
@ -77,8 +76,8 @@ let
pkg-config pkg-config
pari pari
gap gap
ecl maxima.lisp-compiler
maxima-ecl maxima
singular singular
giac giac
palp palp

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

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

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

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

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

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

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

@ -1,21 +1,37 @@
{ lib, stdenv, fetchFromGitHub { lib
, wrapGAppsHook, cmake, gettext , stdenv
, maxima, wxGTK, gnome }: , fetchFromGitHub
, wrapGAppsHook
, cmake
, gettext
, maxima
, wxGTK
, gnome
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wxmaxima"; pname = "wxmaxima";
version = "21.05.2"; version = "21.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wxMaxima-developers"; owner = "wxMaxima-developers";
repo = "wxmaxima"; repo = "wxmaxima";
rev = "Version-${version}"; 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 = '' preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
@ -25,6 +41,7 @@ stdenv.mkDerivation rec {
description = "Cross platform GUI for the computer algebra system Maxima"; description = "Cross platform GUI for the computer algebra system Maxima";
license = licenses.gpl2; license = licenses.gpl2;
homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux; 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 { rustPlatform.buildRustPackage rec {
pname = "git-quickfix"; pname = "git-quickfix";
version = "0.0.4"; version = "0.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "siedentop"; owner = "siedentop";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY="; sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
libiconv libiconv
]; ];
cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q="; cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE=";
meta = with lib; { meta = with lib; {
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";

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

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

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

@ -14,6 +14,7 @@
"no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { };
"paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { };
"pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { };
"pop-shell@system76.com" = callPackage ./pop-shell { };
"sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { };
"system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { };
"taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "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 in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) version;
pname = s.baseName;
inherit nativeBuildInputs propagatedBuildInputs; inherit nativeBuildInputs propagatedBuildInputs;
src = fetchurl { src = fetchurl {

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

@ -130,6 +130,24 @@ let
targetCC = builtins.head toolsForTarget; 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. # 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 # 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. # see #84670 and #49071 for more background.
@ -215,10 +233,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 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") '' '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 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 '' '' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" 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; 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. # 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 # 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. # see #84670 and #49071 for more background.
@ -181,10 +199,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 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") '' '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 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 '' '' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" 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; 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. # 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 # 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. # see #84670 and #49071 for more background.
@ -182,10 +200,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 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") '' '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 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 '' '' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" 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; 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. # 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 # 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. # see #84670 and #49071 for more background.
@ -195,10 +213,10 @@ stdenv.mkDerivation (rec {
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 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") '' '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 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 '' '' + lib.optionalString useLLVM ''
export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export LLC="${lib.getBin llvmPackages.llvm}/bin/llc"
export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" export OPT="${lib.getBin llvmPackages.llvm}/bin/opt"

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; inherit version release;
defaultVersion = with versions; switch coq.version [ 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.13"; out = "8.13.0+0.13.0"; }
{ case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; }
{ case = isEq "8.11"; out = "8.11.0+0.11.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

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

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

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

@ -1,7 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, ncurses , ncurses
, python3 , python3
, cunit , cunit
@ -24,6 +23,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg="; 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 = [ nativeBuildInputs = [
python3 python3
]; ];
@ -36,6 +41,8 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
enableParallelBuilding = true;
configureFlags = [ "--with-dpdk=${dpdk}" ]; configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. 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 { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.0.10651"; version = "9.0.10689";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc="; sha256 = "sha256-U+2R/TlMwRj+FEuO1aOox7dt3RXlDjazjoG7IfN8um8=";
}; };
propagatedBuildInputs = [ pyvex ]; propagatedBuildInputs = [ pyvex ];

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "vt-py"; pname = "vt-py";
version = "0.8.0"; version = "0.9.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "VirusTotal"; owner = "VirusTotal";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw="; sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

14
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -39,16 +39,6 @@ let
doCheck = false; doCheck = false;
}); });
cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
version = "0.6.2";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python-lib";
rev = "v${version}";
sha256 = "10cmp2aqbnbiyrsq5r9p7ppghqj3zyg612d2dldk6m85li3jr500";
};
});
}; };
}; };
in in
@ -56,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "2.0.606"; version = "2.0.614";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0="; sha256 = "sha256-z1d1Zcq4x2wU/j4yWpaRwJXsUqy95Ai2uM18EHqxze0=";
}; };
nativeBuildInputs = with py.pkgs; [ nativeBuildInputs = with py.pkgs; [

4
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -5,13 +5,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "tfsec"; pname = "tfsec";
version = "0.61.2"; version = "0.61.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8wC3IX6BhpCEsj9SiWPpxgboIJsKjMlrIHKqiJbMp+8="; sha256 = "sha256-hMLUdUZz7IUTldiJQLKwq0AJdpQqTTzuorfzaUR+ao8=";
}; };
goPackagePath = "github.com/aquasecurity/tfsec"; goPackagePath = "github.com/aquasecurity/tfsec";

4
pkgs/development/tools/database/sqlfluff/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.8.1"; version = "0.8.2";
disabled = python3.pythonOlder "3.6"; disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I="; sha256 = "sha256-0FlXHUjoeZ7XfmOSlY30b13i2t/4vyWwhDKXquXKaJE=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

25
pkgs/development/tools/gosec/default.nix
View File

@ -1,23 +1,34 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec { buildGoModule rec {
pname = "gosec"; pname = "gosec";
version = "2.9.1"; version = "2.9.3";
subPackages = [ "cmd/gosec" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "securego"; owner = "securego";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; sha256 = "sha256-WjHNiFfa0YXuRq/FfWcamBwAVqRqLv9Qf+vy74rsCS4=";
}; };
vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; vendorSha256 = "sha256-X2qxoq6bCQJH0B/jq670WWuTkDEurFI+Zx/5bcvXtVY=";
subPackages = [
"cmd/gosec"
];
doCheck = false; doCheck = false;
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
"-X main.GitTag=${src.rev}"
"-X main.BuildDate=unknown"
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/securego/gosec"; homepage = "https://github.com/securego/gosec";

4
pkgs/development/tools/ktlint/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ktlint"; pname = "ktlint";
version = "0.43.0"; version = "0.43.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "0vrfxmqnwwgij8hrcbzp3j0vg90w55r6kw4zhqmjsnnsg29gc82s"; sha256 = "1qcalpimgsm5s3xhssrnanryra4dp2if9y4647aimydwvfhi05df";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

13
pkgs/development/tools/ocaml/merlin/4.x.nix
View File

@ -15,11 +15,12 @@
}: }:
let let
merlinVersion = "4.3.1"; merlinVersion = "4.4";
hashes = { hashes = {
"4.3.1-411" = "0lhxkd1wa8k3fkcnhvzlahx3g519cdi5h7lgs60khqqm8nfvfcr5"; "4.4-411" = "sha256:0chx28098mmnjbnaz5wgzsn82rh1w9dhzqmsykb412cq13msl1q4";
"4.3.1-412" = "0ah2zbj1hhrrfxp4nhfh47jsbkvm0b30dr7ikjpmvb13wa8h20sr"; "4.4-412" = "sha256:18xjpsiz7xbgjdnsxfc52l7yfh22harj0birlph4xm42d14pkn0n";
"4.4-413" = "sha256:1ilmh2gqpwgr51w2ba8r0s5zkj75h00wkw4az61ssvivn9jxr7k0";
}; };
ocamlVersionShorthand = lib.concatStrings ocamlVersionShorthand = lib.concatStrings
@ -37,7 +38,7 @@ buildDunePackage {
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz";
sha256 = hashes."${version}"; sha256 = hashes."${version}";
}; };
@ -47,10 +48,12 @@ buildDunePackage {
dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
dune = "${dune_2}/bin/dune"; dune = "${dune_2}/bin/dune";
}) })
] ++ lib.optional (!lib.versionAtLeast ocaml.version "4.12")
# This fixes the test-suite on macOS # This fixes the test-suite on macOS
# See https://github.com/ocaml/merlin/pull/1399 # See https://github.com/ocaml/merlin/pull/1399
# Fixed in 4.4 for OCaml ≥ 4.12
./test.patch ./test.patch
]; ;
useDune2 = true; useDune2 = true;

14
pkgs/development/tools/rust/probe-run/default.nix
View File

@ -1,18 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1 { lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1
, libiconv, AppKit, IOKit }: , libiconv, AppKit, IOKit }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "probe-run"; pname = "probe-run";
version = "0.3.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchCrate {
owner = "knurling-rs"; inherit pname version;
repo = pname; sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm";
rev = "v${version}";
sha256 = "0qlpvy62wqc8k9sww6pbiqv0yrjwpnai1vgrijw5285qpvrdsdw2";
}; };
cargoSha256 = "10ybgzvv2iy5bjmmw48gmgvsx6rfqclsysyfbhd820dg2lshgi44"; cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ] buildInputs = [ libusb1 ]

6
pkgs/games/minecraft-server/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, nixosTests, jre_headless }: { lib, stdenv, fetchurl, nixosTests, jre_headless }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minecraft-server"; pname = "minecraft-server";
version = "1.17.1"; version = "1.18";
src = fetchurl { src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar"; url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar";
# sha1 because that comes from mojang via api # sha1 because that comes from mojang via api
sha1 = "a16d67e5807f57fc4e550299cf20226194497dc2"; sha1 = "3cf24a8694aca6267883b17d934efacc5e44440d";
}; };
preferLocalBuild = true; preferLocalBuild = true;

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

@ -921,8 +921,8 @@ let
mktplcRef = { mktplcRef = {
name = "Ionide-fsharp"; name = "Ionide-fsharp";
publisher = "Ionide"; publisher = "Ionide";
version = "5.5.5"; version = "5.10.1";
sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs="; sha256 = "sha256-LkWWgyh4khPyUgekVeO8ZzPK+1gTrS8d9Yz6/kHomr8=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

3
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
View File

@ -6,6 +6,7 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
}; };
version = (lib.importJSON ./package.json).version; version = (lib.importJSON ./package.json).version;
srcInfo = lib.importJSON ./src.json;
in in
ourNodePackages.package.override { ourNodePackages.package.override {
pname = "matrix-appservice-irc"; pname = "matrix-appservice-irc";
@ -15,7 +16,7 @@ ourNodePackages.package.override {
owner = "matrix-org"; owner = "matrix-org";
repo = "matrix-appservice-irc"; repo = "matrix-appservice-irc";
rev = version; rev = version;
sha256 = "sha256-EncodJKptrLC54B5XipkiHXFgJ5cD+crcT3SOPOc+7M="; inherit (srcInfo) sha256;
}; };
nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ];

915
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

20
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "matrix-appservice-irc", "name": "matrix-appservice-irc",
"version": "0.30.0", "version": "0.32.1",
"description": "An IRC Bridge for Matrix", "description": "An IRC Bridge for Matrix",
"main": "app.js", "main": "app.js",
"bin": "./bin/matrix-appservice-irc", "bin": "./bin/matrix-appservice-irc",
@ -28,13 +28,12 @@
"dependencies": { "dependencies": {
"@sentry/node": "^5.27.1", "@sentry/node": "^5.27.1",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"diff": "^5.0.0",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"extend": "^3.0.2", "extend": "^3.0.2",
"he": "^1.2.0", "he": "^1.2.0",
"logform": "^2.2.0", "logform": "^2.2.0",
"matrix-appservice": "^0.8.0", "matrix-appservice-bridge": "^3.1.2",
"matrix-appservice-bridge": "^2.6.1",
"matrix-lastactive": "^0.1.5",
"matrix-org-irc": "^1.2.0", "matrix-org-irc": "^1.2.0",
"nedb": "^1.1.2", "nedb": "^1.1.2",
"nodemon": "^2.0.7", "nodemon": "^2.0.7",
@ -50,20 +49,23 @@
}, },
"devDependencies": { "devDependencies": {
"@types/bluebird": "^3.5.32", "@types/bluebird": "^3.5.32",
"@types/express": "^4.17.7", "@types/diff": "^5.0.1",
"@types/extend": "^3.0.1", "@types/extend": "^3.0.1",
"@types/he": "^1.1.1", "@types/he": "^1.1.1",
"@types/nedb": "^1.8.11", "@types/nedb": "^1.8.11",
"@types/node": "^14",
"@types/nopt": "^3.0.29", "@types/nopt": "^3.0.29",
"@types/pg": "^8.6.0", "@types/pg": "^8.6.0",
"@types/sanitize-html": "^2.3.1", "@types/sanitize-html": "^2.3.1",
"@typescript-eslint/eslint-plugin": "^4.16.1", "@types/express": "4.17.11",
"@typescript-eslint/parser": "^4.16.1", "@types/express-serve-static-core": "4.17.19",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.21.0", "eslint": "^7.21.0",
"jasmine": "^3.6.2", "jasmine": "^3.6.2",
"nyc": "^14.1.1", "nyc": "^14.1.1",
"prom-client": "^13.0.0", "prom-client": "13.1.0",
"proxyquire": "^1.4.0", "proxyquire": "^1.4.0",
"typescript": "^4.2.2" "typescript": "^4.4.3"
} }
} }

10
pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json Normal file
View File

@ -0,0 +1,10 @@
{
"url": "https://github.com/matrix-org/matrix-appservice-irc",
"rev": "6d5795ce9544c8d73f4846f1bd7190d352dddead",
"date": "2021-10-25T12:54:49+02:00",
"path": "/nix/store/by3iwfs5yayyv576qvfl650dgjw7jy5k-matrix-appservice-irc",
"sha256": "06v5ihn03vidfa8aq8q9yil5s0hdgz09hzsm75fk5v8d8bi3d7d4",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

8
pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh
View File

@ -1,11 +1,11 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix #! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix nix-prefetch-git
set -euo pipefail set -euo pipefail
# cd to the folder containing this script # cd to the folder containing this script
cd "$(dirname "$0")" cd "$(dirname "$0")"
CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') CURRENT_VERSION=$(nix-instantiate ../../../../. --eval --strict -A matrix-appservice-irc.version | tr -d '"')
TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")"
if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
@ -23,6 +23,4 @@ wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-i
rm ./package-lock-temp.json rm ./package-lock-temp.json
# Apparently this is done by r-ryantm, so only uncomment for manual usage nix-prefetch-git --rev "$TARGET_VERSION" --url "https://github.com/matrix-org/matrix-appservice-irc" > ./src.json
#git add ./package.json ./node-packages.nix
#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}"

10
pkgs/servers/search/groonga/default.nix
View File

@ -1,21 +1,21 @@
{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config { lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config
, suggestSupport ? false, zeromq, libevent, msgpack , suggestSupport ? false, zeromq, libevent, msgpack, openssl
, lz4Support ? false, lz4 , lz4Support ? false, lz4
, zlibSupport ? false, zlib , zlibSupport ? true, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "groonga"; pname = "groonga";
version = "11.0.5"; version = "11.0.9";
src = fetchurl { src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4=";
}; };
buildInputs = with lib; buildInputs = with lib;
[ pkg-config mecab kytea libedit ] [ pkg-config mecab kytea libedit openssl ]
++ optional lz4Support lz4 ++ optional lz4Support lz4
++ optional zlibSupport zlib ++ optional zlibSupport zlib
++ optionals suggestSupport [ zeromq libevent msgpack ]; ++ optionals suggestSupport [ zeromq libevent msgpack ];

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pgroonga"; pname = "pgroonga";
version = "2.3.2"; version = "2.3.4";
src = fetchurl { src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy"; sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

6
pkgs/servers/tailscale/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; pname = "tailscale";
version = "1.14.6"; version = "1.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY="; sha256 = "sha256-DmgCuv10TiB4UYISthJ1UghuPdvRKYl0cU9VxDvFjMc=";
}; };
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
CGO_ENABLED = 0; CGO_ENABLED = 0;
vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o="; vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k=";
doCheck = false; doCheck = false;

6
pkgs/tools/admin/certigo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "certigo"; pname = "certigo";
version = "1.12.1"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "square"; owner = "square";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; sha256 = "sha256-3VysSE4N2MlNDOZ27RbCe8rUuYChU5Z3L/CIhtvMp38=";
}; };
vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y=";
doCheck = false; doCheck = false;

16
pkgs/tools/filesystems/wiimms-iso-tools/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, zlib, ncurses, fuse}: {lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wiimms-iso-tools"; name = "wiimms-iso-tools";
@ -11,7 +11,19 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ncurses fuse ]; buildInputs = [ zlib ncurses fuse ];
patches = [ ./fix-paths.diff ]; patches = [
./fix-paths.diff
# Pull pending upstream fix for ncurses-6.3:
# https://github.com/Wiimm/wiimms-iso-tools/pull/14
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/Wiimm/wiimms-iso-tools/commit/3f1e84ec6915cc4f658092d33411985bd3eaf4e6.patch";
sha256 = "18cfri4y1082phg6fzh402gk5ri24wr8ff4zl8v5rlgjndh610im";
stripLen = 1;
})
];
postPatch = '' postPatch = ''
patchShebangs setup.sh patchShebangs setup.sh
patchShebangs gen-template.sh patchShebangs gen-template.sh

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "goreleaser"; pname = "goreleaser";
version = "0.184.0"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goreleaser"; owner = "goreleaser";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ujhYcihLJh52cURvQ7p1B4fZTDx8cq3WA4RfKetWEBo="; sha256 = "1rk2n1c2ia8kwqvbfnhsf3jbbi1qzndniq7cxs8iy9drn4adl7gv";
}; };
vendorSha256 = "sha256-J9lAkmLDowMmbwcHV2t9/7iVzkZRnF60/4PSRS8+4Sg="; vendorSha256 = "1hm5ya240vpfmgc8y6qv4gp4gbcqydk7hg05fwr7nzc2apj5fv6a";
ldflags = [ ldflags = [
"-s" "-s"

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@ -20,12 +20,12 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that # The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported # downloads break constantly. Because of that, updates should always be backported
# to the latest stable release. # to the latest stable release.
version = "2021.11.10.1"; version = "2021.12.1";
src = fetchPypi { src = fetchPypi {
inherit pname; inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version; version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388"; sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8=";
}; };
propagatedBuildInputs = [ websockets mutagen ] propagatedBuildInputs = [ websockets mutagen ]

6
pkgs/tools/networking/godns/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "godns"; pname = "godns";
version = "2.5.2"; version = "2.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimothyYe"; owner = "TimothyYe";
repo = "godns"; repo = "godns";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pNy1mTP2AaeuwNvvfrHOp5v1nQgv+1DJRGYKgnx98Xo="; sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4=";
}; };
vendorSha256 = "sha256-TYjkow/9W467CMyqV2SSRJAuqXGdnAgR9gtfq4vX4u0="; vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI=";
# Some tests require internet access, broken in sandbox # Some tests require internet access, broken in sandbox
doCheck = false; doCheck = false;

12
pkgs/tools/networking/nfstrace/default.nix
View File

@ -22,11 +22,21 @@ stdenv.mkDerivation rec {
url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch";
sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p";
}) })
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/epam/nfstrace/pull/50
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch";
sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx";
})
]; ];
postPatch = '' postPatch = ''
# -Wall -Wextra -Werror fails on clang and newer gcc
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "-Wno-braced-scalar-init" "" --replace "-Wno-braced-scalar-init" "" \
--replace "-Werror" ""
''; '';
buildInputs = [ json_c libpcap ncurses libtirpc ]; buildInputs = [ json_c libpcap ncurses libtirpc ];

6
pkgs/tools/security/httpx/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "httpx"; pname = "httpx";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "httpx"; repo = "httpx";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; sha256 = "sha256-Mis3DQwcTazHVF7hkTRQ2OtQxeGut5LRUAloBXCdq3s=";
}; };
vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; vendorSha256 = "sha256-53Mvc637J306MJLw+l1amAuZhUE/NdDvuWEe0fg4Hog=";
meta = with lib; { meta = with lib; {
description = "Fast and multi-purpose HTTP toolkit"; description = "Fast and multi-purpose HTTP toolkit";

6
pkgs/tools/text/vale/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "vale"; pname = "vale";
version = "2.11.2"; version = "2.13.0";
subPackages = [ "cmd/vale" ]; subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ]; outputs = [ "out" "data" ];
@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai"; owner = "errata-ai";
repo = "vale"; repo = "vale";
rev = "v${version}"; rev = "v${version}";
sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; sha256 = "sha256-I1hrmlNZUDhjWTsOzmp8xIc8rv2gTGRx2/yiAmCy9IY=";
}; };
vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY=";
postInstall = '' postInstall = ''
mkdir -p $data/share/vale mkdir -p $data/share/vale

18
pkgs/top-level/all-packages.nix
View File

@ -5632,9 +5632,7 @@ with pkgs;
git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { };
git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo { git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
pythonPackages = python3Packages;
};
git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
@ -13476,8 +13474,6 @@ with pkgs;
### End of CuboCore ### End of CuboCore
lush2 = callPackage ../development/interpreters/lush {};
maude = callPackage ../development/interpreters/maude { maude = callPackage ../development/interpreters/maude {
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
}; };
@ -21641,7 +21637,9 @@ with pkgs;
syncserver = callPackage ../servers/syncserver { }; syncserver = callPackage ../servers/syncserver { };
tailscale = callPackage ../servers/tailscale { }; tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo117Module;
};
thanos = callPackage ../servers/monitoring/thanos { }; thanos = callPackage ../servers/monitoring/thanos { };
@ -31623,7 +31621,7 @@ with pkgs;
cadical = callPackage ../applications/science/logic/cadical {}; cadical = callPackage ../applications/science/logic/cadical {};
inherit (callPackage ./coq-packages.nix { inherit (callPackage ./coq-packages.nix {
inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12;
}) mkCoqPackages }) mkCoqPackages
coqPackages_8_5 coq_8_5 coqPackages_8_5 coq_8_5
coqPackages_8_6 coq_8_6 coqPackages_8_6 coq_8_6
@ -31934,12 +31932,10 @@ with pkgs;
}; };
maxima = callPackage ../applications/science/math/maxima { maxima = callPackage ../applications/science/math/maxima {
ecl = null; lisp-compiler = sbcl;
}; };
maxima-ecl = maxima.override { maxima-ecl = maxima.override {
inherit ecl; lisp-compiler = ecl;
ecl-fasl = true;
sbcl = null;
}; };
mxnet = callPackage ../applications/science/math/mxnet { mxnet = callPackage ../applications/science/math/mxnet {

9
pkgs/top-level/coq-packages.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 { lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09
, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html , ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html
}@args: }@args:
let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
let let
@ -113,7 +113,12 @@ let
) (lib.attrNames set) ) (lib.attrNames set)
); );
mkCoq = version: callPackage ../applications/science/logic/coq { mkCoq = version: callPackage ../applications/science/logic/coq {
inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; inherit version
ocamlPackages_4_05
ocamlPackages_4_09
ocamlPackages_4_10
ocamlPackages_4_12
;
}; };
in rec { in rec {