From 71ac0cd55efe8fad3623001bb3b7b9a355961802 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 7 Mar 2016 16:41:57 +0000 Subject: yeshup: init at 5461a8f --- pkgs/tools/system/yeshup/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/system/yeshup/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix new file mode 100644 index 000000000000..806d6cc5b945 --- /dev/null +++ b/pkgs/tools/system/yeshup/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "yeshup-${builtins.substring 0 7 rev}"; + rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08"; + + src = fetchFromGitHub { + owner = "RhysU"; + repo = "yeshup"; + inherit rev; + sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -v yeshup $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/RhysU/yeshup; + platforms = platforms.all; + license = licenses.cc-by-sa-30; # From Stackoverflow answer + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c540ff849c8a..f3112324169d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3893,6 +3893,8 @@ let yaml-merge = callPackage ../tools/text/yaml-merge { }; + yeshup = callPackage ../tools/system/yeshup { }; + # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; -- cgit 1.4.1 From 54571aa76b65d55c4a72c8fcbd35d7d237b30437 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 10 Mar 2016 16:32:04 +0000 Subject: goPackages.dbus: a5942de -> 230e4b2 Keep old version around because I can't get lxd-go-systemd to build against the new one --- pkgs/top-level/go-packages.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index dd9a9dde7bb3..023936a2647b 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -596,17 +596,20 @@ let sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; - dbus = buildGoPackage rec { - rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; - name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/godbus/dbus"; + dbus-old-2015-05-19 = buildFromGitHub { + rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; + date = "2015-05-19"; + owner = "godbus"; + repo = "dbus"; + sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; + }; - src = fetchFromGitHub { - inherit rev; - owner = "godbus"; - repo = "dbus"; - sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; - }; + dbus = buildFromGitHub { + rev = "230e4b23db2fd81c53eaa0073f76659d4849ce51"; + date = "2016-03-02"; + owner = "godbus"; + repo = "dbus"; + sha256 = "1wxv2cbihzcsz2z7iycyzl7f3arhhgagcc5kqln1k1mkm4l85z0q"; }; deis = buildFromGitHub { @@ -1705,7 +1708,7 @@ let owner = "stgraber"; repo = "lxd-go-systemd"; sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w"; - buildInputs = [ dbus ]; + buildInputs = [ dbus-old-2015-05-19 ]; }; go-update-v0 = buildFromGitHub { -- cgit 1.4.1 From 8928aa9a7b11e76cdb7e3475bd0d0e7167e9a1d7 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 10 Mar 2016 17:46:15 +0000 Subject: goPackages.go-systemd: 2688e91 -> 7b2428f --- pkgs/top-level/go-packages.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 023936a2647b..3ce1b797c7bf 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1687,18 +1687,13 @@ let sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; }; - go-systemd = buildGoPackage rec { - rev = "2688e91251d9d8e404e86dd8f096e23b2f086958"; - name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/coreos/go-systemd"; - - src = fetchFromGitHub { - inherit rev; - owner = "coreos"; - repo = "go-systemd"; - sha256 = "0c1k3y5msc1xplhx0ksa7g08yqjaavns8s5zrfg4ig8az30gwlpa"; - }; - + go-systemd = buildFromGitHub { + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + date = "2016-03-10"; + owner = "coreos"; + repo = "go-systemd"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + nativeBuildInputs = [ pkgs.pkgconfig pkgs.systemd ]; buildInputs = [ dbus ]; }; -- cgit 1.4.1 From a1f8b5bcd0c2860ed45a4761058b503b148112fb Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 2 Mar 2016 13:43:18 +0000 Subject: goPackages.upower-notify: init at a58ceb9 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 15 +++++++++++++++ 2 files changed, 17 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3112324169d..be6bcc8b3f73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1805,6 +1805,8 @@ let go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; }; + go-upower-notify = goPackages.upower-notify.bin // { outputs = [ "bin" ]; }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3ce1b797c7bf..a6dac58a172b 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3791,4 +3791,19 @@ let sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5"; buildInputs = [ go-colortext yaml-v2 godotenv ]; }; + + # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: + # + # service.xserver.displayManager.sessionCommands = '' + # ${pkgs.dunst}/bin/dunst -shrink -geometry 0x0-50-50 -key space & # ...if don't already have a dbus notification display app + # (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) & + # ''; + upower-notify = buildFromGitHub rec { + rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; + date = "2016-03-10"; + owner = "omeid"; + repo = "upower-notify"; + sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; + propagatedBuildInputs = [ dbus ]; + }; }; in self -- cgit 1.4.1