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

Commits on Feb 27, 2017

  1. lzbench: init at 20170208 

    In-memory benchmark of several up-to-date compressors.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
    @viric
    viric committed Feb 27, 2017
    Copy the full SHA
    9e7ce90 View commit details

  2. megatools: 1.9.97 -> 1.9.98 

    Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
    @viric
    viric committed Feb 27, 2017
    Copy the full SHA
    40b9506 View commit details
Showing with 34 additions and 4 deletions.
  1. +28 −0 pkgs/tools/compression/lzbench/default.nix
  2. +4 −4 pkgs/tools/networking/megatools/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
28 changes: 28 additions & 0 deletions pkgs/tools/compression/lzbench/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, glibc }:

stdenv.mkDerivation rec {
name = "lzbench-20170208";

src = fetchFromGitHub {
owner = "inikep";
repo = "lzbench";
rev = "d5e9b58";
sha256 = "16xj5fldwl639f0ys5rx54csbfvf35ja34bdl5m068hdn6dr47r5";
};

enableParallelBuilding = true;

buildInputs = stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.static ];

installPhase = ''
mkdir -p $out/bin
cp lzbench $out/bin
'';

meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors";
license = licenses.free;
platforms = platforms.all;
};
}
8 changes: 4 additions & 4 deletions pkgs/tools/networking/megatools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas
, makeWrapper }:
, asciidoc, makeWrapper }:

stdenv.mkDerivation rec {
name = "megatools-${version}";
version = "1.9.97";
version = "1.9.98";

src = fetchurl {
url = "http://megatools.megous.com/builds/${name}.tar.gz";
sha256 = "1wssf8f2ndh43sdzcfc644azqa7bjppl3b9s26mz1pjswmpca5ik";
sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
};

buildInputs = [ pkgconfig glib fuse curl makeWrapper
gsettings_desktop_schemas ];
gsettings_desktop_schemas asciidoc ];

postInstall = ''
for i in $(find $out/bin/ -type f); do
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2769,6 +2769,8 @@ with pkgs;

lz4 = callPackage ../tools/compression/lz4 { };

lzbench = callPackage ../tools/compression/lzbench { };

lzop = callPackage ../tools/compression/lzop { };

macchanger = callPackage ../os-specific/linux/macchanger { };