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: ec3f7e3e5453
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f5b182891cb
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Aug 1, 2019

  1. dmenu2: Remove the package (fix #63218)

    @primeos
    primeos committed Aug 1, 2019
    Copy the full SHA
    3f5b182 View commit details
Showing with 7 additions and 32 deletions.
  1. +2 −2 pkgs/applications/misc/clipmenu/default.nix
  2. +0 −29 pkgs/applications/misc/dmenu2/default.nix
  3. +5 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/clipmenu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }:
{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }:
let
runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ];
runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
in
stdenv.mkDerivation rec {
name = "clipmenu-${version}";
29 changes: 0 additions & 29 deletions pkgs/applications/misc/dmenu2/default.nix
View file

This file was deleted.

6 changes: 5 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17549,7 +17549,11 @@ in

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

dmenu2 = callPackage ../applications/misc/dmenu2 { };
# TODO (@primeos): Remove after the 19.09 branch-off:
dmenu2 = throw ''
The fork "dmenu2" is not maintained by upstream anymore. Please use the
original "dmenu" instead.
'';

dmensamenu = callPackage ../applications/misc/dmensamenu {
inherit (python3Packages) buildPythonApplication requests;