From 9ae239680930d3a39af4f1a15d0a5b6018219c2d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 14 Apr 2020 00:32:54 -0700 Subject: [PATCH] [NixOS] Remove old overlays that have been merged into nixpkgs --- nixos/configuration.nix | 7 +++++-- nixos/overlays.nix | 36 ++---------------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 4dd8a040..fde688cf 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -154,9 +154,9 @@ in libnotify lxqt.lxqt-powermanagement networkmanagerapplet - customizable-notify-osd + notify-osd-customizable - pasystray-appindicator + pasystray pinentry pommed_light rofi @@ -212,6 +212,9 @@ in # Ruby ruby + # purescript + purescript + # Tools automake bazaar diff --git a/nixos/overlays.nix b/nixos/overlays.nix index 8d290401..d6cd7211 100644 --- a/nixos/overlays.nix +++ b/nixos/overlays.nix @@ -8,42 +8,10 @@ let lorriBinSource = super.fetchFromGitHub { owner = "IvanMalison"; repo = "lorri"; - rev = "94c7152745688c1268262a42d1d0fa0b7b2f6309"; - sha256 = "07mcmj44f35yb2ifzr4zmazqv54dh0vhvkdikbymm2vdmjh8xdw8"; + rev = "cb966b0d4ab7f4b5861d79a19822eca6b6a50e82"; + sha256 = "1q01cjmvd1shxlwzjsi4gzdn0sx5a132bqql3xksbnhaj7ka6j3f"; }; in { - clipit = super.clipit.overrideAttrs (oldAttrs: rec { - version = "50d983514386029a1f133187902084b753458f32"; - preConfigure = "./autogen.sh"; - configureFlags = ["--with-gtk3" "--enable-appindicator"]; - src = super.fetchFromGitHub { - owner = "IvanMalison"; - repo = "ClipIt"; - sha256 = "1d52zjnxmcp2kr4wvq2yn9fhr61v9scp91fxfvasvz5m7k1zagdn"; - rev = version; - }; - buildInputs = with self; [ - autoconf automake intltool gtk3 xdotool hicolor-icon-theme - libappindicator-gtk3 - ]; - }); - pasystray-appindicator = super.pasystray.overrideAttrs (oldAttrs: rec { - buildInputs = oldAttrs.buildInputs ++ [self.libappindicator-gtk3]; - }); - customizable-notify-osd = super.notify-osd.overrideAttrs (oldAttrs: rec { - version = "0.9.35+16.04.20160415"; - baseURI = "https://launchpad.net/~leolik/+archive/leolik"; - src = super.fetchurl { - url = "${baseURI}/+files/notify-osd_${version}-0ubuntu1-leolik~ppa0.tar.gz"; - sha256 = "026dr46jh3xc4103wnslzy7pxbxkkpflh52c59j8vzwaa7bvvzkv"; - name = "notify-osd-customizable.tar.gz"; - }; - preConfigure = "./autogen.sh --libexecdir=$(out)/bin"; - buildInputs = with self; [ - glib libwnck3 libnotify dbus-glib gnome3.gsettings-desktop-schemas - makeWrapper libtool gnome3.gnome-common - ]; - }); lorri = (import (lorriBinSource.outPath + "/default.nix")) { pkgs = super; }; }