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

Commits on Jan 29, 2020

  1. squashfs-tools-ng: 0.7 -> 0.8 

    Gave up trying to build on Darwin.
    @alyssais
    alyssais committed Jan 29, 2020
    Copy the full SHA
    b7c59cc View commit details
Showing with 6 additions and 111 deletions.
  1. +0 −103 pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch
  2. +6 −8 pkgs/tools/filesystems/squashfs-tools-ng/default.nix
103 changes: 0 additions & 103 deletions pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch
View file

This file was deleted.

14 changes: 6 additions & 8 deletions pkgs/tools/filesystems/squashfs-tools-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, doxygen, graphviz, perl
, pkgconfig, lz4, xz, zlib, zstd
{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig
, lz4, xz, zlib, zstd
}:

stdenv.mkDerivation rec {
pname = "squashfs-tools-ng";
version = "0.7";
version = "0.8";

src = fetchurl {
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
sha256 = "01yn621dnsfhrah3qj1xh6ynag7r3nvihc510sa5frapkyg9nw8n";
sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y";
};

patches = lib.optional (!stdenv.isLinux) ./0001-Fix-build-on-BSD-systems.patch;

nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]
++ lib.optional (!stdenv.isLinux) autoreconfHook;
nativeBuildInputs = [ doxygen graphviz pkgconfig perl ];
buildInputs = [ zlib xz lz4 zstd ];

meta = with lib; {
homepage = https://github.com/AgentD/squashfs-tools-ng;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ qyliss ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}