Merge branch 'master' into staging-next

.github/workflows/manual-rendering.yml

@@ -44,6 +44,7 @@ jobs:
       - name: Compare DocBook and MD manuals
         id: check
         run: |
+          export NIX_PATH=nixpkgs=$(pwd)
           .github/workflows/compare-manuals.sh \
             docbook/share/doc/nixos/options.html \
             md/share/doc/nixos/options.html

nixos/modules/services/databases/influxdb.nix

@@ -96,10 +96,8 @@ let
     };
   } cfg.extraConfig;
 
-  configFile = pkgs.runCommandLocal "config.toml" {
-    nativeBuildInputs = [ pkgs.remarshal ];
-  } ''
-    remarshal -if json -of toml \
+  configFile = pkgs.runCommandLocal "config.toml" { } ''
+    ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \
       < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \
       > $out
   '';

nixos/modules/system/boot/luksroot.nix

@@ -148,6 +148,7 @@ let
            + optionalString dev.bypassWorkqueues " --perf-no_read_workqueue --perf-no_write_workqueue"
            + optionalString (dev.header != null) " --header=${dev.header}";
     cschange = "cryptsetup luksChangeKey ${dev.device} ${optionalString (dev.header != null) "--header=${dev.header}"}";
+    fido2luksCredentials = dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential;
   in ''
     # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g.
     # if on a USB drive.
@@ -417,7 +418,7 @@ let
     }
     ''}
 
-    ${optionalString (luks.fido2Support && (dev.fido2.credential != null)) ''
+    ${optionalString (luks.fido2Support && fido2luksCredentials != []) ''
 
     open_with_hardware() {
       local passsphrase
@@ -433,7 +434,7 @@ let
           echo "Please move your mouse to create needed randomness."
         ''}
           echo "Waiting for your FIDO2 device..."
-          fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
+          fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} "${builtins.concatStringsSep "," fido2luksCredentials}" --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
         if [ $? -ne 0 ]; then
           echo "No FIDO2 key found, falling back to normal open procedure"
           open_normally
@@ -444,7 +445,7 @@ let
     # commands to run right before we mount our device
     ${dev.preOpenCommands}
 
-    ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && (dev.fido2.credential != null)) then ''
+    ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && fido2luksCredentials != []) then ''
     open_with_hardware
     '' else ''
     open_normally
@@ -695,6 +696,17 @@ in
               description = lib.mdDoc "The FIDO2 credential ID.";
             };
 
