Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 810318a622a3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c4298f3849a
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 1, 2018

  1. Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    Copy the full SHA
    de650d4 View commit details
  2. regextester: init at 0.1.7

    samdroid-apps authored and dezgeg committed Mar 1, 2018
    Copy the full SHA
    1c4298f View commit details
54 changes: 54 additions & 0 deletions pkgs/applications/misc/regextester/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{ stdenv
, fetchFromGitHub
, gettext
, libxml2
, pkgconfig
, gtk3
, granite
, gnome3
, cmake
, ninja
, vala
, elementary-cmake-modules
, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "regextester-${version}";
version = "0.1.7";

src = fetchFromGitHub {
owner = "artemanufrij";
repo = "regextester";
rev = version;
sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n";
};

XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
"${granite}/share"
"${gnome3.libgee}/share"
];

nativeBuildInputs = [
pkgconfig
wrapGAppsHook
vala
cmake
ninja
gettext
libxml2
elementary-cmake-modules
];
buildInputs = [
gtk3
granite
gnome3.libgee
];

meta = with stdenv.lib; {
description = "A desktop application to test regular expressions interactively";
homepage = https://github.com/artemanufrij/regextester;
maintainers = with maintainers; [ samdroid-apps ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}
28 changes: 28 additions & 0 deletions pkgs/development/libraries/elementary-cmake-modules/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:

stdenv.mkDerivation {
name = "elementary-cmake-modules";

src = fetchFromGitHub {
owner = "elementary";
repo = "cmake-modules";
rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e";
sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby";
};

prePatch = ''
substituteInPlace CMakeLists.txt \
--replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake"
'';

propagatedBuildInputs = [ cmake pkgconfig ];

setupHook = ./setup-hook.sh;

meta = with lib; {
platforms = platforms.linux ++ platforms.darwin;
homepage = https://github.com/elementary/cmake-modules;
license = licenses.gpl3Plus;
maintainers = [ maintainers.samdroid-apps ];
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_elementaryCMakeEnvHook() {
cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake)
}
addEnvHooks "$targetOffset" _elementaryCMakeEnvHook
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -7159,6 +7159,8 @@ with pkgs;

red = callPackage ../development/interpreters/red { };

regextester = callPackage ../applications/misc/regextester { };

regina = callPackage ../development/interpreters/regina { };

inherit (ocamlPackages) reason;
@@ -9117,6 +9119,7 @@ with pkgs;
gnome-sharp = callPackage ../development/libraries/gnome-sharp {};

granite = callPackage ../development/libraries/granite { };
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };

gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or stdenv.isLinux;