home

commit 9f38d5750ee8b50091882749ce93c551ec4211c3
parent e3551b7a2dc4f899e2cac4e02eedb423f4bcd4d0
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 12 Oct 2021 23:12:57 +0200

nix/packages: fix/clean some builds

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
nix/packages/default.nix
 | 
39
++-------------------------------------
M
nix/packages/tkn/default.nix
 | 
16
----------------

2 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -1,35 +1,7 @@
 { sources ? import ../.
 , pkgs ? sources.pkgs { }
 }:
-let
-  emacs27 = (pkgs.emacs.override { srcRepo = true; }).overrideAttrs (
-    old: {
-      name = "emacs-dev";
-      version = "27.1";
-      src = pkgs.fetchFromGitHub {
-        owner = "emacs-mirror";
-        repo = "emacs";
-        rev = "emacs-27.1";
-        sha256 = "1i50ksf96fxa3ymdb1irpc82vi67861sr4xlcmh9f64qw9imm3ks";
-      };
-      /*
-        %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
-        --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
-        --with-xwidgets --with-modules
-      */
-      configureFlags = old.configureFlags ++ [
-        "--with-xft"
-        "--with-gpm=no"
-        # "--with-nativecomp" # emacs 28
-        "--with-mailutils"
-      ];
-      buildInputs = old.buildInputs ++ [ pkgs.jansson ];
-      patches = [
-        ./patches/clean-env.patch
-      ];
-    }
-  );
-in
+
 rec {
   # pre nur-packages import
   scripts = pkgs.callPackage ./my/scripts { };
@@ -47,9 +19,6 @@ rec {
   systemd-email = pkgs.callPackage ./systemd-email { };
   yak = pkgs.callPackage ./yak { };
 
-  # emacs
-  emacs = emacs27.override { inherit (pkgs) imagemagick; withXwidgets = true; };
-
   # Maybe upstream
   athens = pkgs.callPackage ./athens { };
   envbox = pkgs.callPackage ./envbox { };
@@ -60,7 +29,7 @@ rec {
   ko = pkgs.callPackage ./ko { };
   kss = pkgs.callPackage ./kss { };
   batzconverter = pkgs.callPackage ./batzconverter { };
-  kubernix = pkgs.callPackage ./kubernix { };
+  #kubernix = pkgs.callPackage ./kubernix { };
   krew = pkgs.callPackage ./krew { };
   prm = pkgs.callPackage ./prm { };
   #protobuild = pkgs.callPackage ./protobuild { };
@@ -124,10 +93,6 @@ rec {
 
   # Tekton
   inherit (pkgs.callPackage ./tkn { })
-    tkn_0_13
-    tkn_0_14
-    tkn_0_15
-    tkn_0_16
     tkn_0_17
     tkn_0_18
     tkn_0_19
diff --git a/nix/packages/tkn/default.nix b/nix/packages/tkn/default.nix
@@ -67,20 +67,4 @@ rec {
     version = "0.17.2";
     sha256 = "0wqy8y19l6kay3v2danj10gw58j6l9b3616zn9w5pjbmbcwbslgd";
   };
-  tkn_0_16 = makeOverridable tknGen {
-    version = "0.16.0";
-    sha256 = "0r882qsdz2hhl2fygx48isnak603c2xcngws9145xvxk87gky1ac";
-  };
-  tkn_0_15 = makeOverridable tknGen {
-    version = "0.15.0";
-    sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl";
-  };
-  tkn_0_14 = makeOverridable tknGen {
-    version = "0.14.0";
-    sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p";
-  };
-  tkn_0_13 = makeOverridable tknGen {
-    version = "0.13.1";
-    sha256 = "0cjih8h64wwdp022pn70xqxafdk34z2y2ipxb86dlf2zdrf9xv53";
-  };
 }