diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gdcm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/feedgnuplot/default.nix | 54 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 60 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index dcdb6a2297b24..a4eab462046c6 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.6"; + version = "2.8.7"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; + sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 252fe5abf49fb..910f1b91c215d 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -46,5 +46,5 @@ in lib.makeExtensible (self: { xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "8.2")}"; }) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix new file mode 100644 index 0000000000000..4e371ffd2b07b --- /dev/null +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk +, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +}: + +let + + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + +in + +buildPerlPackage rec { + name = "feedgnuplot-${version}"; + version = "1.49"; + + src = fetchFromGitHub { + owner = "dkogan"; + repo = "feedgnuplot"; + rev = "v${version}"; + sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; + }; + + nativeBuildInputs = [ makeWrapper gawk ]; + + buildInputs = [ gnuplot perl ] + ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = fontsConf; + + postPatch = '' + patchShebangs . + ''; + + # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + install -D -m 444 -t $out/share/bash-completion/completions \ + completions/bash/feedgnuplot + install -D -m 444 -t $out/share/zsh/site-functions \ + completions/zsh/_feedgnuplot + ''; + + meta = with stdenv.lib; { + description = "General purpose pipe-oriented plotting tool"; + homepage = https://github.com/dkogan/feedgnuplot/; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = with maintainers; [ mnacamura ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e76a38cdb82e4..b05ab4926050d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2431,6 +2431,8 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; + feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -9284,7 +9286,7 @@ with pkgs; else if name == "uclibc" then targetPackages.uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries + else if targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; |