Merge master into staging-next

doc/using/configuration.chapter.md

@@ -310,16 +310,16 @@ For this to work fully, you must also have this script sourced when you are logg
 
 ```ShellSession
 #!/bin/sh
-if [ -d $HOME/.nix-profile/etc/profile.d ]; then
+if [ -d "${HOME}/.nix-profile/etc/profile.d" ]; then
-  for i in $HOME/.nix-profile/etc/profile.d/*.sh; do
+  for i in "${HOME}/.nix-profile/etc/profile.d/"*.sh; do
-    if [ -r $i ]; then
+    if [ -r "$i" ]; then
-      . $i
+      . "$i"
     fi
   done
 fi
 ```
 
-Now just run `source $HOME/.profile` and you can starting loading man pages from your environment.
+Now just run `. "${HOME}/.profile"` and you can start loading man pages from your environment.
 
 ### GNU info setup {#sec-gnu-info-setup}
 

maintainers/scripts/debian-patches.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Download patches from debian project
 # Usage $0 debian-patches.txt debian-patches.nix

maintainers/scripts/eval-release.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
 
 if [[ -z "$VERBOSE" ]]; then
   echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"

maintainers/scripts/update-channel-branches.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 
 : ${NIXOS_CHANNELS:=https://nixos.org/channels/}

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

@@ -77,6 +77,32 @@
           with any supported NixOS release.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>nscd</literal> functionality, necessary to provide
+          non-glibc-builtin NSS modules (such as
+          <literal>nss_systemd</literal> or <literal>nss_ldap</literal>)
+          can now be provided by <literal>nsncd</literal>, by setting
+          <literal>services.nscd.enableNsncd</literal> to
+          <literal>true</literal>.
+        </para>
+        <para>
+          The <literal>nscd</literal> daemon provided by glibc, which is
+          currently used by NixOS isn’t very reliable. For example, it’s
+          <link xlink:href="https://github.com/NixOS/nixpkgs/issues/135888">not
+          fully possible to disable caching functionality</link>,
+          causing various issues and failed lookups.
+        </para>
+        <para>
+          In contrast to nscd’s behavior of caching module responses on
+          its own, nsncd merely forwards requests to NSS modules, which
+          might cache or not.
+        </para>
+        <para>
+          We plan to use <literal>nsncd</literal> by default in NixOS
+          23.05.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <literal>emacs</literal> enables native compilation which

nixos/doc/manual/release-notes/rl-2211.section.md

@@ -38,6 +38,20 @@ In addition to numerous new and upgraded packages, this release has the followin
   for a transition period so that in time the ecosystem can switch without
   breaking compatibility with any supported NixOS release.
 
+- `nscd` functionality, necessary to provide non-glibc-builtin NSS
+  modules (such as `nss_systemd` or `nss_ldap`) can now be provided by
+  `nsncd`, by setting `services.nscd.enableNsncd` to `true`.
+
+  The `nscd` daemon provided by glibc, which is currently used by NixOS isn't
+  very reliable. For example, it's [not fully possible to disable caching
+  functionality](https://github.com/NixOS/nixpkgs/issues/135888), causing
+  various issues and failed lookups.
+
+  In contrast to nscd's behavior of caching module responses on its own,
+  nsncd merely forwards requests to NSS modules, which might cache or not.
+
+  We plan to use `nsncd` by default in NixOS 23.05.
+
 - `emacs` enables native compilation which means:
   - emacs packages from nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine;
   - emacs packages from somewhere else, e.g. `package-install`, will do asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still enjoy the benefit of native compilation for packages from nixpkgs.

nixos/tests/musescore.nix

@@ -69,6 +69,10 @@ in
     # Wait until the export dialogue appears.
     machine.wait_for_window("Export")
     machine.screenshot("MuseScore1")
+    machine.send_key("shift-tab")
+    machine.sleep(1)
+    machine.send_key("shift-tab")
+    machine.sleep(1)
     machine.send_key("ret")
     machine.sleep(1)
     machine.send_key("ret")

nixos/tests/restic.nix

@@ -2,9 +2,8 @@ import ./make-test-python.nix (
   { pkgs, ... }:
 
   let
-    password = "some_password";
+    remoteRepository = "/tmp/restic-backup";
-    repository = "/tmp/restic-backup";
+    remoteFromFileRepository = "/tmp/restic-backup-from-file";
-    repositoryFile = "${pkgs.writeText "repositoryFile" "/tmp/restic-backup-from-file"}";
     rcloneRepository = "rclone:local:/tmp/restic-rclone-backup";
 
     backupPrepareCommand = ''
@@ -18,7 +17,6 @@ import ./make-test-python.nix (
     '';
 
     passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}";
-    initialize = true;
     paths = [ "/opt" ];
     pruneOpts = [
       "--keep-daily 2"
@@ -40,12 +38,18 @@ import ./make-test-python.nix (
         {
           services.restic.backups = {
             remotebackup = {
-              inherit repository passwordFile initialize paths pruneOpts backupPrepareCommand backupCleanupCommand;
+              inherit passwordFile paths pruneOpts backupPrepareCommand backupCleanupCommand;
+              repository = remoteRepository;
+              initialize = true;
             };
-            remotebackup-from-file = {
+            remote-from-file-backup = {
-              inherit repositoryFile passwordFile initialize paths pruneOpts;
+              inherit passwordFile paths pruneOpts;
+              initialize = true;
+              repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository;
             };
             rclonebackup = {
+              inherit passwordFile paths pruneOpts;
+              initialize = true;
               repository = rcloneRepository;
               rcloneConfig = {
                 type = "local";
@@ -57,14 +61,15 @@ import ./make-test-python.nix (
                 [local]
                 type=ftp
               '';
-              inherit passwordFile initialize paths pruneOpts;
             };
             remoteprune = {
-              inherit repository passwordFile;
+              inherit passwordFile;
+              repository = remoteRepository;
               pruneOpts = [ "--keep-last 1" ];
             };
             custompackage = {
-              inherit repository passwordFile paths;
+              inherit passwordFile paths;
+              repository = "some-fake-repository";
               package = pkgs.writeShellScriptBin "restic" ''
                 echo "$@" >> /tmp/fake-restic.log;
               '';
@@ -82,50 +87,69 @@ import ./make-test-python.nix (
       server.start()
       server.wait_for_unit("dbus.socket")
       server.fail(
-          "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots",
+          "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots",
-          '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots"',
+          '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots"',
           "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots",
           "grep 'backup .* /opt' /tmp/fake-restic.log",
       )
       server.succeed(
+          # set up
           "mkdir -p /opt",
           "touch /opt/some_file",
           "mkdir -p /tmp/restic-rclone-backup",
+
+          # test that remotebackup runs custom commands and produces a snapshot
           "timedatectl set-time '2016-12-13 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
-          "systemctl start restic-backups-remotebackup-from-file.service",
+          '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
+
+          # test that remote-from-file-backup produces a snapshot
+          "systemctl start restic-backups-remote-from-file-backup.service",
+          '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
+
+          # test that rclonebackup produces a snapshot
           "systemctl start restic-backups-rclonebackup.service",
-          '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
+          '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
-          '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
+
-          '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
+          # test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines
           "systemctl start restic-backups-custompackage.service",
           "grep 'backup .* /opt' /tmp/fake-restic.log",
           "grep 'check .* --some-check-option' /tmp/fake-restic.log",
+
+          # test that we can create four snapshots in remotebackup and rclonebackup
           "timedatectl set-time '2017-12-13 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
           "systemctl start restic-backups-rclonebackup.service",
+
           "timedatectl set-time '2018-12-13 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
           "systemctl start restic-backups-rclonebackup.service",
+
           "timedatectl set-time '2018-12-14 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
           "systemctl start restic-backups-rclonebackup.service",
+
           "timedatectl set-time '2018-12-15 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
           "systemctl start restic-backups-rclonebackup.service",
+
           "timedatectl set-time '2018-12-16 13:45'",
           "systemctl start restic-backups-remotebackup.service",
           "rm /opt/backupCleanupCommand",
           "systemctl start restic-backups-rclonebackup.service",
-          '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
+
-          '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
+          '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"',
+          '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"',
+
+          # test that remoteprune brings us back to 1 snapshot in remotebackup
           "systemctl start restic-backups-remoteprune.service",
-          '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
+          '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
+
       )
     '';
   }

pkgs/applications/blockchains/polkadot/default.nix

@@ -10,13 +10,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "0.9.32";
+  version = "0.9.33";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot";
     rev = "v${version}";
-    sha256 = "sha256-bE7PzvkHKAP/nqNkoBMTGvZZwmf8YY+cGnJ2EM/2xAs=";
+    sha256 = "sha256-vAFGLcsbGuoaNtxtEIHSeX00nsULJROCEhaMv5IEcp4=";
 
     # the build process of polkadot requires a .git folder in order to determine
     # the git commit hash that is being built and add it to the version string.
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "sha256-NI50KFXvQgUV+G1l5D2gnAo1EohnCpQWlFCZ0iP2CVQ=";
+  cargoSha256 = "sha256-SZUkgtI/4kA5iWzalmGo5KXRHXKgdeCo2SSCVF66p5E=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

@@ -49,12 +49,12 @@
   };
   bash = buildGrammar {
     language = "bash";
-    version = "77cf8a7";
+    version = "4488aa4";
     source = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-bash";
-      rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b";
+      rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74";
-      hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY=";
+      hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
   };
@@ -269,6 +269,18 @@
     };
     meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
   };
+  ebnf = buildGrammar {
+    language = "ebnf";
+    version = "ef241bc";
+    source = fetchFromGitHub {
+      owner = "RubixDev";
+      repo = "ebnf";
+      rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
+      hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI=";
+    };
+    location = "crates/tree-sitter-ebnf";
+    meta.homepage = "https://github.com/RubixDev/ebnf.git";
+  };
   eex = buildGrammar {
     language = "eex";
     version = "f742f2f";
@@ -425,12 +437,12 @@
   };
   gitcommit = buildGrammar {
     language = "gitcommit";
-    version = "f6e7f24";
+    version = "d3c15bd";
     source = fetchFromGitHub {
       owner = "gbprod";
       repo = "tree-sitter-gitcommit";
-      rev = "f6e7f24fd12e1d01f9bf23f7625800ace134030c";
+      rev = "d3c15bdf0165c89872cc1345c5f8815be3cad9cc";
-      hash = "sha256-1MPb2JuBFfckh4sRMxwBWySwS5xHhQSaXx2Sl1Kfuso=";
+      hash = "sha256-3ufluVDeCXLksgj68f7MfK+3QrtvLDoc9Xhbh7xz+t0=";
     };
     meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
   };
@@ -658,12 +670,12 @@
   };
   javascript = buildGrammar {
     language = "javascript";
-    version = "936d976";
+    version = "cefdcea";
     source = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-javascript";
-      rev = "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b";
+      rev = "cefdcea72a8cf86c1f10ca55e837397da07afdab";
-      hash = "sha256-uZW1L9ZE1YSZbwxiqSDiKycWv5mSRG4k4MlWFYoWRbw=";
+      hash = "sha256-o+th1Va11YtsHaA5IR9IAYRk3SDxTop0gxfSjR2u/o8=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
   };
@@ -801,12 +813,12 @@
   };
   lua = buildGrammar {
     language = "lua";
-    version = "fb30e8c";
+    version = "f5e84ff";
     source = fetchFromGitHub {
       owner = "MunifTanjim";
       repo = "tree-sitter-lua";
-      rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320";
+      rev = "f5e84ffc2b06858401e0d2edf5dce009efbe34b3";
-      hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI=";
+      hash = "sha256-9ig+F2W6MB5uSS3XFUL2OCW9PKYkb4KPpGN2DWKEdhY=";
     };
     meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
   };
@@ -834,24 +846,24 @@
   };
   markdown = buildGrammar {
     language = "markdown";
-    version = "272e080";
+    version = "16d0b5e";
     source = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "272e080bca0efd19a06a7f4252d746417224959e";
+      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
+      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
     };
     location = "tree-sitter-markdown";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
   };
   markdown_inline = buildGrammar {
     language = "markdown_inline";
-    version = "272e080";
+    version = "16d0b5e";
     source = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "272e080bca0efd19a06a7f4252d746417224959e";
+      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
+      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
     };
     location = "tree-sitter-markdown-inline";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -982,12 +994,12 @@
   };
   pascal = buildGrammar {
     language = "pascal";
-    version = "2fd40f4";
+    version = "9e99540";
     source = fetchFromGitHub {
       owner = "Isopod";
       repo = "tree-sitter-pascal";
-      rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66";
+      rev = "9e995404ddff8319631d72d4b46552e737206912";
-      hash = "sha256-/nChZspacQymw+1P7yrkOpa7BIBVIKeLKUv0y9Hk8oc=";
+      hash = "sha256-y8xPnVZ15+eAnjrLSGjS5wIbLgSKbz9bipgL0o8acmA=";
     };
     meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git";
   };
@@ -1425,12 +1437,12 @@
   };
   twig = buildGrammar {
     language = "twig";
-    version = "035f549";
+    version = "2457993";
     source = fetchFromGitHub {
       owner = "gbprod";
       repo = "tree-sitter-twig";
-      rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91";
+      rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8";
-      hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20=";
+      hash = "sha256-8H2luJtjSZt2AWP1L0A64jm+DeEH8cFaC+yvIDLKk4o=";
     };
     meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
   };

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -77,6 +77,7 @@ https://github.com/turbio/bracey.vim/,,
 https://github.com/fruit-in/brainfuck-vim/,,
 https://github.com/famiu/bufdelete.nvim/,,
 https://github.com/jlanzarotta/bufexplorer/,,
+https://github.com/AndrewRadev/bufferize.vim/,HEAD,
 https://github.com/akinsho/bufferline.nvim/,,
 https://github.com/dkarter/bullets.vim/,,
 https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
@@ -945,6 +946,7 @@ https://github.com/tpope/vim-obsession/,,
 https://github.com/ocaml/vim-ocaml/,,
 https://github.com/rakr/vim-one/,,
 https://github.com/petRUShka/vim-opencl/,,
+https://github.com/sirtaj/vim-openscad/,HEAD,
 https://github.com/kana/vim-operator-replace/,,
 https://github.com/rhysd/vim-operator-surround/,,
 https://github.com/kana/vim-operator-user/,,

pkgs/applications/emulators/sameboy/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
+{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
 
 stdenv.mkDerivation rec {
   pname = "sameboy";
@@ -16,13 +16,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ rgbds glib wrapGAppsHook ];
   buildInputs = [ SDL2 ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/LIJI32/SameBoy/commit/c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch";
-      hash = "sha256-2o/aWimtAKqay7SGq5Q9vLDcQKqV6Bn2xJtnjACrLUw=";
-    })
-  ];
-
   makeFlags = [
     "CONF=release"
     "FREEDESKTOP=true"

pkgs/applications/graphics/sane/backends/default.nix

@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation {
   pname = "sane-backends";
-  version = "1.0.32";
+  version = "1.1.1";
 
   src = fetchurl {
     # raw checkouts of the repo do not work because, the configure script is
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
     # https://gitlab.com/sane-project/backends/-/issues/440
     # unfortunately this make the url unpredictable on update, to find the link
     # go to https://gitlab.com/sane-project/backends/-/releases and choose
-    # the link with other in the URL.
+    # the link under the heading "Other".
-    url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz";
+    url = "https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz";
-    sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s";
+    sha256 = "sha256-3UsEw3pC8UxGGejupqlX9MfGF/5Z4yrihys3OUCotgM=";
   };
 
   patches = [
@@ -140,5 +140,6 @@ stdenv.mkDerivation {
     homepage = "http://www.sane-project.org/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.symphorien ];
   };
 }

pkgs/applications/misc/keepassx/community.nix

@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ];
 
   dontWrapGApps = true;
-  postFixup = ''
+  preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 

pkgs/applications/misc/pe-bear/default.nix

@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pe-bear";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "hasherezade";
+    repo = "pe-bear";
+    rev = "v${version}";
+    sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtbase
+  ];
+
+  meta = with lib; {
+    description = "Portable Executable reversing tool with a friendly GUI";
+    homepage = "https://hshrzd.wordpress.com/pe-bear/";
+
+    license = [
+      # PE-Bear
+      licenses.gpl2Only
+
+      # Vendored capstone
+      licenses.bsd3
+
+      # Vendored bearparser
+      licenses.bsd2
+    ];
+
+    maintainers = with maintainers; [ blitz ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/misc/swaynotificationcenter/default.nix

@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "SwayNotificationCenter";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayNotificationCenter";
     rev = "v${version}";
-    hash = "sha256-Z8CFSaH4RsZ/Qgj+l+36p7smbiGV5RRQhZBBcA3iyK8=";
+    hash = "sha256-RU6zzhRu7YK+zcazxj2wZ5vSwLwlilBaG9l+rEstefc=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -3,10 +3,10 @@
 rec {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "107.0";
+    version = "107.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e";
+      sha512 = "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea";
     };
 
     meta = {

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

@@ -1,25 +1,31 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "pachyderm";
-  version = "1.8.5";
+  version = "2.4.0";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/pachyderm/pachyderm";
-  subPackages = [ "src/server/cmd/pachctl" ];
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "pachyderm";
     repo = "pachyderm";
-    sha256 = "1b9x2xn0sxsjid15lnwr79lps8xzf24i7jfl0i48nabdigmi04wp";
+    rev = "v${version}";
+    hash = "sha256-8JAn7/ge1bCkHsZC1tG46N1eag0Itvlj5TW+8oSWXd8=";
   };
 
+  vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg=";
+
+  subPackages = [ "src/server/cmd/pachctl" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/pachyderm/pachyderm/v${lib.versions.major version}/src/version.AppVersion=${version}"
+  ];
+
   meta = with lib; {
     description = "Containerized Data Analytics";
-    homepage = "https://github.com/pachyderm/pachyderm";
+    homepage = "https://www.pachyderm.com/";
-    license = licenses.asl20;
+    license = licenses.unfree;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline ];
     mainProgram = "pachctl";
   };
 }

