bundler: 2.5.22 -> 2.6.2

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

@@ -206,6 +206,8 @@
 
   - `pytestFlagsArray` and `unittestFlagsArray` are kept for compatibility purposes. They continue to be Bash-expanded before concatenated. This compatibility layer will be removed in future releases.
 
+- The `haka` package and module has been removed because the package was broken and unmaintained for 9 years.
+
 - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package
   and `withGstreamer`/`withVlc` override options have been removed due to this.
 

nixos/modules/module-list.nix

@@ -1379,7 +1379,6 @@
   ./services/security/esdm.nix
   ./services/security/fail2ban.nix
   ./services/security/fprintd.nix
-  ./services/security/haka.nix
   ./services/security/haveged.nix
   ./services/security/hockeypuck.nix
   ./services/security/hologram-agent.nix

nixos/modules/rename.nix

@@ -292,6 +292,9 @@ in
       See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
       Please switch to a different implementation like kea or dnsmasq.
     '')
+    (mkRemovedOptionModule [ "services" "haka" ] ''
+      The corresponding package was broken and removed from nixpkgs.
+    '')
     (mkRemovedOptionModule [ "services" "tedicross" ] ''
       The corresponding package was broken and removed from nixpkgs.
     '')

pkgs/applications/networking/compactor/default.nix

@@ -5,7 +5,7 @@
   asciidoctor,
   autoreconfHook,
   pkg-config,
-  boost,
+  boost186,
   libctemplate,
   libmaxminddb,
   libpcap,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
   buildInputs = [
-    boost
+    boost186
     libctemplate
     libmaxminddb
     libpcap
@@ -69,8 +69,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-boost-libdir=${boost.out}/lib"
-    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost186.out}/lib"
+    "--with-boost=${boost186.dev}"
   ];
   enableParallelBuilding = true;
 

pkgs/applications/networking/mailreaders/astroid/default.nix

@@ -96,5 +96,7 @@ stdenv.mkDerivation rec {
     ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    # error: 'is_regular' was not declared in this scope
+    broken = true;
   };
 }

pkgs/applications/networking/sniffers/qtwirediff/default.nix

@@ -57,5 +57,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/aaptel/qtwirediff";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
+    # error: assignment of member 'trivial' in read-only object
+    broken = true;
   };
 }

pkgs/by-name/bu/bundler/package.nix

@@ -5,20 +5,28 @@
   writeScript,
   testers,
   bundler,
+  versionCheckHook,
 }:
 
 buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.5.22";
-  source.sha256 = "sha256-dj8w1ZjuWHQu6ikoWHVDXqciIY1N8UneNbzjfALOlo4=";
+  version = "2.6.2";
+  source.sha256 = "sha256-S4l1bhsFOQ/2eEkRGaEPCXOiBFzJ/LInsCqTlrKPfXQ=";
   dontPatchShebangs = true;
 
   postFixup = ''
-    sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle
+    substituteInPlace $out/bin/bundle --replace-fail "activate_bin_path" "bin_path"
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/bundler";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = writeScript "gem-update-script" ''
       #!/usr/bin/env nix-shell
@@ -36,12 +44,12 @@ buildRubyGem rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Manage your Ruby application's gem dependencies";
     homepage = "https://bundler.io";
     changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ anthonyroussel ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
     mainProgram = "bundler";
   };
 }

pkgs/by-name/ca/castget/package.nix

@@ -52,5 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [ doronbehar ];
     license = licenses.gpl2;
     platforms = platforms.linux;
+    # libxmlutil.c:51:12: error: implicit declaration of function ‘strtol’; did you mean ‘strtok’?
+    broken = true;
   };
 })

pkgs/by-name/ce/cewl/Gemfile.lock

@@ -1,22 +1,52 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    logger (1.6.6)
     mime (0.4.4)
-    mime-types (3.3.1)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_exiftool (2.10.2)
-    mini_portile2 (2.5.3)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    racc (1.5.2)
-    rexml (3.2.5)
-    rubyzip (2.3.2)
+    mime-types-data (3.2025.0304)
+    mini_exiftool (2.14.0)
+      ostruct (>= 0.6.0)
+      pstore (>= 0.1.3)
+    mini_portile2 (2.8.8)
+    nokogiri (1.18.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.18.3-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.3-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.3-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.3-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.3-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.3-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.3-x86_64-linux-musl)
+      racc (~> 1.4)
+    ostruct (0.6.1)
+    pstore (0.1.4)
+    racc (1.8.1)
+    rexml (3.4.1)
+    rubyzip (2.4.1)
     spider (0.5.4)
 
 PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
   ruby
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   mime
@@ -28,4 +58,4 @@ DEPENDENCIES
   spider
 
 BUNDLED WITH
-   2.1.4
+   2.6.2