From 775646326c383454268d2d51f186732b1da598e3 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 19 Jan 2023 04:13:41 +0100 Subject: [PATCH] Refactor package includes --- .gitignore | 10 ++- apps/logfeed/default.nix | 2 - apps/nixpkgs-bot/flake.lock | 81 ----------------- apps/nixpkgs-bot/flake.nix | 83 ------------------ apps/nixpkgs-bot/fourmolu.yaml | 1 - flake.lock | 14 +-- flake.nix | 14 ++- home-manager/roles/desktop.nix | 2 +- home-manager/roles/kassandra.nix | 2 +- nixos/roles/default.nix | 23 ++--- overlays/kassandra/default.nix | 8 -- overlays/logfeed/default.nix | 3 - overlays/nixpkgs-bot/default.nix | 30 ------- overlays/packages.nix | 1 + overlays/wizards-dialog/default.nix | 3 - packages/default.nix | 76 ++++++++++++++++ {apps => packages}/kassandra/.gitignore | 0 {apps => packages}/kassandra/.hlint.yaml | 0 {apps => packages}/kassandra/README.md | 0 {apps => packages}/kassandra/backend/LICENSE | 0 .../kassandra/backend/backend.cabal | 0 .../kassandra/backend/frontend.jsexe | 0 .../backend/frontendJs/frontend.jsexe | 0 {apps => packages}/kassandra/backend/hie.yaml | 0 .../kassandra/backend/src-bin/main.hs | 0 .../kassandra/backend/src/Backend.hs | 0 .../kassandra/backend/src/Backend/Config.hs | 0 {apps => packages}/kassandra/backend/static | 0 {apps => packages}/kassandra/cabal.project | 0 .../kassandra/cabal.project.local | 0 {apps => packages}/kassandra/code.nix | 0 .../kassandra/common-config.dhall | 0 .../kassandra/config/common/example | 0 .../kassandra/config/common/route | 0 {apps => packages}/kassandra/config/readme.md | 0 {apps => packages}/kassandra/default.nix | 0 {apps => packages}/kassandra/frontend/LICENSE | 0 .../kassandra/frontend/frontend.cabal | 0 .../kassandra/frontend/hie.yaml | 0 .../kassandra/frontend/src-bin/main.hs | 0 .../kassandra/frontend/src/Frontend.hs | 0 .../kassandra/frontend/src/Frontend/Route.hs | 0 {apps => packages}/kassandra/hie.yaml | 0 .../kassandra/kassandra/CHANGELOG.md | 0 .../kassandra/kassandra/LICENSE | 0 .../kassandra/kassandra/Setup.hs | 0 .../kassandra/kassandra/kassandra.cabal | 0 .../kassandra/src/Kassandra/AgendaWidget.hs | 0 .../kassandra/kassandra/src/Kassandra/Api.hs | 0 .../kassandra/src/Kassandra/BaseWidgets.hs | 0 .../kassandra/src/Kassandra/Calendar.hs | 0 .../kassandra/src/Kassandra/Config.hs | 0 .../kassandra/kassandra/src/Kassandra/Css.hs | 0 .../kassandra/src/Kassandra/Debug.hs | 0 .../kassandra/src/Kassandra/DragAndDrop.hs | 0 .../src/Kassandra/ListElementWidget.hs | 0 .../kassandra/src/Kassandra/ListWidget.hs | 0 .../kassandra/src/Kassandra/LocalBackend.hs | 0 .../src/Kassandra/LocalBackendWidget.hs | 0 .../kassandra/src/Kassandra/LogWidget.hs | 0 .../kassandra/src/Kassandra/MainWidget.hs | 0 .../kassandra/src/Kassandra/ReflexUtil.hs | 0 .../src/Kassandra/RemoteBackendWidget.hs | 0 .../kassandra/src/Kassandra/SelectorWidget.hs | 0 .../kassandra/src/Kassandra/Sorting.hs | 0 .../kassandra/src/Kassandra/State.hs | 0 .../kassandra/src/Kassandra/TaskWidget.hs | 0 .../kassandra/src/Kassandra/TextEditWidget.hs | 0 .../kassandra/src/Kassandra/TimeWidgets.hs | 0 .../kassandra/src/Kassandra/Types.hs | 0 .../kassandra/kassandra/src/Kassandra/Util.hs | 0 .../kassandra/kassandra/src/Prelude.hs | 0 .../kassandra/obelisk-shell.nix | 0 {apps => packages}/kassandra/release.nix | 0 .../kassandra/standalone/.hlint.yaml | 0 .../kassandra/standalone/CHANGELOG.md | 0 .../kassandra/standalone/LICENSE | 0 .../kassandra/standalone/src-bin/main.hs | 0 .../src/Kassandra/Backend/Calendar.hs | 0 .../standalone/src/Kassandra/Config/Dhall.hs | 0 .../standalone/src/Kassandra/Standalone.hs | 0 .../src/Kassandra/Standalone/Config.hs | 0 .../src/Kassandra/Standalone/State.hs | 0 .../kassandra/standalone/standalone.cabal | 0 {apps => packages}/kassandra/static/.empty | 0 .../static/MaterialIcons-Regular-Outlined.otf | Bin .../static/MaterialIcons-Regular.ttf | Bin {apps => packages}/kassandra/weeder.dhall | 0 {apps => packages}/logfeed/.gitignore | 0 {apps => packages}/logfeed/Mail.hs | 0 {apps => packages}/logfeed/Main.hs | 0 {apps => packages}/logfeed/logfeed.cabal | 0 {apps => packages}/logfeed/shell.nix | 0 {apps => packages}/nixpkgs-bot/.gitignore | 0 {apps => packages}/nixpkgs-bot/CHANGELOG.md | 0 {apps => packages}/nixpkgs-bot/LICENSE | 0 {apps => packages}/nixpkgs-bot/TODO.md | 0 {apps => packages}/nixpkgs-bot/codegen.yml | 0 {apps => packages}/nixpkgs-bot/exe/Main.hs | 0 .../nixpkgs-bot/graphql/merge_pr_info.graphql | 0 .../nixpkgs-bot/graphql/pr_info.graphql | 0 .../nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs | 0 .../lib/NixpkgsBot/GraphQL/Scalars.hs | 0 .../nixpkgs-bot/nixpkgs-bot.cabal | 0 .../nixpkgs-bot/vendor/github-schema.graphql | 0 packages/wizards-dialog/.envrc | 1 + {apps => packages}/wizards-dialog/Dialog.hs | 0 {apps => packages}/wizards-dialog/Main.hs | 0 {apps => packages}/wizards-dialog/menu.yaml | 0 .../wizards-dialog/wizards-dialog.cabal | 15 ++-- 110 files changed, 126 insertions(+), 243 deletions(-) delete mode 100644 apps/logfeed/default.nix delete mode 100644 apps/nixpkgs-bot/flake.lock delete mode 100644 apps/nixpkgs-bot/flake.nix delete mode 100644 apps/nixpkgs-bot/fourmolu.yaml delete mode 100644 overlays/kassandra/default.nix delete mode 100644 overlays/logfeed/default.nix delete mode 100644 overlays/nixpkgs-bot/default.nix create mode 100644 overlays/packages.nix delete mode 100644 overlays/wizards-dialog/default.nix create mode 100644 packages/default.nix rename {apps => packages}/kassandra/.gitignore (100%) rename {apps => packages}/kassandra/.hlint.yaml (100%) rename {apps => packages}/kassandra/README.md (100%) rename {apps => packages}/kassandra/backend/LICENSE (100%) rename {apps => packages}/kassandra/backend/backend.cabal (100%) rename {apps => packages}/kassandra/backend/frontend.jsexe (100%) rename {apps => packages}/kassandra/backend/frontendJs/frontend.jsexe (100%) rename {apps => packages}/kassandra/backend/hie.yaml (100%) rename {apps => packages}/kassandra/backend/src-bin/main.hs (100%) rename {apps => packages}/kassandra/backend/src/Backend.hs (100%) rename {apps => packages}/kassandra/backend/src/Backend/Config.hs (100%) rename {apps => packages}/kassandra/backend/static (100%) rename {apps => packages}/kassandra/cabal.project (100%) rename {apps => packages}/kassandra/cabal.project.local (100%) rename {apps => packages}/kassandra/code.nix (100%) rename {apps => packages}/kassandra/common-config.dhall (100%) rename {apps => packages}/kassandra/config/common/example (100%) rename {apps => packages}/kassandra/config/common/route (100%) rename {apps => packages}/kassandra/config/readme.md (100%) rename {apps => packages}/kassandra/default.nix (100%) rename {apps => packages}/kassandra/frontend/LICENSE (100%) rename {apps => packages}/kassandra/frontend/frontend.cabal (100%) rename {apps => packages}/kassandra/frontend/hie.yaml (100%) rename {apps => packages}/kassandra/frontend/src-bin/main.hs (100%) rename {apps => packages}/kassandra/frontend/src/Frontend.hs (100%) rename {apps => packages}/kassandra/frontend/src/Frontend/Route.hs (100%) rename {apps => packages}/kassandra/hie.yaml (100%) rename {apps => packages}/kassandra/kassandra/CHANGELOG.md (100%) rename {apps => packages}/kassandra/kassandra/LICENSE (100%) rename {apps => packages}/kassandra/kassandra/Setup.hs (100%) rename {apps => packages}/kassandra/kassandra/kassandra.cabal (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/AgendaWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Api.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/BaseWidgets.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Calendar.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Config.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Css.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Debug.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/DragAndDrop.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/ListElementWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/ListWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/LocalBackend.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/LocalBackendWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/LogWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/MainWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/ReflexUtil.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/RemoteBackendWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/SelectorWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Sorting.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/State.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/TaskWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/TextEditWidget.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/TimeWidgets.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Types.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Kassandra/Util.hs (100%) rename {apps => packages}/kassandra/kassandra/src/Prelude.hs (100%) rename {apps => packages}/kassandra/obelisk-shell.nix (100%) rename {apps => packages}/kassandra/release.nix (100%) rename {apps => packages}/kassandra/standalone/.hlint.yaml (100%) rename {apps => packages}/kassandra/standalone/CHANGELOG.md (100%) rename {apps => packages}/kassandra/standalone/LICENSE (100%) rename {apps => packages}/kassandra/standalone/src-bin/main.hs (100%) rename {apps => packages}/kassandra/standalone/src/Kassandra/Backend/Calendar.hs (100%) rename {apps => packages}/kassandra/standalone/src/Kassandra/Config/Dhall.hs (100%) rename {apps => packages}/kassandra/standalone/src/Kassandra/Standalone.hs (100%) rename {apps => packages}/kassandra/standalone/src/Kassandra/Standalone/Config.hs (100%) rename {apps => packages}/kassandra/standalone/src/Kassandra/Standalone/State.hs (100%) rename {apps => packages}/kassandra/standalone/standalone.cabal (100%) rename {apps => packages}/kassandra/static/.empty (100%) rename {apps => packages}/kassandra/static/MaterialIcons-Regular-Outlined.otf (100%) rename {apps => packages}/kassandra/static/MaterialIcons-Regular.ttf (100%) rename {apps => packages}/kassandra/weeder.dhall (100%) rename {apps => packages}/logfeed/.gitignore (100%) rename {apps => packages}/logfeed/Mail.hs (100%) rename {apps => packages}/logfeed/Main.hs (100%) rename {apps => packages}/logfeed/logfeed.cabal (100%) rename {apps => packages}/logfeed/shell.nix (100%) rename {apps => packages}/nixpkgs-bot/.gitignore (100%) rename {apps => packages}/nixpkgs-bot/CHANGELOG.md (100%) rename {apps => packages}/nixpkgs-bot/LICENSE (100%) rename {apps => packages}/nixpkgs-bot/TODO.md (100%) rename {apps => packages}/nixpkgs-bot/codegen.yml (100%) rename {apps => packages}/nixpkgs-bot/exe/Main.hs (100%) rename {apps => packages}/nixpkgs-bot/graphql/merge_pr_info.graphql (100%) rename {apps => packages}/nixpkgs-bot/graphql/pr_info.graphql (100%) rename {apps => packages}/nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs (100%) rename {apps => packages}/nixpkgs-bot/lib/NixpkgsBot/GraphQL/Scalars.hs (100%) rename {apps => packages}/nixpkgs-bot/nixpkgs-bot.cabal (100%) rename {apps => packages}/nixpkgs-bot/vendor/github-schema.graphql (100%) create mode 100644 packages/wizards-dialog/.envrc rename {apps => packages}/wizards-dialog/Dialog.hs (100%) rename {apps => packages}/wizards-dialog/Main.hs (100%) rename {apps => packages}/wizards-dialog/menu.yaml (100%) rename {apps => packages}/wizards-dialog/wizards-dialog.cabal (79%) diff --git a/.gitignore b/.gitignore index 7f1edd86..aeec6335 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /configuration.nix -/.pre-commit-config.yaml -/result -/result-? -/.direnv +**/flake.lock +!/flake.lock +.pre-commit-config.yaml +result +result-? +.direnv diff --git a/apps/logfeed/default.nix b/apps/logfeed/default.nix deleted file mode 100644 index 4f89cb0c..00000000 --- a/apps/logfeed/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{pkgs ? import (import ../../nix/sources.nix).nixos-unstable {}}: -pkgs.haskellPackages.callCabal2nix "logfeed" ./. {} diff --git a/apps/nixpkgs-bot/flake.lock b/apps/nixpkgs-bot/flake.lock deleted file mode 100644 index cf004ee5..00000000 --- a/apps/nixpkgs-bot/flake.lock +++ /dev/null @@ -1,81 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1667639549, - "narHash": "sha256-frqZKSG/933Ctwl9voSZnXDwo8CqddXcjQhnCzwNqaM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cae3751e9f74eea29c573d6c2f14523f41c2821a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667680128, - "narHash": "sha256-bnXYCDzkviKNeYwnh3YW2HpgSgUMnSGVsTtHNLXBXfE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b84548575a627cad3e0b31b2c2b64eb7774c24db", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/apps/nixpkgs-bot/flake.nix b/apps/nixpkgs-bot/flake.nix deleted file mode 100644 index 7c19502f..00000000 --- a/apps/nixpkgs-bot/flake.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - description = "nixpkgs-bot"; - inputs = { - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; - inputs = { - flake-utils.follows = "flake-utils"; - nixpkgs.follows = "nixpkgs"; - }; - }; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - }; - outputs = { - self, - nixpkgs, - flake-utils, - pre-commit-hooks, - ... - }: - flake-utils.lib.eachSystem ["x86_64-linux"] ( - system: let - ghc-version = "90"; - inherit (nixpkgs.legacyPackages.${system}) lib haskell pkgs; - hlib = haskell.lib.compose; - inherit (hlib) doJailbreak dontCheck markUnbroken appendPatch; - haskellPackages = haskell.packages."ghc${ghc-version}".override { - overrides = final: prev: { - matrix-client = - appendPatch (pkgs.fetchpatch { - url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch"; - sha256 = "sha256-YyxgfNO5RtqpKJ9UOYPlRple0FuNmjAB1iy9vYy0HOE="; - relative = "matrix-client"; - }) - prev.matrix-client; - aeson-schemas = markUnbroken (dontCheck prev.aeson-schemas); - }; - }; - cleanSelf = lib.sourceFilesBySuffices self [ - ".hs" - ".cabal" - "LICENSE" - "CHANGELOG.md" - ]; - in rec { - packages = { - default = - lib.pipe {} - [ - (haskellPackages.callCabal2nix "nixpkgs-bot" cleanSelf) - haskellPackages.buildFromCabalSdist - hlib.justStaticExecutables - ]; - }; - checks = { - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = ./.; - hooks = { - alejandra.enable = true; - statix.enable = true; - cabal-fmt.enable = true; - shellcheck.enable = true; - fourmolu.enable = true; - }; - }; - }; - devShells.default = haskellPackages.shellFor { - packages = _: [packages.default]; - buildInputs = [ - pre-commit-hooks.defaultPackage.${system} - haskellPackages.haskell-language-server - haskellPackages.weeder - pkgs.haskellPackages.cabal-install - pkgs.sqlite - ]; - withHoogle = true; - inherit (self.checks.${system}.pre-commit-check) shellHook; - }; - } - ); -} diff --git a/apps/nixpkgs-bot/fourmolu.yaml b/apps/nixpkgs-bot/fourmolu.yaml deleted file mode 100644 index 47e652db..00000000 --- a/apps/nixpkgs-bot/fourmolu.yaml +++ /dev/null @@ -1 +0,0 @@ -indentation: 2 diff --git a/flake.lock b/flake.lock index 450c4a6d..84738017 100644 --- a/flake.lock +++ b/flake.lock @@ -73,16 +73,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673606088, - "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=", - "owner": "NixOS", + "lastModified": 1673796341, + "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d", + "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { diff --git a/flake.nix b/flake.nix index 3749133b..42c21d33 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,11 @@ { description = "maralorns configuration"; + nixConfig = { + allow-import-from-derivation = true; + }; inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; pre-commit-hooks-nix = { url = "github:cachix/pre-commit-hooks.nix"; @@ -25,11 +29,17 @@ self', pkgs, config, + lib, ... - }: { - devShells.default = pkgs.mkShell { + }: let + packages = import ./packages {inherit pkgs;}; + in { + devShells.default = packages.shell { shellHook = config.pre-commit.installationScript; }; + inherit (packages) packages; + legacyPackages = {inherit (packages) haskellPackagesOverlay;}; + pre-commit = { check.enable = true; settings = { diff --git a/home-manager/roles/desktop.nix b/home-manager/roles/desktop.nix index 1b8fefc3..0dc72f62 100644 --- a/home-manager/roles/desktop.nix +++ b/home-manager/roles/desktop.nix @@ -69,7 +69,7 @@ in { xwayland xdg_utils libnotify - kassandra + kassandra-standalone shotcut audacity paprefs diff --git a/home-manager/roles/kassandra.nix b/home-manager/roles/kassandra.nix index 3c0bc5f5..ef52e80a 100644 --- a/home-manager/roles/kassandra.nix +++ b/home-manager/roles/kassandra.nix @@ -1,7 +1,7 @@ {pkgs, ...}: let dhallFiles = pkgs.runCommand "kassandra-config-src" {} '' mkdir $out - ${pkgs.kassandra}/bin/kassandra2 print-types > $out/types.dhall + ${pkgs.kassandra-standalone}/bin/kassandra2 print-types > $out/types.dhall ln -s ${./kassandra}/{config,backend}.dhall $out ln -s ${pkgs.privateFile "kassandra-uiConfig.dhall"} $out/uiConfig.dhall ''; diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 23f41288..60b18890 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -152,23 +152,26 @@ in { lib.mkIf (!pkgs.withSecrets) {text = "echo No secrets loaded!; exit 1;";}; nix = { - settings.substituters = lib.mkAfter ( - pkgs.privateValue [] "binary-caches" - # ++ ( - # if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true&priority=100" ] else [ ] - # ) - ); - settings.trusted-public-keys = [ - "nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30=" - ]; + settings = { + substituters = lib.mkAfter ( + pkgs.privateValue [] "binary-caches" + # ++ ( + # if config.networking.hostName != "hera" then [ "ssh-ng://nix-ssh@hera.m-0.eu?trusted=true&priority=100" ] else [ ] + # ) + ); + trusted-public-keys = [ + "nixbuild.net/maralorn-1:cpqv21sJgRL+ROaKY1Gr0k7AKolAKaP3S3iemGxK/30=" + ]; + trusted-users = ["maralorn" "laminar"]; + }; nixPath = ["/etc/nix-path"]; - settings.trusted-users = ["maralorn" "laminar"]; buildMachines = pkgs.privateValue [] "remote-builders"; extraOptions = '' experimental-features = nix-command flakes fallback = true auto-optimise-store = true builders-use-substitutes = true + allow-import-from-derivation = true ''; optimise = { dates = []; diff --git a/overlays/kassandra/default.nix b/overlays/kassandra/default.nix deleted file mode 100644 index 01d2f50c..00000000 --- a/overlays/kassandra/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -final: prev: let - haskellPackages = prev.haskellPackages.extend (self: super: { - kassandra = self.callCabal2nix "kassandra" ../../apps/kassandra/kassandra {}; - standalone = self.callCabal2nix "standalone" ../../apps/kassandra/standalone {}; - }); -in { - kassandra = haskellPackages.standalone; -} diff --git a/overlays/logfeed/default.nix b/overlays/logfeed/default.nix deleted file mode 100644 index 9a002e48..00000000 --- a/overlays/logfeed/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -final: prev: { - logfeed = prev.unstableHaskellPackages.callCabal2nix "logfeed" ../../apps/logfeed {}; -} diff --git a/overlays/nixpkgs-bot/default.nix b/overlays/nixpkgs-bot/default.nix deleted file mode 100644 index b63f77b8..00000000 --- a/overlays/nixpkgs-bot/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -final: prev: let - inherit (final) lib; - inherit (final.haskell.lib.compose) justStaticExecutables dontCheck markUnbroken appendPatch; - haskellPackages = final.haskellPackages.override { - overrides = hfinal: hprev: { - matrix-client = - appendPatch (final.fetchpatch { - url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch"; - sha256 = "sha256-YyxgfNO5RtqpKJ9UOYPlRple0FuNmjAB1iy9vYy0HOE="; - relative = "matrix-client"; - }) - hprev.matrix-client; - aeson-schemas = markUnbroken (dontCheck hprev.aeson-schemas); - }; - }; - cleanSelf = lib.sourceFilesBySuffices ../../apps/nixpkgs-bot [ - ".hs" - ".cabal" - "CHANGELOG.md" - "LICENSE" - ]; -in { - nixpkgs-bot = - lib.pipe {} - [ - (haskellPackages.callCabal2nix "nixpkgs-bot" cleanSelf) - haskellPackages.buildFromCabalSdist - justStaticExecutables - ]; -} diff --git a/overlays/packages.nix b/overlays/packages.nix new file mode 100644 index 00000000..08b7bb64 --- /dev/null +++ b/overlays/packages.nix @@ -0,0 +1 @@ +_: prev: (import ../packages {pkgs = prev;}).packages diff --git a/overlays/wizards-dialog/default.nix b/overlays/wizards-dialog/default.nix deleted file mode 100644 index 5f36f348..00000000 --- a/overlays/wizards-dialog/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: prev: { - wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../../apps/wizards-dialog {}; -} diff --git a/packages/default.nix b/packages/default.nix new file mode 100644 index 00000000..18442c58 --- /dev/null +++ b/packages/default.nix @@ -0,0 +1,76 @@ +{pkgs}: let + inherit (pkgs) lib; + inherit (pkgs.haskell.lib.compose) unmarkBroken doJailbreak dontCheck appendPatch; + includePatterns = [ + ".hs" + ".cabal" + "LICENSE" + "CHANGELOG.md" + ]; + cleanCabalPackage = { + name, + source, + extraPatterns ? [], + }: hpkgs: + lib.pipe source + [ + (src: lib.sourceFilesBySuffices src (includePatterns ++ extraPatterns)) + (src: hpkgs.callCabal2nix name src {}) + hpkgs.buildFromCabalSdist + ]; + haskellPackagesOverlay = final: prev: + lib.mapAttrs (_: package: package final) myHaskellPackages + // { + # For kassandra + clay = unmarkBroken (doJailbreak prev.clay); + streamly-bytestring = + unmarkBroken (dontCheck prev.streamly-bytestring); + # For nixpkgs-bot + matrix-client = + appendPatch (pkgs.fetchpatch { + url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch"; + sha256 = "sha256-YyxgfNO5RtqpKJ9UOYPlRple0FuNmjAB1iy9vYy0HOE="; + relative = "matrix-client"; + }) + prev.matrix-client; + aeson-schemas = unmarkBroken (dontCheck prev.aeson-schemas); + }; + hpkgs = pkgs.haskellPackages.override { + overrides = haskellPackagesOverlay; + }; + selectHaskellPackages = attrs: lib.mapAttrs (name: _: attrs.${name}) myHaskellPackages; + myHaskellPackages = { + wizards-dialog = cleanCabalPackage { + name = "wizards-dialog"; + source = ./wizards-dialog; + }; + logfeed = cleanCabalPackage { + name = "logfeed"; + source = ./logfeed; + }; + kassandra = cleanCabalPackage { + name = "kassandra"; + source = ./kassandra/kassandra; + }; + kassandra-standalone = cleanCabalPackage { + name = "standalone"; + source = ./kassandra/standalone; + }; + nixpkgs-bot = cleanCabalPackage { + name = "nixpkgs-bot"; + source = ./nixpkgs-bot; + }; + }; +in { + packages = selectHaskellPackages hpkgs; + inherit haskellPackagesOverlay; + shell = args: + hpkgs.shellFor ({ + packages = hpkgs: (builtins.attrValues (selectHaskellPackages hpkgs)); + buildInputs = [ + hpkgs.haskell-language-server + pkgs.cabal-install + ]; + } + // args); +} diff --git a/apps/kassandra/.gitignore b/packages/kassandra/.gitignore similarity index 100% rename from apps/kassandra/.gitignore rename to packages/kassandra/.gitignore diff --git a/apps/kassandra/.hlint.yaml b/packages/kassandra/.hlint.yaml similarity index 100% rename from apps/kassandra/.hlint.yaml rename to packages/kassandra/.hlint.yaml diff --git a/apps/kassandra/README.md b/packages/kassandra/README.md similarity index 100% rename from apps/kassandra/README.md rename to packages/kassandra/README.md diff --git a/apps/kassandra/backend/LICENSE b/packages/kassandra/backend/LICENSE similarity index 100% rename from apps/kassandra/backend/LICENSE rename to packages/kassandra/backend/LICENSE diff --git a/apps/kassandra/backend/backend.cabal b/packages/kassandra/backend/backend.cabal similarity index 100% rename from apps/kassandra/backend/backend.cabal rename to packages/kassandra/backend/backend.cabal diff --git a/apps/kassandra/backend/frontend.jsexe b/packages/kassandra/backend/frontend.jsexe similarity index 100% rename from apps/kassandra/backend/frontend.jsexe rename to packages/kassandra/backend/frontend.jsexe diff --git a/apps/kassandra/backend/frontendJs/frontend.jsexe b/packages/kassandra/backend/frontendJs/frontend.jsexe similarity index 100% rename from apps/kassandra/backend/frontendJs/frontend.jsexe rename to packages/kassandra/backend/frontendJs/frontend.jsexe diff --git a/apps/kassandra/backend/hie.yaml b/packages/kassandra/backend/hie.yaml similarity index 100% rename from apps/kassandra/backend/hie.yaml rename to packages/kassandra/backend/hie.yaml diff --git a/apps/kassandra/backend/src-bin/main.hs b/packages/kassandra/backend/src-bin/main.hs similarity index 100% rename from apps/kassandra/backend/src-bin/main.hs rename to packages/kassandra/backend/src-bin/main.hs diff --git a/apps/kassandra/backend/src/Backend.hs b/packages/kassandra/backend/src/Backend.hs similarity index 100% rename from apps/kassandra/backend/src/Backend.hs rename to packages/kassandra/backend/src/Backend.hs diff --git a/apps/kassandra/backend/src/Backend/Config.hs b/packages/kassandra/backend/src/Backend/Config.hs similarity index 100% rename from apps/kassandra/backend/src/Backend/Config.hs rename to packages/kassandra/backend/src/Backend/Config.hs diff --git a/apps/kassandra/backend/static b/packages/kassandra/backend/static similarity index 100% rename from apps/kassandra/backend/static rename to packages/kassandra/backend/static diff --git a/apps/kassandra/cabal.project b/packages/kassandra/cabal.project similarity index 100% rename from apps/kassandra/cabal.project rename to packages/kassandra/cabal.project diff --git a/apps/kassandra/cabal.project.local b/packages/kassandra/cabal.project.local similarity index 100% rename from apps/kassandra/cabal.project.local rename to packages/kassandra/cabal.project.local diff --git a/apps/kassandra/code.nix b/packages/kassandra/code.nix similarity index 100% rename from apps/kassandra/code.nix rename to packages/kassandra/code.nix diff --git a/apps/kassandra/common-config.dhall b/packages/kassandra/common-config.dhall similarity index 100% rename from apps/kassandra/common-config.dhall rename to packages/kassandra/common-config.dhall diff --git a/apps/kassandra/config/common/example b/packages/kassandra/config/common/example similarity index 100% rename from apps/kassandra/config/common/example rename to packages/kassandra/config/common/example diff --git a/apps/kassandra/config/common/route b/packages/kassandra/config/common/route similarity index 100% rename from apps/kassandra/config/common/route rename to packages/kassandra/config/common/route diff --git a/apps/kassandra/config/readme.md b/packages/kassandra/config/readme.md similarity index 100% rename from apps/kassandra/config/readme.md rename to packages/kassandra/config/readme.md diff --git a/apps/kassandra/default.nix b/packages/kassandra/default.nix similarity index 100% rename from apps/kassandra/default.nix rename to packages/kassandra/default.nix diff --git a/apps/kassandra/frontend/LICENSE b/packages/kassandra/frontend/LICENSE similarity index 100% rename from apps/kassandra/frontend/LICENSE rename to packages/kassandra/frontend/LICENSE diff --git a/apps/kassandra/frontend/frontend.cabal b/packages/kassandra/frontend/frontend.cabal similarity index 100% rename from apps/kassandra/frontend/frontend.cabal rename to packages/kassandra/frontend/frontend.cabal diff --git a/apps/kassandra/frontend/hie.yaml b/packages/kassandra/frontend/hie.yaml similarity index 100% rename from apps/kassandra/frontend/hie.yaml rename to packages/kassandra/frontend/hie.yaml diff --git a/apps/kassandra/frontend/src-bin/main.hs b/packages/kassandra/frontend/src-bin/main.hs similarity index 100% rename from apps/kassandra/frontend/src-bin/main.hs rename to packages/kassandra/frontend/src-bin/main.hs diff --git a/apps/kassandra/frontend/src/Frontend.hs b/packages/kassandra/frontend/src/Frontend.hs similarity index 100% rename from apps/kassandra/frontend/src/Frontend.hs rename to packages/kassandra/frontend/src/Frontend.hs diff --git a/apps/kassandra/frontend/src/Frontend/Route.hs b/packages/kassandra/frontend/src/Frontend/Route.hs similarity index 100% rename from apps/kassandra/frontend/src/Frontend/Route.hs rename to packages/kassandra/frontend/src/Frontend/Route.hs diff --git a/apps/kassandra/hie.yaml b/packages/kassandra/hie.yaml similarity index 100% rename from apps/kassandra/hie.yaml rename to packages/kassandra/hie.yaml diff --git a/apps/kassandra/kassandra/CHANGELOG.md b/packages/kassandra/kassandra/CHANGELOG.md similarity index 100% rename from apps/kassandra/kassandra/CHANGELOG.md rename to packages/kassandra/kassandra/CHANGELOG.md diff --git a/apps/kassandra/kassandra/LICENSE b/packages/kassandra/kassandra/LICENSE similarity index 100% rename from apps/kassandra/kassandra/LICENSE rename to packages/kassandra/kassandra/LICENSE diff --git a/apps/kassandra/kassandra/Setup.hs b/packages/kassandra/kassandra/Setup.hs similarity index 100% rename from apps/kassandra/kassandra/Setup.hs rename to packages/kassandra/kassandra/Setup.hs diff --git a/apps/kassandra/kassandra/kassandra.cabal b/packages/kassandra/kassandra/kassandra.cabal similarity index 100% rename from apps/kassandra/kassandra/kassandra.cabal rename to packages/kassandra/kassandra/kassandra.cabal diff --git a/apps/kassandra/kassandra/src/Kassandra/AgendaWidget.hs b/packages/kassandra/kassandra/src/Kassandra/AgendaWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/AgendaWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/AgendaWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Api.hs b/packages/kassandra/kassandra/src/Kassandra/Api.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Api.hs rename to packages/kassandra/kassandra/src/Kassandra/Api.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/BaseWidgets.hs b/packages/kassandra/kassandra/src/Kassandra/BaseWidgets.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/BaseWidgets.hs rename to packages/kassandra/kassandra/src/Kassandra/BaseWidgets.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Calendar.hs b/packages/kassandra/kassandra/src/Kassandra/Calendar.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Calendar.hs rename to packages/kassandra/kassandra/src/Kassandra/Calendar.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Config.hs b/packages/kassandra/kassandra/src/Kassandra/Config.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Config.hs rename to packages/kassandra/kassandra/src/Kassandra/Config.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Css.hs b/packages/kassandra/kassandra/src/Kassandra/Css.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Css.hs rename to packages/kassandra/kassandra/src/Kassandra/Css.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Debug.hs b/packages/kassandra/kassandra/src/Kassandra/Debug.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Debug.hs rename to packages/kassandra/kassandra/src/Kassandra/Debug.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/DragAndDrop.hs b/packages/kassandra/kassandra/src/Kassandra/DragAndDrop.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/DragAndDrop.hs rename to packages/kassandra/kassandra/src/Kassandra/DragAndDrop.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/ListElementWidget.hs b/packages/kassandra/kassandra/src/Kassandra/ListElementWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/ListElementWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/ListElementWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/ListWidget.hs b/packages/kassandra/kassandra/src/Kassandra/ListWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/ListWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/ListWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/LocalBackend.hs b/packages/kassandra/kassandra/src/Kassandra/LocalBackend.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/LocalBackend.hs rename to packages/kassandra/kassandra/src/Kassandra/LocalBackend.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/LocalBackendWidget.hs b/packages/kassandra/kassandra/src/Kassandra/LocalBackendWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/LocalBackendWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/LocalBackendWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/LogWidget.hs b/packages/kassandra/kassandra/src/Kassandra/LogWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/LogWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/LogWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/MainWidget.hs b/packages/kassandra/kassandra/src/Kassandra/MainWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/MainWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/MainWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/ReflexUtil.hs b/packages/kassandra/kassandra/src/Kassandra/ReflexUtil.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/ReflexUtil.hs rename to packages/kassandra/kassandra/src/Kassandra/ReflexUtil.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/RemoteBackendWidget.hs b/packages/kassandra/kassandra/src/Kassandra/RemoteBackendWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/RemoteBackendWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/RemoteBackendWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/SelectorWidget.hs b/packages/kassandra/kassandra/src/Kassandra/SelectorWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/SelectorWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/SelectorWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Sorting.hs b/packages/kassandra/kassandra/src/Kassandra/Sorting.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Sorting.hs rename to packages/kassandra/kassandra/src/Kassandra/Sorting.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/State.hs b/packages/kassandra/kassandra/src/Kassandra/State.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/State.hs rename to packages/kassandra/kassandra/src/Kassandra/State.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/TaskWidget.hs b/packages/kassandra/kassandra/src/Kassandra/TaskWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/TaskWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/TaskWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/TextEditWidget.hs b/packages/kassandra/kassandra/src/Kassandra/TextEditWidget.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/TextEditWidget.hs rename to packages/kassandra/kassandra/src/Kassandra/TextEditWidget.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/TimeWidgets.hs b/packages/kassandra/kassandra/src/Kassandra/TimeWidgets.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/TimeWidgets.hs rename to packages/kassandra/kassandra/src/Kassandra/TimeWidgets.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Types.hs b/packages/kassandra/kassandra/src/Kassandra/Types.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Types.hs rename to packages/kassandra/kassandra/src/Kassandra/Types.hs diff --git a/apps/kassandra/kassandra/src/Kassandra/Util.hs b/packages/kassandra/kassandra/src/Kassandra/Util.hs similarity index 100% rename from apps/kassandra/kassandra/src/Kassandra/Util.hs rename to packages/kassandra/kassandra/src/Kassandra/Util.hs diff --git a/apps/kassandra/kassandra/src/Prelude.hs b/packages/kassandra/kassandra/src/Prelude.hs similarity index 100% rename from apps/kassandra/kassandra/src/Prelude.hs rename to packages/kassandra/kassandra/src/Prelude.hs diff --git a/apps/kassandra/obelisk-shell.nix b/packages/kassandra/obelisk-shell.nix similarity index 100% rename from apps/kassandra/obelisk-shell.nix rename to packages/kassandra/obelisk-shell.nix diff --git a/apps/kassandra/release.nix b/packages/kassandra/release.nix similarity index 100% rename from apps/kassandra/release.nix rename to packages/kassandra/release.nix diff --git a/apps/kassandra/standalone/.hlint.yaml b/packages/kassandra/standalone/.hlint.yaml similarity index 100% rename from apps/kassandra/standalone/.hlint.yaml rename to packages/kassandra/standalone/.hlint.yaml diff --git a/apps/kassandra/standalone/CHANGELOG.md b/packages/kassandra/standalone/CHANGELOG.md similarity index 100% rename from apps/kassandra/standalone/CHANGELOG.md rename to packages/kassandra/standalone/CHANGELOG.md diff --git a/apps/kassandra/standalone/LICENSE b/packages/kassandra/standalone/LICENSE similarity index 100% rename from apps/kassandra/standalone/LICENSE rename to packages/kassandra/standalone/LICENSE diff --git a/apps/kassandra/standalone/src-bin/main.hs b/packages/kassandra/standalone/src-bin/main.hs similarity index 100% rename from apps/kassandra/standalone/src-bin/main.hs rename to packages/kassandra/standalone/src-bin/main.hs diff --git a/apps/kassandra/standalone/src/Kassandra/Backend/Calendar.hs b/packages/kassandra/standalone/src/Kassandra/Backend/Calendar.hs similarity index 100% rename from apps/kassandra/standalone/src/Kassandra/Backend/Calendar.hs rename to packages/kassandra/standalone/src/Kassandra/Backend/Calendar.hs diff --git a/apps/kassandra/standalone/src/Kassandra/Config/Dhall.hs b/packages/kassandra/standalone/src/Kassandra/Config/Dhall.hs similarity index 100% rename from apps/kassandra/standalone/src/Kassandra/Config/Dhall.hs rename to packages/kassandra/standalone/src/Kassandra/Config/Dhall.hs diff --git a/apps/kassandra/standalone/src/Kassandra/Standalone.hs b/packages/kassandra/standalone/src/Kassandra/Standalone.hs similarity index 100% rename from apps/kassandra/standalone/src/Kassandra/Standalone.hs rename to packages/kassandra/standalone/src/Kassandra/Standalone.hs diff --git a/apps/kassandra/standalone/src/Kassandra/Standalone/Config.hs b/packages/kassandra/standalone/src/Kassandra/Standalone/Config.hs similarity index 100% rename from apps/kassandra/standalone/src/Kassandra/Standalone/Config.hs rename to packages/kassandra/standalone/src/Kassandra/Standalone/Config.hs diff --git a/apps/kassandra/standalone/src/Kassandra/Standalone/State.hs b/packages/kassandra/standalone/src/Kassandra/Standalone/State.hs similarity index 100% rename from apps/kassandra/standalone/src/Kassandra/Standalone/State.hs rename to packages/kassandra/standalone/src/Kassandra/Standalone/State.hs diff --git a/apps/kassandra/standalone/standalone.cabal b/packages/kassandra/standalone/standalone.cabal similarity index 100% rename from apps/kassandra/standalone/standalone.cabal rename to packages/kassandra/standalone/standalone.cabal diff --git a/apps/kassandra/static/.empty b/packages/kassandra/static/.empty similarity index 100% rename from apps/kassandra/static/.empty rename to packages/kassandra/static/.empty diff --git a/apps/kassandra/static/MaterialIcons-Regular-Outlined.otf b/packages/kassandra/static/MaterialIcons-Regular-Outlined.otf similarity index 100% rename from apps/kassandra/static/MaterialIcons-Regular-Outlined.otf rename to packages/kassandra/static/MaterialIcons-Regular-Outlined.otf diff --git a/apps/kassandra/static/MaterialIcons-Regular.ttf b/packages/kassandra/static/MaterialIcons-Regular.ttf similarity index 100% rename from apps/kassandra/static/MaterialIcons-Regular.ttf rename to packages/kassandra/static/MaterialIcons-Regular.ttf diff --git a/apps/kassandra/weeder.dhall b/packages/kassandra/weeder.dhall similarity index 100% rename from apps/kassandra/weeder.dhall rename to packages/kassandra/weeder.dhall diff --git a/apps/logfeed/.gitignore b/packages/logfeed/.gitignore similarity index 100% rename from apps/logfeed/.gitignore rename to packages/logfeed/.gitignore diff --git a/apps/logfeed/Mail.hs b/packages/logfeed/Mail.hs similarity index 100% rename from apps/logfeed/Mail.hs rename to packages/logfeed/Mail.hs diff --git a/apps/logfeed/Main.hs b/packages/logfeed/Main.hs similarity index 100% rename from apps/logfeed/Main.hs rename to packages/logfeed/Main.hs diff --git a/apps/logfeed/logfeed.cabal b/packages/logfeed/logfeed.cabal similarity index 100% rename from apps/logfeed/logfeed.cabal rename to packages/logfeed/logfeed.cabal diff --git a/apps/logfeed/shell.nix b/packages/logfeed/shell.nix similarity index 100% rename from apps/logfeed/shell.nix rename to packages/logfeed/shell.nix diff --git a/apps/nixpkgs-bot/.gitignore b/packages/nixpkgs-bot/.gitignore similarity index 100% rename from apps/nixpkgs-bot/.gitignore rename to packages/nixpkgs-bot/.gitignore diff --git a/apps/nixpkgs-bot/CHANGELOG.md b/packages/nixpkgs-bot/CHANGELOG.md similarity index 100% rename from apps/nixpkgs-bot/CHANGELOG.md rename to packages/nixpkgs-bot/CHANGELOG.md diff --git a/apps/nixpkgs-bot/LICENSE b/packages/nixpkgs-bot/LICENSE similarity index 100% rename from apps/nixpkgs-bot/LICENSE rename to packages/nixpkgs-bot/LICENSE diff --git a/apps/nixpkgs-bot/TODO.md b/packages/nixpkgs-bot/TODO.md similarity index 100% rename from apps/nixpkgs-bot/TODO.md rename to packages/nixpkgs-bot/TODO.md diff --git a/apps/nixpkgs-bot/codegen.yml b/packages/nixpkgs-bot/codegen.yml similarity index 100% rename from apps/nixpkgs-bot/codegen.yml rename to packages/nixpkgs-bot/codegen.yml diff --git a/apps/nixpkgs-bot/exe/Main.hs b/packages/nixpkgs-bot/exe/Main.hs similarity index 100% rename from apps/nixpkgs-bot/exe/Main.hs rename to packages/nixpkgs-bot/exe/Main.hs diff --git a/apps/nixpkgs-bot/graphql/merge_pr_info.graphql b/packages/nixpkgs-bot/graphql/merge_pr_info.graphql similarity index 100% rename from apps/nixpkgs-bot/graphql/merge_pr_info.graphql rename to packages/nixpkgs-bot/graphql/merge_pr_info.graphql diff --git a/apps/nixpkgs-bot/graphql/pr_info.graphql b/packages/nixpkgs-bot/graphql/pr_info.graphql similarity index 100% rename from apps/nixpkgs-bot/graphql/pr_info.graphql rename to packages/nixpkgs-bot/graphql/pr_info.graphql diff --git a/apps/nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs b/packages/nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs similarity index 100% rename from apps/nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs rename to packages/nixpkgs-bot/lib/NixpkgsBot/GraphQL/API.hs diff --git a/apps/nixpkgs-bot/lib/NixpkgsBot/GraphQL/Scalars.hs b/packages/nixpkgs-bot/lib/NixpkgsBot/GraphQL/Scalars.hs similarity index 100% rename from apps/nixpkgs-bot/lib/NixpkgsBot/GraphQL/Scalars.hs rename to packages/nixpkgs-bot/lib/NixpkgsBot/GraphQL/Scalars.hs diff --git a/apps/nixpkgs-bot/nixpkgs-bot.cabal b/packages/nixpkgs-bot/nixpkgs-bot.cabal similarity index 100% rename from apps/nixpkgs-bot/nixpkgs-bot.cabal rename to packages/nixpkgs-bot/nixpkgs-bot.cabal diff --git a/apps/nixpkgs-bot/vendor/github-schema.graphql b/packages/nixpkgs-bot/vendor/github-schema.graphql similarity index 100% rename from apps/nixpkgs-bot/vendor/github-schema.graphql rename to packages/nixpkgs-bot/vendor/github-schema.graphql diff --git a/packages/wizards-dialog/.envrc b/packages/wizards-dialog/.envrc new file mode 100644 index 00000000..3550a30f --- /dev/null +++ b/packages/wizards-dialog/.envrc @@ -0,0 +1 @@ +use flake diff --git a/apps/wizards-dialog/Dialog.hs b/packages/wizards-dialog/Dialog.hs similarity index 100% rename from apps/wizards-dialog/Dialog.hs rename to packages/wizards-dialog/Dialog.hs diff --git a/apps/wizards-dialog/Main.hs b/packages/wizards-dialog/Main.hs similarity index 100% rename from apps/wizards-dialog/Main.hs rename to packages/wizards-dialog/Main.hs diff --git a/apps/wizards-dialog/menu.yaml b/packages/wizards-dialog/menu.yaml similarity index 100% rename from apps/wizards-dialog/menu.yaml rename to packages/wizards-dialog/menu.yaml diff --git a/apps/wizards-dialog/wizards-dialog.cabal b/packages/wizards-dialog/wizards-dialog.cabal similarity index 79% rename from apps/wizards-dialog/wizards-dialog.cabal rename to packages/wizards-dialog/wizards-dialog.cabal index 840f9698..ea3caedc 100644 --- a/apps/wizards-dialog/wizards-dialog.cabal +++ b/packages/wizards-dialog/wizards-dialog.cabal @@ -1,23 +1,22 @@ -cabal-version: >=1.10 +cabal-version: >=1.10 -- Initial package description 'haskell-dialog.cabal' generated by 'cabal -- init'. For further documentation, see -- http://haskell.org/cabal/users-guide/ -name: wizards-dialog -version: 0.1.0.0 +name: wizards-dialog +version: 0.1.0.0 -- synopsis: -- description: -- bug-reports: -license: AGPL -author: Malte Brandy -maintainer: malte.brandy@maralorn.de +license: AGPL +author: Malte Brandy +maintainer: malte.brandy@maralorn.de -- copyright: -- category: -build-type: Simple -extra-source-files: CHANGELOG.md +build-type: Simple library default-extensions: ImportQualifiedPost