From d9d1e233da515db87f9afae8785cbdc227629f2c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 6 Jan 2025 17:15:33 +0100
Subject: [PATCH 1/3] isa-l: move to by-name

---
 .../isa-l/default.nix => by-name/is/isa-l/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/isa-l/default.nix => by-name/is/isa-l/package.nix} (100%)

diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/by-name/is/isa-l/package.nix
similarity index 100%
rename from pkgs/development/libraries/isa-l/default.nix
rename to pkgs/by-name/is/isa-l/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd1a3db79f56..83f47ba2fc8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8679,8 +8679,6 @@ with pkgs;
 
   hci = callPackage ../development/tools/continuous-integration/hci { };
 
-  isa-l = callPackage ../development/libraries/isa-l { };
-
   niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv);
 
   ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);

From 42b3d30e318e2c8670cb96bc1cf965d576b24487 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 6 Jan 2025 17:17:23 +0100
Subject: [PATCH 2/3] isa-l: 2.31.0-unstable-2024-04-25 -> 2.31.1

Diff:
https://github.com/intel/isa-l/compare/dbaf284e112bea1b90983772a3164e794b923aaf...v2.31.1

Changelog: https://github.com/intel/isa-l/releases/tag/v2.31.1
---
 pkgs/by-name/is/isa-l/package.nix | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix
index ea4a682f05f6..587ba745ad97 100644
--- a/pkgs/by-name/is/isa-l/package.nix
+++ b/pkgs/by-name/is/isa-l/package.nix
@@ -2,21 +2,29 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  runCommand,
-  autoreconfHook,
-  nix,
+
+  # nativeBuildInputs
   nasm,
+  autoreconfHook,
+
+  versionCheckHook,
+
+  # passthru
+  runCommand,
+  nix,
+  pkgs,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "isa-l";
-  version = "2.31.0-unstable-2024-04-25";
+  version = "2.31.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "isa-l";
-    rev = "dbaf284e112bea1b90983772a3164e794b923aaf";
-    sha256 = "sha256-eM1K3uObb4eZq0nSfafltp5DuZIDwknUYj9CdLn14lY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pv0Aq1Yp/NkGN7KXJ4oQMSG36k5v9YnsELuATl86Zp4=";
   };
 
   nativeBuildInputs = [
@@ -28,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     export AS=nasm
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/igzip";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru = {
     tests = {
       igzip =
@@ -42,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
                   nativeBuildInputs = [ nix ];
                 }
                 ''
-                  nix nar --extra-experimental-features nix-command pack ${../../../../lib} > "$out"
+                  nix nar --extra-experimental-features nix-command pack ${pkgs.path + "/lib"} > "$out"
                 '';
             meta = {
               description = "Cross validation of igzip provided by isa-l with gzip";
@@ -68,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
             touch "$out"
           '';
     };
+    updateScript = gitUpdater { rev-prefix = "v"; };
   };
 
   meta = {
@@ -75,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "igzip";
     license = lib.licenses.bsd3;
     homepage = "https://github.com/intel/isa-l";
+    changelog = "https://github.com/intel/isa-l/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.all;
   };

From d230a4e059c38b05dc46aeb18a0dd4bbcab436cb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 7 Jan 2025 08:51:26 +0100
Subject: [PATCH 3/3] isa-l: mark as broken on aarch64-darwin

---
 pkgs/by-name/is/isa-l/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix
index 587ba745ad97..29248952f91b 100644
--- a/pkgs/by-name/is/isa-l/package.nix
+++ b/pkgs/by-name/is/isa-l/package.nix
@@ -94,5 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/intel/isa-l/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.all;
+    badPlatforms = [
+      # <instantiation>:4:26: error: unexpected token in argument list
+      #  movk x7, p4_low_b1, lsl 16
+      "aarch64-darwin"
+    ];
   };
 })