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

Commits on Jan 19, 2021

  1. ngadmin: unstable-2017-11-17 -> unstable-2020-10-05

    @astro
    astro committed Jan 19, 2021
    Copy the full SHA
    0e67406 View commit details

  2. ngadmin: add withReadline, enableEmu, enableSpy flags

    @astro
    astro committed Jan 19, 2021
    Copy the full SHA
    4b5b5a8 View commit details

Commits on Jan 20, 2021

  1. Merge pull request #110046 from astro/netgear

    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021
    Copy the full SHA
    7e5551e View commit details
Showing with 18 additions and 7 deletions.
  1. +18 −7 pkgs/applications/networking/ngadmin/default.nix
25 changes: 18 additions & 7 deletions pkgs/applications/networking/ngadmin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
{ stdenv, lib, fetchgit, autoreconfHook, readline }:
{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline
, withReadline ? true
, enableEmu ? true
, enableSpy ? true
}:

stdenv.mkDerivation {
pname = "ngadmin";
version = "unstable-2017-11-17";
version = "unstable-2020-10-05";

src = fetchgit {
url = "https://git.netgeek.ovh/c/ngadmin.git";
rev = "95240c567b5c40129d733cbd76911ba7574e4998";
sha256 = "052ss82fs8cxk3dqdwlh3r8q9gsm36in2lxdgwj9sljdgwg75c34";
src = fetchFromGitHub {
owner = "Alkorin";
repo = "ngadmin";
rev = "5bf8650ce6d465b8cb1e570548819f0cefe9a87d";
sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4";
};

nativeBuildInputs = [ autoreconfHook readline ];
nativeBuildInputs =
[ autoreconfHook ]
++ lib.optional withReadline readline;
enableParallelBuild = true;
configureFlags = with lib;
optional (!withReadline) "--without-readline"
++ optional enableEmu "--enable-emu"
++ optional enableSpy "--enable-spy";

meta = with lib; {
description = "Netgear switch (NSDP) administration tool";