Merge staging-next into staging

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,9 +21,13 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
   - [ ] x86_64-darwin
   - [ ] aarch64-darwin
 - [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/#sec-conf-file))
-- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
+- [ ] Tested, as applicable:
+  - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
+  - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)
+  - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)
+  - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
 - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
-- [ ] Tested execution of all binary files (usually in `./result/bin/`)
+- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
 - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
   - [ ] (Package updates) Added a release notes entry if the change is major or breaking
   - [ ] (Module updates) Added a release notes entry if the change is significant

nixos/modules/module-list.nix

@@ -772,6 +772,7 @@
   ./services/networking/libreswan.nix
   ./services/networking/lldpd.nix
   ./services/networking/logmein-hamachi.nix
+  ./services/networking/lxd-image-server.nix
   ./services/networking/mailpile.nix
   ./services/networking/magic-wormhole-mailbox-server.nix
   ./services/networking/matterbridge.nix

nixos/modules/services/networking/lxd-image-server.nix

@@ -0,0 +1,138 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.lxd-image-server;
+  format = pkgs.formats.toml {};
+
+  location = "/var/www/simplestreams";
+in
+{
+  options = {
+    services.lxd-image-server = {
+      enable = mkEnableOption "lxd-image-server";
+
+      group = mkOption {
+        type = types.str;
+        description = "Group assigned to the user and the webroot directory.";
+        default = "nginx";
+        example = "www-data";
+      };
+
+      settings = mkOption {
+        type = format.type;
+        description = ''
+          Configuration for lxd-image-server.
+
+          Example see <link xlink:href="https://github.com/Avature/lxd-image-server/blob/master/config.toml"/>.
+        '';
+        default = {};
+      };
+
+      nginx = {
+        enable = mkEnableOption "nginx";
+        domain = mkOption {
+          type = types.str;
+          description = "Domain to use for nginx virtual host.";
+          example = "images.example.org";
+        };
+      };
+    };
+  };
+
+  config = mkMerge [
+    (mkIf (cfg.enable) {
+      users.users.lxd-image-server = {
+        isSystemUser = true;
+        group = cfg.group;
+      };
+      users.groups.${cfg.group} = {};
+
+      environment.etc."lxd-image-server/config.toml".source = format.generate "config.toml" cfg.settings;
+
+      services.logrotate.paths.lxd-image-server = {
+        path = "/var/log/lxd-image-server/lxd-image-server.log";
+        frequency = "daily";
+        keep = 21;
+        user = "lxd-image-server";
+        group = cfg.group;
+        extraConfig = ''
+          missingok
+          compress
+          delaycompress
+          copytruncate
+          notifempty
+        '';
+      };
+
+      systemd.tmpfiles.rules = [
+        "d /var/www/simplestreams 0755 lxd-image-server ${cfg.group}"
+      ];
+
+      systemd.services.lxd-image-server = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+
+        description = "LXD Image Server";
+
+        script = ''
+          ${pkgs.lxd-image-server}/bin/lxd-image-server init
+          ${pkgs.lxd-image-server}/bin/lxd-image-server watch
+        '';
+
+        serviceConfig = {
+          User = "lxd-image-server";
+          Group = cfg.group;
+          DynamicUser = true;
+          LogsDirectory = "lxd-image-server";
+          RuntimeDirectory = "lxd-image-server";
+          ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
+          ReadWritePaths = [ location ];
+        };
+      };
+    })
+    # this is seperate so it can be enabled on mirrored hosts
+    (mkIf (cfg.nginx.enable) {
+      # https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf
+      services.nginx.virtualHosts = {
+        "${cfg.nginx.domain}" = {
+          forceSSL = true;
+          enableACME = mkDefault true;
+
+          root = location;
+
+          locations = {
+            "/streams/v1/" = {
+              index = "index.json";
+            };
+
+            # Serve json files with content type header application/json
+            "~ \.json$" = {
+              extraConfig = ''
+                add_header Content-Type application/json;
+              '';
+            };
+
+            "~ \.tar.xz$" = {
+              extraConfig = ''
+                add_header Content-Type application/octet-stream;
+              '';
+            };
+
+            "~ \.tar.gz$" = {
+              extraConfig = ''
+                add_header Content-Type application/octet-stream;
+              '';
+            };
+
+            # Deny access to document root and the images folder
+            "~ ^/(images/)?$" = {
+              return = "403";
+            };
+          };
+        };
+      };
+    })
+  ];
+}

nixos/tests/all-tests.nix

@@ -239,6 +239,7 @@ in
   lxd = handleTest ./lxd.nix {};
   lxd-image = handleTest ./lxd-image.nix {};
   lxd-nftables = handleTest ./lxd-nftables.nix {};
+  lxd-image-server = handleTest ./lxd-image-server.nix {};
   #logstash = handleTest ./logstash.nix {};
   lorri = handleTest ./lorri/default.nix {};
   magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};

nixos/tests/elk.nix

@@ -1,12 +1,15 @@
+# To run the test on the unfree ELK use the folllowing command:
+# cd path/to/nixpkgs
+# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6
+
 { system ? builtins.currentSystem,
   config ? {},
   pkgs ? import ../.. { inherit system config; },
-  enableUnfree ? false
-  # To run the test on the unfree ELK use the folllowing command:
-  # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true
 }:
 
 let
+  inherit (pkgs) lib;
+
   esUrl = "http://localhost:9200";
 
   mkElkTest = name : elk :
@@ -215,38 +218,40 @@ let
               '! curl --silent --show-error "${esUrl}/_cat/indices" | grep logstash | grep ^'
           )
     '';
-  }) {};
+  }) { inherit pkgs system; };
-in pkgs.lib.mapAttrs mkElkTest {
+in {
-  ELK-6 =
+  ELK-6 = mkElkTest {
-    if enableUnfree
+    name = "elk-6-oss";
-    then {
+    elasticsearch = pkgs.elasticsearch6-oss;
+    logstash      = pkgs.logstash6-oss;
+    kibana        = pkgs.kibana6-oss;
+    journalbeat   = pkgs.journalbeat6;
+    metricbeat    = pkgs.metricbeat6;
+  };
+  # We currently only package upstream binaries.
+  # Feel free to package an SSPL licensed source-based package!
+  # ELK-7 = mkElkTest {
+  #   name = "elk-7";
+  #   elasticsearch = pkgs.elasticsearch7-oss;
+  #   logstash      = pkgs.logstash7-oss;
+  #   kibana        = pkgs.kibana7-oss;
+  #   journalbeat   = pkgs.journalbeat7;
+  #   metricbeat    = pkgs.metricbeat7;
+  # };
+  unfree = lib.dontRecurseIntoAttrs {
+    ELK-6 = mkElkTest "elk-6" {
       elasticsearch = pkgs.elasticsearch6;
       logstash      = pkgs.logstash6;
       kibana        = pkgs.kibana6;
       journalbeat   = pkgs.journalbeat6;
       metricbeat    = pkgs.metricbeat6;
-    }
-    else {
-      elasticsearch = pkgs.elasticsearch6-oss;
-      logstash      = pkgs.logstash6-oss;
-      kibana        = pkgs.kibana6-oss;
-      journalbeat   = pkgs.journalbeat6;
-      metricbeat    = pkgs.metricbeat6;
     };
-  ELK-7 =
+    ELK-7 = mkElkTest "elk-7" {
-    if enableUnfree
-    then {
       elasticsearch = pkgs.elasticsearch7;
       logstash      = pkgs.logstash7;
       kibana        = pkgs.kibana7;
       journalbeat   = pkgs.journalbeat7;
       metricbeat    = pkgs.metricbeat7;
-    }
-    else {
-      elasticsearch = pkgs.elasticsearch7-oss;
-      logstash      = pkgs.logstash7-oss;
-      kibana        = pkgs.kibana7-oss;
-      journalbeat   = pkgs.journalbeat7;
-      metricbeat    = pkgs.metricbeat7;
     };
+  };
 }

nixos/tests/lxd-image-server.nix

@@ -0,0 +1,127 @@
+import ./make-test-python.nix ({ pkgs, ...} :
+
+let
+  # Since we don't have access to the internet during the tests, we have to
+  # pre-fetch lxd containers beforehand.
+  #
+  # I've chosen to import Alpine Linux, because its image is turbo-tiny and,
+  # generally, sufficient for our tests.
+  alpine-meta = pkgs.fetchurl {
+    url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";
+    hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";
+  };
+
+  alpine-rootfs = pkgs.fetchurl {
+    url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";
+    hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";
+  };
+
+  lxd-config = pkgs.writeText "config.yaml" ''
+    storage_pools:
+      - name: default
+        driver: dir
+        config:
+          source: /var/lxd-pool
+
+    networks:
+      - name: lxdbr0
+        type: bridge
+        config:
+          ipv4.address: auto
+          ipv6.address: none
+
+    profiles:
+      - name: default
+        devices:
+          eth0:
+            name: eth0
+            network: lxdbr0
+            type: nic
+          root:
+            path: /
+            pool: default
+            type: disk
+  '';
+
+
+in {
+  name = "lxd-image-server";
+
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ mkg20001 ];
+  };
+
+  machine = { lib, ... }: {
+    virtualisation = {
+      cores = 2;
+
+      memorySize = 2048;
+      diskSize = 4096;
+
+      lxc.lxcfs.enable = true;
+      lxd.enable = true;
+    };
+
+    security.pki.certificates = [
+      (builtins.readFile ./common/acme/server/ca.cert.pem)
+    ];
+
+    services.nginx = {
+      enable = true;
+    };
+
+    services.lxd-image-server = {
+      enable = true;
+      nginx = {
+        enable = true;
+        domain = "acme.test";
+      };
+    };
+
+    services.nginx.virtualHosts."acme.test" = {
+      enableACME = false;
+      sslCertificate = ./common/acme/server/acme.test.cert.pem;
+      sslCertificateKey = ./common/acme/server/acme.test.key.pem;
+    };
+
+    networking.hosts = {
+      "::1" = [ "acme.test" ];
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("sockets.target")
+    machine.wait_for_unit("lxd.service")
+    machine.wait_for_file("/var/lib/lxd/unix.socket")
+
+    # It takes additional second for lxd to settle
+    machine.sleep(1)
+
+    # lxd expects the pool's directory to already exist
+    machine.succeed("mkdir /var/lxd-pool")
+
+
+    machine.succeed(
+        "cat ${lxd-config} | lxd init --preseed"
+    )
+
+    machine.succeed(
+        "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"
+    )
+
+    loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"
+
+    with subtest("push image to server"):
+        machine.succeed("lxc launch alpine test")
+        machine.succeed("lxc stop test")
+        machine.succeed("lxc publish --public test --alias=testimg")
+        machine.succeed("lxc image export testimg")
+        machine.succeed("ls >&2")
+        machine.succeed("mkdir -p " + loc)
+        machine.succeed("mv *.tar.gz " + loc)
+
+    with subtest("pull image from server"):
+        machine.succeed("lxc remote add img https://acme.test --protocol=simplestreams")
+        machine.succeed("lxc image list img: >&2")
+  '';
+})

nixos/tests/lxd.nix

@@ -133,9 +133,5 @@ in {
         )
 
         machine.succeed("lxc delete -f test")
-
-    with subtest("Unless explicitly changed, lxd leans on iptables"):
-        machine.succeed("lsmod | grep ip_tables")
-        machine.fail("lsmod | grep nf_tables")
   '';
 })

pkgs/applications/audio/vocal/default.nix

@@ -88,5 +88,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.needleandthread.vocal";
   };
 }

pkgs/applications/graphics/akira/default.nix

@@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.akiraux.akira";
   };
 }

pkgs/applications/graphics/fondo/default.nix

@@ -58,15 +58,16 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/calo001/fondo";
     description = "Find the most beautiful wallpapers for your desktop";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
     platforms = platforms.linux;
-  };
+    mainProgram = "com.github.calo001.fondo";
-
-  passthru.updateScript = nix-update-script {
-    attrPath = pname;
   };
 }

