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

Commits on Oct 25, 2020

  1. lsd2dsl: 0.5.1 -> 0.5.2

    @sikmir
    sikmir committed Oct 25, 2020
    Copy the full SHA
    29c5b32 View commit details

Commits on Nov 27, 2020

  1. Merge pull request #96609 from sikmir/lsd2dsl 

    lsd2dsl: 0.5.1 -> 0.5.2
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020
    Copy the full SHA
    fffe30c View commit details
Showing with 4 additions and 5 deletions.
  1. +3 −4 pkgs/applications/misc/lsd2dsl/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
7 changes: 3 additions & 4 deletions pkgs/applications/misc/lsd2dsl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

mkDerivation rec {
pname = "lsd2dsl";
version = "0.5.1";
version = "0.5.2";

src = fetchFromGitHub {
owner = "nongeneric";
repo = pname;
rev = "v${version}";
sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8";
sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi";
};

nativeBuildInputs = [ cmake ];
@@ -19,8 +19,7 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";

installPhase = ''
install -Dm755 console/lsd2dsl $out/bin/lsd2dsl
install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui
install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin
'' + lib.optionalString stdenv.isDarwin ''
wrapQtApp $out/bin/lsd2dsl
wrapQtApp $out/bin/lsd2dsl-qtgui
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22286,7 +22286,7 @@ in

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

lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { };
lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { };

lrzsz = callPackage ../tools/misc/lrzsz { };