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: f4f76bdf3370
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6dbb6a380ba7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 24, 2018

  1. procps-ng: updated project location 

    - use the real project location and not some sf.net mirror
- the meta attribute shouldn't point users to a website cluttered
  with ads (sf.net) where they probably just follow the link
  to the real project location
- adapted the build to the new archive
    @typetetris
    typetetris committed Mar 24, 2018
    Copy the full SHA
    67b23ee View commit details

  2. procps-ng: took maintainership

    @typetetris
    typetetris committed Mar 24, 2018
    Copy the full SHA
    59a9165 View commit details

  3. Merge #37731: procps-ng: update project location

    @vcunat
    vcunat committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    38d6699 View commit details

  4. poppler: fix evaluation, probably after merges

    @vcunat
    vcunat committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6dbb6a3 View commit details
Showing with 21 additions and 8 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +1 −3 pkgs/development/libraries/poppler/default.nix
  3. +15 −5 pkgs/os-specific/linux/procps-ng/default.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3660,6 +3660,11 @@
github = "twey";
name = "James ‘Twey’ Kay";
};
typetetris = {
email = "ericwolf42@mail.com";
github = "typetetris";
name = "Eric Wolf";
};
unode = {
email = "alves.rjc@gmail.com";
github = "unode";
4 changes: 1 addition & 3 deletions pkgs/development/libraries/poppler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ninja pkgconfig ];

# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

cmakeFlags = [
@@ -43,9 +44,6 @@ stdenv.mkDerivation rec {
(mkFlag qt5Support "QT5")
];

# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = if stdenv.cc.isClang then [ "-std=c++11" ] else null;

meta = with lib; {
homepage = https://poppler.freedesktop.org/;
description = "A PDF rendering library";
20 changes: 15 additions & 5 deletions pkgs/os-specific/linux/procps-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
{ lib, stdenv, fetchurl, ncurses }:
{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:

stdenv.mkDerivation rec {
name = "procps-${version}";
version = "3.3.12";

src = fetchurl {
url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf";
src = fetchFromGitLab {
owner ="procps-ng";
repo = "procps";
rev = "v${version}";
sha256 = "0k5vvvjn954xqnhk97j62ilwmipbi4gqjcznllmk6ilfmszqczzz";
};

buildInputs = [ ncurses ];
nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ];

# autoreconfHook doesn't quite get, what procps-ng buildprocss does
# with po/Makefile.in.in and stuff.
preConfigure = ''
./autogen.sh
'';

makeFlags = "usrbin_execdir=$(out)/bin";

@@ -22,10 +31,11 @@ stdenv.mkDerivation rec {
"ac_cv_func_realloc_0_nonnull=yes" ];

meta = {
homepage = https://sourceforge.net/projects/procps-ng/;
homepage = https://gitlab.com/procps-ng/procps;
description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
license = lib.licenses.gpl2;
platforms = lib.platforms.linux ++ lib.platforms.cygwin;
maintainers = [ lib.maintainers.typetetris ];
};
}