From 263a6577c241c096fbde90d39a9c971d0f3ff65c Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 12 Sep 2023 00:30:06 +0200 Subject: [PATCH] chore: Turn bdfr-browser and weewx-proxy into proper packages --- flake.lock | 376 +------------------------------------- flake.nix | 16 +- packages/bdfr-browser.nix | 28 +++ packages/weewx-proxy.nix | 28 +++ 4 files changed, 60 insertions(+), 388 deletions(-) create mode 100644 packages/bdfr-browser.nix create mode 100644 packages/weewx-proxy.nix diff --git a/flake.lock b/flake.lock index 4828b97..76b32bc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,65 +1,5 @@ { "nodes": { - "bdfr-browser-flake": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "flake-root": "flake-root", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "process-compose-flake": "process-compose-flake", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1693342000, - "narHash": "sha256-ZKQe3CYv3+VS3xqTwnI7BHEsYMmhN91D388JPV42Tc0=", - "owner": "nifoc", - "repo": "bdfr-browser", - "rev": "be98b4b1c826cac94041535746e637175ef4db05", - "type": "github" - }, - "original": { - "owner": "nifoc", - "repo": "bdfr-browser", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -78,36 +18,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1680964220, - "narHash": "sha256-dIdTYcf+KW9a4pKHsEbddvLVSfR1yiAJynzg2x0nfWg=", - "owner": "srid", - "repo": "flake-root", - "rev": "f1c0b93d05bdbea6c011136ba1a135c80c5b326c", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, - "flake-root_2": { - "locked": { - "lastModified": 1680964220, - "narHash": "sha256-dIdTYcf+KW9a4pKHsEbddvLVSfR1yiAJynzg2x0nfWg=", - "owner": "srid", - "repo": "flake-root", - "rev": "f1c0b93d05bdbea6c011136ba1a135c80c5b326c", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -126,87 +36,9 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "bdfr-browser-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "weewx-proxy-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -261,116 +93,11 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "gitignore": [ - "bdfr-browser-flake", - "gitignore" - ], - "nixpkgs": [ - "bdfr-browser-flake", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1691747570, - "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks-nix_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "gitignore": [ - "weewx-proxy-flake", - "gitignore" - ], - "nixpkgs": [ - "weewx-proxy-flake", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1690743255, - "narHash": "sha256-dsJzQsyJGWCym1+LMyj2rbYmvjYmzeOrk7ypPrSFOPo=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "fcbf4705d98398d084e6cb1c826a0b90a91d22d7", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "process-compose-flake": { - "locked": { - "lastModified": 1691182187, - "narHash": "sha256-dmHKgFXstdfX7nfnpbzR5H4DWGdWo610zsW9BCtI2WQ=", - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "rev": "bacdaf54ffe3a2c1734fd973a95e6b39b1560c2e", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "type": "github" - } - }, "root": { "inputs": { - "bdfr-browser-flake": "bdfr-browser-flake", "flake-parts": "flake-parts", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs", - "weewx-proxy-flake": "weewx-proxy-flake" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -387,105 +114,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "bdfr-browser-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1691833704, - "narHash": "sha256-ASGhgGduEgcD3gQZhGr8xtmZ3PlVY+m2HuPnIZDbu78=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "19dee4bf6001849006a63f3435247316b0488e99", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "weewx-proxy-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689620039, - "narHash": "sha256-BtNwghr05z7k5YMdq+6nbue+nEalvDepuA7qdQMAKoQ=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "719c2977f958c41fa60a928e2fbc50af14844114", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "weewx-proxy-flake": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "flake-root": "flake-root_2", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1691607477, - "narHash": "sha256-cMsz+72xSnJhPRGbrVrJWF4dJlyuFImc6JLBZw3lDIM=", - "owner": "nifoc", - "repo": "weewx-proxy", - "rev": "2ad93b457ccda286185e8e64a284589111f48768", - "type": "github" - }, - "original": { - "owner": "nifoc", - "repo": "weewx-proxy", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d86b336..42f0bb8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,18 +9,6 @@ url = "github:neovim/neovim?dir=contrib"; inputs.nixpkgs.follows = "nixpkgs"; }; - - bdfr-browser-flake = { - url = "github:nifoc/bdfr-browser"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; - - weewx-proxy-flake = { - url = "github:nifoc/weewx-proxy"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; }; outputs = inputs@{ flake-parts, ... }: @@ -60,8 +48,8 @@ rimgo = import ./packages/rimgo.nix { inherit pkgs lib; }; vuetorrent = import ./packages/vuetorrent.nix { inherit pkgs lib; }; - bdfr-browser = inputs'.bdfr-browser-flake.packages.default; - weewx-proxy = inputs'.weewx-proxy-flake.packages.default; + bdfr-browser = import ./packages/bdfr-browser.nix { inherit pkgs lib; }; + weewx-proxy = import ./packages/weewx-proxy.nix { inherit pkgs lib; }; website-docs-nifoc-pw = import ./packages/website-docs-nifoc-pw.nix { inherit pkgs; }; } // darwinPackages; diff --git a/packages/bdfr-browser.nix b/packages/bdfr-browser.nix new file mode 100644 index 0000000..90abab6 --- /dev/null +++ b/packages/bdfr-browser.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, ... }: + +let + erlang = pkgs.beam.interpreters.erlangR26; + beamPackagesPrev = pkgs.beam.packagesWith erlang; + elixir = beamPackagesPrev.elixir_1_15; + + beamPackages = beamPackagesPrev // rec { + inherit erlang elixir; + hex = beamPackagesPrev.hex.override { inherit elixir; }; + buildMix = beamPackagesPrev.buildMix.override { inherit elixir erlang hex; }; + mixRelease = beamPackagesPrev.mixRelease.override { inherit erlang elixir; }; + }; +in +beamPackages.mixRelease rec { + pname = "bdfr-browser"; + version = "0.0.1"; + + src = pkgs.fetchFromGitea { + domain = "git.kempkens.io"; + owner = "daniel"; + repo = pname; + rev = "be98b4b1c826cac94041535746e637175ef4db05"; + sha256 = "sha256-ZKQe3CYv3+VS3xqTwnI7BHEsYMmhN91D388JPV42Tc0="; + }; + + mixNixDeps = import "${src}/mix.nix" { inherit lib beamPackages; }; +} diff --git a/packages/weewx-proxy.nix b/packages/weewx-proxy.nix new file mode 100644 index 0000000..9dc4aa5 --- /dev/null +++ b/packages/weewx-proxy.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, ... }: + +let + erlang = pkgs.beam.interpreters.erlangR26; + beamPackagesPrev = pkgs.beam.packagesWith erlang; + elixir = beamPackagesPrev.elixir_1_15; + + beamPackages = beamPackagesPrev // rec { + inherit erlang elixir; + hex = beamPackagesPrev.hex.override { inherit elixir; }; + buildMix = beamPackagesPrev.buildMix.override { inherit elixir erlang hex; }; + mixRelease = beamPackagesPrev.mixRelease.override { inherit erlang elixir; }; + }; +in +beamPackages.mixRelease rec { + pname = "weewx-proxy"; + version = "0.0.1"; + + src = pkgs.fetchFromGitea { + domain = "git.kempkens.io"; + owner = "daniel"; + repo = pname; + rev = "2ad93b457ccda286185e8e64a284589111f48768"; + sha256 = "sha256-cMsz+72xSnJhPRGbrVrJWF4dJlyuFImc6JLBZw3lDIM="; + }; + + mixNixDeps = import "${src}/mix.nix" { inherit lib beamPackages; }; +}