pkgs/applications/graphics/ideogram/default.nix

@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.cassidyjames.ideogram";
   };
 
 }

pkgs/applications/graphics/shutter/default.nix

@@ -10,6 +10,7 @@
 , procps
 , libwnck
 , libappindicator-gtk3
+, xdg-utils
 }:
 
 let
@@ -64,13 +65,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "shutter";
-  version = "0.99";
+  version = "0.99.2";
 
   src = fetchFromGitHub {
     owner = "shutter-project";
     repo = "shutter";
     rev = "v${version}";
-    sha256 = "sha256-n5M+Ggk8ulJQMWjAW+/fC8fbqiBGzsx6IXlYxvf8utA=";
+    sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
@@ -81,6 +82,7 @@ stdenv.mkDerivation rec {
     librsvg
     libwnck
     libappindicator-gtk3
+    hicolor-icon-theme
   ] ++ perlModules;
 
   makeFlags = [
@@ -94,9 +96,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     gappsWrapperArgs+=(
       --set PERL5LIB ${perlPackages.makePerlPath perlModules} \
-      --prefix PATH : ${lib.makeBinPath [ imagemagick ] } \
+      --prefix PATH : ${lib.makeBinPath [ imagemagick xdg-utils ] }
-      --suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
-      --set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE
     )
   '';
 

pkgs/applications/misc/appeditor/default.nix

@@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
+    mainProgram = "com.github.donadigo.appeditor";
   };
 }

pkgs/applications/misc/cipher/default.nix

@@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
+    mainProgram = "com.github.arshubham.cipher";
   };
 }

pkgs/applications/misc/flavours/default.nix

@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flavours";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "Misterio77";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-77nSz3J/9TsptpSHRFYY8mZAvn+o35gro2OwQkGzEC0=";
+    sha256 = "sha256-P7F7PHP2EiZz6RgKbmqXRQOGG1P8TJ1emR0BEY9yBqk=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
-  cargoSha256 = "sha256-UukLWMd8+wq5Y0dtePH312c1Nm4ztXPsoPHPN0nUb1w=";
+  cargoSha256 = "sha256-QlCjAtQGITGrWNKQM39QPmv/MPZaaHfwdHjal2i1qv4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/misc/formatter/default.nix

@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.lgpl2Plus;
+    mainProgram = "com.github.djaler.formatter";
   };
 }

pkgs/applications/misc/limesctl/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "limesctl";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "sapcc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fhmGVgJ/4xnf6pe8aXxx1KEmLInxm54my+qgSU4Vc/k=";
+    sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0=";
   };
 
   vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw=";

pkgs/applications/misc/mdzk/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdzk";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "mdzk-rs";
     repo = "mdzk";
     rev = version;
-    sha256 = "sha256-yz8lLFAP2/16fixknqGziyrUJKs3Qo1+whV82kUPuAE=";
+    sha256 = "sha256-VUvV1XA9Bd3ugYHcKOcAQLUt0etxS/Cw2EgnFGxX0z0=";
   };
 
-  cargoSha256 = "sha256-TGNzi8fMU7RhX2SJyxpYfJLgGYxpO/XkmDXzMdlX/2o=";
+  cargoSha256 = "sha256-lZ4fc/94ESlhpfa5ylg45oZNeaF1mZPxQUSLZrl2V3o=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

pkgs/applications/misc/minder/default.nix

@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
+    mainProgram = "com.github.phase1geo.minder";
   };
 }

pkgs/applications/misc/mob/default.nix

@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   pname = "mob";
-  version = "1.12.0";
+  version = "2.0.0";
   goPackagePath = "github.com/remotemobprogramming/mob";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "remotemobprogramming";
     repo = pname;
-    sha256 = "sha256-5hvuaKlaWrB8nEeHytnn4ywciLbOSoXdBdc3K/PqMG8=";
+    sha256 = "sha256-sSeXL+eHroxDr+91rwmUJ+WwDgefZgJBRTxy4wo6DDM=";
   };
 
   meta = with lib; {

pkgs/applications/misc/nerd-font-patcher/default.nix

@@ -0,0 +1,41 @@
+{ python3Packages, lib, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "nerd-font-patcher";
+  version = "2.1.0";
+
+  # The size of the nerd fonts repository is bigger than 2GB, because it
+  # contains a lot of fonts and the patcher.
+  # until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed,
+  # we download the patcher from an alternative repository
+  src = fetchFromGitHub {
+    owner = "betaboon";
+    repo = "nerd-fonts-patcher";
+    rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0";
+    sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ fontforge ];
+
+  format = "other";
+
+  postPatch = ''
+    sed -i font-patcher \
+      -e 's,__dir__ + "/src,"'$out'/share/${pname},'
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/${pname}
+    install -Dm755 font-patcher $out/bin/${pname}
+    cp -ra src/glyphs $out/share/${pname}
+  '';
+
+  meta = with lib; {
+    description = "Font patcher to generate Nerd font";
+    homepage = "https://nerdfonts.com/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ck3d ];
+  };
+}

pkgs/applications/misc/notejot/default.nix

@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "io.github.lainsce.Notejot";
   };
 }

pkgs/applications/misc/sequeler/default.nix

@@ -47,5 +47,6 @@ in stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ etu ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.alecaddd.sequeler";
   };
 }

pkgs/applications/networking/browsers/ephemeral/default.nix

@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3;
+    mainProgram = "com.github.cassidyjames.ephemeral";
   };
 }

pkgs/applications/networking/cluster/helm/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.7.0";
+  version = "3.7.1";
-  gitCommit = "eeac83883cb4014fe60267ec6373570374ce770b";
+  gitCommit = "1d11fcb5d3f3bf00dbe6fe31b8412839a96b3dc4";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "sha256-dV6Bx6XVzPqaRBeCzEFR473xnxjff4f24jd5vETVX78=";
+    sha256 = "sha256-NjBG3yLtvnAXziLH/ALRJVaFW327qo7cvnf1Jpq3QlI=";
   };
-  vendorSha256 = "sha256-Q/ycpLCIvf+PP+03ug3fKT+uIOdzDwP7709VfFVJglk=";
+  vendorSha256 = "sha256-gmyF/xuf5dTxorgqvW4PNA1l2SQ2oJuZCAFw7d8ufGc=";
 
   doCheck = false;
 

pkgs/applications/networking/cluster/istioctl/default.nix

@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.11.2";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "sha256-4v/2lEq2BJX90P3UpSyDcHkxclMOTK9bmvyq0MyB7Pg=";
+    sha256 = "sha256-DkZRRjnTWziAL6WSPy5V8fgjpRO2g3Ew25j3F47pDnk=";
   };
-  vendorSha256 = "sha256-TY7l5ttLKC3rqZ2kcy0l2gRXZg3vRrZBNzYsGerPe0k=";
+  vendorSha256 = "sha256-kioicA4vdWuv0mvpjZRH0r1EuosS06Q3hIEkxdV4/1A=";
 
   doCheck = false;
 

pkgs/applications/networking/cluster/kube3d/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "5.0.0";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "k3d";
     rev = "v${version}";
-    sha256 = "1pkrcjr78xxw3idmyzpkbx0rp20972dl44bzwkkp06milrzsq27i";
+    sha256 = "sha256-BUQG+Nq5BsL+4oBksL8Im9CtNFvwuaW/HebMp9VoORo=";
   };
 
   vendorSha256 = null;

pkgs/applications/networking/ftp/taxi/default.nix

@@ -52,15 +52,16 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/Alecaddd/taxi";
     description = "The FTP Client that drives you anywhere";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
     platforms = platforms.linux;
-  };
+    mainProgram = "com.github.alecaddd.taxi";
-
-  passthru.updateScript = nix-update-script {
-    attrPath = pname;
   };
 }

pkgs/applications/networking/p2p/torrential/default.nix

@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
+    mainProgram = "com.github.davidmhewitt.torrential";
   };
 }

pkgs/applications/networking/ping/default.nix

@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3;
+    mainProgram = "com.github.jeremyvaartjes.ping";
   };
 }

pkgs/applications/networking/soju/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "soju";
-  version = "0.1.2";
+  version = "0.2.2";
 
   src = fetchFromSourcehut {
     owner = "~emersion";
     repo = "soju";
     rev = "v${version}";
-    sha256 = "sha256-dauhGfwSjjRt1vl2+OPhtcme/QaRNTs43heQVnI7oRU=";
+    sha256 = "sha256-ssq4fED7YIJkSHhxybBIqOr5qVEHGordBxuJOmilSOY=";
   };
 
-  vendorSha256 = "sha256-0JLbqqybLZ/cYyHAyNR4liAVJI2oIsHELJLWlQy0qjE=";
+  vendorSha256 = "sha256-60b0jhyXQg9RG0mkvUOmJOEGv96FZq/Iwv1S9c6C35c=";
 
   subPackages = [
     "cmd/soju"

pkgs/applications/office/agenda/default.nix

@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3;
+    mainProgram = "com.github.dahenson.agenda";
   };
 }
 

pkgs/applications/office/elementary-planner/default.nix

@@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
     homepage = "https://planner-todo.web.app";
     license = licenses.gpl3;
     maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
+    platforms = platforms.linux;
+    mainProgram = "com.github.alainm23.planner";
   };
 }
 

pkgs/applications/office/notes-up/default.nix

@@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.philip-scott.notes-up";
   };
 }

pkgs/applications/office/spice-up/default.nix

@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
     license = licenses.gpl3Plus;
+    mainProgram = "com.github.philip-scott.spice-up";
   };
 }

pkgs/applications/science/math/nasc/default.nix

@@ -83,5 +83,6 @@ stdenv.mkDerivation rec {
     maintainers = teams.pantheon.members;
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
+    mainProgram = "com.github.parnold_x.nasc";
   };
 }

pkgs/applications/video/kodi-packages/defusedxml/default.nix

@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+
+buildKodiAddon rec {
+  pname = "defusedxml";
+  namespace = "script.module.defusedxml";
+  version = "0.6.0+matrix.1";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "026i5rx9rmxcc18ixp6qhbryqdl4pn7cbwqicrishivan6apnacd";
+  };
+
+  passthru = {
+    pythonPath = "lib";
+    updateScript = addonUpdateScript {
+      attrPath = "kodi.packages.defusedxml";
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/tiran/defusedxml";
+    description = "defusing XML bombs and other exploits";
+    license = licenses.psfl;
+    maintainers = teams.kodi.members;
+  };
+}

pkgs/applications/video/kodi-packages/keymap/default.nix

@@ -0,0 +1,24 @@
+{ lib, addonDir, buildKodiAddon, fetchzip, defusedxml, kodi-six }:
+
+buildKodiAddon rec {
+  pname = "keymap";
+  namespace = "script.keymap";
+  version = "1.1.3+matrix.1";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "1icrailzpf60nw62xd0khqdp66dnr473m2aa9wzpmkk3qj1ay6jv";
+  };
+
+  propagatedBuildInputs = [
+    defusedxml
+    kodi-six
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/tamland/xbmc-keymap-editor";
+    description = "A GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi";
+    license = licenses.gpl3Plus;
+    maintainers = teams.kodi.members;
+  };
+}

pkgs/applications/video/motion/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "motion";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner  = "Motion-Project";
     repo   = "motion";
     rev    = "release-${version}";
-    sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95";
+    sha256 = "sha256-srL9F99HHq5cw82rnQpywkTuY4s6hqIO64Pw5CnaG5Q=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/build-support/trivial-builders/test/references-test.sh

@@ -8,11 +8,11 @@
 #
 #  This file can be run independently (quick):
 #
-#      $ pkgs/build-support/trivial-builders/test.sh
+#      $ pkgs/build-support/trivial-builders/references-test.sh
 #
 #  or in the build sandbox with a ~20s VM overhead
 #
-#      $ nix-build -A tests.trivial-builders
+#      $ nix-build -A tests.trivial-builders.references
 #
 # -------------------------------------------------------------------------- #
 
