flake: Update flake.lock (#311)

* flake.lock: Update Flake lock file updates: • Updated input 'buildbot-nix': 'github:Mic92/buildbot-nix/0b56574a5c823097771487d1bac952c3549fe9fb?narHash=sha256-TGZthxgxLdT8boadFm6%2BMK7HZlIxN1u1V%2Bx3hu%2BFd8I%3D' (2024-07-01) → 'github:Mic92/buildbot-nix/d1d3746aa7111f0f8bb2e48d5da9995356170249?narHash=sha256-r6HiSdc2IhKfKoSixH5fBMx8hWO/eoSUJJM71aeDbkE%3D' (2024-07-06) • Updated input 'buildbot-nix/flake-parts': 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01) → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03) • Updated input 'buildbot-nix/treefmt-nix': 'github:numtide/treefmt-nix/065a23edceff48f948816b795ea8cc6c0dee7cdf?narHash=sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4%3D' (2024-06-24) → 'github:numtide/treefmt-nix/bdb6355009562d8f9313d9460c0d3860f525bc6c?narHash=sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII%2BXXHDHqek%3D' (2024-07-02) • Updated input 'dream2nix': 'github:nix-community/dream2nix/1b5e01219a32324c8f6889fe1f4db933ec7932f6?narHash=sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI%3D' (2024-06-29) → 'github:nix-community/dream2nix/11cfa4eeef9aea1a84a89336d2f92175156000d4?narHash=sha256-tQdxotaD6hnsP0f4Q9vqeljWatHX7AtUSKauSzwq8to%3D' (2024-07-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1e3deb3d8a86a870d925760db1a5adecc64d329d?narHash=sha256-vN5xJAZ4UGREEglh3lfbbkIj%2BMPEYMuqewMn4atZFaQ%3D' (2024-06-27) → 'github:NixOS/nixpkgs/ab82a9612aa45284d4adf69ee81871a389669a9e?narHash=sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ%3D' (2024-07-07) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/4a1e673523344f6ccc84b37f4413ad74ea19a119?narHash=sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo%3D' (2024-06-29) → 'github:NixOS/nixpkgs/7144d6241f02d171d25fba3edeaf15e0f2592105?narHash=sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL%2B%2BdvNjMp9I%3D' (2024-07-02) • Updated input 'sops-nix': 'github:Mic92/sops-nix/b5974d4331fb6c893e808977a2e1a6d34b3162d6?narHash=sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8%2BawNMyqs%3D' (2024-06-30) → 'github:Mic92/sops-nix/c184aca4db5d71c3db0c8cbfcaaec337a5d065ea?narHash=sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk%3D' (2024-07-07) * libeufin, taler-wallet-core: patch against python 3.12 * kikit: pin python to python311 * libresoc-nmigen: disable test paths with type errors * flake.lock: bump nixpkgs to f53f729e --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Weijia Wang <[email protected]>
ngi-nix · Jul 8, 2024 · 25285eb · 25285eb
1 parent 3756525
commit 25285eb
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 36 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/by-name/kikit/package.nix b/pkgs/by-name/kikit/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   pybars3,
-  python3,
+  python311,
   openscad,
   fetchFromGitHub,
   bats,
@@ -15,7 +15,11 @@
 
   properCaseName = "KiKit";
 
-  solidpython = callPackage ./solidpython {};
+  python3 = python311;
+
+  solidpython = callPackage ./solidpython {
+    inherit python3;
+  };
 in
   python3.pkgs.buildPythonPackage rec {
     pname = toLower properCaseName;
@@ -39,12 +43,12 @@ in
         markdown2
         commentjson
         # https://github.com/yaqwsx/KiKit/issues/575
-        wxPython_4_2
+        wxpython
         shapely
         pcbnew-transition
       ]
       ++ [
-        pybars3
+        (pybars3.override {inherit python3;})
         # https://github.com/yaqwsx/KiKit/issues/576
         solidpython
         openscad

diff --git a/pkgs/by-name/kikit/solidpython/default.nix b/pkgs/by-name/kikit/solidpython/default.nix
@@ -64,7 +64,7 @@ in
         setuptools
       ]
       ++ [
-        euclid3
+        (euclid3.override {inherit python3;})
         pypng
       ];
 

diff --git a/pkgs/by-name/libeufin/deps/default.nix b/pkgs/by-name/libeufin/deps/default.nix
@@ -34,13 +34,7 @@
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash =
-      {
-        aarch64-linux = "sha256-bP38VcA6HxgkuXUUiQxXiGBgk9A+/jcMlpK1Z1Edo/0=";
-        x86_64-linux = "sha256-ir5fC6EJKoyvyDsBLdKt/7Wb9nhVFWTW4XBUTYIJZy8=";
-      }
-      .${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+    outputHash = "sha256-ir5fC6EJKoyvyDsBLdKt/7Wb9nhVFWTW4XBUTYIJZy8=";
   };
   # For dependencies that are still missing, we fetch them individually from Maven
   artifactsMeta = import ./artifacts.nix;

diff --git a/pkgs/by-name/libeufin/package.nix b/pkgs/by-name/libeufin/package.nix
@@ -28,6 +28,7 @@
     '';
   };
   patches = [
+    ../taler-wallet-core/taler-python-3.12.patch
     # The .git folder had to be deleted. Read hash from file instead of using the git command.
     ./read-HEAD-hash-from-file.patch
     # Gradle projects provide a .module metadata file as artifact. This artifact is used by gradle

diff --git a/pkgs/by-name/libresoc-nmigen/soc.nix b/pkgs/by-name/libresoc-nmigen/soc.nix
@@ -62,7 +62,12 @@ python39Packages.buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    "unused_please_ignore_completely/" # ???
+    # ???
+    "unused_please_ignore_completely/"
+    # TypeError: __init__() missing 4 required positional arguments: 'fukls', 'iodef', 'funit', and 'bigendian'
+    "src/soc/fu/compunits/test/"
+    # TypeError: unsupported operand type(s) for -: 'Mock' and 'int'
+    "src/soc/fu/mmu/test/"
   ];
 
   pythonImportsCheck = ["soc"];