pkgs/applications/video/screenkey/default.nix

@@ -1,23 +1,23 @@
 { lib
 , fetchFromGitLab
-# native
 , wrapGAppsHook
-# not native
 , xorg
 , gobject-introspection
 , gtk3
+, libappindicator-gtk3
+, slop
 , python3
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "screenkey";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitLab {
-    owner = "screenkey";
+    owner = pname;
-    repo = "screenkey";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l";
+    hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug=";
   };
 
   nativeBuildInputs = [
@@ -28,20 +28,24 @@ python3.pkgs.buildPythonApplication rec {
 
   buildInputs = [
     gtk3
+    libappindicator-gtk3
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
     babel
     pycairo
     pygobject3
+    dbus-python
   ];
 
   # Prevent double wrapping because of wrapGAppsHook
   dontWrapGApps = true;
-  # https://github.com/NixOS/nixpkgs/issues/56943
+
-  strictDeps = false;
   preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      --prefix PATH ":" "${lib.makeBinPath [ slop ]}"
+      "''${gappsWrapperArgs[@]}"
+      )
   '';
 
   # screenkey does not have any tests

pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash

@@ -136,7 +136,7 @@ while (( "${#norm[@]}" )); do
                 norm=("${norm[@]:1}")
             else
                 echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2
-                exit -1
+                exit 255
             fi
             ;;
     esac

pkgs/desktops/gnome/apps/ghex/default.nix

@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Ghex";
     description = "Hex editor for GNOME desktop environment";
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
   };

pkgs/desktops/gnome/core/eog/default.nix

@@ -117,5 +117,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
     platforms = platforms.unix;
+    # requires <gio/gdesktopappinfo.h>
+    broken = stdenv.isDarwin;
   };
 }