@@ -26,9 +26,15 @@ set -euo pipefail
 cd "$(dirname ${BASH_SOURCE[0]})"  # nixpkgs root
 
 if [[ -z ${SAMPLE:-} ]]; then
-  sample=( `nix-build test/sample.nix` )
+  echo "Running the script directly is currently not supported."
-  directRefs=( `nix-build test/invoke-writeDirectReferencesToFile.nix` )
+  echo "If you need to iterate, remove the raw path, which is not returned by nix-build."
-  references=( `nix-build test/invoke-writeReferencesToFile.nix` )
+  exit 1
+#   sample=( `nix-build --no-out-link sample.nix` )
+#   directRefs=( `nix-build --no-out-link invoke-writeDirectReferencesToFile.nix` )
+#   references=( `nix-build --no-out-link invoke-writeReferencesToFile.nix` )
+#   echo "sample: ${#sample[@]}"
+#   echo "direct: ${#directRefs[@]}"
+#   echo "indirect: ${#references[@]}"
 else
   # Injected by Nix (to avoid evaluating in a derivation)
   # turn them into arrays

pkgs/build-support/trivial-builders/test/references.nix

@@ -8,11 +8,11 @@
 #
 #  This file can be run independently (quick):
 #
-#      $ pkgs/build-support/trivial-builders/test.sh
+#      $ pkgs/build-support/trivial-builders/references-test.sh
 #
 #  or in the build sandbox with a ~20s VM overhead
 #
-#      $ nix-build -A tests.trivial-builders
+#      $ nix-build -A tests.trivial-builders.references
 #
 # -------------------------------------------------------------------------- #
 
@@ -33,30 +33,15 @@ nixosTest {
       builtins.toJSON [hello figlet stdenvNoCC]
     );
     environment.variables = {
-      SAMPLE = invokeSamples ./test/sample.nix;
+      SAMPLE = invokeSamples ./sample.nix;
-      REFERENCES = invokeSamples ./test/invoke-writeReferencesToFile.nix;
+      REFERENCES = invokeSamples ./invoke-writeReferencesToFile.nix;
-      DIRECT_REFS = invokeSamples ./test/invoke-writeDirectReferencesToFile.nix;
+      DIRECT_REFS = invokeSamples ./invoke-writeDirectReferencesToFile.nix;
     };
   };
   testScript =
-    let
+    ''
-      sample = import ./test/sample.nix { inherit pkgs; };
-      samplePaths = lib.unique (lib.attrValues sample);
-      sampleText = pkgs.writeText "sample-text" (lib.concatStringsSep "\n" samplePaths);
-      stringReferencesText =
-        pkgs.writeStringReferencesToFile
-          ((lib.concatMapStringsSep "fillertext"
-            (d: "${d}")
-            (lib.attrValues sample)) + ''
-              STORE=${builtins.storeDir};\nsystemctl start bar-foo.service
-            '');
-    in ''
       machine.succeed("""
-        ${./test.sh} 2>/dev/console
+        ${./references-test.sh} 2>/dev/console
-      """)
-      machine.succeed("""
-        echo >&2 Testing string references...
-        diff -U3 <(sort ${stringReferencesText}) <(sort ${sampleText})
       """)
     '';
   meta = {

pkgs/build-support/trivial-builders/test/sample.nix

@@ -1,10 +1,11 @@
-{ pkgs ? import ../../../.. { config = {}; overlays = []; } }:
+{ pkgs ? import ../../../.. { config = { }; overlays = [ ]; } }:
 let
   inherit (pkgs)
     figlet
     zlib
     hello
     writeText
+    runCommand
     ;
 in
 {
@@ -17,7 +18,10 @@ in
   helloRef = writeText "hi" "hello ${hello}";
   helloRefDup = writeText "hi" "hello ${hello}";
   path = ./invoke-writeReferencesToFile.nix;
+  pathLike.outPath = ./invoke-writeReferencesToFile.nix;
   helloFigletRef = writeText "hi" "hello ${hello} ${figlet}";
+  selfRef = runCommand "self-ref-1" {} "echo $out >$out";
+  selfRef2 = runCommand "self-ref-2" {} ''echo "${figlet}, $out" >$out'';
   inherit (pkgs)
     emptyFile
     emptyDirectory

pkgs/build-support/trivial-builders/test/writeStringReferencesToFile.nix

@@ -0,0 +1,18 @@
+{ callPackage, lib, pkgs, runCommand, writeText, writeStringReferencesToFile }:
+let
+  sample = import ./sample.nix { inherit pkgs; };
+  samplePaths = lib.unique (lib.attrValues sample);
+  stri = x: "${x}";
+  sampleText = writeText "sample-text" (lib.concatStringsSep "\n" (lib.unique (map stri samplePaths)));
+  stringReferencesText =
+    writeStringReferencesToFile
+      ((lib.concatMapStringsSep "fillertext"
+        stri
+        (lib.attrValues sample)) + ''
+        STORE=${builtins.storeDir};\nsystemctl start bar-foo.service
+      '');
+in
+runCommand "test-writeStringReferencesToFile" { } ''
+  diff -U3 <(sort ${stringReferencesText}) <(sort ${sampleText})
+  touch $out
+''

pkgs/data/themes/marwaita/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita";
-  version = "11.2.1";
+  version = "11.3";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    sha256 = "1bc9pj5k0zwc5fspp7b2i2sfrd6qbbi4kyxggc8kxrgv1sdgw3ff";
+    sha256 = "sha256-7l3fvqhMMJyv27yv/jShju0hL5AAvHk8pmISj/oyUP4=";
   };
 
   buildInputs = [

pkgs/development/compilers/asl/default.nix

@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchzip
-, buildDocs? false, tex
+, buildDocs ? false, tex
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM=";
   };
 
-  nativeBuildInputs = lib.optional buildDocs [ tex ];
+  nativeBuildInputs = lib.optionals buildDocs [ tex ];
 
   postPatch = lib.optionalString (!buildDocs) ''
     substituteInPlace Makefile --replace "all: binaries docs" "all: binaries"
@@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
     mkdir -p .objdir
   '';
 
-  hardenedDisable = [ "all" ];
-
-  # buildTargets = [ "binaries" "docs" ];
-
   meta = with lib; {
     homepage = "http://john.ccac.rwth-aachen.de:8000/as/index.html";
     description = "Portable macro cross assembler";

pkgs/development/compilers/kotlin/native.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     mkdir -p $out
+    rm bin/kotlinc
     mv * $out
 
     runHook postInstall
@@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
       standard library.
     '';
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ fabianhjr ];
     platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
   };
 }

pkgs/development/libraries/libstrophe/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libstrophe";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "strophe";
     repo = pname;
     rev = version;
-    sha256 = "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79";
+    sha256 = "sha256-xAqBxCYNo2IntnHKXY6CSJ+Yiu01lxQ1Q3gb0ioypSs=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/development/libraries/libxsmm/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libxsmm";
-  version = "1.16.2";
+  version = "1.16.3";
 
   src = fetchFromGitHub {
     owner = "hfp";
     repo = "libxsmm";
     rev = version;
-    sha256 = "sha256-gmv5XHBRztcF7+ZKskQMloytJ53k0eJg0HJmUhndq70=";
+    sha256 = "sha256-PpMiD/PeQ0pe5hqFG6VFHWpR8y3wnO2z1dJfHHeItlQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/utf8cpp/default.nix

@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  doCheck = true;
+  # Tests fail on darwin, probably due to a bug in the test framework:
+  # https://github.com/nemtrif/utfcpp/issues/84
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     homepage = "https://github.com/nemtrif/utfcpp";

pkgs/development/node-packages/default.nix

@@ -302,24 +302,22 @@ let
       meta.mainProgram = "postcss";
     };
 
-    prisma = super.prisma.override {
+    prisma = super.prisma.override rec {
       nativeBuildInputs = [ pkgs.makeWrapper ];
-      version = "3.2.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prisma/-/prisma-3.2.0.tgz";
+        url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
-        sha512 = "sha512-o8+DH0RD5DbP8QTZej2dsY64yvjOwOG3TWOlJyoCHQ+8DH9m4tzxo38j6IF/PqpN4PmAGPpHuNi/nssG1cvYlQ==";
+        sha512 = "sha512-W0AFjVxPOLW5SEnf0ZwbOu4k8ElX98ioFC1E8Gb9Q/nuO2brEwxFJebXglfG+N6zphGbu2bG1I3VAu7aYzR3VA==";
       };
-      dependencies = [
+      dependencies = [ rec {
-        {
+        name = "_at_prisma_slash_engines";
-          name = "_at_prisma_slash_engines";
+        packageName = "@prisma/engines";
-          packageName = "@prisma/engines";
+        version = "3.4.0-27.1c9fdaa9e2319b814822d6dbfd0a69e1fcc13a85";
-          version = "3.2.0-34.afdab2f10860244038c4e32458134112852d4dad";
+        src = fetchurl {
-          src = fetchurl {
+          url = "https://registry.npmjs.org/@prisma/engines/-/engines-${version}.tgz";
-            url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.2.0-34.afdab2f10860244038c4e32458134112852d4dad.tgz";
+          sha512 = "sha512-jyCjXhX1ZUbzA7+6Hm0iEdeY+qFfpD/RB7iSwMrMoIhkVYvnncSdCLBgbK0yqxTJR2nglevkDY2ve3QDxFciMA==";
-            sha512 = "sha512-MiZORXXsGORXTF9RqqKIlN/2ohkaxAWTsS7qxDJTy5ThTYLrXSmzxTSohM4qN/AI616B+o5WV7XTBhjlPKSufg==";
+        };
-          };
+      }];
-        }
-      ];
       postInstall = with pkgs; ''
         wrapProgram "$out/bin/prisma" \
           --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \

pkgs/development/node-packages/node-packages.json

@@ -177,6 +177,7 @@
 , {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
 , "lua-fmt"
 , "madoko"
+, "manta"
 , "markdownlint-cli"
 , "markdownlint-cli2"
 , "markdown-link-check"

pkgs/development/node-packages/node-packages.nix

@@ -3127,58 +3127,58 @@ let
         sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.36" = {
+    "@joplin/fork-htmlparser2-4.1.38" = {
       name = "_at_joplin_slash_fork-htmlparser2";
       packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.36";
+      version = "4.1.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.36.tgz";
+        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.38.tgz";
-        sha512 = "utKsPcJpU4dKQqdp7NfcCex3eTln7QHB90xJKNUOpCsfHsMjJ8qMdHEb6N3/iD+wjD16ZYaPoF7FfBWur2Ascg==";
+        sha512 = "DAv/fkv+tR0HFu6g8hNn2b/g2ZOBxGU8wuj2WScc598VOQXVKFfOAqZ+phZ1apTxpk1X0Z/HwmyTyzuS76QgYA==";
       };
     };
-    "@joplin/fork-sax-1.2.40" = {
+    "@joplin/fork-sax-1.2.42" = {
       name = "_at_joplin_slash_fork-sax";
       packageName = "@joplin/fork-sax";
-      version = "1.2.40";
+      version = "1.2.42";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.40.tgz";
+        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.42.tgz";
-        sha512 = "dmlgrm/Oj7VevER0U4pFqdZFcB38gcUdKqIm5EoL9a9hKOX+IKHHsvzSZima4iGwDrfiBEqC16p/dgvX1CJTwg==";
+        sha512 = "mHeN2V/kbxKLpTn5xCsiVTYaGPTk3amw0uAPedxB9oqb1BhTennzvlhWvM7HdnQER+infrqb+giRlYakiNjcBw==";
       };
     };
-    "@joplin/lib-2.4.3" = {
+    "@joplin/lib-2.6.2" = {
       name = "_at_joplin_slash_lib";
       packageName = "@joplin/lib";
-      version = "2.4.3";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.4.3.tgz";
+        url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.6.2.tgz";
-        sha512 = "H1WmRhd8Eso07W3Dxaa+7LirNoQbXMVRbUhRzfoAgj8/ZfTrmHycbpoLKQKv9gS0QzPqR+ynnBfBRfAfb8mmkw==";
+        sha512 = "mb/JK30T5BCUtDq+xwoURCJw8EXvhyqvqwE+G4EVBwxnxyQ/scMBfVMVOhR4RM2Wokrf0rPqeYGQFYFAiYEZvQ==";
       };
     };
-    "@joplin/renderer-2.4.3" = {
+    "@joplin/renderer-2.6.2" = {
       name = "_at_joplin_slash_renderer";
       packageName = "@joplin/renderer";
-      version = "2.4.3";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.4.3.tgz";
+        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.6.2.tgz";
-        sha512 = "dxoDjBJwmzAyGBf2G2I/rGMK6MljTFB7OHxl6lAE5sIZ+xTPN8nKOCr9b5zJVde6G7DA9RsnfFdG51S5BGtPRA==";
+        sha512 = "3Dv6s8hb4hj9UZwa6BJotZijz/EQtEQftqcP5S8xHkL+YNRH+bkCOSof8s1p98nH3l/6Z9GTv99APoA1fp5sDA==";
       };
     };
-    "@joplin/turndown-4.0.58" = {
+    "@joplin/turndown-4.0.60" = {
       name = "_at_joplin_slash_turndown";
       packageName = "@joplin/turndown";
-      version = "4.0.58";
+      version = "4.0.60";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.58.tgz";
+        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.60.tgz";
-        sha512 = "4WUJTU3wt0PgiN+ezqz5tHf9EHNGZ5d1Hc6Oe33A2hgpYweKBQ8YMJ3CS3AEWjy2tM3HvwBwqhe7JurVJNsxWQ==";
+        sha512 = "o7HCjVnai5kFIrRPfjIgixZrgNCGL9qYBK4p0v3S5b6gMz2Xt6NPkvlz09bTv7Ix3uJFJsRr4A6G6gVKZKt0ow==";
       };
     };
-    "@joplin/turndown-plugin-gfm-1.0.40" = {
+    "@joplin/turndown-plugin-gfm-1.0.42" = {
       name = "_at_joplin_slash_turndown-plugin-gfm";
       packageName = "@joplin/turndown-plugin-gfm";
-      version = "1.0.40";
+      version = "1.0.42";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.40.tgz";
+        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.42.tgz";
-        sha512 = "AhaCa3/tz6ceHnt5+NiJ0x77F3+FKpexIyeGMItrZV1qtHovIv1ntxEXzrl5RryHQD8/NK1uf3KbZPEasbDKTA==";
+        sha512 = "8vYIdyKuQAkG8ANyHwOwxabQAj1IqTjs8MK9z8qXFpUyy/3b7sKd/oOALL+cnOnc63YcLWLz1JB9jGYAmkUKhg==";
       };
     };
     "@josephg/resolvable-1.0.1" = {
@@ -5332,13 +5332,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.17.1" = {
+    "@serverless/components-3.17.2" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.17.1";
+      version = "3.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.1.tgz";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.2.tgz";
-        sha512 = "Ra0VVpivEWB816ZAca4UCNzOxQqxveEp4h+RzUX5vaAsZrxpotPUFZi96w9yZGQk3OTxxscRqrsBLxGDtOu8SA==";
+        sha512 = "7iFkhwLKPD1iqSYr3ppF5CsJ08KYKVCCV6DoiG7ek2Aiy+JtqZkTn9GMCEbrGqZtxDMiRfaYuaOt19F19JqTlQ==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -5413,13 +5413,13 @@ let
         sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog==";
       };
     };
