update stuff to nim 2

huantianad · huantianad · commit a93efde0e64f · 2024-08-09T14:15:19.000-07:00
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   APP_NAME: "levelsync"
-  NIM_VERSION: '1.6.10'
+  NIM_VERSION: '2.0.8'
 
 jobs:
   build:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   APP_NAME: 'levelsync'
-  NIM_VERSION: '1.6.10'
+  NIM_VERSION: '2.0.8'
 
 jobs:
   dll:
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,56 +2,27 @@
   description = "test";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-
-    nimble.url = "github:nix-community/flake-nimble";
-    nimble.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, flake-utils, nixpkgs, nimble }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        someOverlay = self: super: {
-          nimPackages = super.nimPackages.overrideScope' (nself: nsuper: {
-            zippy = nsuper.zippy.overrideAttrs (attrs: {
-              # nativeBuildInputs = [ super.unzip ];
-              doCheck = false;
-            });
-            testutils = nsuper.testutils.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-            stew = nsuper.stew.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-            chronos = nsuper.chronos.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-            faststreams = nsuper.faststreams.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-            json_serialization  = nsuper.json_serialization.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-            chronicles  = nsuper.chronicles.overrideAttrs (attrs: {
-              doCheck = false;
-            });
-          });
-        };
-
+  outputs = {
+    self,
+    flake-utils,
+    nixpkgs,
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ nimble.overlay someOverlay ];
+          overlays = [];
         };
-      in
-      rec {
+      in {
         devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            nim
-            nimPackages.yaml
-            nimPackages.zippy
-            nimPackages.chronicles
-            sqlite
+          buildInputs = [
+            pkgs.nim2
+            pkgs.nimble
+            pkgs.sqlite
           ];
         };
       }
diff --git a/levelsync.nimble b/levelsync.nimble
@@ -10,7 +10,7 @@ bin           = @["levelsync"]
 
 # Dependencies
 
-requires "nim >= 1.6.4"
-requires "yaml >= 0.16.0"
-requires "zippy >= 0.9.8"
-requires "chronicles >= 0.10.2"
+requires "nim >= 2.0.8"
+requires "yaml >= 2.1.1"
+requires "zippy >= 0.10.15"
+requires "chronicles >= 0.10.3"