+            credentials = mkOption {
+              default = [];
+              example = [ "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2" ];
+              type = types.listOf types.str;
+              description = lib.mdDoc ''
+                List of FIDO2 credential IDs.
+
+                Use this if you have multiple FIDO2 keys you want to use for the same luks device.
+              '';
+            };
+
             gracePeriod = mkOption {
               default = 10;
               type = types.int;

pkgs/applications/emulators/pcsx2/default.nix

@@ -33,6 +33,7 @@
 stdenv.mkDerivation rec {
   pname = "pcsx2";
   version = "1.7.3165";
+  # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "PCSX2";

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz",
-  "sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4",
-  "msg": "Update from Hackage at 2022-08-20T06:29:36Z"
+  "commit": "0fd2081c5296d9891054f8c742545d3871d76485",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fd2081c5296d9891054f8c742545d3871d76485.tar.gz",
+  "sha256": "1bxxlks9bjf9lmshlg8777j6h7gb5mpd9lxj97nkqh32gnlj8m38",
+  "msg": "Update from Hackage at 2022-08-28T23:15:42Z"
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -99,7 +99,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0p9qd7yasdji5kwxn4d0hrv9hnxbzfsczknldh8jav3ynhg8k6c9";
+      sha256 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -820,9 +820,9 @@ self: super: {
     testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
     testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
   }) (super.sensei.override {
-    hspec = self.hspec_2_10_0_1;
+    hspec = self.hspec_2_10_1;
     hspec-wai = super.hspec-wai.override {
-      hspec = self.hspec_2_10_0_1;
+      hspec = self.hspec_2_10_1;
     };
   });
 
@@ -1223,9 +1223,18 @@ self: super: {
 
   # The test suite depends on an impure cabal-install installation in
   # $HOME, which we don't have in our build sandbox.
-  cabal-install-parsers = dontCheck (super.cabal-install-parsers.override {
-    Cabal = self.Cabal_3_6_3_0;
-  });
+  # 2022-08-31: Jailbreak is done to allow aeson 2.0.*:
+  # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900
+  cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  }));
+  cabal-install-parsers_0_4_5 = doDistribute (
+    dontCheck (
+      super.cabal-install-parsers_0_4_5.override {
+        Cabal = self.Cabal_3_6_3_0;
+      }
+    )
+  );
 
   # 2022-03-12: Pick patches from master for compat with Stackage Nightly
   gitit = appendPatches [
@@ -1633,14 +1642,14 @@ self: super: {
   servant-openapi3 = dontCheck super.servant-openapi3;
 
   # Give hspec 2.10.* correct dependency versions without overrideScope
-  hspec_2_10_0_1 = doDistribute (super.hspec_2_10_0_1.override {
-    hspec-discover = self.hspec-discover_2_10_0_1;
-    hspec-core = self.hspec-core_2_10_0_1;
+  hspec_2_10_1 = doDistribute (super.hspec_2_10_1.override {
+    hspec-discover = self.hspec-discover_2_10_1;
+    hspec-core = self.hspec-core_2_10_1;
   });
-  hspec-discover_2_10_0_1 = super.hspec-discover_2_10_0_1.override {
+  hspec-discover_2_10_1 = super.hspec-discover_2_10_1.override {
     hspec-meta = self.hspec-meta_2_9_3;
   };
-  hspec-core_2_10_0_1 = super.hspec-core_2_10_0_1.override {
+  hspec-core_2_10_1 = super.hspec-core_2_10_1.override {
     hspec-meta = self.hspec-meta_2_9_3;
   };
 
@@ -2022,19 +2031,9 @@ self: super: {
   haskell-ci = super.haskell-ci.overrideScope (self: super: {
     Cabal = self.Cabal_3_6_3_0;
     ShellCheck = self.ShellCheck_0_7_2;
+    cabal-install-parsers = self.cabal-install-parsers_0_4_5;
   });
 
-  # Build haskell-ci from git repository
-  haskell-ci-unstable = overrideSrc rec {
-    version = "0.14.1-${builtins.substring 0 7 src.rev}";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell-CI";
-      repo = "haskell-ci";
-      rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";
-      sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";
-    };
-  } self.haskell-ci;
-
   large-hashable = lib.pipe (super.large-hashable.override {
     # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c
     utf8-light = null;
@@ -2186,7 +2185,19 @@ self: super: {
 
   # Fixes https://github.com/NixOS/nixpkgs/issues/140613
   # https://github.com/recursion-schemes/recursion-schemes/issues/128
-  recursion-schemes = appendPatch ./patches/recursion-schemes-128.patch super.recursion-schemes;
+  recursion-schemes = overrideCabal (drv: {
+    patches = drv.patches or [] ++ [
+      ./patches/recursion-schemes-128.patch
+    ];
+    # make sure line endings don't break the patch
+    prePatch = drv.prePatch or "" + ''
+      "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
+    '';
+  }) super.recursion-schemes;
+
+  # 2022-08-30 Too strict bounds on finite-typelits
+  # https://github.com/jumper149/blucontrol/issues/1
+  blucontrol = doJailbreak super.blucontrol;
 
   # Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release
   # Can't use fetchpatch as it required tweaking the line endings as the .cabal
@@ -2547,6 +2558,10 @@ self: super: {
     testTarget = "regex-tdfa-unittest";
   } super.regex-tdfa;
 
+  # 2022-09-01:
+  # Restrictive upper bound on base.
+  # Remove once version 1.* is released
+  monad-bayes = doJailbreak super.monad-bayes;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
   # We need to build purescript with these dependencies and thus also its reverse
   # dependencies to avoid version mismatches in their dependency closure.

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix

@@ -93,7 +93,8 @@ self: super: {
   time-compat = doJailbreak super.time-compat;
   http-media = unmarkBroken (doJailbreak super.http-media);
   servant-server = unmarkBroken (doJailbreak super.servant-server);
-  foundation = dontCheck super.foundation;
+  basement = doDistribute self.basement_0_0_14;
+  foundation = doDistribute (dontCheck self.foundation_0_0_28);
   vault = dontHaddock super.vault;
 
   # https://github.com/snapframework/snap-core/issues/288

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

@@ -87,7 +87,7 @@ self: super: {
   constraints = doJailbreak super.constraints;
   cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
   data-fix = doJailbreak super.data-fix;
-  dbus = self.dbus_1_2_25;
+  dbus = self.dbus_1_2_26;
   dec = doJailbreak super.dec;
   ed25519 = doJailbreak super.ed25519;
   ghc-byteorder = doJailbreak super.ghc-byteorder;
@@ -130,13 +130,27 @@ self: super: {
   retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
   singleton-bool = doJailbreak super.singleton-bool;
   servant = doJailbreak super.servant;
-  servant-auth = doJailbreak super.servant-auth;
   servant-swagger = doJailbreak super.servant-swagger;
+
+  # 2022-09-02: Too strict bounds on lens
+  # https://github.com/haskell-servant/servant/pull/1607/files
+  servant-docs = doJailbreak super.servant-docs;
+  servant-foreign = doJailbreak super.servant-foreign;
+  servant-auth = doJailbreak super.servant-auth;
+  servant-auth-docs = doJailbreak super.servant-auth-docs;
+  servant-auth-server = doJailbreak super.servant-auth-server;
   servant-auth-swagger = doJailbreak super.servant-auth-swagger;
+  # 2022-09-02: Too strict bounds on lens
+  # https://github.com/haskell-servant/servant-multipart/pull/64
+  servant-multipart = doJailbreak super.servant-multipart;
+  # 2022-09-02: Too strict bounds on lens
+  # https://github.com/GetShopTV/swagger2/pull/242
+  swagger2 = doJailbreak super.swagger2;
+
   shelly = doJailbreak super.shelly;
   splitmix = doJailbreak super.splitmix;
   tasty-hspec = doJailbreak super.tasty-hspec;
-  th-desugar = self.th-desugar_1_13_1;
+  th-desugar = self.th-desugar_1_14;
   time-compat = doJailbreak super.time-compat;
   tomland = doJailbreak super.tomland;
   type-equality = doJailbreak super.type-equality;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -70,6 +70,7 @@ broken-packages:
   - aeson-bson
   - aeson-decode
   - aeson-default
+  - aeson-dependent-sum
   - aeson-deriving
   - aeson-diff-generic
   - aeson-filthy
@@ -1144,6 +1145,7 @@ broken-packages:
   - djinn-th
   - dmcc
   - dmenu
+  - dns-patterns
   - dnsrbl
   - dnssd
   - dobutok
@@ -1344,7 +1346,6 @@ broken-packages:
   - etcd
   - ethereum-rlp
   - eurofxref
-  - evdev
   - eve
   - eved
   - event
@@ -2144,7 +2145,6 @@ broken-packages:
   - heterogeneous-list-literals
   - hetris
   - heukarya
-  - hevm
   - HExcel
   - hexchat
   - hexif
@@ -2421,6 +2421,7 @@ broken-packages:
   - hsns
   - hsntp
   - hs-openmoji-data
+  - hs-opentelemetry-instrumentation-hspec
   - hsoptions
   - hsoz
   - hsparql
@@ -2809,7 +2810,6 @@ broken-packages:
   - kd-tree
   - keccak
   - keera-hails-reactivevalues
-  - keid-render-basic
   - keid-ui-dearimgui
   - keiretsu
   - kempe
@@ -3273,7 +3273,6 @@ broken-packages:
   - monadacme
   - monad-atom
   - monad-atom-simple
-  - monad-bayes
   - monad-branch
   - MonadCatchIO-transformers
   - monad-choice
@@ -4069,6 +4068,7 @@ broken-packages:
   - proxy-mapping
   - psc-ide
   - pseudo-trie
+  - psx
   - PTQ
   - publicsuffix
   - publicsuffixlistcreate
@@ -5068,6 +5068,7 @@ broken-packages:
   - text-ascii
   - text-builder-linear
   - text-containers
+  - text-display
   - text-format-heavy
   - text-generic-pretty
   - text-icu-normalized
@@ -5198,6 +5199,7 @@ broken-packages:
   - tracetree
   - tracked-files
   - tracker
+  - trackit
   - traction
   - tracy
   - traildb

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -150,6 +150,9 @@ extra-packages:
   - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
   - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
   - brick == 0.70.*                     # 2022-08-13: needed by matterhorn-50200.17.0
+  - basement < 0.0.15                   # 2022-08-30: last version to support GHC < 8.10
+  - foundation < 0.0.29                 # 2022-08-30: last version to support GHC < 8.10
+  - cabal-install-parsers < 0.5         # 2022-08-31: required by haskell-ci 0.14.3
 
 package-maintainers:
   abbradar:
@@ -535,6 +538,8 @@ supported-platforms:
   dx9base:                                      [ platforms.windows ]
   dx9d3d:                                       [ platforms.windows ]
   dx9d3dx:                                      [ platforms.windows ]
+  evdev:                                        [ platforms.linux ]
+  evdev-streamly:                               [ platforms.linux ]
   geomancy:                                     [ platforms.x86 ] # x86 intrinsics
   gi-gtkosxapplication:                         [ platforms.darwin ]
   gtk-mac-integration:                          [ platforms.darwin ]

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml

@@ -1,4 +1,4 @@
-# Stackage LTS 19.19
+# Stackage LTS 19.20
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -13,11 +13,11 @@ default-package-overrides:
   - active ==0.2.0.15
   - ad ==4.5.2
   - ad-delcont ==0.3.0.0
-  - adjunctions ==4.4.1
+  - adjunctions ==4.4.2
   - adler32 ==0.1.2.0
   - advent-of-code-api ==0.2.8.1
-  - aern2-mp ==0.2.9.1
-  - aern2-real ==0.2.9.1
+  - aern2-mp ==0.2.10.0
+  - aern2-real ==0.2.10.0
   - aeson ==2.0.3.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.1
@@ -140,7 +140,7 @@ default-package-overrides:
   - base64-string ==0.2
   - base-compat ==0.11.2
   - base-compat-batteries ==0.11.2
-  - basement ==0.0.14
+  - basement ==0.0.15
   - base-orphans ==0.8.7
   - base-prelude ==1.6.1
   - base-unicode-symbols ==0.2.4.2
@@ -315,7 +315,7 @@ default-package-overrides:
   - charset ==0.3.9
   - charsetdetect-ae ==1.1.0.4
   - Chart ==1.9.4
-  - ChasingBottoms ==1.3.1.11
+  - ChasingBottoms ==1.3.1.12
   - cheapskate ==0.1.1.2
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -429,7 +429,7 @@ default-package-overrides:
   - convertible ==1.1.1.1
   - cookie ==0.4.5
   - copr-api ==0.1.0
-  - core-data ==0.3.4.0
+  - core-data ==0.3.6.0
   - core-program ==0.4.6.4
   - core-text ==0.3.8.0
   - countable ==1.0
@@ -604,7 +604,7 @@ default-package-overrides:
   - doctest-exitcode-stdio ==0.0
   - doctest-extract ==0.1
   - doctest-lib ==0.1
-  - doctest-parallel ==0.2.4
+  - doctest-parallel ==0.2.5
   - doldol ==0.4.1.2
   - do-list ==1.0.1
   - domain ==0.1.1.3
@@ -624,7 +624,7 @@ default-package-overrides:
   - drifter-sqlite ==0.1.0.0
   - dsp ==0.2.5.1
   - dual ==0.1.1.1
-  - dual-tree ==0.2.3.0
+  - dual-tree ==0.2.3.1
   - dublincore-xml-conduit ==0.1.0.2
   - dunai ==0.8.3
   - duration ==0.2.0.0
@@ -683,7 +683,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.12
-  - esqueleto ==3.5.6.1
+  - esqueleto ==3.5.7.0
   - essence-of-live-coding ==0.2.6
   - essence-of-live-coding-gloss ==0.2.6
   - essence-of-live-coding-pulse ==0.2.6
@@ -725,7 +725,7 @@ default-package-overrides:
   - fakedata-quickcheck ==0.2.0
   - fakefs ==0.3.0.2
   - fakepull ==0.3.0.2
-  - faktory ==1.1.2.2
+  - faktory ==1.1.2.3
   - fast-builder ==0.1.3.0
   - fast-logger ==3.1.1
   - fast-math ==1.0.2
@@ -754,7 +754,7 @@ default-package-overrides:
   - fin ==0.2.1
   - FindBin ==0.0.5
   - fingertree ==0.1.5.0
-  - finite-typelits ==0.1.4.2
+  - finite-typelits ==0.1.6.0
   - first-class-families ==0.8.0.1
   - first-class-patterns ==0.3.2.5
   - fitspec ==0.4.10
@@ -793,7 +793,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.1
   - formatting ==7.1.3
   - fortran-src ==0.9.0
-  - foundation ==0.0.28
+  - foundation ==0.0.29
   - fourmolu ==0.4.0.0
   - Frames ==0.7.3
   - free ==5.1.9
@@ -946,7 +946,7 @@ default-package-overrides:
   - graph-core ==0.3.0.0
   - graphite ==0.10.0.1
   - graphs ==0.7.2
-  - graphula ==2.0.1.1
+  - graphula ==2.0.2.1
   - graphviz ==2999.20.1.0
   - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.1
@@ -1122,7 +1122,7 @@ default-package-overrides:
   - hslua-core ==2.1.0
   - hslua-marshalling ==2.1.0
   - hslua-module-doclayout ==1.0.4
-  - hslua-module-path ==1.0.2
+  - hslua-module-path ==1.0.3
   - hslua-module-system ==1.0.2
   - hslua-module-text ==1.0.2
   - hslua-module-version ==1.0.2
@@ -1299,7 +1299,7 @@ default-package-overrides:
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
-  - io-streams ==1.5.2.1
+  - io-streams ==1.5.2.2
   - ip6addr ==1.0.3
   - iproute ==1.7.12
   - IPv6Addr ==2.0.5
@@ -1480,7 +1480,7 @@ default-package-overrides:
   - markdown ==0.1.17.5
   - markdown-unlit ==0.5.1
   - markov-chain ==0.0.3.4
-  - massiv ==1.0.1.1
+  - massiv ==1.0.2.0
   - massiv-io ==1.0.0.1
   - massiv-persist ==1.0.0.3
   - massiv-serialise ==1.0.0.2
@@ -1624,7 +1624,7 @@ default-package-overrides:
   - nano-erl ==0.1.0.1
   - NanoID ==3.2.1
   - nanospec ==0.2.2
-  - nanovg ==0.8.0.0
+  - nanovg ==0.8.1.0
   - nats ==1.1.2
   - natural-arithmetic ==0.1.3.0
   - natural-induction ==0.2.0.0
@@ -1953,7 +1953,7 @@ default-package-overrides:
   - pulse-simple ==0.1.14
   - pureMD5 ==2.1.4
   - purescript-bridge ==0.14.0.0
-  - pusher-http-haskell ==2.1.0.10
+  - pusher-http-haskell ==2.1.0.11
   - pvar ==1.0.0.0
   - PyF ==0.10.2.0
   - qchas ==1.1.0.1
@@ -2343,7 +2343,7 @@ default-package-overrides:
   - Stream ==0.4.7.2
   - streaming ==0.2.3.1
   - streaming-attoparsec ==1.0.0.1
-  - streaming-bytestring ==0.2.2
+  - streaming-bytestring ==0.2.3
   - streaming-cassava ==0.2.0.0
   - streaming-commons ==0.2.2.4
   - streamly ==0.8.1.1
@@ -2598,7 +2598,7 @@ default-package-overrides:
   - type-spec ==0.4.0.0
   - typography-geometry ==1.0.1.0
   - tz ==0.1.3.6
-  - tzdata ==0.2.20220810.0
+  - tzdata ==0.2.20220815.0
   - ua-parser ==0.7.7.0
   - uglymemo ==0.1.0.1
   - unagi-chan ==0.4.1.4
@@ -2840,7 +2840,7 @@ with-compiler: ghc-9.0.2
   - yesod-auth ==1.6.11
   - yesod-auth-basic ==0.1.0.3
   - yesod-auth-hashdb ==1.7.1.7
-  - yesod-auth-oauth2 ==0.7.0.1
+  - yesod-auth-oauth2 ==0.7.0.2
   - yesod-bin ==1.6.2.1
   - yesod-core ==1.6.24.0
   - yesod-eventsource ==1.6.0.1

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -1332,7 +1332,6 @@ dont-distribute-packages:
  - ethereum-client-haskell
  - ethereum-merkle-patricia-db
  - euphoria
- - evdev-streamly
  - eve-cli
  - event-monad
  - eventful-dynamodb
@@ -2184,6 +2183,7 @@ dont-distribute-packages:
  - hsx-jmacro
  - hsx-xhtml
  - html-kure
+ - html-parse-util
  - htoml-parse
  - hts
  - htsn-import

pkgs/development/haskell-modules/configuration-nix.nix

@@ -738,8 +738,10 @@ self: super: builtins.intersectAttrs super {
     '';
   }) super.haskell-language-server;
 
+  # NOTE: this patch updates the hevm code to work with the latest packages that broke the build
+  # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1
   # tests depend on a specific version of solc
-  hevm = dontCheck (doJailbreak super.hevm);
+  hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm);
 
   # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
   # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
@@ -980,6 +982,14 @@ self: super: builtins.intersectAttrs super {
     '';
   }) super.jacinda;
 
+  # Smoke test can't be executed in sandbox
+  # https://github.com/georgefst/evdev/issues/25
+  evdev = overrideCabal (drv: {
+    testFlags = drv.testFlags or [] ++ [
+      "-p" "!/Smoke/"
+    ];
+  }) super.evdev;
+
   # Tests assume dist-newstyle build directory is present
   cabal-hoogle = dontCheck super.cabal-hoogle;
 
@@ -1026,6 +1036,8 @@ self: super: builtins.intersectAttrs super {
     broken = false;
   }) super.cabal-install;
 
+  keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
+
 # haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
 } // pkgs.lib.mapAttrs
   (_: overrideCabal (drv: {

pkgs/development/haskell-modules/patches/hevm-update-deps.patch

@@ -0,0 +1,129 @@
+diff --git a/hevm.cabal b/hevm.cabal
+index cf36961e..3b31f595 100644
+--- a/hevm.cabal
++++ b/hevm.cabal
+@@ -71,6 +71,10 @@ library
+     -Wall -Wno-deprecations
+   extra-libraries:
+     secp256k1, ff
++  if os(darwin)
++     extra-libraries: c++
++  else
++     extra-libraries: stdc++
+   c-sources:
+     ethjet/tinykeccak.c, ethjet/ethjet.c
+   cxx-sources:
+@@ -88,7 +92,7 @@ library
+     transformers                      >= 0.5.6 && < 0.6,
+     tree-view                         >= 0.5 && < 0.6,
+     abstract-par                      >= 0.3.3 && < 0.4,
+-    aeson                             >= 1.5.6 && < 1.6,
++    aeson                             >= 2.0 && < 2.1,
+     bytestring                        >= 0.10.8 && < 0.11,
+     scientific                        >= 0.3.6 && < 0.4,
+     binary                            >= 0.8.6 && < 0.9,
+@@ -97,7 +101,7 @@ library
+     vector                            >= 0.12.1 && < 0.13,
+     ansi-wl-pprint                    >= 0.6.9 && < 0.7,
+     base16-bytestring                 >= 1.0.0 && < 2.0,
+-    brick                             >= 0.58 && < 0.63,
++    brick                             >= 0.58 && < 0.69,
+     megaparsec                        >= 9.0.0 && < 10.0,
+     mtl                               >= 2.2.2 && < 2.3,
+     directory                         >= 1.3.3 && < 1.4,
+@@ -105,13 +109,13 @@ library
+     vty                               >= 5.25.1 && < 5.34,
+     cereal                            >= 0.5.8 && < 0.6,
+     cryptonite                        >= 0.27 && <= 0.29,
+-    memory                            >= 0.14.18 && < 0.16,
++    memory                            >= 0.14.18 && < 0.20,
+     data-dword                        >= 0.3.1 && < 0.4,
+     fgl                               >= 5.7.0 && < 5.8,
+     free                              >= 5.1.3 && < 5.2,
+     haskeline                         >= 0.8.0 && < 0.9,
+     process                           >= 1.6.5 && < 1.7,
+-    lens                              >= 4.17.1 && < 4.20,
++    lens                              >= 4.17.1 && < 5.1,
+     lens-aeson                        >= 1.0.2 && < 1.2,
+     monad-par                         >= 0.3.5 && < 0.4,
+     multiset                          >= 0.3.4 && < 0.4,
+@@ -124,7 +128,6 @@ library
+     sbv                               >= 8.9,
+     semver-range                      >= 0.2.7 && < 0.3,
+     temporary                         >= 1.3 && < 1.4,
+-    text-format                       >= 0.3.2 && < 0.4,
+     witherable                        >= 0.3.5 && < 0.5,
+     wreq                              >= 0.5.3 && < 0.6,
+     regex-tdfa                        >= 1.2.3 && < 1.4,
+@@ -190,7 +193,6 @@ executable hevm
+     sbv,
+     temporary,
+     text,
+-    text-format,
+     unordered-containers,
+     vector,
+     vty
+diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs
+index b7d0f36b..4e9d6892 100644
+--- a/src/EVM/Solidity.hs
++++ b/src/EVM/Solidity.hs
+@@ -70,6 +70,7 @@ import Control.Monad
+ import Control.Lens         hiding (Indexed, (.=))
+ import qualified Data.String.Here as Here
+ import Data.Aeson hiding (json)
++import qualified Data.Aeson.KeyMap as KeyMap
+ import Data.Aeson.Types
+ import Data.Aeson.Lens
+ import Data.Scientific
+@@ -714,8 +715,8 @@ astIdMap = foldMap f
+     f :: Value -> Map Int Value
+     f (Array x) = foldMap f x
+     f v@(Object x) =
+-      let t = foldMap f (HMap.elems x)
+-      in case HMap.lookup "id" x of
++      let t = foldMap f (KeyMap.elems x)
++      in case KeyMap.lookup "id" x of
+         Nothing         -> t
+         Just (Number i) -> t <> Map.singleton (round i) v
+         Just _          -> t
+diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs
+index 5bbf1c03..b828098e 100644
+--- a/src/EVM/SymExec.hs
++++ b/src/EVM/SymExec.hs
+@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM ()
+
+ -- | Convenience functions for generating large symbolic byte strings
+ sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8])
+-sbytes32 = toBytes <$> freshVar_ @ (WordN 256)
+-sbytes128 = toBytes <$> freshVar_ @ (WordN 1024)
++sbytes32 = toBytes <$> freshVar_ @(WordN 256)
++sbytes128 = toBytes <$> freshVar_ @(WordN 1024)
+ sbytes256 = liftA2 (++) sbytes128 sbytes128
+ sbytes512 = liftA2 (++) sbytes256 sbytes256
+ sbytes1024 = liftA2 (++) sbytes512 sbytes512
+diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs
+index fdd2368d..1dc29e83 100644
+--- a/src/EVM/Types.hs
++++ b/src/EVM/Types.hs
+@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer)
+ readNull :: Read a => a -> String -> a
+ readNull x = fromMaybe x . Text.Read.readMaybe
+
+-wordField :: JSON.Object -> Text -> JSON.Parser W256
++wordField :: JSON.Object -> Key -> JSON.Parser W256
+ wordField x f = ((readNull 0) . Text.unpack)
+                   <$> (x .: f)
+
+-addrField :: JSON.Object -> Text -> JSON.Parser Addr
++addrField :: JSON.Object -> Key -> JSON.Parser Addr
+ addrField x f = (read . Text.unpack) <$> (x .: f)
+
+-addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr)
++addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr)
+ addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f)
+
+-dataField :: JSON.Object -> Text -> JSON.Parser ByteString
++dataField :: JSON.Object -> Key -> JSON.Parser ByteString
+ dataField x f = hexText <$> (x .: f)
+
+ toWord512 :: W256 -> Word512

pkgs/development/libraries/libixp/default.nix

@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc=";
   };
 
+  postPatch = lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace mk/ixp.mk \
+      --replace "©" "C "
+  '';
+
   postConfigure = ''
    sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
   '';
@@ -19,7 +24,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ txt2tags ];
 
   meta = {
-    broken = stdenv.isDarwin;
     homepage = "https://github.com/0intro/libixp";
     description = "Portable, simple C-language 9P client and server libary";
     maintainers = with lib.maintainers; [ kovirobi ];

pkgs/development/libraries/v8/default.nix

@@ -2,6 +2,8 @@
 , gn, ninja, python3, glib, pkg-config, icu
 , xcbuild, darwin
 , fetchpatch
+, llvmPackages
+, symlinkJoin
 }:
 
 # Use update.sh to update all checksums.
@@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
     touch build/config/gclient_args.gni
   '';
 
+  llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; };
+
   gnFlags = [
     "use_custom_libcxx=false"
     "is_clang=${lib.boolToString stdenv.cc.isClang}"
@@ -123,7 +127,8 @@ stdenv.mkDerivation rec {
     # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
     ''host_toolchain="//build/toolchain/linux/unbundle:default"''
     ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
-  ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
+  ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"''
+  ++ lib.optional stdenv.isDarwin ''use_lld=false'';
 
   NIX_CFLAGS_COMPILE = "-O2";
   FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
@@ -135,7 +140,7 @@ stdenv.mkDerivation rec {
     python3
   ] ++ lib.optionals stdenv.isDarwin [
     xcbuild
-    darwin.DarwinTools
+    llvmPackages.llvm
     python3.pkgs.setuptools
   ];
   buildInputs = [ glib icu ];
@@ -166,7 +171,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
     platforms = platforms.unix;
     license = licenses.bsd3;
-    # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076
-    broken = stdenv.isDarwin;
   };
 }

pkgs/development/python-modules/discogs-client/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "discogs-client";
-  version = "2.3.15";
+  version = "2.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "joalla";
     repo = "discogs_client";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-teI0sbvluwVFmEOL/V1zLNGFVbeM7QzZ9rCOl3+A+aY=";
+    sha256 = "sha256-gGAtRhAg/W0dREhCOmif1XlQ4gldIGQ2hIC8gzifRu8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/django-extensions/default.nix

@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "django-extensions";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-jibske9cnOn4FPAGNs2EU1w1huF4dNxHAnOzuKSj3/E=";
+    sha256 = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI=";
   };
 
   postPatch = ''

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "goodwe";
-  version = "0.2.19";
+  version = "0.2.20";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "marcelblijleven";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80=";
+    sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE=";
   };
 
   checkInputs = [

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

@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "mailchecker";
-  version = "5.0.0";
+  version = "5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38=";
+    hash = "sha256-fJoV/mNImdcTpJC6c2zmYWZCXlBWLOP+5W5Hsmw2yOQ=";
   };
 
   # Module has no tests

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

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "nextcord";
-  version = "2.1.0";
+  version = "2.2.0";
 
   format = "setuptools";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "nextcord";
     repo = "nextcord";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/M7Wyb1GW6LPWm41jVnhWA6+dyTrdLyJ6pfsMozw5xI=";