-    "@serverless/utils-5.19.0" = {
+    "@serverless/utils-5.20.0" = {
       name = "_at_serverless_slash_utils";
       packageName = "@serverless/utils";
-      version = "5.19.0";
+      version = "5.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.19.0.tgz";
+        url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.20.0.tgz";
-        sha512 = "bgQawVfBgxcZoS1wxukJfRYKkMOZncZfOSTCRUnYzwH78fAAE79vfu49LGx2EGEJa8BThmtzjinZ9SK9yS0kIw==";
+        sha512 = "ko6NsB5tudcSiqeBeqAKsEfa/gDZlwBIenajec2nUELcXVSy13Y4deCSYQqzn1MA0OkNOgMBJL349exukENiTg==";
       };
     };
     "@serverless/utils-china-1.1.4" = {
@@ -12109,6 +12109,15 @@ let
         sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
+    "backoff-2.3.0" = {
+      name = "backoff";
+      packageName = "backoff";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
+        sha1 = "ee7c7e38093f92e472859db635e7652454fc21ea";
+      };
+    };
     "backoff-2.4.1" = {
       name = "backoff";
       packageName = "backoff";
@@ -16475,6 +16484,15 @@ let
         sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
       };
     };
+    "clone-0.1.19" = {
+      name = "clone";
+      packageName = "clone";
+      version = "0.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
+        sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
+      };
+    };
     "clone-0.1.5" = {
       name = "clone";
       packageName = "clone";
@@ -30078,6 +30096,15 @@ let
         sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
       };
     };
+    "hogan.js-2.0.0" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-2.0.0.tgz";
+        sha1 = "3a5b04186d51737fd2035792d419a9f5a82f9d0e";
+      };
+    };
     "hogan.js-3.0.2" = {
       name = "hogan.js";
       packageName = "hogan.js";
@@ -31150,13 +31177,13 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
-    "ignore-5.1.8" = {
+    "ignore-5.1.9" = {
       name = "ignore";
       packageName = "ignore";
-      version = "5.1.8";
+      version = "5.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz";
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz";
-        sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==";
+        sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -38279,6 +38306,15 @@ let
         sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0";
       };
     };
+    "lomstream-1.1.1" = {
+      name = "lomstream";
+      packageName = "lomstream";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lomstream/-/lomstream-1.1.1.tgz";
+        sha512 = "G2UKFT23/uueUnpUWYwB+uOlqcLvF6r1vNsMgTR6roJPpvpFQkgG75bkpAy/XYvaLpGs8XSgS24CUKC92Ap+jg==";
+      };
+    };
     "long-1.1.2" = {
       name = "long";
       packageName = "long";
@@ -43187,6 +43223,15 @@ let
         sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==";
       };
     };
+    "node-rsa-1.1.1" = {
+      name = "node-rsa";
+      packageName = "node-rsa";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz";
+        sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
+      };
+    };
     "node-ssdp-2.9.1" = {
       name = "node-ssdp";
       packageName = "node-ssdp";
@@ -46662,6 +46707,15 @@ let
         sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
       };
     };
+    "path-platform-0.0.1" = {
+      name = "path-platform";
+      packageName = "path-platform";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
+        sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
+      };
+    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -49057,6 +49111,15 @@ let
         sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg==";
       };
     };
+    "progbar-1.2.1" = {
+      name = "progbar";
+      packageName = "progbar";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progbar/-/progbar-1.2.1.tgz";
+        sha512 = "iEb0ZXmdQ24Pphdwa8+LbH75hMpuCMlPnsFUa3zHzDQj4kq4q72VGuD2pe3nwauKjxKgq3U0M9tCoLes6ISltw==";
+      };
+    };
     "progress-1.1.8" = {
       name = "progress";
       packageName = "progress";
@@ -53728,6 +53791,15 @@ let
         sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389";
       };
     };
+    "restify-clients-1.6.0" = {
+      name = "restify-clients";
+      packageName = "restify-clients";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.6.0.tgz";
+        sha1 = "1eaac176185162104dcc546f944950b70229f8e5";
+      };
+    };
     "restify-errors-3.0.0" = {
       name = "restify-errors";
       packageName = "restify-errors";
@@ -55726,6 +55798,15 @@ let
         sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==";
       };
     };
+    "showdown-1.4.4" = {
+      name = "showdown";
+      packageName = "showdown";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/showdown/-/showdown-1.4.4.tgz";
+        sha1 = "6805e569551e3122926f9d8f069f4e36c56f380a";
+      };
+    };
     "shuffled-priority-queue-2.1.0" = {
       name = "shuffled-priority-queue";
       packageName = "shuffled-priority-queue";
@@ -57841,6 +57922,15 @@ let
         sha512 = "zR4GV5XYSypCusFzfTeTSXVqrFJJsK79Ec2KXZdo/x7qxBGSJPPZFtqMcqpXPaJ9VCK7Zn/vI+/kMrqeQILv4w==";
       };
     };
+    "sshpk-agent-1.8.1" = {
+      name = "sshpk-agent";
+      packageName = "sshpk-agent";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.8.1.tgz";
+        sha512 = "YzAzemVrXEf1OeZUpveXLeYUT5VVw/I5gxLeyzq1aMS3pRvFvCeaGliNFjKR3VKtGXRqF9WamqKwYadIG6vStQ==";
+      };
+    };
     "ssri-5.3.0" = {
       name = "ssri";
       packageName = "ssri";
@@ -69141,7 +69231,7 @@ in
       sources."has-symbols-1.0.2"
       sources."http-cache-semantics-4.1.0"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-absolute-1.0.0"
@@ -70545,7 +70635,7 @@ in
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."immediate-3.0.6"
       sources."inflection-1.13.1"
@@ -72784,7 +72874,7 @@ in
           sources."fill-range-7.0.1"
           sources."glob-parent-5.1.2"
           sources."globby-11.0.4"
-          sources."ignore-5.1.8"
+          sources."ignore-5.1.9"
           sources."is-number-7.0.0"
           sources."lru-cache-6.0.0"
           sources."micromatch-4.0.4"
@@ -77151,7 +77241,7 @@ in
       sources."human-signals-2.1.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."import-from-3.0.0"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
@@ -79594,7 +79684,7 @@ in
       sources."hosted-git-info-4.0.2"
       sources."html-tags-3.1.0"
       sources."htmlparser2-3.10.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       (sources."import-fresh-3.3.0" // {
         dependencies = [
           sources."resolve-from-4.0.0"
@@ -81095,7 +81185,7 @@ in
       sources."human-signals-1.1.1"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.3"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."import-fresh-3.3.0"
       sources."import-lazy-2.1.0"
@@ -83569,7 +83659,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
       sources."graceful-fs-4.2.8"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -85536,7 +85626,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
@@ -87719,7 +87809,7 @@ in
       sources."icss-utils-4.1.1"
       sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."image-size-1.0.0"
       sources."immer-8.0.1"
@@ -89661,7 +89751,7 @@ in
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -93849,7 +93939,7 @@ in
       sources."http2-client-1.3.5"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       (sources."import-fresh-3.3.0" // {
         dependencies = [
           sources."resolve-from-4.0.0"
@@ -97116,30 +97206,30 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "2.4.1";
+    version = "2.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-2.4.1.tgz";
+      url = "https://registry.npmjs.org/joplin/-/joplin-2.6.1.tgz";
-      sha512 = "5ao7WEDYzEe0eMyFQAjtOkXI5mN+4KqUfCW/xQvigeEwRPuljLGgyqj0w/U915CXnAk4QifOA5vQ6HXL65WgJQ==";
+      sha512 = "fnpQ169874h4kg9yYrqAt/kuJuNEKngNQk1FjIFoIZaQJ6iLV6vnqFSl/ncF/dNK6OJahcngtAcFBHHyYxTF1A==";
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
       sources."@cronvel/get-pixels-3.4.0"
-      sources."@joplin/fork-htmlparser2-4.1.36"
+      sources."@joplin/fork-htmlparser2-4.1.38"
-      sources."@joplin/fork-sax-1.2.40"
+      sources."@joplin/fork-sax-1.2.42"
-      sources."@joplin/lib-2.4.3"
+      sources."@joplin/lib-2.6.2"
-      (sources."@joplin/renderer-2.4.3" // {
+      (sources."@joplin/renderer-2.6.2" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."jsonfile-4.0.0"
           sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
         ];
       })
-      (sources."@joplin/turndown-4.0.58" // {
+      (sources."@joplin/turndown-4.0.60" // {
         dependencies = [
           sources."css-2.2.4"
         ];
       })
-      sources."@joplin/turndown-plugin-gfm-1.0.40"
+      sources."@joplin/turndown-plugin-gfm-1.0.42"
       sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."acorn-7.4.1"
@@ -97165,11 +97255,7 @@ in
       sources."anymatch-3.1.2"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.7"
-      (sources."argparse-1.0.10" // {
+      sources."argparse-2.0.1"
-        dependencies = [
-          sources."sprintf-js-1.0.3"
-        ];
-      })
       sources."array-back-2.0.0"
       sources."array-equal-1.0.0"
       sources."array-flatten-3.0.0"
@@ -97320,7 +97406,7 @@ in
       })
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."debug-3.2.7"
+      sources."debug-0.7.4"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
@@ -97493,6 +97579,7 @@ in
       sources."jmespath-0.15.0"
       sources."jpeg-js-0.4.3"
       sources."js-tokens-4.0.0"