diff --git a/pkgs/by-name/pybars3/package.nix b/pkgs/by-name/pybars3/package.nix
@@ -19,8 +19,8 @@ in
       hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI=";
     };
 
-    propagatedBuildInputs = with python3.pkgs; [
-      pymeta3
+    propagatedBuildInputs = [
+      (pymeta3.override {inherit python3;})
     ];
 
     checkPhase = ''

diff --git a/pkgs/by-name/taler-wallet-core/package.nix b/pkgs/by-name/taler-wallet-core/package.nix
@@ -71,6 +71,10 @@ in
       git commit --allow-empty -m "Initial commit"
     '';
 
+    patches = [
+      ./taler-python-3.12.patch
+    ];
+
     postPatch = ''
       patchShebangs packages/*/*.mjs
       substituteInPlace pnpm-lock.yaml \

diff --git a/pkgs/by-name/taler-wallet-core/taler-python-3.12.patch b/pkgs/by-name/taler-wallet-core/taler-python-3.12.patch
@@ -0,0 +1,22 @@
+diff --git a/build-system/taler-build-scripts/talerbuildconfig.py b/build-system/taler-build-scripts/talerbuildconfig.py
+index 642bcbc..cb0133b 100644
+--- a/build-system/taler-build-scripts/talerbuildconfig.py
++++ b/build-system/taler-build-scripts/talerbuildconfig.py
+@@ -32,7 +32,7 @@ import os
+ import sys
+ import shlex
+ import logging
+-from distutils.spawn import find_executable
++from shutil import which
+ import subprocess
+ from dataclasses import dataclass
+ import semver
+@@ -179,7 +179,7 @@ class BuildConfig:
+
+
+ def existence(name):
+-    return find_executable(name) is not None
++    return which(name) is not None
+
+
+ class Option(Plugin):