+    hash = "sha256-2VlmcldbW+BfQRzOjCsh6r29qzwD+SG8H8arbTDg94k=";
   };
 
   patches = [

pkgs/development/ruby-modules/gem-config/default.nix

@@ -361,6 +361,12 @@ in
     buildInputs = [ which v8 python2 ];
     buildFlags = [ "--with-system-v8=true" ];
     dontBuild = false;
+    # The gem includes broken symlinks which are ignored during unpacking, but
+    # then fail during build. Since the content is missing anyway, touching the
+    # files is enough to unblock the build.
+    preBuild = ''
+      touch vendor/depot_tools/cbuildbot vendor/depot_tools/chrome_set_ver vendor/depot_tools/cros_sdk
+    '';
     postPatch = ''
       substituteInPlace ext/libv8/extconf.rb \
         --replace "location = Libv8::Location::Vendor.new" \

pkgs/development/tools/build-managers/jam/default.nix

@@ -1,7 +1,9 @@
-{ lib, stdenv, fetchurl, bison, buildPackages }:
+{ lib, stdenv, fetchurl, bison, buildPackages, pkgsBuildTarget }:
 
 let
-  mkJam = { meta ? { }, ... } @ args: stdenv.mkDerivation (args // {
+  mkJam = { pname, version, src, meta ? { } }: stdenv.mkDerivation {
+    inherit pname version src;
+
     depsBuildBuild = [ buildPackages.stdenv.cc ];
     nativeBuildInputs = [ bison ];
 
@@ -10,6 +12,23 @@ let
       export AR="$AR rc"
     '';
 
+    # When cross-compiling, we need to set the preprocessor macros
+    # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the
+    # host platform. This looks a little ridiculous because the vast majority of
+    # build tools don't embed target-specific information into their binary, but
+    # in this case we behave more like a compiler than a make(1)-alike.
+    postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
+      cat >>jam.h <<EOF
+      #undef OSMAJOR
+      #undef OSMINOR
+      #undef OSPLAT
+      $(
+        ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h \
+          | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) '
+      )
+      EOF
+    '';
+
     LOCATE_TARGET = "bin.unix";
 
     buildPhase = ''
@@ -30,59 +49,67 @@ let
 
     enableParallelBuilding = true;
 
-    meta = with lib; meta // {
+    meta = with lib; {
       license = licenses.free;
       mainProgram = "jam";
       platforms = platforms.unix;
-    };
-  });
+    } // meta;
+  };
 in
 {
   jam = let
     pname = "jam";
     version = "2.6.1";
-  in mkJam {
-    inherit pname version;
 
-    src = fetchurl {
-      url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar";
-      sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
-    };
+    base = mkJam {
+      inherit pname version;
 
-    meta = with lib; {
-      description = "Just Another Make";
-      homepage = "https://www.perforce.com/resources/documentation/jam";
-      maintainers = with maintainers; [ impl orivej ];
+      src = fetchurl {
+        url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar";
+        sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
+      };
+
+      meta = with lib; {
+        description = "Just Another Make";
+        homepage = "https://www.perforce.com/resources/documentation/jam";
+        maintainers = with maintainers; [ impl orivej ];
+      };
     };
-  };
+  in base.overrideAttrs (oldAttrs: {
+    makeFlags = (oldAttrs.makeFlags or []) ++ [
+      "CC=${buildPackages.stdenv.cc.targetPrefix}cc"
+    ];
+  });
 
   ftjam = let
     pname = "ftjam";
     version = "2.5.2";
-  in mkJam {
-    inherit pname version;
 
-    src = fetchurl {
-      url = "https://downloads.sourceforge.net/project/freetype/${pname}/${version}/${pname}-${version}.tar.bz2";
-      hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM=";
+    base = mkJam {
+      inherit pname version;
+
+      src = fetchurl {
+        url = "https://downloads.sourceforge.net/project/freetype/${pname}/${version}/${pname}-${version}.tar.bz2";
+        hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM=";
+      };
+
+      meta = with lib; {
+        description = "FreeType's enhanced, backwards-compatible Jam clone";
+        homepage = "https://freetype.org/jam/";
+        maintainers = with maintainers; [ AndersonTorres impl ];
+      };
     };
-
-    postPatch = ''
+  in base.overrideAttrs (oldAttrs: {
+    postPatch = (oldAttrs.postPatch or "") + ''
       substituteInPlace Jamfile --replace strip ${stdenv.cc.targetPrefix}strip
     '';
 
     # Doesn't understand how to cross compile once bootstrapped, so we'll just
     # use the Makefile for the bootstrapping portion.
     configurePlatforms = [ "build" "target" ];
-    configureFlags = [
+    configureFlags = (oldAttrs.configureFlags or []) ++ [
       "CC=${buildPackages.stdenv.cc.targetPrefix}cc"
       "--host=${stdenv.buildPlatform.config}"
     ];
-
-    meta = with lib; {
-      description = "FreeType's enhanced, backwards-compatible Jam clone";
-      homepage = "https://freetype.org/jam/";
-      maintainers = with maintainers; [ AndersonTorres impl ];
-    };
-  };
+  });
 }

pkgs/development/tools/json2tsv/default.nix

@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "json2tsv";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz";
+    hash = "sha256-BOamDWszYDqKGdKOlAOLY7F9ScZaBJXNdhz38iYW3ps=";
+  };
+
+  postPatch = ''
+    substituteInPlace jaq --replace "json2tsv" "$out/bin/json2tsv"
+  '';
+
+  makeFlags = [ "RANLIB:=$(RANLIB)" ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "JSON to TSV converter";
+    homepage = "https://codemadness.org/json2tsv.html";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+  };
+}

pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch

@@ -1,19 +0,0 @@
-diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
-index 88632df..ba6cfa9 100644
---- a/scripts/genksyms/genksyms.c
-+++ b/scripts/genksyms/genksyms.c
-@@ -233,11 +233,11 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
- 		free_list(last_enum_expr, NULL);
- 		last_enum_expr = NULL;
- 		enum_counter = 0;
--		if (!name)
--			/* Anonymous enum definition, nothing more to do */
--			return NULL;
- 	}
- 
-+	if (!name)
-+		return NULL;
-+
- 	h = crc32(name) % HASH_BUCKETS;
- 	for (sym = symtab[h]; sym; sym = sym->hash_next) {
- 		if (map_to_ns(sym->type) == map_to_ns(type) &&

pkgs/os-specific/linux/kernel/mac-nvme-t2.patch

@@ -1,283 +0,0 @@
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index dd10cf78f2d3..8f006638452b 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -28,8 +28,8 @@
- #include "trace.h"
- #include "nvme.h"
- 
--#define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))
--#define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))
-+#define SQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_command))
-+#define CQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_completion))
- 
- #define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))
- 
-@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
- 
- static void nvme_free_queue(struct nvme_queue *nvmeq)
- {
--	dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth),
-+	dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq),
- 				(void *)nvmeq->cqes, nvmeq->cq_dma_addr);
- 	if (!nvmeq->sq_cmds)
- 		return;
- 
- 	if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) {
- 		pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev),
--				nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth));
-+				nvmeq->sq_cmds, SQ_SIZE(nvmeq));
- 	} else {
--		dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth),
-+		dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq),
- 				nvmeq->sq_cmds, nvmeq->sq_dma_addr);
- 	}
- }
-@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues,
- }
- 
- static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
--				int qid, int depth)
-+				int qid)
- {
- 	struct pci_dev *pdev = to_pci_dev(dev->dev);
- 
- 	if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) {
--		nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth));
-+		nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq));
- 		if (nvmeq->sq_cmds) {
- 			nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev,
- 							nvmeq->sq_cmds);
-@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
- 				return 0;
- 			}
- 
--			pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth));
-+			pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq));
- 		}
- 	}
- 
--	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth),
-+	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq),
- 				&nvmeq->sq_dma_addr, GFP_KERNEL);
- 	if (!nvmeq->sq_cmds)
- 		return -ENOMEM;
-@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
- 	if (dev->ctrl.queue_count > qid)
- 		return 0;
- 
--	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth),
-+	nvmeq->q_depth = depth;
-+	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq),
- 					 &nvmeq->cq_dma_addr, GFP_KERNEL);
- 	if (!nvmeq->cqes)
- 		goto free_nvmeq;
- 
--	if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth))
-+	if (nvme_alloc_sq_cmds(dev, nvmeq, qid))
- 		goto free_cqdma;
- 
- 	nvmeq->dev = dev;
-@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
- 	nvmeq->cq_head = 0;
- 	nvmeq->cq_phase = 1;
- 	nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];
--	nvmeq->q_depth = depth;
- 	nvmeq->qid = qid;
- 	dev->ctrl.queue_count++;
- 
- 	return 0;
- 
-  free_cqdma:
--	dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes,
--							nvmeq->cq_dma_addr);
-+	dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes,
-+			  nvmeq->cq_dma_addr);
-  free_nvmeq:
- 	return -ENOMEM;
- }
-@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid)
- 	nvmeq->cq_head = 0;
- 	nvmeq->cq_phase = 1;
- 	nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];
--	memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth));
-+	memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq));
- 	nvme_dbbuf_init(dev, nvmeq, qid);
- 	dev->online_queues++;
- 	wmb(); /* ensure the first interrupt sees the initialization */
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index cc09b81fc7f4..716ebe87a2b8 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
- 	ctrl->ctrl_config = NVME_CC_CSS_NVM;
- 	ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT;
- 	ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;
-+	/* Use default IOSQES. We'll update it later if needed */
- 	ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;
- 	ctrl->ctrl_config |= NVME_CC_ENABLE;
- 
-@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
- 		ctrl->hmmin = le32_to_cpu(id->hmmin);
- 		ctrl->hmminds = le32_to_cpu(id->hmminds);
- 		ctrl->hmmaxd = le16_to_cpu(id->hmmaxd);
-+
-+		/* Grab required IO queue size */
-+		ctrl->iosqes = id->sqes & 0xf;
-+		if (ctrl->iosqes < NVME_NVM_IOSQES) {
-+			dev_err(ctrl->device,
-+				"unsupported required IO queue size %d\n", ctrl->iosqes);
-+			ret = -EINVAL;
-+			goto out_free;
-+		}
-+		/*
-+		 * If our IO queue size isn't the default, update the setting
-+		 * in CC:IOSQES.
-+		 */
-+		if (ctrl->iosqes != NVME_NVM_IOSQES) {
-+			ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT);
-+			ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT;
-+			ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC,
-+						     ctrl->ctrl_config);
-+			if (ret) {
-+				dev_err(ctrl->device,
-+					"error updating CC register\n");
-+				goto out_free;
-+			}
-+		}
- 	}
- 
- 	ret = nvme_mpath_init(ctrl, id);
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 716a876119c8..34ef35fcd8a5 100644
---- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -244,6 +244,7 @@ struct nvme_ctrl {
- 	u32 hmmin;
- 	u32 hmminds;
- 	u16 hmmaxd;
-+	u8 iosqes;
- 
- 	/* Fabrics only */
- 	u16 sqsize;
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 8f006638452b..54b35ea4af88 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -28,7 +28,7 @@
- #include "trace.h"
- #include "nvme.h"
- 
--#define SQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_command))
-+#define SQ_SIZE(q)	((q)->q_depth << (q)->sqes)
- #define CQ_SIZE(q)	((q)->q_depth * sizeof(struct nvme_completion))
- 
- #define SGES_PER_PAGE	(PAGE_SIZE / sizeof(struct nvme_sgl_desc))
-@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl)
- struct nvme_queue {
- 	struct nvme_dev *dev;
- 	spinlock_t sq_lock;
--	struct nvme_command *sq_cmds;
-+	void *sq_cmds;
- 	 /* only used for poll queues: */
- 	spinlock_t cq_poll_lock ____cacheline_aligned_in_smp;
- 	volatile struct nvme_completion *cqes;
-@@ -178,6 +178,7 @@ struct nvme_queue {
- 	u16 last_cq_head;
- 	u16 qid;
- 	u8 cq_phase;
-+	u8 sqes;
- 	unsigned long flags;
- #define NVMEQ_ENABLED		0
- #define NVMEQ_SQ_CMB		1
-@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd,
- 			    bool write_sq)
- {
- 	spin_lock(&nvmeq->sq_lock);
--	memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd));
-+	memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes),
-+	       cmd, sizeof(*cmd));
- 	if (++nvmeq->sq_tail == nvmeq->q_depth)
- 		nvmeq->sq_tail = 0;
- 	nvme_write_sq_db(nvmeq, write_sq);
-@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth)
- 	if (dev->ctrl.queue_count > qid)
- 		return 0;
- 
-+	nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES;
- 	nvmeq->q_depth = depth;
- 	nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq),
- 					 &nvmeq->cq_dma_addr, GFP_KERNEL);
-diff --git a/include/linux/nvme.h b/include/linux/nvme.h
-index 01aa6a6c241d..7af18965fb57 100644
---- a/include/linux/nvme.h
-+++ b/include/linux/nvme.h
-@@ -141,6 +141,7 @@ enum {
-  * (In bytes and specified as a power of two (2^n)).
-  */
- #define NVME_NVM_IOSQES		6
-+#define NVME_NVM_ADMSQES	6
- #define NVME_NVM_IOCQES		4
- 
- enum {
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 716ebe87a2b8..480ea24d8cf4 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
- 		ctrl->hmmaxd = le16_to_cpu(id->hmmaxd);
- 
- 		/* Grab required IO queue size */
--		ctrl->iosqes = id->sqes & 0xf;
-+		if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES)
-+			ctrl->iosqes = 7;
-+		else
-+			ctrl->iosqes = id->sqes & 0xf;
- 		if (ctrl->iosqes < NVME_NVM_IOSQES) {
- 			dev_err(ctrl->device,
- 				"unsupported required IO queue size %d\n", ctrl->iosqes);
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 34ef35fcd8a5..b2a78d08b984 100644
---- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -92,6 +92,16 @@ enum nvme_quirks {
- 	 * Broken Write Zeroes.
- 	 */
- 	NVME_QUIRK_DISABLE_WRITE_ZEROES		= (1 << 9),
-+
-+	/*
-+	 * Use only one interrupt vector for all queues
-+	 */
-+	NVME_QUIRK_SINGLE_VECTOR		= (1 << 10),
-+
-+	/*
-+	 * Use non-standard 128 bytes SQEs.
-+	 */
-+	NVME_QUIRK_128_BYTES_SQES		= (1 << 11),
- };
- 
- /*
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 54b35ea4af88..ab2358137419 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues)
- 	dev->io_queues[HCTX_TYPE_DEFAULT] = 1;
- 	dev->io_queues[HCTX_TYPE_READ] = 0;
- 
-+	if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR)
-+		irq_queues = 1;
-+
- 	return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues,
- 			      PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd);
- }
-@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = {
- 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005),
-+		.driver_data = NVME_QUIRK_SINGLE_VECTOR |
-+				NVME_QUIRK_128_BYTES_SQES },
- 	{ 0, }
- };
- MODULE_DEVICE_TABLE(pci, nvme_id_table);

pkgs/os-specific/linux/kernel/p9-fixes.patch

@@ -1,85 +0,0 @@
-diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
---- a/fs/9p/vfs_inode.c
-+++ b/fs/9p/vfs_inode.c
-@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data)
- 
- 	if (v9inode->qid.type != st->qid.type)
- 		return 0;
-+
-+	if (v9inode->qid.path != st->qid.path)
-+		return 0;
- 	return 1;
- }
- 
-diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
---- a/fs/9p/vfs_inode_dotl.c
-+++ b/fs/9p/vfs_inode_dotl.c
-@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data)
- 
- 	if (v9inode->qid.type != st->qid.type)
- 		return 0;
-+
-+	if (v9inode->qid.path != st->qid.path)
-+		return 0;
- 	return 1;
- }
- 
-diff --git a/net/9p/client.c b/net/9p/client.c
-index 3ce672af1596..f1c8ad373f90 100644
---- a/net/9p/client.c
-+++ b/net/9p/client.c
-@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
- 	}
- again:
- 	/* Wait for the response */
--	err = wait_event_interruptible(*req->wq,
--				       req->status >= REQ_STATUS_RCVD);
-+	err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
- 
- 	/*
- 	 * Make sure our req is coherent with regard to updates in other
-diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
-index f24b25c25106..f3a4efcf1456 100644
---- a/net/9p/trans_virtio.c
-+++ b/net/9p/trans_virtio.c
-@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
- 		if (err == -ENOSPC) {
- 			chan->ring_bufs_avail = 0;
- 			spin_unlock_irqrestore(&chan->lock, flags);
--			err = wait_event_interruptible(*chan->vc_wq,
--							chan->ring_bufs_avail);
-+			err = wait_event_killable(*chan->vc_wq,
-+						  chan->ring_bufs_avail);
- 			if (err  == -ERESTARTSYS)
- 				return err;
- 
-@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
- 		 * Other zc request to finish here
- 		 */
- 		if (atomic_read(&vp_pinned) >= chan->p9_max_pages) {
--			err = wait_event_interruptible(vp_wq,
-+			err = wait_event_killable(vp_wq,
- 			      (atomic_read(&vp_pinned) < chan->p9_max_pages));
- 			if (err == -ERESTARTSYS)
- 				return err;
-@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
- 		if (err == -ENOSPC) {
- 			chan->ring_bufs_avail = 0;
- 			spin_unlock_irqrestore(&chan->lock, flags);
--			err = wait_event_interruptible(*chan->vc_wq,
--						       chan->ring_bufs_avail);
-+			err = wait_event_killable(*chan->vc_wq,
-+						  chan->ring_bufs_avail);
- 			if (err  == -ERESTARTSYS)
- 				goto err_out;
- 
-@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
- 	virtqueue_kick(chan->vq);
- 	spin_unlock_irqrestore(&chan->lock, flags);
- 	p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");
--	err = wait_event_interruptible(*req->wq,
--				       req->status >= REQ_STATUS_RCVD);
-+	err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
- 	/*
- 	 * Non kernel buffers are pinned, unpin them
- 	 */

pkgs/os-specific/linux/kernel/patches.nix

@@ -29,21 +29,11 @@
       patch = ./request-key-helper-updated.patch;
     };
 
-  p9_fixes =
-    { name = "p9-fixes";
-      patch = ./p9-fixes.patch;
-    };
-
   modinst_arg_list_too_long =
     { name = "modinst-arglist-too-long";
       patch = ./modinst-arg-list-too-long.patch;
     };
 
-  genksyms_fix_segfault =
-    { name = "genksyms-fix-segfault";
-      patch = ./genksyms-fix-segfault.patch;
-    };
-
   cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
 
   hardened = let
@@ -56,36 +46,6 @@
     patches = lib.importJSON ./hardened/patches.json;
   in lib.mapAttrs mkPatch patches;
 
-  # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6
-  iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec {
-    name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command";
-    patch = fetchpatch {
-      name = name + ".patch";
-      url = "https://bugzilla.kernel.org/attachment.cgi?id=260597";
-      sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr";
-    };
-  };
-
-  # https://github.com/NixOS/nixpkgs/issues/42755
-  xen-netfront_fix_mismatched_rtnl_unlock = rec {
-    name = "xen-netfront_fix_mismatched_rtnl_unlock";
-    patch = fetchpatch {
-      name = name + ".patch";
-      url = "https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch";
-      sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8";
-    };
-  };
-
-  # https://github.com/NixOS/nixpkgs/issues/42755
-  xen-netfront_update_features_after_registering_netdev = rec {
-    name = "xen-netfront_update_features_after_registering_netdev";
-    patch = fetchpatch {
-      name = name + ".patch";
-      url = "https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch";
-      sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
-    };
-  };
-
   # Adapted for Linux 5.4 from:
   # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45
   rtl8761b_support =
@@ -97,10 +57,4 @@
     name = "export-rt-sched-migrate";
     patch = ./export-rt-sched-migrate.patch;
   };
-
-  # patches from https://lkml.org/lkml/2019/7/15/1748
-  mac_nvme_t2 = rec {
-    name = "mac_nvme_t2";
-    patch = ./mac-nvme-t2.patch;
-  };
 }

pkgs/tools/package-management/nix-prefetch/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
+{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, makeWrapper, asciidoc
 , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
 , gnugrep, gnused, jq, nix }:
 
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     '';
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-prefetching-hash-key.patch";
+      url = "https://github.com/msteen/nix-prefetch/commit/877f80ac7e91d684857e2c940cdb3c423efa1833.patch";
+      hash = "sha256-nkVQ2c+zezPQBOCDeMg+GHW3uz9EBnHIT+ZafdC8nQQ=";
+    })
+  ];
+
   postPatch = ''
     lib=$out/lib/${pname}
 

