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

Commits on May 2, 2020

  1. woeusb: remove p7zip

    @eadwu
    eadwu authored and Milan committed May 2, 2020
    Copy the full SHA
    5e52a39 View commit details

  2. jetbrains: remove p7zip from nativeBuildInputs

    @eadwu
    eadwu authored and Milan committed May 2, 2020
    Copy the full SHA
    d9fc843 View commit details

  3. ark: remove p7zip

    @eadwu
    eadwu authored and Milan committed May 2, 2020
    Copy the full SHA
    06fa14f View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/applications/editors/jetbrains/common.nix
  2. +2 −2 pkgs/applications/kde/ark/default.nix
  3. +2 −2 pkgs/tools/misc/woeusb/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/jetbrains/common.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:

@@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
'';
};

nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
nativeBuildInputs = [ makeWrapper patchelf unzip ];

patchPhase = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() {
4 changes: 2 additions & 2 deletions pkgs/applications/kde/ark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@
libarchive, libzip,

# Archive tools
p7zip, lrzip,
lrzip,

# Unfree tools
unfreeEnableUnrar ? false, unrar,
}:

let
extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar;
extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar;
in

mkDerivation {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/woeusb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget
, wxGTK30 }:

stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# should be patched with a less useless default PATH, but for now
# we add everything we need manually.
wrapProgram "$out/bin/woeusb" \
--set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
--set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}'
'';

doInstallCheck = true;