Fix nixos-rebuild due to insecure packages and outdated haskell overlay

evanjs · Dec 4, 2020 · 05a59a9 · 05a59a9
1 parent e49c698
commit 05a59a9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/config/new-modules/profiles/desktop.nix b/config/new-modules/profiles/desktop.nix
@@ -330,6 +330,11 @@ in {
       services.fstrim.enable = true;
 
       mine.prometheus.export.enable = true;
+
+      # what requires cryptography for python 2.7?
+      nixpkgs.config.permittedInsecurePackages = [
+        "python2.7-cryptography-2.9.2"
+      ];
     })
   ];
 }
diff --git a/overlays/haskell/overlay.nix b/overlays/haskell/overlay.nix
@@ -6,43 +6,43 @@ self: super: {
   haskellPackages = super.haskellPackages.override (old: {
     overrides = with self.haskell.lib; self.lib.composeExtensions (old.overrides or (_: _: { })) (hself: hsuper: {
 
-      gi-cairo-connector = markUnbroken (hsuper.gi-cairo-connector);
+      #gi-cairo-connector = markUnbroken (hsuper.gi-cairo-connector);
 
-      gi-cairo-render = markUnbroken (overrideCabal (hsuper.gi-cairo-render) (drv: {
-        src = self.fetchFromGitHub {
-          owner = "thestr4ng3r";
-          repo = "gi-cairo-render";
-          rev = "8727c43cdf91aeedffc9cb4c5575f56660a86399";
-          sha256 = "16kqh2ck0dad1l4m6q9xs5jqj9q0vgpqrzb2dc90jk8xwslmmhxd";
-          };
-          editedCabalFile = null;
-          postUnpack = ''
-          mv source all
-          mv all/gi-cairo-render source
-          '';
-          }));
+      #gi-cairo-render = markUnbroken (overrideCabal (hsuper.gi-cairo-render) (drv: {
+        #src = self.fetchFromGitHub {
+          #owner = "thestr4ng3r";
+          #repo = "gi-cairo-render";
+          #rev = "8727c43cdf91aeedffc9cb4c5575f56660a86399";
+          #sha256 = "16kqh2ck0dad1l4m6q9xs5jqj9q0vgpqrzb2dc90jk8xwslmmhxd";
+          #};
+          #editedCabalFile = null;
+          #postUnpack = ''
+          #mv source all
+          #mv all/gi-cairo-render source
+          #'';
+          #}));
 
-          gi-dbusmenu = markUnbroken (hself.gi-dbusmenu_0_4_8);
+          #gi-dbusmenu = markUnbroken (hself.gi-dbusmenu_0_4_8);
 
-          gi-dbusmenugtk3 = markUnbroken (hself.gi-dbusmenugtk3_0_4_9);
+          #gi-dbusmenugtk3 = markUnbroken (hself.gi-dbusmenugtk3_0_4_9);
 
-          gi-gdk = hself.gi-gdk_3_0_23;
+          #gi-gdk = hself.gi-gdk_3_0_23;
 
-          gi-gdkx11 = markUnbroken (overrideSrc hsuper.gi-gdkx11 {
-            src = self.fetchurl {
-              url = "https://hackage.haskell.org/package/gi-gdkx11-3.0.10/gi-gdkx11-3.0.10.tar.gz";
-              sha256 = "0kfn4l5jqhllz514zw5cxf7181ybb5c11r680nwhr99b97yy0q9f";
-            };
-            version = "3.0.10";
-          });
+          #gi-gdkx11 = markUnbroken (overrideSrc hsuper.gi-gdkx11 {
+            #src = self.fetchurl {
+              #url = "https://hackage.haskell.org/package/gi-gdkx11-3.0.10/gi-gdkx11-3.0.10.tar.gz";
+              #sha256 = "0kfn4l5jqhllz514zw5cxf7181ybb5c11r680nwhr99b97yy0q9f";
+            #};
+            #version = "3.0.10";
+          #});
 
-          gi-gtk-hs = markUnbroken (hself.gi-gtk-hs_0_3_9);
+          #gi-gtk-hs = markUnbroken (hself.gi-gtk-hs_0_3_9);
 
-          gi-xlib = markUnbroken (hself.gi-xlib_2_0_9);
+          #gi-xlib = markUnbroken (hself.gi-xlib_2_0_9);
 
-          gtk-sni-tray = markUnbroken (hsuper.gtk-sni-tray);
+          #gtk-sni-tray = markUnbroken (hsuper.gtk-sni-tray);
 
-          gtk-strut = markUnbroken (hsuper.gtk-strut);
+          #gtk-strut = markUnbroken (hsuper.gtk-strut);
 
       # Version with meck's fix for struts in hidpi
       # https://github.com/taffybar/gtk-strut/pull/5