+      sources."js-yaml-4.1.0"
       sources."jsbn-0.1.1"
       sources."jsdom-15.2.1"
       sources."json-schema-0.2.3"
@@ -97530,7 +97617,9 @@ in
       sources."magicli-0.0.8"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
+          sources."argparse-1.0.10"
           sources."entities-2.0.3"
+          sources."sprintf-js-1.0.3"
         ];
       })
       sources."markdown-it-abbr-1.0.4"
@@ -97543,9 +97632,11 @@ in
       sources."markdown-it-mark-3.0.1"
       (sources."markdown-it-multimd-table-4.1.1" // {
         dependencies = [
+          sources."argparse-1.0.10"
           sources."entities-2.0.3"
           sources."linkify-it-3.0.3"
           sources."markdown-it-11.0.1"
+          sources."sprintf-js-1.0.3"
         ];
       })
       sources."markdown-it-sub-1.0.0"
@@ -97577,7 +97668,11 @@ in
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
-      sources."needle-2.9.1"
+      (sources."needle-2.9.1" // {
+        dependencies = [
+          sources."debug-3.2.7"
+        ];
+      })
       sources."nextgen-events-1.5.2"
       sources."no-case-2.3.2"
       (sources."node-abi-2.30.1" // {
@@ -97608,6 +97703,7 @@ in
           sources."semver-5.7.1"
         ];
       })
+      sources."node-rsa-1.1.1"
       sources."nopt-4.0.3"
       sources."normalize-path-3.0.0"
       sources."npm-bundled-1.1.2"
@@ -97773,7 +97869,6 @@ in
       })
       (sources."tcp-port-used-0.1.2" // {
         dependencies = [
-          sources."debug-0.7.4"
           sources."q-0.9.7"
         ];
       })
@@ -99081,7 +99176,7 @@ in
       sources."has-symbols-1.0.2"
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."inquirer-7.3.3"
@@ -100766,7 +100861,7 @@ in
       sources."human-signals-2.1.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.3"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       (sources."import-fresh-3.3.0" // {
         dependencies = [
@@ -103301,6 +103396,188 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  manta = nodeEnv.buildNodePackage {
+    name = "manta";
+    packageName = "manta";
+    version = "5.2.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/manta/-/manta-5.2.3.tgz";
+      sha512 = "dO6YemmfLxQt6atbXp0LP9lDlsDgDlr8T8GRouHSXfaE9rxRIr5f7XUvzWH8QOLgb40Jyt/lpacJQoJzm1OeCA==";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."backoff-2.3.0"
+      sources."balanced-match-1.0.2"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."block-stream-0.0.9"
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.15"
+      sources."camelcase-2.1.1"
+      sources."cliui-3.2.0"
+      sources."clone-0.1.19"
+      sources."cmdln-4.1.2"
+      sources."code-point-at-1.1.0"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."decamelize-1.2.0"
+      sources."dtrace-provider-0.8.8"
+      sources."ecc-jsbn-0.1.2"
+      sources."extsprintf-1.4.1"
+      sources."fast-safe-stringify-1.2.3"
+      sources."fstream-1.0.12"
+      sources."fuzzyset.js-0.0.1"
+      sources."getpass-0.1.7"
+      sources."glob-6.0.4"
+      sources."graceful-fs-4.2.8"
+      sources."hogan.js-2.0.0"
+      sources."http-signature-1.3.5"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."invert-kv-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."isarray-0.0.1"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."extsprintf-1.3.0"
+          sources."verror-1.10.0"
+        ];
+      })
+      sources."keep-alive-agent-0.0.1"
+      sources."lcid-1.0.0"
+      sources."lodash-4.17.21"
+      (sources."lomstream-1.1.1" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+          sources."extsprintf-1.3.0"
+        ];
+      })
+      sources."lru-cache-4.1.5"
+      sources."lstream-0.0.4"
+      sources."mime-1.2.11"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.5"
+      sources."moment-2.29.1"
+      (sources."mooremachine-2.3.0" // {
+        dependencies = [
+          sources."assert-plus-0.2.0"
+        ];
+      })
+      sources."mv-2.1.1"
+      sources."nan-2.15.0"
+      sources."ncp-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."once-1.4.0"
+      sources."os-locale-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-platform-0.0.1"
+      sources."precond-0.2.3"
+      sources."process-nextick-args-2.0.1"
+      (sources."progbar-1.2.1" // {
+        dependencies = [
+          sources."readable-stream-1.0.34"
+        ];
+      })
+      sources."pseudomap-1.0.2"
+      sources."readable-stream-1.1.14"
+      (sources."restify-clients-1.6.0" // {
+        dependencies = [
+          sources."backoff-2.5.0"
+          sources."mime-1.6.0"
+          sources."uuid-3.4.0"
+        ];
+      })
+      (sources."restify-errors-3.1.0" // {
+        dependencies = [
+          sources."assert-plus-0.2.0"
+          sources."lodash-3.10.1"
+        ];
+      })
+      sources."rimraf-2.4.5"
+      sources."safe-buffer-5.2.1"
+      sources."safe-json-stringify-1.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.7.1"
+      sources."showdown-1.4.4"
+      (sources."smartdc-auth-2.5.7" // {
+        dependencies = [
+          sources."bunyan-1.8.12"
+          sources."clone-0.1.5"
+          (sources."dashdash-1.10.1" // {
+            dependencies = [
+              sources."assert-plus-0.1.5"
+            ];
+          })
+          sources."extsprintf-1.0.0"
+          sources."json-schema-0.2.2"
+          (sources."jsprim-0.3.0" // {
+            dependencies = [
+              sources."verror-1.3.3"
+            ];
+          })
+          sources."once-1.3.0"
+          sources."vasync-1.4.3"
+          sources."verror-1.1.0"
+        ];
+      })
+      sources."sshpk-1.16.1"
+      (sources."sshpk-agent-1.8.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."string-width-1.0.2"
+      sources."string_decoder-0.10.31"
+      sources."strip-ansi-3.0.1"
+      sources."strsplit-1.0.0"
+      sources."tar-2.2.2"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-2.0.3"
+      (sources."vasync-1.6.4" // {
+        dependencies = [
+          sources."extsprintf-1.2.0"
+          sources."verror-1.6.0"
+        ];
+      })
+      sources."verror-1.10.1"
+      (sources."vstream-0.1.0" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+          sources."extsprintf-1.2.0"
+        ];
+      })
+      (sources."watershed-0.3.4" // {
+        dependencies = [
+          sources."readable-stream-1.0.2"
+        ];
+      })
+      sources."window-size-0.1.4"
+      sources."wrap-ansi-2.1.0"
+      sources."wrappy-1.0.2"
+      sources."y18n-3.2.2"
+      sources."yallist-2.1.2"
+      sources."yargs-3.32.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Manta Client API";
+      homepage = "http://apidocs.joyent.com/manta";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   markdownlint-cli = nodeEnv.buildNodePackage {
     name = "markdownlint-cli";
     packageName = "markdownlint-cli";
@@ -103320,7 +103597,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-stdin-8.0.0"
       sources."glob-7.2.0"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-2.0.0"
@@ -103374,7 +103651,7 @@ in
       sources."fill-range-7.0.1"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
@@ -105899,7 +106176,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."human-signals-2.1.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."import-fresh-3.3.0"
       sources."import-lazy-2.1.0"
@@ -106428,7 +106705,7 @@ in
       sources."https-proxy-agent-5.0.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.3"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -109014,7 +109291,7 @@ in
       sources."has-unicode-2.0.1"
       sources."https-proxy-agent-5.0.0"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
       sources."into-stream-6.0.0"
@@ -109457,7 +109734,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-12.0.2"
       sources."graceful-fs-4.2.8"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."import-cwd-3.0.0"
       sources."import-from-3.0.0"
       sources."is-binary-path-2.1.0"
@@ -113255,7 +113532,7 @@ in
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.6.3"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."import-fresh-3.3.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -113800,7 +114077,7 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.17.1" // {
+      (sources."@serverless/components-3.17.2" // {
         dependencies = [
           (sources."@serverless/utils-4.1.0" // {
             dependencies = [
@@ -113840,7 +114117,7 @@ in
         ];
       })
       sources."@serverless/template-1.1.4"
-      (sources."@serverless/utils-5.19.0" // {
+      (sources."@serverless/utils-5.20.0" // {
         dependencies = [
           sources."get-stream-6.0.1"
           sources."has-flag-4.0.0"
@@ -114215,7 +114492,7 @@ in
       })
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."immediate-3.0.6"
       sources."imurmurhash-0.1.4"
       sources."indexof-0.0.1"
@@ -115283,10 +115560,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.750.0";
+    version = "1.751.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.750.0.tgz";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.751.0.tgz";
-      sha512 = "1tYnqj0VgHbss+GvMA5747iwQCdGq61fMDfxxfD+Y3Ii7wO1G1tYWnVhmmR48NYPup4L9qq6FuWgCYSEwUxFug==";
+      sha512 = "eF7qoDbPxxysNdRDRxixQTKFlKdbD1Ssi5eNJ7AKNALx78fqkibROfBtB2XKJxa6Q0dMUWfszgl5T3WYotPJ0A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -117406,7 +117683,7 @@ in
       sources."has-flag-3.0.0"
       sources."hosted-git-info-4.0.2"
       sources."html-tags-3.1.0"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       (sources."import-fresh-3.3.0" // {
         dependencies = [
           sources."resolve-from-4.0.0"
@@ -119054,7 +119331,7 @@ in
       sources."hastscript-6.0.0"
       sources."hosted-git-info-2.8.9"
       sources."http-cache-semantics-4.1.0"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
@@ -120659,7 +120936,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
       sources."graceful-fs-4.2.8"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -120860,7 +121137,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."http-errors-1.7.2"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.8"
@@ -124637,7 +124914,7 @@ in
       sources."http-proxy-middleware-2.0.1"
       sources."human-signals-2.1.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -124844,7 +125121,7 @@ in
       sources."fill-range-7.0.1"
       sources."glob-parent-6.0.2"
       sources."globby-11.0.4"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
@@ -125325,7 +125602,7 @@ in
       sources."glob-7.2.0"
       sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -125672,7 +125949,7 @@ in
       sources."humanize-string-1.0.2"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."ignore-walk-3.0.4"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -126350,7 +126627,7 @@ in
       sources."globby-12.0.2"
       sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.9"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"

pkgs/development/python-modules/ailment/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.0.10339";
+  version = "9.0.10409";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wHIQMPoylCUiH4rhRfx7TA0+tzeOMDa7HTiBj03+ZDQ=";
+    sha256 = "sha256-QIQ/NzhFdO4+GrfhAvZRLycydgzB8Ae4L1RvBs8D5No=";
   };
 
   propagatedBuildInputs = [ pyvex ];

pkgs/development/python-modules/angr/default.nix

@@ -43,14 +43,14 @@ in
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.0.10339";
+  version = "9.0.10409";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-+bJuV4Ce3WoNtkZC+ism+QtRqTu42BDVVhqbZqVPAPA=";
+    sha256 = "sha256-etBXFDl5TPGpLHXRCH+ImQDnbpsp30vKxCU+O4pF7PY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/angrop/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "angrop";
-  version = "9.0.10339";
+  version = "9.0.10409";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YZ5pvn8ndtWnHd4QSpuyg8uenFm4K5dt6IgicSL/Ouw=";
+    sha256 = "sha256-3PU+WA5718L2qDl0j3hDdMS1wxJG3jJlM0yPFWE3NJ4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/archinfo/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.0.10339";
+  version = "9.0.10409";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gVK3l2j64Sr67P81eUBYV/p77lwdIea5LNnteoDbwA0=";
+    sha256 = "sha256-yPI80xIJ4zQSWAo6kQchMqYMUMLSR9mx8OceDj8TPnY=";
   };
 
   checkInputs = [

pkgs/development/python-modules/cachecontrol/default.nix

@@ -1,34 +1,46 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, cherrypy
-, requests
+, fetchFromGitHub
+, lockfile
+, mock
 , msgpack
-, pytest
+, pytestCheckHook
+, requests
 }:
 
 buildPythonPackage rec {
-  version = "0.12.6";
+  pname = "cachecontrol";
-  pname = "CacheControl";
+  version = "0.12.8";
+  format = "setuptools";
 
-  src = fetchPypi {
+  src = fetchFromGitHub {
-    inherit pname version;
+    owner = "ionrock";
-    sha256 = "be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0y15xbaqw2lxidwbyrgpy42v3cxgv4ys63fx2586h1szlrd4f3p4";
   };
 
-  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
-  propagatedBuildInputs = [ requests msgpack ];
+    msgpack
+    requests
+  ];
 
-  # tests not included with pypi release
+  checkInputs = [
-  doCheck = false;
+    cherrypy
+    mock
+    lockfile
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
+  pythonImportsCheck = [
-    pytest tests
+    "cachecontrol"
-  '';
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/ionrock/cachecontrol";
     description = "Httplib2 caching for requests";
+    homepage = "https://github.com/ionrock/cachecontrol";
     license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

pkgs/development/python-modules/claripy/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.0.10339";
+  version = "9.0.10409";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pi/XMVk50zVCW+MLP1Dsm5amJ55PHE4Ey4nIvhCwiwk=";
+    sha256 = "sha256-tDlxeSBPvSGLPmvflMywxTieE9AgjrPb0IxeMkhqXpU=";
   };
 
   # Use upstream z3 implementation

pkgs/development/python-modules/cle/default.nix

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

pkgs/development/python-modules/confight/default.nix

@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, toml
+}:
+
+buildPythonPackage rec {
+  pname = "confight";
+  version = "1.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-fJr7f9Y/zEpCedWYd04AMuhkOFqZLJOw4sDiz8SDQ/Y=";
+  };
+
+  propagatedBuildInputs = [
+    toml
+  ];
+
+  pythonImportsCheck = [ "confight" ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python context manager for managing pid files";
+    homepage = "https://github.com/avature/confight";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ mkg20001 ];
+  };
+}

pkgs/development/python-modules/inotify/default.nix

@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "inotify";
+  version = "unstable-2020-08-27";
+
+  src = fetchFromGitHub {
+    owner = "dsoprea";
+    repo = "PyInotify";
+    rev = "f77596ae965e47124f38d7bd6587365924dcd8f7";
+    sha256 = "X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc=";
+    fetchSubmodules = false;
+  };
+
+  checkInputs = [
+    nose
+  ];
+
+  # dunno what's wrong but the module works regardless
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/dsoprea/PyInotify";
+    description = "Monitor filesystems events on Linux platforms with inotify";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

pkgs/development/python-modules/pytest-dotenv/default.nix

@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, python-dotenv }:
+
+buildPythonPackage rec {
+  pname = "pytest-dotenv";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "LcbDrG2HZMccbSgE6QLQ/4EPoZaS6V/hOK78mxqnNzI=";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ python-dotenv ];
+
+  checkInputs = [ pytest ];
+
+  meta = with lib; {
+    description = "A pytest plugin that parses environment files before running tests";
+    homepage = "https://github.com/quiqua/pytest-dotenv";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cleeyv ];
+  };
+}

