ehmry
/
syndicate-flake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Override nimPackages and nim2Packages

This commit is contained in:
Emery Hemingway 2023-08-10 11:46:11 +01:00
parent c9faca6bf9
commit 124911f948
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -20,18 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690881426, "lastModified": 1690860117,
"narHash": "sha256-PkcXpzQUI5bO0/bKIXTtpyg1i1eIuPvxnaXZSphQC8I=", "narHash": "sha256-srkCfjMlg777HxDVMfhkIFgRhhtuZjIOIyR2ejLYK+Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e5ee889ca5a14cd0296ea3d9cf63ec680b933d62", "rev": "96d403ee2479f2070050353b94808209f1352edb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "release-23.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

43
flake.nix
View File

@ -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";
@ -13,19 +12,10 @@
lib = nixpkgs.lib.extend (import ./lib.nix); lib = nixpkgs.lib.extend (import ./lib.nix);
overlays.default = final: prev: overlays.default = final: prev:
let rust' = (prev.extend rust.overlay).rust-bin.nightly.latest.default; let
in { rust' = (prev.extend rust.overlay).rust-bin.nightly.latest.default;
inherit (self) lib;
acpi_actor = final.nimPackages.callPackage ./packages/acpi_actor { }; nimOverlay = final': prev': {
fontconfig_actor =
final.nimPackages.callPackage ./packages/fontconfig_actor { };
libnotify_actor =
final.nimPackages.callPackage ./packages/libnotify_actor { };
nimPackages = prev.nimPackages.overrideScope' (final': prev': {
noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { }; noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { };
preserves = final'.callPackage ./packages/preserves-nim { }; preserves = final'.callPackage ./packages/preserves-nim { };
syndicate = final'.callPackage ./packages/syndicate-nim { }; syndicate = final'.callPackage ./packages/syndicate-nim { };
@ -35,9 +25,22 @@
xdg_open_ng = xdg_open_ng =
builtins.trace "xdg_open_ng has been renamed to syndicated-open" builtins.trace "xdg_open_ng has been renamed to syndicated-open"
final'.syndicated-open; final'.syndicated-open;
}); };
in {
inherit (self) lib;
nix_actor = final.nimPackages.callPackage ./packages/nix_actor { }; acpi_actor = final.nim2Packages.callPackage ./packages/acpi_actor { };
fontconfig_actor =
final.nim2Packages.callPackage ./packages/fontconfig_actor { };
libnotify_actor =
final.nim2Packages.callPackage ./packages/libnotify_actor { };
nimPackages = prev.nimPackages.overrideScope' nimOverlay;
nim2Packages = prev.nim2Packages.overrideScope' nimOverlay;
nix_actor = final.nim2Packages.callPackage ./packages/nix_actor { };
noise-c = final.callPackage ./packages/noise-c { }; noise-c = final.callPackage ./packages/noise-c { };
@ -50,7 +53,7 @@
final.callPackage ./packages/preserves-tools { rust = rust'; }; final.callPackage ./packages/preserves-tools { rust = rust'; };
sqlite_actor = sqlite_actor =
final.nimPackages.callPackage ./packages/sqlite_actor { }; final.nim2Packages.callPackage ./packages/sqlite_actor { };
squeak = final.callPackage ./packages/squeak { }; squeak = final.callPackage ./packages/squeak { };
squeaker = final.python3Packages.callPackage ./packages/squeaker { }; squeaker = final.python3Packages.callPackage ./packages/squeaker { };
@ -61,7 +64,7 @@
synit-pid1 = final.callPackage ./packages/synit-pid1 { rust = rust'; }; synit-pid1 = final.callPackage ./packages/synit-pid1 { rust = rust'; };
xapian_actor = xapian_actor =
final.nimPackages.callPackage ./packages/xapian_actor { }; final.nim2Packages.callPackage ./packages/xapian_actor { };
}; };
legacyPackages = legacyPackages =
@ -73,10 +76,10 @@
with pkgs; { with pkgs; {
inherit fontconfig_actor libnotify_actor noise-c preserves-tools squeak inherit fontconfig_actor libnotify_actor noise-c preserves-tools squeak
squeaker syndicate-server; squeaker syndicate-server;
inherit (nimPackages) syndicate_utils xdg_open_ng; inherit (nim2Packages) syndicate_utils xdg_open_ng;
preserves-nim = nimPackages.preserves; preserves-nim = nim2Packages.preserves;
preserves-py = python3Packages.preserves; preserves-py = python3Packages.preserves;
syndicate-nim = nimPackages.syndicate; syndicate-nim = nim2Packages.syndicate;
syndicate-py = python3Packages.syndicate; syndicate-py = python3Packages.syndicate;
}) self.legacyPackages; }) self.legacyPackages;