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

Commits on Jul 24, 2020

  1. liblinear: 2.30 -> 2.40 

    Also improve the derivation a bit:

- Use fetchFromGitHub in place of fetchurl.
- Replace buildPhase by buildFlags.
- Create multiple outputs.
- Replace mkdir/cp by install.
    @danieldk
    danieldk committed Jul 24, 2020
    Copy the full SHA
    0e29fcd View commit details

Commits on Jul 31, 2020

  1. Merge pull request #93759 from danieldk/liblinear-2.40 

    liblinear: 2.30 -> 2.40
    @danieldk
    danieldk authored Jul 31, 2020
    Copy the full SHA
    c31de49 View commit details
Showing with 22 additions and 20 deletions.
  1. +22 −20 pkgs/development/libraries/liblinear/default.nix
42 changes: 22 additions & 20 deletions pkgs/development/libraries/liblinear/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
{ stdenv, fetchurl, fixDarwinDylibNames }:
{ stdenv, fetchFromGitHub, fixDarwinDylibNames }:

stdenv.mkDerivation rec {
let
soVersion = "4";
in stdenv.mkDerivation rec {
pname = "liblinear";
version = "2.30";
version = "2.40";

src = fetchurl {
url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz";
sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748";
src = fetchFromGitHub {
owner = "cjlin1";
repo = "liblinear";
rev = "v${builtins.replaceStrings ["."] [""] version}";
sha256 = "041fby9vc7nvj0gls5zd9mhw7yqazm530bmln38mfz7wd06z1d6b";
};

buildPhase = ''
make
make lib
'';
outputs = [ "bin" "dev" "out" ];

nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];

buildFlags = [ "lib" "predict" "train" ];

installPhase = ''
mkdir -p $out/lib $out/bin $out/include
${if stdenv.isDarwin then ''
cp liblinear.so.3 $out/lib/liblinear.3.dylib
ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib
install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib
ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib
'' else ''
cp liblinear.so.3 $out/lib/liblinear.so.3
ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so
install -Dt $out/lib liblinear.so.${soVersion}
ln -s $out/lib/liblinear.so.${soVersion} $out/lib/liblinear.so
''}
cp train $out/bin/liblinear-train
cp predict $out/bin/liblinear-predict
cp linear.h $out/include
install -D train $bin/bin/liblinear-train
install -D predict $bin/bin/liblinear-predict
install -Dm444 -t $dev/include linear.h
'';

nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];

meta = with stdenv.lib; {
description = "A library for large linear classification";
homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/";