diff --git a/flake.lock b/flake.lock index 94b0e1f..a702c53 100644 --- a/flake.lock +++ b/flake.lock @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1725469705, - "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=", + "lastModified": 1731683943, + "narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=", "owner": "daylinmorgan", "repo": "nim2nix", - "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663", + "rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7", "type": "github" }, "original": { diff --git a/lib/default.nix b/lib/default.nix index b5e2d8b..b9b42c7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -43,10 +43,7 @@ let rec { default = oizys; oizys = pkgs.callPackage ../pkgs/oizys { }; - # nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { }; - nph = pkgs.callPackage ../pkgs/nph { }; iso = mkIso.config.system.build.isoImage; - # roc = (pkgsFromSystem pkgs.system "roc").full; } // (inheritFlakePkgs pkgs [ "pixi" diff --git a/pkgs/default.nix b/pkgs/default.nix index dc28975..e2dd876 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,7 +4,7 @@ { # nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/ # nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; - # nimble = pkgs.callPackage ./nim/nimble { }; + nimble = pkgs.callPackage ./nim/nimble { }; distrobox = pkgs.callPackage ./distrobox {}; llm = python3Packages.callPackage ./llm {}; llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 {}; diff --git a/pkgs/nim/nimble/default.nix b/pkgs/nim/nimble/default.nix index bc78c03..18fc594 100644 --- a/pkgs/nim/nimble/default.nix +++ b/pkgs/nim/nimble/default.nix @@ -7,14 +7,19 @@ }: buildNimPackage (finalAttrs: { pname = "nimble"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v${finalAttrs.version}"; - hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us="; + hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw="; + fetchSubmodules = true; }; buildInputs = [ openssl ]; - lockFile = ./lock.json; doCheck = false; + + # localPassC needed from zippy since name mangling on nix is broken + nimFlags = [ + ''--passC:"-msse4.1 -mpclmul"'' + ]; }) diff --git a/pkgs/nim/nimble/lock.json b/pkgs/nim/nimble/lock.json deleted file mode 100644 index 14fde9f..0000000 --- a/pkgs/nim/nimble/lock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "depends": [ - { - "method": "fetchzip", - "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source", - "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0", - "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615", - "srcDir": "src", - "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz", - "subDir": "", - "packages": [ - "checksums" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source", - "rev": "faf1617f44d7632ee9601ebc13887644925dcc01", - "sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4", - "srcDir": "src", - "url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz", - "subDir": "", - "packages": [ - "sat" - ] - } - ] -}