Merge all branches

flake.nix

@@ -2,21 +2,17 @@
   inputs.nixpkgs.url = "nixpkgs";
 
   outputs = { self, nixpkgs, ...}:
-  let
-    system = "x86_64-linux";
-    pkgs = import nixpkgs {
-      inherit system;
+    let
       # For now we only support x86
-      overlays = [ self.overlays.default ];
-    };
-  in
+      system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ self.overlays.default ];
+      };
+    in
     {
       bscOverlay = import ./overlay.nix;
       overlays.default = self.bscOverlay;
- 
-      # propagate nixpkgs lib, so we can do bscpkgs.lib
-      inherit (nixpkgs) lib;
-
       # full nixpkgs with our overlay applied
       legacyPackages.${system} = pkgs;
 
@@ -26,18 +22,21 @@
           inherit (builtins) attrNames removeAttrs;
           inherit (nixpkgs.lib) flip filterAttrs getAttrs pipe isDerivation;
         in
-          # extract the names of the packages from the overlay, then get the
-          # actual packages from the full package set with the overlay applied
-          pipe (self.overlays.default null { inherit (nixpkgs) lib; } ) [
-            attrNames
-            (flip getAttrs pkgs)
-            (flip removeAttrs [ "bsc" ])
-            (filterAttrs (_: isDerivation))
-          ];
+        # extract the names of the packages from the overlay, then get the
+        # actual packages from the full package set with the overlay applied
+        pipe (self.overlays.default null { inherit (nixpkgs) lib; }) [
+          attrNames
+          (flip getAttrs pkgs)
+          (flip removeAttrs [ "bsc" ])
+          (filterAttrs (_: isDerivation))
+        ];
 
       hydraJobs = {
         inherit (self.legacyPackages.x86_64-linux.bsc-ci) test;
         packages = self.packages.${system};
       };
-   };
+
+      # propagate nixpkgs lib, so we can do bscpkgs.lib
+      inherit (nixpkgs) lib;
+    };
 }