Merge remote-tracking branch 'origin/master' into rfc101-style

.github/workflows/main.yml

@@ -10,49 +10,17 @@ on:
     branches:
       - master
 
-env:
-  CDN_DISTRIBUTION_ID: E13UN1J1JFIWUZ
-  CDN_BUCKET: s3://nixfmt.serokell.io
-
 jobs:
   check:
-    runs-on: [self-hosted, nix]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
+      - uses: cachix/install-nix-action@v26
+
       - name: reuse lint
         run: nix shell .#packages.x86_64-linux.reuse -c reuse lint
 
-      # - name: hlint
-      #   run: nix build -L .#checks.x86_64-linux.hlint
-      #   if: success() || failure()
-
-      # - name: stylish-haskell
-      #   run: nix build -L .#checks.x86_64-linux.stylish-haskell
-      #   if: success() || failure()
-
       - name: build nixfmt
         run: nix build -L .#nixfmt-static
         if: success() || failure()
-
-      - name: build webdemo
-        run: nix build -L .#nixfmt-webdemo
-        if: success() || failure()
-
-      - name: build awscli
-        run: nix shell .#awscli
-        if: success() || failure()
-
-  deploy:
-    runs-on: [self-hosted, nix]
-    if: ${{ github.ref == 'refs/heads/master' }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: deploy webdemo
-        run: |
-          nix build .#nixfmt-webdemo
-          nix shell .#awscli -c aws s3 cp --recursive result/ "$CDN_BUCKET"
-          # delete files that don't exist anymore, use `--size-only` so behavior won't depend on local file timestamps
-          nix shell .#awscli -c aws s3 sync --delete --size-only result/ "$CDN_BUCKET"
-          nix shell .#awscli -c aws cloudfront create-invalidation --distribution-id "$CDN_DISTRIBUTION_ID" --paths '/*'

flake.nix

@@ -8,7 +8,6 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
 
     flake-utils.url = "github:numtide/flake-utils";
 
@@ -22,7 +21,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-stable, flake-utils, serokell-nix, ... }:
+  outputs = { self, nixpkgs, flake-utils, serokell-nix, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         overlay = self: super: {
@@ -38,26 +37,8 @@
           overlays = [ overlay serokell-nix.overlay ];
         };
 
-        pkgs-stable = import nixpkgs-stable {
-          inherit system;
-          overlays = [ overlay ];
-        };
-
         inherit (pkgs) haskell lib;
 
-        ghcjsPackages = pkgs-stable.haskell.packages.ghcjs810.override (old: {
-          overrides = (self: super: {
-            QuickCheck = haskell.lib.dontCheck super.QuickCheck;
-            tasty-quickcheck = haskell.lib.dontCheck super.tasty-quickcheck;
-            scientific = haskell.lib.dontCheck super.scientific;
-            temporary = haskell.lib.dontCheck super.temporary;
-            time-compat = haskell.lib.dontCheck super.time-compat;
-            text-short = haskell.lib.dontCheck super.text-short;
-            vector = haskell.lib.dontCheck super.vector;
-            aeson = super.aeson_1_5_6_0;
-          });
-        });
-
         regexes =
           [ ".*.cabal$" "^src.*" "^main.*" "^Setup.hs$" "^js.*" "LICENSE" ];
         src = builtins.path {
@@ -74,14 +55,6 @@
           nixfmt = pkgs.haskellPackages.nixfmt;
           nixfmt-static = haskell.lib.justStaticExecutables nixfmt;
           nixfmt-deriver = nixfmt-static.cabal2nixDeriver;
-          nixfmt-js = ghcjsPackages.callCabal2nix "nixfmt" src { };
-          nixfmt-webdemo = pkgs.runCommandNoCC "nixfmt-webdemo" { } ''
-            mkdir $out
-            cp ${./js/index.html} $out/index.html
-            cp ${./js/404.html} $out/404.html
-            cp ${nixfmt-js}/bin/js-interface.jsexe/{rts,lib,out,runmain}.js $out
-            substituteInPlace $out/index.html --replace ../dist/build/js-interface/js-interface.jsexe/ ./
-          '';
 
           nixfmt-shell = nixfmt.env.overrideAttrs (oldAttrs: {
             buildInputs = oldAttrs.buildInputs ++ (with pkgs; [
@@ -92,7 +65,7 @@
             ]);
           });
 
-          inherit (pkgs) awscli reuse;
+          inherit (pkgs) reuse;
         };
 
         apps.default = {