Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9ebc84f8d2c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0125544e2a05
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 16, 2019

  1. odyssey: init at 2019-03-12

    marsam committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    fef17b1 View commit details

Commits on Mar 17, 2019

  1. Merge pull request #57576 from marsam/init-odyssey

    odyssey: init at 2019-03-12
    ryantm authored Mar 17, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5d5c24b View commit details
  2. bamf: add wrapGAppsHook

    worldofpeace committed Mar 17, 2019
    Copy the full SHA
    0125544 View commit details
Showing with 32 additions and 1 deletion.
  1. +2 −1 pkgs/development/libraries/bamf/default.nix
  2. +28 −0 pkgs/tools/misc/odyssey/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/bamf/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
, libstartup_notification, gobject-introspection, gtk-doc, docbook_xsl
, xorgserver, dbus, python2 }:
, xorgserver, dbus, python2, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "bamf-${version}";
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
python2.pkgs.libxml2
dbus
xorgserver
wrapGAppsHook
];

buildInputs = [
28 changes: 28 additions & 0 deletions pkgs/tools/misc/odyssey/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, openssl }:

stdenv.mkDerivation rec {
pname = "odyssey";
version = "unstable-2019-03-12";

src = fetchFromGitHub {
owner = "yandex";
repo = pname;
rev = "af015839b03f30260c75d8f565521910c0694ed6";
sha256 = "1cnnypvk78wp1qmqfriky40ls0grkp4v46mypyaq5kl8ppknvnvs";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];

installPhase = ''
install -Dm755 -t $out/bin sources/odyssey
'';

meta = with stdenv.lib; {
description = "Scalable PostgreSQL connection pooler";
homepage = https://github.com/yandex/odyssey;
license = licenses.bsd3;
maintainers = [ maintainers.marsam ];
platforms = [ "x86_64-linux" ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -4628,6 +4628,8 @@ in

odt2txt = callPackage ../tools/text/odt2txt { };

odyssey = callPackage ../tools/misc/odyssey { };

offlineimap = callPackage ../tools/networking/offlineimap { };

oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };