diff --git a/flake.lock b/flake.lock index 363b893..522b9f2 100644 --- a/flake.lock +++ b/flake.lock @@ -20,18 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686968143, - "narHash": "sha256-NkXmT9ArJBeu56jo/agURQ1pvqrx0nUHi30yM7sttK8=", + "lastModified": 1690860117, + "narHash": "sha256-srkCfjMlg777HxDVMfhkIFgRhhtuZjIOIyR2ejLYK+Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56799517d0537a6f3e91a5171af8c4bfd82c092e", + "rev": "96d403ee2479f2070050353b94808209f1352edb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { @@ -48,11 +46,11 @@ ] }, "locked": { - "lastModified": 1686968542, - "narHash": "sha256-Gjlj7UeHqMFRAYyefeoLnSjLo8V+0XheIamojNEyTbE=", + "lastModified": 1690856601, + "narHash": "sha256-OP1w4rwMJscne5ckSfzOjXXQTPzAWM3Mkm4wRmHwCh8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01d84cd842e48e89be67e4c2d9dc46aa7709adc5", + "rev": "657d170ebe594da9fa32797e38704d45732d0c72", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e6233ef..9851a2b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Syndicate utilities"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; rust = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,8 +28,29 @@ nimPackages = prev.nimPackages.overrideScope' (final': prev': { noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { }; - preserves = final'.callPackage ./packages/preserves-nim { }; - syndicate = final'.callPackage ./packages/syndicate-nim { }; + + preserves = prev'.preserves.overrideAttrs (f: p: { + version = "20230801"; + src = prev.fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "preserves-nim"; + rev = f.version; + sha256 = "sha256-60QsbXMYYfEWvXQAXu7XSpvg2J9YaGKDkDrfclcK6pc="; + }; + }); + + syndicate = prev'.syndicate.overrideAttrs (f: p: { + version = "20230801"; + src = prev.fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "syndicate-nim"; + rev = f.version; + hash = "sha256-/mZGWVdQ5FtZf2snPIjTG2tNFVzxQmxvkKuLCAGARYs="; + }; + }); + syndicate_utils = final'.callPackage ./packages/syndicate_utils-nim { }; syndicated-open = final'.callPackage ./packages/syndicated-open { }; diff --git a/packages/preserves-nim/default.nix b/packages/preserves-nim/default.nix deleted file mode 100644 index 580625f..0000000 --- a/packages/preserves-nim/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildNimPackage, fetchFromGitea, fetchFromGitHub, runCommand -, nim-unwrapped, preserves }: - -let - compiler = runCommand "compiler.nimble" { inherit (nim-unwrapped) src; } '' - mkdir -p $out - tar xf $src --strip-components=1 -C $out - ''; - - npeg = fetchFromGitHub { - owner = "zevv"; - repo = "npeg"; - rev = "1.2.1"; - hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y="; - }; - -in buildNimPackage rec { - pname = "preserves"; - version = "20230530"; - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "${pname}-nim"; - rev = version; - sha256 = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY="; - }; - - propagatedBuildInputs = [ compiler npeg ]; - propagatedNativeBuildInputs = - lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) preserves; - # propagate the utilities of this package for this build platform - preConfigure = "substituteInPlace preserves.nimble --replace '# bin ' 'bin '"; - - postInstall = '' - pushd $out/bin - for link in preserves_decode preserves_from_json preserves_to_json; - do ln -s preserves_encode $link - done - popd - ''; - doCheck = true; - - meta = src.meta // { - maintainers = [ lib.maintainers.ehmry ]; - license = lib.licenses.unlicense; - }; -} diff --git a/packages/syndicate-nim/default.nix b/packages/syndicate-nim/default.nix deleted file mode 100644 index c8cf996..0000000 --- a/packages/syndicate-nim/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, preserves }: - -let - hashlib = buildNimPackage rec { - pname = "hashlib"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "khchen"; - repo = pname; - rev = "84e0247555e4488594975900401baaf5bbbfb531"; - hash = "sha256-nWNThelCh0LPVU7ryZgS/23hRRvJDVL2xWbQibb+zN0="; - }; - doCheck = true; - }; -in buildNimPackage rec { - pname = "syndicate"; - version = "20230530"; - - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "${pname}-nim"; - rev = version; - hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50="; - }; - - propagatedBuildInputs = [ hashlib preserves ]; - - doCheck = true; - - meta = src.meta // { - maintainers = [ lib.maintainers.ehmry ]; - license = lib.licenses.unlicense; - }; -} diff --git a/packages/syndicate_utils-nim/default.nix b/packages/syndicate_utils-nim/default.nix index 5d2b7cb..bab0922 100644 --- a/packages/syndicate_utils-nim/default.nix +++ b/packages/syndicate_utils-nim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, syndicate }: +{ lib, buildNimPackage, fetchFromGitea, illwill, syndicate }: -buildNimPackage rec { +buildNimPackage (final: prev: { pname = "syndicate_utils"; - version = "20230701"; + version = "20230801"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = pname; - rev = version; - hash = "sha256-lkgYogxQOoVX8gywdty8sgYv9oHl8b8r+SIv/I6pCno="; + repo = final.pname; + rev = final.version; + hash = "sha256-O9n9y0v0cQg5b2P4GjOEKYj6t1fGTMy4v/QpeAScv2Q="; }; - propagatedBuildInputs = [ syndicate ]; + propagatedBuildInputs = [ illwill syndicate ]; - meta = src.meta // { + meta = final.src.meta // { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -} +})