pkgs/development/python-modules/pyvex/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.0.10339";
+  version = "9.0.10409";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Rf3G5qFisb/rTRswqCCGJNjjFbjUhIgKgbbZwicUJDo=";
+    sha256 = "sha256-PEUNfitkbc0d306JzvYlM1/qwiwjPznpLHM/Zt1dUd0=";
   };
 
   postPatch = lib.optionalString stdenv.isDarwin ''

pkgs/development/python-modules/snakeviz/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "snakeviz";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s6byw23hr2khqx2az36hpi52fk4v6bfm1bb7biaf0d2nrpqgbcj";
+    sha256 = "0d96c006304f095cb4b3fb7ed98bb866ca35a7ca4ab9020bbc27d295ee4c94d9";
   };
 
   # Upstream doesn't run tests from setup.py

pkgs/development/tools/database/prisma-engines/default.nix

@@ -10,19 +10,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "3.2.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    sha256 = "sha256-q0MF6LyIB7dCotYlXiZ4rXl2xMOLqXe5Y+zO+bpoCoY=";
+    sha256 = "sha256-EuGGGTHBXm6crnoh5h0DYZZHUtzY4W0wlNgMAxbEb5w=";
   };
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
 
-  cargoSha256 = "sha256-NAXoKz+tZmjmZ/PkDaXEp9D++iu/3Knp0Yy6NJWEoDM=";
+  cargoSha256 = "sha256-CwNe4Qsswh+jMFMpg7DEM9Hq2YeEMcN4UTFMd8AEekw=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/development/tools/esbuild/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.13.11";
+  version = "0.13.12";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    sha256 = "sha256-QaSH3TgUgfBrmryAFwxjqCMORu3VwcDkqEHNQ0nX73o=";
+    sha256 = "sha256-1SjLbrOYEh0g9weVEqcOT7hMr9asxgSr+rKDNP75Sc4=";
   };
 
   vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

pkgs/development/tools/jbang/default.nix

@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
 
 stdenv.mkDerivation rec {
-  version = "0.80.1";
+  version = "0.82.1";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-Hc0/4nN67FqmcLmAUU0GbWYwnPFiDHSwCRrlqbphWHA=";
+    sha256 = "sha256-C2zsIJvna7iqcaCM4phJonbA9TALL89rACms5II9hhU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/just/default.nix

@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "just";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "casey";
     repo = pname;
     rev = version;
-    sha256 = "sha256-AR1bNsyex+kfXdiSF3QgeqK8qwIssLfaaY0qNhnp7ak=";
+    sha256 = "sha256-r6kP1LbT8ZQoxSuy7jpnHD2/RgcPvmTNfjKzj5ceXRc=";
   };
-  cargoSha256 = "sha256-Ukhp8mPXD/dDolfSugOCVwRMgkjmDRCoNzthgqrN6p0=";
+  cargoSha256 = "sha256-y6RcFH2qDoM3wWnZ6ewC9QyRD3mFsoakToRmon4bAnE=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

pkgs/development/tools/misc/kibana/7.x.nix

@@ -4,32 +4,27 @@
 , stdenv
 , makeWrapper
 , fetchurl
-, nodejs-10_x
+, nodejs-14_x
 , coreutils
 , which
 }:
 
 with lib;
 let
-  nodejs = nodejs-10_x;
+  nodejs = nodejs-14_x;
   inherit (builtins) elemAt;
   info = splitString "-" stdenv.hostPlatform.system;
   arch = elemAt info 0;
   plat = elemAt info 1;
   shas =
