Merge master into staging-next

pkgs/by-name/fs/fstrm/package.nix

@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE=";
   };
 
   outputs = [
@@ -34,16 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ];
 
-  strictDeps = true;
-
   preBuild = ''
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${openssl}/lib"
   '';
 
   doCheck = true;
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Frame Streams implementation in C";
     homepage = "https://github.com/farsightsec/fstrm";

pkgs/by-name/li/libressl/default.nix

@@ -70,7 +70,7 @@ let
         # missing a .note.GNU-stack section. An executable stack is dangerous
         # and unintentional, but without this check the derivation will build
         # and even run if W^X is not enforced; it would fail dangerously.
-        $OBJDUMP -p **/*.so | awk '
+        objdump -p **/*.so | awk '
           BEGIN { res = 0 }
           /file format/ { file = $1 }
           /STACK/ { stack = 1; next }

pkgs/by-name/qe/qemu/package.nix

@@ -140,11 +140,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString nixosTestRunner "-for-vm-tests"
     + lib.optionalString toolsOnly "-utils"
     + lib.optionalString userOnly "-user";
-  version = "11.1.1";
+  version = "11.1.0";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-B5/7/4pxEbvIkCIQfLq/O7/WFNX8nXzGdZkRlqyhJII=";
+    hash = "sha256-buHRph9oISR2snEIwm2l9EncCbYm1C+CeboNwuCPqFg=";
   };
 
   depsBuildBuild = [

pkgs/by-name/ty/ty/package.nix

@@ -17,7 +17,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.81";
+  version = "0.0.80";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-5jTSF3Fb/mwelgeSlSoYRynII20TuF77DER1WeO38sQ=";
+    hash = "sha256-Fr806UFsB9zLUsqjSeg31x2Gs5sl1G3QNLSLuolb0HI=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-EPVKH8i9fNk9dqEMW/ToN70TqvmzTX6zdgLkWtBf4bA=";
+  cargoHash = "sha256-pPILCWR81PQQrpq6PyFs4z8tQBHhg+WAqthAsfLbMIo=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];