pkgs/tools/security/echidna/default.nix

@@ -1,5 +1,4 @@
 { lib
-, fetchpatch
 , fetchFromGitHub
 # Haskell deps
 , mkDerivation, aeson, ansi-terminal, base, base16-bytestring, binary, brick
@@ -8,19 +7,24 @@
 , MonadRandom, mtl, optparse-applicative, process, random, stm, tasty
 , tasty-hunit, tasty-quickcheck, temporary, text, transformers , unix, unliftio
 , unliftio-core, unordered-containers, vector, vector-instances, vty
-, wl-pprint-annotated, word8, yaml , extra, ListLike, semver
+, wl-pprint-annotated, word8, yaml, extra, ListLike, semver
 }:
 mkDerivation rec {
   pname = "echidna";
-  version = "1.7.3";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "echidna";
     rev = "v${version}";
-    sha256 = "sha256-NkAAXYa1bbCNUO0eDM7LQbyC3//RRFAKmEHGH2Dhl/M=";
+    sha256 = "sha256-WmlQWgn4qfRmx3PdzY7wzT9AyU7Re2T1CWJ7yGjcVac=";
   };
 
+  # NOTE: echidna is behind with aeson because of hevm, this patch updates
+  # the code to work with the major aeson update that broke the build
+  # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1
+  patches = [ ./echidna-update-aeson.patch ];
+
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
@@ -51,4 +55,5 @@ mkDerivation rec {
   license = lib.licenses.agpl3Plus;
   maintainers = with lib.maintainers; [ arturcygan ];
   platforms = lib.platforms.unix;
+  mainProgram = "echidna-test";
 }