-    if enableUnfree
+    {
-    then {
+      x86_64-linux  = "19p9s4sir982bb1zcldrbphhwfs9i11p0q28vgc421iqg10kjlf1";
-      x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo=";
+      x86_64-darwin = "0qq557ngwwakifidyrccga4cadj9k9pzhjwy4msmbcgf5pb86qyc";
-      x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc=";
+      aarch64-linux = "183cp1h8d3n7xfcpcys4hf36palczxa409afyp62kzyzckngy0j8";
-    }
-    else {
-      x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ=";
-      x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk=";
     };
 
-in
+in stdenv.mkDerivation rec {
-stdenv.mkDerivation rec {
+  pname = "kibana";
-  pname = "kibana${optionalString (!enableUnfree) "-oss"}";
   version = elk7Version;
 
   src = fetchurl {
@@ -58,7 +53,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Visualize logs and time-stamped data";
     homepage = "http://www.elasticsearch.org/overview/kibana";
-    license = if enableUnfree then licenses.elastic else licenses.asl20;
+    license = licenses.elastic;
     maintainers = with maintainers; [ offline basvandijk ];
     platforms = with platforms; unix;
   };

pkgs/development/tools/sentry-cli/default.nix

@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "1.68.0";
+  version = "1.71.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    sha256 = "sha256-JhKRfeAaSs4KwfcI88UbqIXNw0aZytPkIxkwrg1d2xM=";
+    sha256 = "0iw6skcxnqqa0vj5q1ra855gxgjj9a26hj85nm9p49ai5l85bkgv";
   };
   doCheck = false;
 
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8=";
+  cargoSha256 = "0n9354mm97z3n001airipq8k58i7lg20p2m9yfx9y0zhsagyhmj8";
 
   meta = with lib; {
     homepage = "https://docs.sentry.io/cli/";

pkgs/misc/logging/beats/7.x.nix

@@ -8,10 +8,10 @@ let beat = package: extraArgs: buildGoModule (rec {
     owner = "elastic";
     repo = "beats";
     rev = "v${version}";
-    sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA=";
+    sha256 = "0gjyzprgj9nskvlkm2bf125b7qn3608llz4kh1fyzsvrw6zb7sm8";
   };
 
-  vendorSha256 = "sha256-xmw432vY1T2EixkDcXdGrnMdc8fYOI4R2lEjbkav3JQ=";
+  vendorSha256 = "04cwf96fh60ld3ndjzzssgirc9ssb53yq71j6ksx36m3y1x7fq9c";
 
   subPackages = [ package ];
 

pkgs/servers/libreddit/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "libreddit";
-  version = "0.15.3";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "spikecodes";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-G7QJhRmfqzDIfBHu8rSSMVlBoazY+0iDS7VJsmxaLqI=";
+    sha256 = "sha256-E8PoUoHsrTKgLBs3b/C2x/nRrL99eiVNscRtDfKIWNc=";
   };
 
-  cargoSha256 = "sha256-xvPwzRGmRVe+Og78fKqcvf3I0uMR9DOdOXMNbuLI8sY=";
+  cargoSha256 = "sha256-tK0wvmn+U4pdDdBhmXJ2TmFRro85kfFkYVkxBXftbdE=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 

pkgs/servers/moonraker/default.nix

@@ -15,13 +15,13 @@ let
   ]);
 in stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "unstable-2021-10-10";
+  version = "unstable-2021-10-24";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "562f971c3d039fb3a8a1d7f8362e34a15d851b62";
+    rev = "1dd89bac4b7153b77eb4208cc151de17e612b6fc";
-    sha256 = "ruutyDeR79X13+LkhkHHymxHMZjGY2mde5YT1J9CNDQ=";
+    sha256 = "dxtDXpviasvfjQuhtjfTjZ6OgKWAsHjaInlyYlpLzYY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/servers/search/elasticsearch/7.x.nix

@@ -1,5 +1,4 @@
 { elk7Version
-, enableUnfree ? true
 , lib
 , stdenv
 , fetchurl
@@ -18,19 +17,15 @@ let
   arch = elemAt info 0;
   plat = elemAt info 1;
   shas =
-    if enableUnfree
+    {
-    then {
+      x86_64-linux  = "1ld7656b37l67vi4pyv0il865b168niqnbd4hzbvdnwrm35prp10";
-      x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4=";
+      x86_64-darwin = "11b180y11xw5q01l7aw6lyn15lp9ks8xmakjg1j7gp3z6c90hpn3";
-      x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24=";
+      aarch64-linux = "0s4ph79x17f90jk31wjwk259dk9dmhnmnkxdcn77m191wvf6m3wy";
-    }
-    else {
-      x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ=";
-      x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo=";
     };
 in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
+  pname = "elasticsearch";
   version = elk7Version;
-  pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz";
@@ -49,9 +44,11 @@ stdenv.mkDerivation (rec {
       "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
   '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
-  buildInputs = [ jre_headless util-linux ]
+
-    ++ optional enableUnfree zlib;
+  buildInputs = [ jre_headless util-linux zlib ];
+
+  runtimeDependencies = [ zlib ];
 
   installPhase = ''
     mkdir -p $out
@@ -69,22 +66,12 @@ stdenv.mkDerivation (rec {
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
   '';
 
-  passthru = { inherit enableUnfree; };
+  passthru = { enableUnfree = true; };
 
   meta = {
     description = "Open Source, Distributed, RESTful Search Engine";
-    license = if enableUnfree then licenses.elastic else licenses.asl20;
+    license = licenses.elastic;
     platforms = platforms.unix;
     maintainers = with maintainers; [ apeschar basvandijk ];
   };
-} // optionalAttrs enableUnfree {
+}
-  dontPatchELF = true;
-  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
-  runtimeDependencies = [ zlib ];
-  postFixup = ''
-    for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
-      echo "patching $exe..."
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
-    done
-  '';
-})

pkgs/servers/search/elasticsearch/plugins.nix

@@ -4,13 +4,14 @@ let
   esVersion = elasticsearch.version;
 
   esPlugin =
-    a@{ pluginName
+    a@{
-    , installPhase ? ''
+      pluginName,
+      installPhase ? ''
         mkdir -p $out/config
         mkdir -p $out/plugins
-        ln -s ${elasticsearch}/lib $out/lib
+        ln -s ${elasticsearch}/lib ${elasticsearch}/modules $out
         ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src
-        rm $out/lib
+        rm $out/lib $out/modules
       ''
     , ...
     }:
@@ -37,7 +38,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E="
+        if version == "7.11.1" then "0mi6fmnjbqypa4n1w34dvlmyq793pz4wf1r5srcs7i84kkiddysy"
         else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -54,7 +55,7 @@ in
     src = fetchurl {
       url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8="
+        if version == "7.11.1" then "0r2k2ndgqiqh27lch8dbay1m09f00h5kjcan87chcvyf623l40a3"
         else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -71,7 +72,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y="
+        if version == "7.11.1" then "10ln81zyf04qi9wv10mck8iz0xwfvwp4ni0hl1gkgvh44lf1n855"
         else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -88,7 +89,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s="
+        if version == "7.11.1" then "09grfvqjmm2rznc48z84awh54afh81qa16amfqw3amsb8dr6czm6"
         else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -105,7 +106,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc="
+        if version == "7.11.1" then "0imkf3w2fmspb78vkf9k6kqx1crm4f82qgnbk1qa7gbsa2j47hbs"
         else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -122,7 +123,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE="
+        if version == "7.11.1" then "0ahyb1plgwvq22id2kcx9g076ybb3kvybwakgcvsdjjdyi4cwgjs"
         else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -139,7 +140,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
       sha256 =
-        if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g="
+        if version == "7.11.1" then "0i98b905k1zwm3y9pfhr40v2fm5qdsp3icygibhxf7drffygk4l7"
         else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -150,30 +151,31 @@ in
     };
   };
 
-  search-guard =
+  search-guard = let
-    let
+    majorVersion = lib.head (builtins.splitVersion esVersion);
-      majorVersion = lib.head (builtins.splitVersion esVersion);
+  in esPlugin rec {
-    in
+    pluginName = "search-guard";
-    esPlugin rec {
+    version =
-      pluginName = "search-guard";
+      # https://docs.search-guard.com/latest/search-guard-versions
-      version =
+      if esVersion == "7.11.1" then "${esVersion}-50.0.0"
-        # https://docs.search-guard.com/latest/search-guard-versions
+      else if esVersion == "6.8.3" then "${esVersion}-25.5"
-        if esVersion == "7.10.2" then "7.10.1-49.3.0"
+      else throw "unsupported version ${esVersion} for plugin ${pluginName}";
-        else if esVersion == "6.8.3" then "${esVersion}-25.5"
+    src =
-        else throw "unsupported version ${esVersion} for plugin ${pluginName}";
+      if esVersion == "7.11.1" then
-      src = fetchurl {
+        fetchurl {
-        url =
+          url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";
-          if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"
+          sha256 = "1lippygiy0xcxxlakylhvj3bj2i681k6jcfjsprkfk7hlaqsqxkm";
-          else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
+        }
-        sha256 =
+      else if esVersion == "6.8.3" then
-          if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4="
+        fetchurl {
-          else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb"
+          url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
-          else throw "unsupported version ${version} for plugin ${pluginName}";
+          sha256 = "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb";
-      };
+        }
-      meta = with lib; {
+      else throw "unsupported version ${version} for plugin ${pluginName}";
-        homepage = "https://search-guard.com";
+    meta = with lib; {
-        description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
+      homepage = "https://search-guard.com";
-        license = licenses.asl20;
+      description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
-      };
+      license = licenses.asl20;
     };
+  };
 }

pkgs/test/default.nix

@@ -51,8 +51,11 @@ with pkgs;
 
   cuda = callPackage ./cuda { };
 
-  trivial = callPackage ../build-support/trivial-builders/test.nix {};
+  trivial-builders = recurseIntoAttrs {
-  trivial-overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
+    writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {};
+    references = callPackage ../build-support/trivial-builders/test/references.nix {};
+    overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
+  };
 
   writers = callPackage ../build-support/writers/test.nix {};
 }

pkgs/tools/admin/lxd/default.nix

@@ -26,6 +26,11 @@ buildGoPackage rec {
       url = "https://github.com/lxc/lxd/commit/ba6be1043714458b29c4b37687d4f624ee421943.patch";
       sha256 = "0716129n70c6i695fyi1j8q6cls7g62vkdpcrlfrr9i324y3w1dx";
     })
+    # feat: add support for nixOS path
+    (fetchpatch {
+      url = "https://github.com/lxc/lxd/commit/eeace06b2e3151786e94811ada8c658cce479f6d.patch";
+      sha256 = "sha256-knXlvcSvMPDeR0KqHFgh6YQZc+CSJ8yEqGE/vQMciEk=";
+    })
   ];
 
   postPatch = ''

pkgs/tools/misc/goreleaser/default.nix

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

pkgs/tools/misc/hashit/default.nix

@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.artemanufrij.hashit";
   };
 }

pkgs/tools/misc/jdupes/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jdupes";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "sha256-G6ixqSIdDoM/OVlPfv2bI4MA/k0x3Jic/kFo5XEsN/M=";
+    sha256 = "sha256-qGYMLLksbC6bKbK+iRkZ2eSNU5J/wEvTfzT0IkKukvA=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.

pkgs/tools/misc/logstash/7.x.nix

@@ -17,17 +17,20 @@ let
   shas =
     if enableUnfree
     then {
-      x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY=";
+      x86_64-linux  = "0yjaki7gjffrz86hvqgn1gzhd9dc9llcj50g2x1sgpyn88zk0z0p";
-      x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo=";
+      x86_64-darwin = "0dqm66c89w1nvmbwqzphlqmf7avrycgv1nwd5b0k1z168fj0c3zm";
+      aarch64-linux = "11hjhyb48mjagmvqyxb780n57kr619h6p4adl2vs1zm97g9gslx8";
     }
     else {
-      x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU=";
+      x86_64-linux  = "14b1649avjcalcsi0ffkgznq6d93qdk6m3j0i73mwfqka5d3dvy3";
-      x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A=";
+      x86_64-darwin = "0ypgdfklr5rxvsnc3czh231pa1z2h70366j1c6q5g64b3xnxpphs";
+      aarch64-linux = "01ainayr8fwwfix7dmxfhhmb23ji65dn4lbjwnj2w0pl0ym9h9w2";
     };
   this = stdenv.mkDerivation rec {
     version = elk7Version;
     pname = "logstash${optionalString (!enableUnfree) "-oss"}";
 
+
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz";
       sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");

pkgs/tools/misc/macchina/default.nix

@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "macchina";
-  version = "1.1.6";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "Macchina-CLI";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-JiyJU+5bKXHUgaRyUKdgINbMxkv2XXAkuoouQv9SEow=";
+    sha256 = "sha256-9T1baNmgzB3RBlFaaIQ47Yc9gJAgtS42NNEY1Tk/hBs=";
   };
 
-  cargoSha256 = "sha256-pychP3OHXMv23TtZbaMOPBbEoJh4R03ySzEdwADTmFI=";
+  cargoSha256 = "sha256-A5C/B9R58p/DR6cONIRTSkmtXEOobtYHGBHxjdwagRA=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

pkgs/tools/networking/ntp/default.nix

@@ -1,11 +1,4 @@
-{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }:
+{ stdenv, lib, fetchurl, openssl, perl, pps-tools, libcap }:
-
-assert stdenv.isLinux -> libcap != null;
-assert stdenv.isLinux -> libseccomp != null;
-
-let
-  withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64);
-in
 
 stdenv.mkDerivation rec {
   pname = "ntp";
@@ -16,10 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
   };
 
