syndicate_utils: 20230701 -> 20230801
This commit is contained in:
parent
4d2691722c
commit
097e0c17f2
18
flake.lock
18
flake.lock
|
@ -20,18 +20,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686968143,
|
"lastModified": 1690860117,
|
||||||
"narHash": "sha256-NkXmT9ArJBeu56jo/agURQ1pvqrx0nUHi30yM7sttK8=",
|
"narHash": "sha256-srkCfjMlg777HxDVMfhkIFgRhhtuZjIOIyR2ejLYK+Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "56799517d0537a6f3e91a5171af8c4bfd82c092e",
|
"rev": "96d403ee2479f2070050353b94808209f1352edb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"id": "nixpkgs",
|
||||||
"ref": "release-23.05",
|
"type": "indirect"
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
@ -48,11 +46,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686968542,
|
"lastModified": 1690856601,
|
||||||
"narHash": "sha256-Gjlj7UeHqMFRAYyefeoLnSjLo8V+0XheIamojNEyTbE=",
|
"narHash": "sha256-OP1w4rwMJscne5ckSfzOjXXQTPzAWM3Mkm4wRmHwCh8=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "01d84cd842e48e89be67e4c2d9dc46aa7709adc5",
|
"rev": "657d170ebe594da9fa32797e38704d45732d0c72",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
26
flake.nix
26
flake.nix
|
@ -2,7 +2,6 @@
|
||||||
description = "Syndicate utilities";
|
description = "Syndicate utilities";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
|
|
||||||
rust = {
|
rust = {
|
||||||
url = "github:oxalica/rust-overlay";
|
url = "github:oxalica/rust-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
@ -29,8 +28,29 @@
|
||||||
|
|
||||||
nimPackages = prev.nimPackages.overrideScope' (final': prev': {
|
nimPackages = prev.nimPackages.overrideScope' (final': prev': {
|
||||||
noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { };
|
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 =
|
syndicate_utils =
|
||||||
final'.callPackage ./packages/syndicate_utils-nim { };
|
final'.callPackage ./packages/syndicate_utils-nim { };
|
||||||
syndicated-open = final'.callPackage ./packages/syndicated-open { };
|
syndicated-open = final'.callPackage ./packages/syndicated-open { };
|
||||||
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,21 +1,21 @@
|
||||||
{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, syndicate }:
|
{ lib, buildNimPackage, fetchFromGitea, illwill, syndicate }:
|
||||||
|
|
||||||
buildNimPackage rec {
|
buildNimPackage (final: prev: {
|
||||||
pname = "syndicate_utils";
|
pname = "syndicate_utils";
|
||||||
version = "20230701";
|
version = "20230801";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "git.syndicate-lang.org";
|
domain = "git.syndicate-lang.org";
|
||||||
owner = "ehmry";
|
owner = "ehmry";
|
||||||
repo = pname;
|
repo = final.pname;
|
||||||
rev = version;
|
rev = final.version;
|
||||||
hash = "sha256-lkgYogxQOoVX8gywdty8sgYv9oHl8b8r+SIv/I6pCno=";
|
hash = "sha256-O9n9y0v0cQg5b2P4GjOEKYj6t1fGTMy4v/QpeAScv2Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ syndicate ];
|
propagatedBuildInputs = [ illwill syndicate ];
|
||||||
|
|
||||||
meta = src.meta // {
|
meta = final.src.meta // {
|
||||||
maintainers = [ lib.maintainers.ehmry ];
|
maintainers = [ lib.maintainers.ehmry ];
|
||||||
license = lib.licenses.unlicense;
|
license = lib.licenses.unlicense;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
Loading…
Reference in New Issue