pkgs/tools/security/echidna/echidna-update-aeson.patch

@@ -0,0 +1,38 @@
+diff --git a/lib/Echidna/Config.hs b/lib/Echidna/Config.hs
+index f8d5777..3d761fe 100644
+--- a/lib/Echidna/Config.hs
++++ b/lib/Echidna/Config.hs
+@@ -13,8 +13,8 @@ import Control.Monad.State (StateT(..), runStateT)
+ import Control.Monad.Trans (lift)
+ import Data.Bool (bool)
+ import Data.Aeson
++import Data.Aeson.KeyMap (keys)
+ import Data.Has (Has(..))
+-import Data.HashMap.Strict (keys)
+ import Data.HashSet (fromList, insert, difference)
+ import Data.Maybe (fromMaybe)
+ import Data.Text (isPrefixOf)
+@@ -23,11 +23,13 @@ import EVM.Types (w256)
+ 
+ import qualified Control.Monad.Fail as M (MonadFail(..))
+ import qualified Data.ByteString as BS
++import qualified Data.Aeson.Key as Key
++import qualified Data.HashSet as HS
+ import qualified Data.List.NonEmpty as NE
+ import qualified Data.Yaml as Y
+ 
+ import Echidna.Test
+-import Echidna.Types.Campaign 
++import Echidna.Types.Campaign
+ import Echidna.Mutator.Corpus (defaultMutationConsts)
+ import Echidna.Types.Config (EConfigWithUsage(..), EConfig(..))
+ import Echidna.Types.Solidity
+@@ -52,7 +54,7 @@ instance FromJSON EConfigWithUsage where
+                   _        -> mempty
+     (c, ks) <- runStateT (parser v') $ fromList []
+     let found = fromList (keys v')
+-    return $ EConfigWithUsage c (found `difference` ks) (ks `difference` found)
++    return $ EConfigWithUsage c (HS.map Key.toText $ found `difference` ks) (HS.map Key.toText $ ks `difference` found)
+     -- this parser runs in StateT and comes equipped with the following
+     -- equivalent unary operators:
+     -- x .:? k (Parser) <==> x ..:? k (StateT)

pkgs/top-level/all-packages.nix

@@ -15394,8 +15394,6 @@ with pkgs;
     inherit (darwin) libobjc;
   };
   defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
-    # recent v8 doesn't build on nixpkgs Darwin yet. https://github.com/NixOS/nixpkgs/issues/158076
-    v8 = if stdenv.isDarwin then v8_8_x else v8;
     inherit (darwin) DarwinTools cctools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -16781,7 +16779,6 @@ with pkgs;
   msitools = callPackage ../development/tools/misc/msitools { };
 
   haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci;
-  haskell-ci-unstable = lowPrio (haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci-unstable);
 
   neoload = callPackage ../development/tools/neoload {
     licenseAccepted = (config.neoload.accept_license or false);
@@ -19002,6 +18999,8 @@ with pkgs;
 
   json2hcl = callPackage ../development/tools/json2hcl { };
 
+  json2tsv = callPackage ../development/tools/json2tsv { };
+
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
   json-glib = callPackage ../development/libraries/json-glib { };
@@ -22015,7 +22014,7 @@ with pkgs;
 
   ucommon = callPackage ../development/libraries/ucommon { };
 
-  v8 = callPackage ../development/libraries/v8 { };
+  v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { };
 
   v8_8_x = callPackage ../development/libraries/v8/8_x.nix { };
 

pkgs/top-level/beam-packages.nix

@@ -1,57 +1,65 @@
-{ beam, callPackage, wxGTK30, buildPackages, stdenv
+{ beam
+, callPackage
 , openssl_1_1
+, wxGTK30
+, buildPackages
+, stdenv
 , wxSupport ? true
 , systemdSupport ? stdenv.isLinux
 }:
 
-with beam; {
-  lib = callPackage ../development/beam-modules/lib.nix { };
+let
+  self = beam;
+in
+
+{
+  beamLib = callPackage ../development/beam-modules/lib.nix { };
 
   # R24 is the default version.
   # The main switch to change default Erlang version.
   defaultVersion = "erlangR24";
 
   # Each
-  interpreters = with beam.interpreters; {
+  interpreters = {
 
-    erlang = beam.interpreters.${defaultVersion};
-    erlang_odbc = beam.interpreters."${defaultVersion}_odbc";
-    erlang_javac = beam.interpreters."${defaultVersion}_javac";
-    erlang_odbc_javac = beam.interpreters."${defaultVersion}_odbc_javac";
+    erlang = self.interpreters.${self.defaultVersion};
+    erlang_odbc = self.interpreters."${self.defaultVersion}_odbc";
+    erlang_javac = self.interpreters."${self.defaultVersion}_javac";
+    erlang_odbc_javac = self.interpreters."${self.defaultVersion}_odbc_javac";
 
     # Standard Erlang versions, using the generic builder.
 
     # R25
-    erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix {
+    erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix {
       wxGTK = wxGTK30;
       parallelBuild = true;
       autoconf = buildPackages.autoconf269;
       inherit wxSupport systemdSupport;
     };
-    erlangR25_odbc = erlangR25.override { odbcSupport = true; };
-    erlangR25_javac = erlangR25.override { javacSupport = true; };
-    erlangR25_odbc_javac = erlangR25.override {
+    erlangR25_odbc = self.interpreters.erlangR25.override { odbcSupport = true; };
+    erlangR25_javac = self.interpreters.erlangR25.override { javacSupport = true; };
+    erlangR25_odbc_javac = self.interpreters.erlangR25.override {
       javacSupport = true;
       odbcSupport = true;
     };
 
     # R24
-    erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
+    erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix {
       wxGTK = wxGTK30;
       # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
       parallelBuild = true;
       autoconf = buildPackages.autoconf269;
       inherit wxSupport systemdSupport;
     };
-    erlangR24_odbc = erlangR24.override { odbcSupport = true; };
-    erlangR24_javac = erlangR24.override { javacSupport = true; };
-    erlangR24_odbc_javac = erlangR24.override {
+    erlangR24_odbc = self.interpreters.erlangR24.override { odbcSupport = true; };
+    erlangR24_javac = self.interpreters.erlangR24.override { javacSupport = true; };
+    erlangR24_odbc_javac = self.interpreters.erlangR24.override {
       javacSupport = true;
       odbcSupport = true;
     };
 
     # R23
-    erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
+    erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix {
       openssl = openssl_1_1;
       wxGTK = wxGTK30;
       # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
@@ -59,15 +67,15 @@ with beam; {
       autoconf = buildPackages.autoconf269;
       inherit wxSupport systemdSupport;
     };
-    erlangR23_odbc = erlangR23.override { odbcSupport = true; };
-    erlangR23_javac = erlangR23.override { javacSupport = true; };
-    erlangR23_odbc_javac = erlangR23.override {
+    erlangR23_odbc = self.interpreters.erlangR23.override { odbcSupport = true; };
+    erlangR23_javac = self.interpreters.erlangR23.override { javacSupport = true; };
+    erlangR23_odbc_javac = self.interpreters.erlangR23.override {
       javacSupport = true;
       odbcSupport = true;
     };
 
     # R22
-    erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
+    erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix {
       openssl = openssl_1_1;
       wxGTK = wxGTK30;
       # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
@@ -75,23 +83,23 @@ with beam; {
       autoconf = buildPackages.autoconf269;
       inherit wxSupport systemdSupport;
     };
-    erlangR22_odbc = erlangR22.override { odbcSupport = true; };
-    erlangR22_javac = erlangR22.override { javacSupport = true; };
-    erlangR22_odbc_javac = erlangR22.override {
+    erlangR22_odbc = self.interpreters.erlangR22.override { odbcSupport = true; };
+    erlangR22_javac = self.interpreters.erlangR22.override { javacSupport = true; };
+    erlangR22_odbc_javac = self.interpreters.erlangR22.override {
       javacSupport = true;
       odbcSupport = true;
     };
 
     # R21
-    erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
+    erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix {
       openssl = openssl_1_1;
       wxGTK = wxGTK30;
       autoconf = buildPackages.autoconf269;
       inherit wxSupport systemdSupport;
     };
-    erlangR21_odbc = erlangR21.override { odbcSupport = true; };
-    erlangR21_javac = erlangR21.override { javacSupport = true; };
-    erlangR21_odbc_javac = erlangR21.override {
+    erlangR21_odbc = self.interpreters.erlangR21.override { odbcSupport = true; };
+    erlangR21_javac = self.interpreters.erlangR21.override { javacSupport = true; };
+    erlangR21_odbc_javac = self.interpreters.erlangR21.override {
       javacSupport = true;
       odbcSupport = true;
     };
@@ -99,10 +107,10 @@ with beam; {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR24.elixir`.
-    inherit (packages.erlang)
+    inherit (self.packages.erlang)
       elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_ls;
 
-    inherit (packages.erlang) lfe lfe_1_3;
+    inherit (self.packages.erlang) lfe lfe_1_3;
   };
 
   # Helper function to generate package set with a specific Erlang version.
@@ -113,12 +121,12 @@ with beam; {
   # appropriate Erlang/OTP version.
   packages = {
     # Packages built with default Erlang version.
-    erlang = packages.${defaultVersion};
+    erlang = self.packages.${self.defaultVersion};
 
-    erlangR25 = packagesWith interpreters.erlangR25;
-    erlangR24 = packagesWith interpreters.erlangR24;
-    erlangR23 = packagesWith interpreters.erlangR23;
-    erlangR22 = packagesWith interpreters.erlangR22;
-    erlangR21 = packagesWith interpreters.erlangR21;
+    erlangR25 = self.packagesWith self.interpreters.erlangR25;
+    erlangR24 = self.packagesWith self.interpreters.erlangR24;
+    erlangR23 = self.packagesWith self.interpreters.erlangR23;
+    erlangR22 = self.packagesWith self.interpreters.erlangR22;
+    erlangR21 = self.packagesWith self.interpreters.erlangR21;
   };
 }