-  # The hardcoded list of allowed system calls for seccomp is
-  # insufficient for NixOS, add more to make it work (issue #21136).
-  patches = [ ./seccomp.patch ];
-
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -27,12 +16,10 @@ stdenv.mkDerivation rec {
     "--with-openssl-incdir=${openssl.dev}/include"
     "--enable-ignore-dns-errors"
     "--with-yielding-select=yes"
-  ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps"
+  ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps";
-    ++ lib.optional withSeccomp "--enable-libseccomp";
 
-  buildInputs = [ libcap openssl perl ]
+  buildInputs = [ openssl perl ]
-    ++ lib.optional withSeccomp libseccomp
+    ++ lib.optionals stdenv.isLinux [ pps-tools libcap ];
-    ++ lib.optional stdenv.isLinux pps-tools;
 
   hardeningEnable = [ "pie" ];
 

pkgs/tools/networking/ntp/seccomp.patch

@@ -1,57 +0,0 @@
-From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001
-From: Michael Bishop <cleverca22@gmail.com>
-Date: Mon, 11 Jun 2018 08:30:48 -0300
-Subject: [PATCH] fix the seccomp filter to include a few previously missed
- syscalls
-
----
- ntpd/ntpd.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
-index 2c7f02ec5..4c59dc2ba 100644
---- a/ntpd/ntpd.c
-+++ b/ntpd/ntpd.c
-@@ -1140,10 +1140,12 @@ int scmp_sc[] = {
- 	SCMP_SYS(close),
- 	SCMP_SYS(connect),
- 	SCMP_SYS(exit_group),
-+	SCMP_SYS(fcntl),
- 	SCMP_SYS(fstat),
- 	SCMP_SYS(fsync),
- 	SCMP_SYS(futex),
- 	SCMP_SYS(getitimer),
-+	SCMP_SYS(getpid),
- 	SCMP_SYS(getsockname),
- 	SCMP_SYS(ioctl),
- 	SCMP_SYS(lseek),
-@@ -1162,6 +1164,8 @@ int scmp_sc[] = {
- 	SCMP_SYS(sendto),
- 	SCMP_SYS(setitimer),
- 	SCMP_SYS(setsid),
-+	SCMP_SYS(setsockopt),
-+	SCMP_SYS(openat),
- 	SCMP_SYS(socket),
- 	SCMP_SYS(stat),
- 	SCMP_SYS(time),
-@@ -1178,9 +1182,11 @@ int scmp_sc[] = {
- 	SCMP_SYS(clock_settime),
- 	SCMP_SYS(close),
- 	SCMP_SYS(exit_group),
-+	SCMP_SYS(fcntl),
- 	SCMP_SYS(fsync),
- 	SCMP_SYS(futex),
- 	SCMP_SYS(getitimer),
-+	SCMP_SYS(getpid),
- 	SCMP_SYS(madvise),
- 	SCMP_SYS(mmap),
- 	SCMP_SYS(mmap2),
-@@ -1194,6 +1200,8 @@ int scmp_sc[] = {
- 	SCMP_SYS(select),
- 	SCMP_SYS(setitimer),
- 	SCMP_SYS(setsid),
-+	SCMP_SYS(setsockopt),
-+	SCMP_SYS(openat),
- 	SCMP_SYS(sigprocmask),
- 	SCMP_SYS(sigreturn),
- 	SCMP_SYS(socketcall),

pkgs/tools/security/cosign/default.nix

@@ -1,29 +1,35 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true }:
 
 buildGoModule rec {
   pname = "cosign";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-peR/TPydR4O6kGkRUpOgUCJ7xGRLbl9pYB1lAehjVK4=";
+    sha256 = "sha256-VKlM+bsK2Oj0UB4LF10pHEIJqXv6cAO5rtxnTogpfOk=";
   };
 
-  buildInputs =
+  buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
-    lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
     ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config installShellFiles ];
 
-  vendorSha256 = "sha256-DyRMQ43BJOkDtWEqmAzqICyaSyQJ9H4i69VJ4dCGF44=";
+  vendorSha256 = "sha256-idMvvYeP5rAT6r9RPZ9S8K9KTpVYVq06ZKSBPxWA2ms=";
 
-  excludedPackages = "\\(copasetic\\|sample\\|webhook\\)";
+  excludedPackages = "\\(sample\\|webhook\\|help\\)";
 
   tags = lib.optionals pivKeySupport [ "pivkey" ];
 
-  ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.GitVersion=v${version}" ];
+  ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli/options.GitVersion=v${version}" ];
+
+  postInstall = ''
+    installShellCompletion --cmd cosign \
+      --bash <($out/bin/cosign completion bash) \
+      --fish <($out/bin/cosign completion fish) \
+      --zsh <($out/bin/cosign completion zsh)
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/sigstore/cosign";

pkgs/tools/security/exploitdb/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2021-10-30";
+  version = "2021-11-02";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = version;
-    sha256 = "sha256-GwyqtoRxiijF4lewKXX8d/pmO4r+BWn8mfmApGum8/w=";
+    sha256 = "sha256-47/gsOZaFI3ujht3dj2lvsspe/Iv/ujdFkcvhgGAm9E=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/text/mdcat/default.nix

@@ -12,20 +12,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdcat";
-  version = "0.23.2";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "lunaryorn";
     repo = pname;
     rev = "mdcat-${version}";
-    sha256 = "sha256-PM6bx7qzEx4He9aX4WRO7ad/f9+wzT+gPGXKwYwG8+A=";
+    sha256 = "sha256-fAbiPzyPaHy0KQb/twCovjgqIRzib7JZslb9FdVlQEg=";
   };
 
   nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "sha256-GL9WGoyM1++QFAR+bzj0XkjaRaDCWcbcahles5amNpk=";
+  cargoSha256 = "sha256-UgCFlzihBvZywDNir/92lub9R6yYPJSK8S4mlMk2sMk=";
 
   checkInputs = [ ansi2html ];
   # Skip tests that use the network and that include files.

pkgs/tools/text/snippetpixie/default.nix

@@ -88,5 +88,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members;
     platforms = platforms.linux;
+    mainProgram = "com.github.bytepixie.snippetpixie";
   };
 }

pkgs/tools/virtualization/lxd-image-server/default.nix

@@ -0,0 +1,47 @@
+{ lib
+, openssl
+, rsync
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "lxd-image-server";
+  version = "0.0.4";
+
+  src = fetchFromGitHub {
+    owner = "Avature";
+    repo = "lxd-image-server";
+    rev = version;
+    sha256 = "yx8aUmMfSzyWaM6M7+WcL6ouuWwOpqLzODWSdNgwCwo=";
+  };
+
+  patches = [
+    ./state.patch
+    ./run.patch
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    setuptools
+    attrs
+    click
+    inotify
+    cryptography
+    confight
+    python-pidfile
+  ];
+
+  makeWrapperArgs = [
+    ''--prefix PATH ':' "${lib.makeBinPath [ openssl rsync ]}"''
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Creates and manages a simplestreams lxd image server on top of nginx";
+    homepage = "https://github.com/Avature/lxd-image-server";
+    license = licenses.apsl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mkg20001 ];
+  };
+}

pkgs/tools/virtualization/lxd-image-server/run.patch

@@ -0,0 +1,25 @@
+From df2ce9fb48a3790407646a388e0d220a75496c52 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Wed, 3 Nov 2021 14:23:38 +0100
+Subject: [PATCH] /var/run -> /run
+
+---
+ lxd_image_server/tools/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lxd_image_server/tools/config.py b/lxd_image_server/tools/config.py
+index 60e8973..23d392a 100644
+--- a/lxd_image_server/tools/config.py
++++ b/lxd_image_server/tools/config.py
+@@ -9,7 +9,7 @@ import confight
+ class Config():
+ 
+     _lock = Lock()
+-    pidfile = Path('/var/run/lxd-image-server/pidfile')
++    pidfile = Path('/run/lxd-image-server/pidfile')
+     data = {}
+ 
+     @classmethod
+-- 
+2.33.0
+

pkgs/tools/virtualization/lxd-image-server/state.patch

@@ -0,0 +1,49 @@
+From 17a1e09eaf8957174425d05200be9ee3e77229f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Thu, 21 Oct 2021 00:39:08 +0200
+Subject: [PATCH] Remove system-state changing code
+
+This is already done by the module on nixOS
+---
+ lxd_image_server/cli.py | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/lxd_image_server/cli.py b/lxd_image_server/cli.py
+index d276e6d..f759bf2 100644
+--- a/lxd_image_server/cli.py
++++ b/lxd_image_server/cli.py
+@@ -140,30 +140,17 @@ def reload_config():
+ @cli.command()
+ @click.option('--root_dir', default='/var/www/simplestreams',
+               show_default=True)
+-@click.option('--ssl_dir', default='/etc/nginx/ssl', show_default=True,
+-              callback=lambda ctx, param, val: Path(val))
+ @click.pass_context
+-def init(ctx, root_dir, ssl_dir):
++def init(ctx, root_dir):
+     if not Path(root_dir).exists():
+         logger.error('Root directory does not exists')
+     else:
+-        if not ssl_dir.exists():
+-            os.makedirs(str(ssl_dir))
+-
+-        if not (ssl_dir / 'nginx.key').exists():
+-            generate_cert(str(ssl_dir))
+-
+         img_dir = str(Path(root_dir, 'images'))
+         streams_dir = str(Path(root_dir, 'streams/v1'))
+         if not Path(img_dir).exists():
+             os.makedirs(img_dir)
+         if not Path(streams_dir).exists():
+             os.makedirs(streams_dir)
+-        conf_path = Path('/etc/nginx/sites-enabled/simplestreams.conf')
+-        if not conf_path.exists():
+-            conf_path.symlink_to(
+-                '/etc/nginx/sites-available/simplestreams.conf')
+-            os.system('nginx -s reload')
+ 
+         if not Path(root_dir, 'streams', 'v1', 'images.json').exists():
+             ctx.invoke(update, img_dir=Path(root_dir, 'images'),
+-- 
+2.33.0
+

pkgs/top-level/aliases.nix

@@ -213,6 +213,7 @@ mapAliases ({
   ec2_ami_tools = ec2-ami-tools; # added 2021-10-08
   ec2_api_tools = ec2-api-tools; # added 2021-10-08
   elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
+  elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
   emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
@@ -376,6 +377,7 @@ mapAliases ({
   json_glib = json-glib; # added 2018-02-25
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
+  kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
   kodiGBM = kodi-gbm;
   kodiPlain = kodi;
   kodiPlainWayland = kodi-wayland;

pkgs/top-level/all-packages.nix

@@ -4863,7 +4863,7 @@ with pkgs;
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
   # When updating make sure to update all plugins or they will break!
   elk6Version = "6.8.3";
-  elk7Version = "7.10.2";
+  elk7Version = "7.11.1";
 
   elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
     util-linux = util-linuxMinimal;
@@ -4878,11 +4878,6 @@ with pkgs;
     util-linux = util-linuxMinimal;
     jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
-  elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
-    enableUnfree = false;
-    util-linux = util-linuxMinimal;
-    jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
   elasticsearch = elasticsearch6;
   elasticsearch-oss = elasticsearch6-oss;
 
@@ -4895,7 +4890,7 @@ with pkgs;
     elasticsearch = elasticsearch6-oss;
   };
   elasticsearch7Plugins = elasticsearchPlugins.override {
-    elasticsearch = elasticsearch7-oss;
+    elasticsearch = elasticsearch7;
   };
 
   elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator {
@@ -6704,9 +6699,6 @@ with pkgs;
     enableUnfree = false;
   };
   kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { };
-  kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix {
-    enableUnfree = false;
-  };
   kibana = kibana6;
   kibana-oss = kibana6-oss;
 
@@ -7360,6 +7352,8 @@ with pkgs;
   lxcfs = callPackage ../os-specific/linux/lxcfs { };
   lxd = callPackage ../tools/admin/lxd { };
 
+  lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { };
+
   lzfse = callPackage ../tools/compression/lzfse { };
 
   lzham = callPackage ../tools/compression/lzham { };
@@ -7994,9 +7988,7 @@ with pkgs;
 
   ntopng = callPackage ../tools/networking/ntopng { };
 
-  ntp = callPackage ../tools/networking/ntp {
+  ntp = callPackage ../tools/networking/ntp { };
-    libcap = if stdenv.isLinux then libcap else null;
-  };
 
   numdiff = callPackage ../tools/text/numdiff { };
 
@@ -26777,6 +26769,8 @@ with pkgs;
 
   neocomp  = callPackage ../applications/window-managers/neocomp { };
 
+  nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
+
   newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
 
   nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };

pkgs/top-level/kodi-packages.nix

@@ -80,6 +80,8 @@ let self = rec {
 
   joystick = callPackage ../applications/video/kodi-packages/joystick { };
 
+  keymap = callPackage ../applications/video/kodi-packages/keymap { };
+
   netflix = callPackage ../applications/video/kodi-packages/netflix { };
 
   svtplay = callPackage ../applications/video/kodi-packages/svtplay { };
@@ -114,6 +116,8 @@ let self = rec {
 
   dateutil = callPackage ../applications/video/kodi-packages/dateutil { };
 
+  defusedxml = callPackage ../applications/video/kodi-packages/defusedxml { };
+
   idna = callPackage ../applications/video/kodi-packages/idna { };
 
   inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };

pkgs/top-level/perl-packages.nix

@@ -9708,10 +9708,10 @@ let
 
   Gtk3ImageView = buildPerlPackage rec {
     pname = "Gtk3-ImageView";
-    version = "9";
+    version = "10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz";
-      sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w=";
+      sha256 = "sha256-vHfnBgaeZPK7hBgZcP1KjepG+IvsDE3XwrH9U4xoN+Y=";
     };
     buildInputs = [ pkgs.gtk3 ];
     propagatedBuildInputs = [ Readonly Gtk3 ];

pkgs/top-level/python-packages.nix

@@ -1705,6 +1705,8 @@ in {
 
   confuse = callPackage ../development/python-modules/confuse { };
 
+  confight = callPackage ../development/python-modules/confight { };
+
   connexion = callPackage ../development/python-modules/connexion { };
 
   consonance = callPackage ../development/python-modules/consonance { };
@@ -3770,6 +3772,8 @@ in {
 
   inkex = callPackage ../development/python-modules/inkex { };
 
+  inotify = callPackage ../development/python-modules/inotify { };
+
   inotify-simple = callPackage ../development/python-modules/inotify-simple { };
 
   inotifyrecursive = callPackage ../development/python-modules/inotifyrecursive { };
@@ -7258,6 +7262,8 @@ in {
 
   pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };
 
+  pytest-dotenv = callPackage ../development/python-modules/pytest-dotenv { };
+
   pytest-env = callPackage ../development/python-modules/pytest-env { };
 
   pytest-error-for-skips = callPackage ../development/python-modules/pytest-error-for-skips { };