pkgs/development/interpreters/ngn-k/default.nix

@@ -3,24 +3,26 @@
 , stdenvNoLibs
 , fetchFromGitea
 , runtimeShell
-, doCheck ? stdenv.hostPlatform == stdenv.buildPlatform
+, doCheck ? withLibc && stdenv.hostPlatform == stdenv.buildPlatform
+, withLibc ? true
 }:
 
 let
-  # k itself is compiled with -ffreestanding, but tests require a libc
+  # k itself can be compiled with -ffreestanding, but tests require a libc;
-  useStdenv = if doCheck then stdenv else stdenvNoLibs;
+  # if we want to build k-libc we need a libc obviously
+  useStdenv = if withLibc || doCheck then stdenv else stdenvNoLibs;
 in
 
 useStdenv.mkDerivation {
   pname = "ngn-k";
-  version = "unstable-2021-12-17";
+  version = "unstable-2022-11-28";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "ngn";
     repo = "k";
-    rev = "26f83645e9ed4798b43390fb9dcdfa0ab8245a8f";
+    rev = "e5138f182a8ced07dd240e3fe58274130842a85d";
-    sha256 = "sha256-VcJcLcL1C8yQH6xvpKR0R0gMrhSfsU4tW+Yy0rGdSSw=";
+    sha256 = "1pn416znrdndb8iccprzx4zicmsx8c6i9dm3wq5z3jg8nan53p69";
   };
 
   patches = [
@@ -28,21 +30,25 @@ useStdenv.mkDerivation {
   ];
 
   postPatch = ''
-    patchShebangs a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh
+    patchShebangs --build a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh
 
     # don't use hardcoded /bin/sh
-    for f in repl.k m.c;do
+    for f in repl.k repl-bg.k m.c;do
       substituteInPlace "$f" --replace "/bin/sh" "${runtimeShell}"
     done
   '';
 
   makeFlags = [ "-e" ];
-  buildFlags = [ "k" "libk.so" ];
+  buildFlags = [
+    (if withLibc then "k-libc" else "k")
+    "libk.so"
+  ];
   checkTarget = "t";
   inherit doCheck;
 
   outputs = [ "out" "dev" "lib" ];
 
+  # TODO(@sternenseemann): package bulgarian translation
   installPhase = ''
     runHook preInstall
     install -Dm755 k "$out/bin/k"
@@ -59,6 +65,6 @@ useStdenv.mkDerivation {
     homepage = "https://codeberg.org/ngn/k";
     license = lib.licenses.agpl3Only;
     maintainers = [ lib.maintainers.sternenseemann ];
-    platforms = [ "x86_64-linux" "x86_64-freebsd" ];
+    platforms = [ "x86_64-linux" "x86_64-freebsd13" ];
   };
 }

pkgs/development/interpreters/ngn-k/repl-license-path.patch

@@ -1,10 +1,13 @@
+diff --git a/repl.k b/repl.k
+index 4c023467..10414162 100755
 --- a/repl.k
 +++ b/repl.k
-@@ -1,6 +1,6 @@
+@@ -2,7 +2,7 @@
- #!k
+ `1:"ngn/k, (c) 2019-2022 ngn, GNU AGPLv3. type \\ for more info\n"
- `1:"ngn/k, (c) 2019-2021 ngn, GNU AGPLv3. type \\ for more info\n",repl.prompt:," "
+ \d repl
--repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"LICENSE";}
+ `1:prompt:," " /use 0x0720 for emacs integration
-+repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"../share/ngn-k/LICENSE";}
+-cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"LICENSE";}
- repl.dirname:{$[#x:"/"/-1_"/"\x;x;,"."]}
++cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"../share/ngn-k/LICENSE";}
- repl.joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]}
+ dirname:{$[#x:"/"/-1_"/"\x;x;,"."]}
- repl.fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]}
+ joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]}
+ fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]}

pkgs/development/libraries/libguestfs/default.nix

@@ -35,12 +35,13 @@
 , perlPackages
 , ocamlPackages
 , libtirpc
-, withAppliance ? true
+, appliance ? null
-, appliance
 , javaSupport ? false
 , jdk
 }:
 
+assert appliance == null || lib.isDerivation appliance;
+
 stdenv.mkDerivation rec {
   pname = "libguestfs";
   version = "1.48.4";
@@ -127,13 +128,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  postFixup = lib.optionalString withAppliance ''
+  postFixup = lib.optionalString (appliance != null) ''
     mkdir -p $out/{lib,lib64}
     ln -s ${appliance} $out/lib64/guestfs
     ln -s ${appliance} $out/lib/guestfs
   '';
 
-  doInstallCheck = withAppliance;
+  doInstallCheck = appliance != null;
   installCheckPhase = ''
     runHook preInstallCheck
 
@@ -160,6 +161,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
     # this is to avoid "output size exceeded"
-    hydraPlatforms = if withAppliance then appliance.meta.hydraPlatforms else platforms.linux;
+    hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
   };
 }

pkgs/development/libraries/libjwt/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libjwt";
-  version = "1.13.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "benmcollins";
     repo = "libjwt";
     rev = "v${version}";
-    sha256 = "sha256-hS10Ecq0VVuYLDrBu4x+Y2mz6eeJV1SvnqttgbiQbi0=";
+    sha256 = "sha256-fdMrJaD0jq4aQtxNLUvPVP6dWMwp3Mz4TuW2zX6r7QA=";
   };
 
   buildInputs = [ jansson openssl ];

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

@@ -20,6 +20,7 @@
 , setuptools
 , toolz
 , xmltodict
+, pythonRelaxDepsHook
 }:
 
 buildPythonPackage rec {
@@ -38,6 +39,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = [
@@ -54,6 +56,8 @@ buildPythonPackage rec {
     xmltodict
   ];
 
+  pythonRelaxDeps = [ "potentials" ];
+
   preCheck = ''
     # By default, pytestCheckHook imports atomman from the current directory
     # instead of from where `pip` installs it and fails due to missing Cython

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

@@ -1,5 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib
-, pep8, coverage, logilab_common, requests }:
+, buildPythonPackage
+, fetchPypi
+, requests
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "bugzilla";
@@ -11,9 +15,12 @@ buildPythonPackage rec {
     sha256 = "0q8c3k0kdnd11g2s56cp8va9365x0xfr2m2zn9fgxjijdyhwdic5";
   };
 
-  buildInputs = [ pep8 coverage logilab_common ];
   propagatedBuildInputs = [ requests ];
 
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   preCheck = ''
     mkdir -p check-phase
     export HOME=$(pwd)/check-phase
@@ -22,7 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/python-bugzilla/python-bugzilla";
     description = "Bugzilla XMLRPC access module";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pierron ];
   };

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "bundlewrap";
-  version = "4.15.0";
+  version = "4.16.0";
 
   disabled = pythonOlder "3.7";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "bundlewrap";
     repo = "bundlewrap";
     rev = version;
-    sha256 = "sha256-O31lh43VyaFnd/IUkx44wsgxkWubZKzjsKXzHwcGox0";
+    sha256 = "sha256-y7h43D/SeXmMm0Fxi3hOOfXgDlmeoca11HOhGeJffRA=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, isPy3k
+, pythonOlder
 , fetchFromGitHub
 , fetchpatch
 , python-dateutil
@@ -21,27 +21,19 @@
 
 buildPythonPackage rec {
   pname = "dateparser";
-  version = "1.1.3";
+  version = "1.1.4";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "scrapinghub";
     repo = "dateparser";
     rev = "v${version}";
-    sha256 = "sha256-2bZaaaLT3hocIiqLZpudP6gmiYwxPNMrjG9dYF3GvTc=";
+    sha256 = "sha256-r13WNI+T2NtTwjnGOqX3ZOqPhvr8fBdXGULW7IXszlo=";
   };
 
-  patches = [
-    ./regex-compat.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.py --replace \
-      'regex !=2019.02.19,!=2021.8.27,<2022.3.15' \
-      'regex'
-  '';
-
   propagatedBuildInputs = [
     python-dateutil
     pytz
@@ -80,6 +72,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "dateparser" ];
 
   meta = with lib; {
+    changelog = "https://github.com/scrapinghub/dateparser/blob/${src.rev}/HISTORY.rst";
     description = "Date parsing library designed to parse dates from HTML pages";
     homepage = "https://github.com/scrapinghub/dateparser";
     license = licenses.bsd3;

pkgs/development/python-modules/dateparser/regex-compat.patch

@@ -1,11 +0,0 @@
---- a/dateparser/languages/locale.py
-+++ b/dateparser/languages/locale.py
-@@ -169,7 +169,7 @@ class Locale:
-             if normalize:
-                 value = list(map(normalize_unicode, value))
-             pattern = '|'.join(sorted(value, key=len, reverse=True))
--            pattern = DIGIT_GROUP_PATTERN.sub(r'?P<n>\d+', pattern)
-+            pattern = pattern.replace(r'\d+', r'?P<n>\d+')
-             pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE)
-             relative_dictionary[pattern] = key
-         return relative_dictionary

pkgs/development/python-modules/logilab/common.nix

@@ -1,24 +1,51 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, setuptools
+, importlib-metadata
+, mypy-extensions
+, typing-extensions
+, pytestCheckHook
+, pytz
+}:
 
 buildPythonPackage rec {
   pname = "logilab-common";
-  version = "1.6.1";
+  version = "1.9.7";
-  disabled = isPy27;
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h0b2vg2xpfbnynrkg2yki4zjpscm6wgm6nhaahb088v98zxqbrk";
+    hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM=";
   };
 
-  propagatedBuildInputs = [ unittest2 six ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
-  # package supports 3.x but tests require egenix-mx-base which is python 2.x only
+  propagatedBuildInputs = [
-  # and is not currently in nixos
+    mypy-extensions
-  doCheck = false;
+    typing-extensions
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytz
+  ];
+
+  preCheck = ''
+    export COLLECT_DEPRECATION_WARNINGS_PACKAGE_NAME=true
+  '';
 
   meta = with lib; {
     description = "Python packages and modules used by Logilab ";
-    homepage = "https://www.logilab.org/project/logilab-common";
+    homepage = "https://logilab-common.readthedocs.io/";
-    license = licenses.lgpl21;
+    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md";
+    license = licenses.lgpl21Plus;
   };
 }

pkgs/development/python-modules/logilab/constraint.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, logilab_common, six }:
+{ lib, buildPythonPackage, fetchPypi, logilab-common, six }:
 
 buildPythonPackage rec {
   pname = "logilab-constraint";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    logilab_common six
+    logilab-common six
   ];
 
 

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

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchurl
-, logilab_common
+, logilab-common
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn";
   };
 
-  propagatedBuildInputs = [ logilab_common ];
+  propagatedBuildInputs = [ logilab-common ];
 
   meta = with lib; {
     homepage = "https://www.logilab.org/project/logilab-astng";

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

@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "mailchecker";
-  version = "5.0.3";
+  version = "5.0.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D8xyXBUDRaXLempcJ7G/Ybe7A3FiAaZ8kgm4jgKhkSI=";
+    hash = "sha256-CTeZ63hOBUHuuIJgWRNttBRgrHSsuL78zo6MW8VwEDE=";
   };
 
   # Module has no tests

pkgs/development/python-modules/pylsp-mypy/default.nix

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , mypy
 , pytestCheckHook
 , python-lsp-server
@@ -22,6 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "0001-adapt-test-to-latest-mypy.patch";
+      url = "https://github.com/python-lsp/pylsp-mypy/commit/99cf687798464f810b128881dbbec82aa5353e04.patch";
+      sha256 = "sha256-wLaGMaW/gTab2fX7zGnemLQQNDWxBURYb7VsgEas61Y=";
+    })
+  ];
+
   propagatedBuildInputs = [
     mypy
     python-lsp-server

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

@@ -1,38 +1,41 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, six
+, fetchpatch
-, statistics
 , pythonOlder
-, nose
 , psutil
-, contextlib2
+, unittestCheckHook
-, mock
-, unittest2
-, isPy27
-, python
 }:
 
 buildPythonPackage rec {
   pname = "pyperf";
-  version = "2.4.1";
+  version = "2.5.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OM9ekMVvkGqDIM6CpQv6kskCuTr/1y5NyBWAEV81WFM=";
+    hash = "sha256-n9m+W1ciTmi1pbiPcSbxW2yGZ1c/YqCjn68U1v3ROQk=";
   };
 
-  checkInputs = [ nose psutil ] ++
+  patches = [
-    lib.optionals isPy27 [ contextlib2 mock unittest2 ];
+    (fetchpatch {
-  propagatedBuildInputs = [ six ] ++
+      name = "fix-pythonpath-in-tests.patch";
-    lib.optionals (pythonOlder "3.4") [ statistics ];
+      url = "https://github.com/psf/pyperf/commit/d373c5e56c0257d2d7abd705b676bea25cf66566.patch";
+      hash = "sha256-2q1fTf+uU3qj3BG8P5otX4f7mSTnQxm4sfmmgIUuszA=";
+    })
+  ];
 
-  # tests not included in pypi repository
+  propagatedBuildInputs = [
-  doCheck = false;
+    psutil
+  ];
 
-  checkPhase = ''
+  checkInputs = [
-    ${python.interpreter} -m nose
+    unittestCheckHook
-  '';
+  ];
+
+  unittestFlagsArray = [ "-s" "pyperf/tests/" "-v" ];
 
   meta = with lib; {
     description = "Python module to generate and modify perf";

pkgs/development/python-modules/sphinx-external-toc/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sphinx-external-toc";
-  version = "0.3.0";
+  version = "0.3.1";
 
   format = "flit";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "sphinx_external_toc";
-    sha256 = "73198636ada4b4f72f69c7bab09f0e4ce84978056dc5afa9ee51d287bec0a8ef";
+    sha256 = "9c8ea9980ea0e57bf3ce98f6a400f9b69eb1df808f7dd796c9c8cc1873d8b355";
   };
 
   nativeBuildInputs = [ flit-core ];
@@ -35,6 +35,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A sphinx extension that allows the site-map to be defined in a single YAML file";
     homepage = "https://github.com/executablebooks/sphinx-external-toc";
+    changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ marsam ];
   };

pkgs/development/tools/analysis/checkstyle/default.nix

@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "10.4";
+  version = "10.5.0";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-x/13rqb3NOP4ML2HoddkmRrEwBAsG97Z2iLLoJCu2PQ=";
+    sha256 = "sha256-GbPVA/Z9R0P9prJTFJUCTV9pq9/Cbl6UOjwhAlhe9BA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/oh-my-posh/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "12.20.0";
+  version = "12.22.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-nGhPfwZw73w0iJLdBiXjRQnKPnKIuk6K/5GFKeHlcVw=";
+    hash = "sha256-UIoMJjZrU9aDGnDx5K2SJO6lBgivMqGUDbtTfF3WfNE=";
   };
 
   vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

pkgs/servers/monitoring/bosun/default.nix

@@ -1,18 +1,21 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
+buildGoModule {
   pname = "bosun";
-  version = "0.8.0-preview";
+  version = "unstable-2021-05-13";
 
   src = fetchFromGitHub {
     owner = "bosun-monitor";
     repo = "bosun";
-    rev = version;
+    rev = "e25bc3e69a1fb2e29d28f13a78ffa71cc0b8cc87";
-    sha256 = "172mm006jarc2zm2yq7970k2a9akmyzvsrr8aqym4wk5v9x8kk0r";
+    hash = "sha256-YL1RqoryHRWKyUwO9NE8z/gsE195D+vFWR8YpZH+gbw=";
   };
 
+  vendorHash = "sha256-5mVI5cyuIB+6KHlTpDxSNGU7yBsGQC4IA+iDgvVFVZM=";
+
   subPackages = [ "cmd/bosun" "cmd/scollector" ];
-  goPackagePath = "bosun.org";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Time Series Alerting Framework";
@@ -20,5 +23,6 @@ buildGoPackage rec {
     homepage = "https://bosun.org";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

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

@@ -5,6 +5,7 @@
 , makeWrapper
 , jre_headless
 , util-linux, gnugrep, coreutils
+, libxcrypt
 , autoPatchelfHook
 , zlib
 }:
@@ -37,7 +38,7 @@ stdenv.mkDerivation (rec {
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre_headless util-linux ]
-             ++ optional enableUnfree zlib;
+             ++ optional enableUnfree [ zlib libxcrypt ];
 
   installPhase = ''
     mkdir -p $out

pkgs/servers/search/meilisearch/default.nix

@@ -8,7 +8,7 @@
 , nixosTests
 }:
 
-let version = "0.29.2";
+let version = "0.30.0";
 in
 rustPlatform.buildRustPackage {
   pname = "meilisearch";
@@ -17,9 +17,9 @@ rustPlatform.buildRustPackage {
     owner = "meilisearch";
     repo = "MeiliSearch";
     rev = "v${version}";
-    sha256 = "sha256-ltfJUwz/QFwsXJzES0GVOaCXh7QbziuKMILQNvaCG+4=";
+    sha256 = "sha256-nw2aSEdd21iiFrV2EPOyCfSru84eNM59wsL+ipcSoDw=";
   };
-  cargoSha256 = "sha256-HrPve9x7dSQx/CTxV7t4+SUu4gRmVNRHIZj+2S3CbLQ=";
+  cargoSha256 = "sha256-0JdI5I63ImdUUBQuC4LYqHpEA1xJ5QJ+3n3MTaIHKDI=";
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;
   buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];

pkgs/tools/audio/mpris-scrobbler/default.nix

@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , nix-update-script
 , curl
@@ -15,18 +16,22 @@
 
 stdenv.mkDerivation rec {
   pname = "mpris-scrobbler";
-  version = "0.4.95";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    owner  = "mariusor";
+    owner = "mariusor";
-    repo   = "mpris-scrobbler";
+    repo = "mpris-scrobbler";
-    rev    = "v${version}";
+    rev = "v${version}";
-    sha256 = "sha256-Cqf0egS4XSDiKLdizNHPdS0Zt3jQxw9e78S7n23CuKI=";
+    sha256 = "sha256-HUEUkVL5d6FD698k8iSCJMNeSo8vGJCsExJW/E0EWpQ=";
   };
 
   postPatch = ''
     substituteInPlace src/signon.c \
       --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace meson.build \
+      --replace "-Werror=format-truncation=0" "" \
+      --replace "-Wno-stringop-overflow" ""
   '';
 
   nativeBuildInputs = [
@@ -44,6 +49,19 @@ stdenv.mkDerivation rec {
     libevent
   ];
 
+  mesonFlags = [
+    "-Dversion=${version}"
+  ];
+
+  NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
+    "-Wno-sometimes-uninitialized"
+    "-Wno-tautological-pointer-compare"
+  ] ++ lib.optionals stdenv.isLinux [
+    "-Wno-array-bounds"
+    "-Wno-free-nonheap-object"
+    "-Wno-stringop-truncation"
+  ]);
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = pname;
@@ -56,6 +74,5 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ emantor ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mpris-scrobbler.x86_64-darwin
   };
 }

pkgs/tools/filesystems/grive2/default.nix

@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.1";
+  version = "0.5.3";
   pname = "grive2";
 
   src = fetchFromGitHub {
     owner = "vitalif";
     repo = "grive2";
     rev =  "v${version}";
-    sha256 = "1kv34ys8qarjsxpb1kd8dp7b3b4ycyiwjzd6mg97d3jk7405g6nm";
+    sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

pkgs/tools/filesystems/stratisd/default.nix

@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation rec {
   pname = "stratisd";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SHrD9zzGLGSlsf4UOqp4Xday6IDnryVDHIVRiPbE5CM=";
+    hash = "sha256-NM6+1Etf7pOOSKNuxGIUlAbtZwixof7wNgkPoMwPn7w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-lkuFWVmO+qw2ZXbCwdhU5OpRZy589QKnudgNVTgsJhI=";
+    hash = "sha256-anxDfls5MTfvklIDst+Ocduzc8ds5pD3WDaDUtF6R+g=";
   };
 
   postPatch = ''

pkgs/tools/games/steamtinkerlaunch/default.nix

@@ -0,0 +1,62 @@
+{ bash
+, gawk
+, git
+, gnugrep
+, fetchFromGitHub
+, installShellFiles
+, lib
+, makeWrapper
+, stdenv
+, unixtools
+, unzip
+, wget
+, xdotool
+, xorg
+, yad
+}:
+
+stdenv.mkDerivation rec {
+  pname = "steamtinkerlaunch";
+  version = "11.11";
+
+  src = fetchFromGitHub {
+    owner = "sonic2kk";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-rWENtgV6spokzkhnmrrzsAQ19dROJ50ofEulU5Jx5IE=";
+  };
+
+  # hardcode PROGCMD because #150841
+  postPatch = ''
+    substituteInPlace steamtinkerlaunch --replace 'PROGCMD="''${0##*/}"' 'PROGCMD="steamtinkerlaunch"'
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installFlags = [ "PREFIX=\${out}" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/steamtinkerlaunch --prefix PATH : ${lib.makeBinPath [
+      bash
+      gawk
+      git
+      gnugrep
+      unixtools.xxd
+      unzip
+      wget
+      xdotool
+      xorg.xprop
+      xorg.xrandr
+      xorg.xwininfo
+      yad
+    ]}
+  '';
+
+  meta = with lib; {
+    description = "Linux wrapper tool for use with the Steam client for custom launch options and 3rd party programs";
+    homepage = "https://github.com/sonic2kk/steamtinkerlaunch";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ urandom ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/tools/graphics/resvg/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "resvg";
-  version = "0.26.1";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1UZWX+8hH5DyjFb70wFtnp2RUCmgUKxOGv/yIaLz+30=";
+    sha256 = "sha256-rl3bGXCwVmJdBPANWYJEIuGlKUQTqWy8tutyx0zzG+U=";
   };
 
-  cargoSha256 = "sha256-b1jDJod/pDmtm2i4YKNTm8to3YIIkbjkVKnE3sG32H4=";
+  cargoSha256 = "sha256-iluhNT4qsg5flLRdH88xuUSt22+e5cgkTYXVXNI1L3I=";
 
   meta = with lib; {
     description = "An SVG rendering library";

pkgs/tools/misc/moar/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "moar";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-I/VN2KCI38uADLpLAJbkhTU3AG40ECYVMAqLVajhsw0=";
+    sha256 = "sha256-jIxZAslqkQU51O9ZSvlVZ3sCZpFYQTtuPpS2tEXXLzo=";
   };
 
   vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I=";

pkgs/tools/misc/systrayhelper/default.nix

@@ -1,19 +1,19 @@
-{ lib, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
+{ lib, pkg-config, libappindicator-gtk3, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "systrayhelper";
-  version = "0.0.5";
+  version = "unstable-2021-05-20";
-  rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
+  rev = "da47887f050cf0f22d9348cb4493df9ffda2a229";
-
-  goPackagePath = "github.com/ssbc/systrayhelper";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
     owner = "ssbc";
     repo = "systrayhelper";
-    sha256 = "0bn3nf43m89qmh8ds5vmv0phgdz32idz1zisr47jmvqm2ky1a45s";
+    rev = rev;
+    hash = "sha256-9ejpARZghXhb3EJDvNcidg5QM8Z+P91ICGuA89ksqeA=";
   };
 
+  vendorHash = null;
+
   # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178
   # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time.
   ldflags = [
@@ -27,11 +27,13 @@ buildGoPackage rec {
   nativeBuildInputs = [ pkg-config libappindicator-gtk3 ];
   buildInputs = [ libappindicator-gtk3 ];
 
+  doCheck = false; # Display required
+
   meta = with lib; {
     description = "A systray utility written in go, using json over stdio for control and events";
-    homepage    = "https://github.com/ssbc/systrayhelper";
+    homepage = "https://github.com/ssbc/systrayhelper";
     maintainers = with maintainers; [ cryptix ];
-    license     = licenses.mit;
+    license = licenses.mit;
     # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though
     # I hope nix can figure this out?! ¯\\_(ツ)_/¯
   };

pkgs/tools/networking/airgeddon/default.nix

@@ -24,7 +24,8 @@
 , util-linux
 , ccze
   # Optionals
-  # Missing in nixpkgs: beef, hostapd-wpe, asleap
+  # Missing in nixpkgs: beef, hostapd-wpe
+, asleap
 , bettercap
 , bully
 , crunch
@@ -84,6 +85,7 @@ let
     pixiewps
     reaverwps-t6x
   ] ++ lib.optionals supportHashCracking [
+    asleap
     crunch
     hashcat
     hcxdumptool
@@ -109,13 +111,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "airgeddon";
-  version = "11.02";
+  version = "11.10";
 
   src = fetchFromGitHub {
     owner = "v1s1t0r1sh3r3";
     repo = "airgeddon";
     rev = "v${version}";
-    hash = "sha256-k3xQndF1m3fnn7nCb2T/wGxbUPJ83wOV33Ky0FbToVg=";
+    hash = "sha256-0x13QmT61lcPc7b3OYs13g6AISWRipvxbSFb7XyQA5U=";
   };
 
   strictDeps = true;

pkgs/tools/networking/ngrok/versions.json

@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/fZXabEBxqTt/ngrok-v3-3.0.4-linux-386",
+    "url": "https://bin.equinox.io/a/26QHEgwoE5Z/ngrok-v3-3.1.0-linux-386",
-    "sha256": "94c106392171a537d45ff5db749ce064d721b7c2204c7c951b9e9bfd96fd41f5",
+    "sha256": "85f1da543cd77021862c757186220c414b849bb25a31c9e8cc280bc843bb3ba6",
-    "version": "3.0.4"
+    "version": "3.1.0"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/fydLsfbG16K/ngrok-v3-3.0.4-linux-amd64",
+    "url": "https://bin.equinox.io/a/7UAdGDeyg6i/ngrok-v3-3.1.0-linux-amd64",
-    "sha256": "1d93dfcbcf8f1be3a21460022b5644228f9dcc2e71012bd61fcfb39ddf2a7a89",
+    "sha256": "2f6d941d421987daa37fbf3c726d875c9e3ef1c2e26bbf452223d64c0d2b2adb",
-    "version": "3.0.4"
+    "version": "3.1.0"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/8Fzm6mvbW6H/ngrok-v3-3.0.4-linux-arm",
+    "url": "https://bin.equinox.io/a/hAZN7QUBMxw/ngrok-v3-3.1.0-linux-arm",
-    "sha256": "d9bf182808f254bea7f177f7dc814dbfa0f3a5ee2aea18cfabac7975a9c6397e",
+    "sha256": "27ace158cadd1e5e5c6e9b2f0652bdf7ab0d4cf39e3d9454fbefcc6c6ec03d56",
-    "version": "3.0.4"
+    "version": "3.1.0"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/NGErr1qsBJ/ngrok-v3-3.0.4-linux-arm64",
+    "url": "https://bin.equinox.io/a/5skoQje3DKb/ngrok-v3-3.1.0-linux-arm64",
-    "sha256": "26174fa2a0c22cf44fff118658348d6e4bfa8d60e4cfc092dedc4a0223427916",
+    "sha256": "668cc681c4d5bd6b4d205b8332091f8236575ebebd900b5ef9d273116471d820",
-    "version": "3.0.4"
+    "version": "3.1.0"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/RZEPEGHd2t/ngrok-v3-3.0.4-darwin-amd64",
+    "url": "https://bin.equinox.io/a/h7mizaTkyfP/ngrok-v3-3.1.0-darwin-amd64",
-    "sha256": "a7eca7635e6174174880a79d51e2d9c4ec32e15752751d5427f70ecf59f9f8e2",
+    "sha256": "5f607e9f3aa699ae4e85ceeb25c275d9e720614f457423bc4657b3f48168cfad",
-    "version": "3.0.4"
+    "version": "3.1.0"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/dxEFAXR7WZr/ngrok-v3-3.0.4-darwin-arm64",
+    "url": "https://bin.equinox.io/a/46gUrn19J7F/ngrok-v3-3.1.0-darwin-arm64",
-    "sha256": "6db91466407e9538a4f598cc362e8be292d4621f8b331e0d0818e1c672decc66",
+    "sha256": "0a2119d6ef9dcc0b6203d38b536483c417a59c355d505e92a4b6c7c96810ef4b",
-    "version": "3.0.4"
+    "version": "3.1.0"
   }
 }

pkgs/tools/networking/snabb/default.nix

@@ -1,51 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools
+{ lib
-,supportOpenstack ? true
+, stdenv
+, fetchFromGitHub
 }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   pname = "snabb";
-  version = "2019.11";
+  version = "2022.10";
 
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
     rev = "v${version}";
-    sha256 = "1sas9d9kk92mc2wrwgmm0xxz7ycmh388dwvyxf1hy183yvin1nac";
+    sha256 = "GIIW+2/1fuHTmYev/QvuO5Yb2ozbyw/45qQkym36US8=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
-
-  patchPhase = ''
-    patchShebangs .
-
-    # some hardcodeism
-    for f in $(find src/program/snabbnfv/ -type f); do
-      substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
-    done
-  '' + optionalString supportOpenstack ''
-    # We need a way to pass $PATH to the scripts
-    sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
-    sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
-  '';
-
-  preBuild = ''
-    make clean
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
     cp src/snabb $out/bin
   '';
 
-  # Dependencies are underspecified: "make -C src obj/arch/sse2_c.o" fails with
+  meta = {
-  # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
-  enableParallelBuilding = false;
-
-  meta =  {
     homepage = "https://github.com/SnabbCo/snabbswitch";
     description = "Simple and fast packet networking toolkit";
     longDescription = ''

pkgs/tools/security/opensc/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opensc";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "sha256-0IFpiG1SJq4cpS5z6kwpWSPVWjO0q0SHs+doD2vbUKs=";
+    sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k=";
   };
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];

pkgs/tools/text/miller/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "miller";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${version}";
-    sha256 = "sha256-nxkJfbZ5zdAKtmhZiWhTV0cU+qvqimOADC9T0r+1iS0=";
+    sha256 = "sha256-k/ibxJYgk3CT+/mYJ3DN9GatuiIgMPMs1+5cbCg4jxM=";
   };
 
-  vendorSha256 = "sha256-EF5hTtTGGOYg9TGIsR3UL2Sxc3FHGV2q5VNXlBNma/M=";
+  vendorSha256 = "sha256-UQHqDuQeXfmGrRYSbqW6lnBDVTgDJGhJWmH4kgPrggE=";
 
   subPackages = [ "cmd/mlr" ];
 

pkgs/top-level/all-packages.nix

@@ -778,6 +778,8 @@ with pkgs;
 
   pet = callPackage ../development/tools/pet { };
 
+  pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear {};
+
   pkger = callPackage ../development/libraries/pkger { };
 
   tapview = callPackage ../development/tools/tapview { };
@@ -1437,6 +1439,8 @@ with pkgs;
 
   spectre-cli = callPackage ../tools/security/spectre-cli { };
 
+  steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {};
+
   sx-go = callPackage ../tools/security/sx-go { };
 
   systeroid = callPackage ../tools/system/systeroid { };

pkgs/top-level/python-aliases.nix

@@ -107,6 +107,7 @@ mapAliases ({
   Keras = keras; # added 2021-11-25
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
+  logilab_common = logilab-common; # added 2022-11-21
   loo-py = loopy; # added 2022-05-03
   Markups = markups; # added 2022-02-14
   MechanicalSoup = mechanicalsoup; # added 2021-06-01

pkgs/top-level/python-packages.nix

@@ -5408,7 +5408,7 @@ self: super: with self; {
 
   logilab_astng = callPackage ../development/python-modules/logilab_astng { };
 
-  logilab_common = callPackage ../development/python-modules/logilab/common.nix { };
+  logilab-common = callPackage ../development/python-modules/logilab/common.nix { };
 
   logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { };