diff options
Diffstat (limited to 'pkgs')
26 files changed, 363 insertions, 138 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index f1e652cbcad5..72669aa183ba 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.4.0"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig"; + sha256 = "1f0lbzisqaj4pr9xxsx105a9ibym2qbngalnsb7iwmcvyrpc0l6a"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 52a47954776c..3882debd9980 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f"; + sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; }; - cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi"; + cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 736d7530be1e..e82769ad317a 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; + sha256 = "09a4hhl9h6y57yfq1gx83fzqxp3wb88y17rl8f54ndpp6p1n9m9m"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix new file mode 100644 index 000000000000..53f3b8a3150a --- /dev/null +++ b/pkgs/applications/office/portfolio/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, autoPatchelfHook +, fetchurl +, glibc +, gcc-unwrapped +, gtk3 +, jre +, libsecret +, makeDesktopItem +, webkitgtk +, wrapGAppsHook +}: +let + desktopItem = makeDesktopItem { + name = "Portfolio"; + exec = "portfolio"; + icon = "portfolio"; + comment = "Calculate Investment Portfolio Performance"; + desktopName = "Portfolio Performance"; + categories = "Office;"; + }; + + runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; +in +stdenv.mkDerivation rec { + pname = "PortfolioPerformance"; + version = "0.46.3"; + + src = fetchurl { + url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libsecret + ]; + + installPhase = '' + mkdir -p $out/portfolio + cp -av ./* $out/portfolio + + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix PATH : ${jre}/bin + + # Create desktop item + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + ''; + + meta = with stdenv.lib; { + description = "A simple tool to calculate the overall performance of an investment portfolio."; + homepage = "https://www.portfolio-performance.info/"; + license = licenses.epl10; + maintainers = with maintainers; [ elohmeier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be2a323943d0..45ebf0beb448 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -37,16 +38,16 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -80,6 +81,11 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 2fb9e3ce2fc4..ec963ab3b8d4 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }: +# This derivation is a reduced-functionality variant of Gambit stable, +# used to compile the full version of Gambit stable *and* unstable. -stdenv.mkDerivation { +{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better + +gccStdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; @@ -16,29 +20,25 @@ stdenv.mkDerivation { CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out + ./configure --prefix=$out/gambit ''; buildPhase = '' # Copy the (configured) sources now, not later, so we don't have to filter out # all the intermediate build products. - mkdir -p $out ; cp -rp . $out/ + mkdir -p $out/gambit ; cp -rp . $out/gambit/ # build the gsc-boot* compiler - make bootstrap + make -j$NIX_BUILD_CORES bootstrap ''; installPhase = '' - cp -fa ./ $out/ + cp -fa ./ $out/gambit/ ''; forceShare = [ "info" ]; - meta = { + meta = gambit-support.meta // { description = "Optimizing Scheme to C compiler, bootstrap step"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index e17241b6d98d..fc71128eb37c 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,11 +1,13 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }: +{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, + src, version, git-version, + gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling # Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30, # the numbers were still heavily in favor of GCC in October 2019. # Thus we use GCC over clang, even on macOS. - +# # Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks # with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark. # The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%, @@ -13,29 +15,34 @@ # However, -Os seems more consistent in winning slightly against both -O1 and -O2, # and is overall 15% faster than -O2. As for compile times, -O1 is fastest, # -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1. -# Overall, -Os seems like the best choice, and that's what we now use. +# +# Overall, -Os seems like the best choice, but I care more about compile-time, +# so I stick with -O1 (in the defaults above), which is also the default for Gambit. -stdenv.mkDerivation rec { - pname = "gambit"; - inherit version; - inherit src; +gccStdenv.mkDerivation rec { - bootstrap = import ./bootstrap.nix ( pkgs ); + pname = "gambit"; + inherit src version git-version; + bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. buildInputs = [ git autoconf bootstrap openssl ]; + # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? + # Or wrap relevant programs to add a suitable PATH ? + #runtimeDeps = [ gnused gnugrep ]; + configureFlags = [ "--enable-single-host" - "--enable-c-opt=-Os" + "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-poll" "--enable-openssl" - "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O + "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -53,11 +60,17 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ + export CC=${gcc}/bin/gcc \ + CXX=${gcc}/bin/g++ \ + CPP=${gcc}/bin/cpp \ + CXXCPP=${gcc}/bin/cpp \ + LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags} + + ${gambit-params.fix-stamp git-version} + + ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ @@ -69,28 +82,26 @@ stdenv.mkDerivation rec { buildPhase = '' # Make bootstrap compiler, from release bootstrap mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && + cp -rp ${bootstrap}/gambit/. boot/. && chmod -R u+w boot && cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && cd .. && cp boot/gsc/gsc gsc-boot && # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch + make -j$NIX_BUILD_CORES from-scratch + ''; + + postInstall = '' + mkdir $out/bin + cd $out/bin + ln -s ../gambit/bin/* . ''; doCheck = true; - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - # NB regarding platforms: only actually tested on Linux, *should* work everywhere, - # but *might* need adaptation e.g. on macOS. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; + meta = gambit-support.meta; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 303f6a30aadb..8f77daa4173b 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: -callPackage ./build.nix { +callPackage ./build.nix rec { version = "4.9.3"; + git-version = version; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix new file mode 100644 index 000000000000..0e78831f2e4e --- /dev/null +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -0,0 +1,33 @@ +{ pkgs, lib }: + +rec { + stable-params = { + defaultRuntimeOptions = "f8,-8,t8"; + buildRuntimeOptions = "f8,-8,t8"; + fix-stamp = git-version : ""; + }; + + unstable-params = { + defaultRuntimeOptions = "iL,fL,-L,tL"; + buildRuntimeOptions = "i8,f8,-8,t8"; + fix-stamp = git-version : '' + substituteInPlace configure \ + --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ + --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + ''; + }; + + export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; + + gambit-bootstrap = import ./bootstrap.nix ( pkgs ); + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = lib.licenses.lgpl21; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux, + # tested on macOS once in a while, *should* work everywhere. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 4c33c83c67b1..3ac4f5363195 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-02-24"; -# git-version = "4.9.3-979-gc69e9f70"; + version = "unstable-2020-05-15"; + git-version = "4.9.3-1109-g3c4d40de"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; - sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; + rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; + sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; }; - inherit stdenv; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 21c2936fa0f8..8297dafff8e2 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,34 +1,34 @@ -{ stdenv, makeStaticLibraries, - coreutils, rsync, bash, +{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, gambit, src }: + version, git-version, + gambit-support, + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: + +# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix +let stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "gerbil"; inherit version; inherit src; - # Use makeStaticLibraries to enable creation of statically linked binaries buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; + # TODO: either fix all of Gerbil's dependencies to provide static libraries, + # or give up and delete all tentative support for static libraries. + #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit ] + ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; + patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' - done - substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; + done ; ''; ## TODO: make static compilation work. @@ -47,22 +47,31 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; + buildPhase = '' runHook preBuild - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")" - done - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")" - done - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD + export HOME=$PWD + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_GXC=$PWD/bin/gxc + export GERBIL_BASE=$PWD + export GERBIL_HOME=$PWD + export GERBIL_PATH=$PWD/lib + export PATH=$PWD/bin:$PATH + ${gambit-support.export-gambopt gambit-params} # Build, replacing make by build.sh ( cd src && sh build.sh ) @@ -72,19 +81,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi <<EOF -#!${bash}/bin/bash -e -export GERBIL_HOME=$out -case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac -if [[ \$# = 0 ]] ; then - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - -else - exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@" -fi -EOF + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall ''; @@ -93,10 +92,10 @@ EOF meta = { description = "Gerbil Scheme"; homepage = "https://github.com/vyzo/gerbil"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl21; # also asl20, like Gambit # NB regarding platforms: regularly tested on Linux, only occasionally on macOS. # Please report success and/or failure to fare. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fare ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; }; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 8c6b1a87cd37..3367ae581b2e 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,14 +1,12 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit }: +{ callPackage, fetchFromGitHub }: callPackage ./build.nix rec { - version = "0.15.1"; - git-version = "0.15.1"; - inherit gambit; + version = "0.16"; + git-version = version; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0qpqms66hz41wwhxb1z0fnzj96ivkm7qi9h9d7lhlr3fsxm1kp1n"; + sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix new file mode 100644 index 000000000000..4e94b6e65de1 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -0,0 +1,64 @@ +{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +# See ../gambit/build.nix regarding gccStdenv + +rec { + # Gerbil libraries + gerbilPackages-unstable = { + gerbil-utils = callPackage ./gerbil-utils.nix { }; + }; + + # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. + gerbilLoadPath = + gerbilInputs : builtins.concatStringsSep ":" (map (x : x + "/gerbil/lib") gerbilInputs); + + # Use this function to create a Gerbil library. See gerbil-utils as an example. + gerbilPackage = { + pname, version, src, meta, package, + git-version ? "", version-path ? "config/version.ss", + gerbil ? pkgs.gerbil-unstable, + gambit-params ? pkgs.gambit-support.stable-params, + gerbilInputs ? [], + buildInputs ? [], + softwareName ? "" } : + let buildInputs_ = buildInputs; in + gccStdenv.mkDerivation rec { + inherit src meta pname version; + buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; + postPatch = '' + set -e ; + if [ -n "${version-path}" ] ; then + echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}" + fi + patchShebangs . ; + ''; + + postConfigure = '' + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_PATH=$PWD/.build + export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + ${pkgs.gambit-support.export-gambopt gambit-params} + ''; + + buildPhase = '' + runHook preBuild + ./build.ss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil/lib + cp -fa .build/lib $out/gerbil/ + bins=(.build/bin/*) + if [ 0 -lt ''${#bins} ] ; then + cp -fa .build/bin $out/gerbil/ + mkdir $out/bin + cd $out/bin + ln -s ../gerbil/bin/* . + fi + runHook postInstall + ''; + + dontFixup = true; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix new file mode 100644 index 000000000000..075a63d7bf4c --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-utils"; + version = "unstable-2020-05-17"; + git-version = "33ef720"; + package = "clan"; + gerbil = gerbil-unstable; + gambit-params = gambit-support.unstable-params; + version-path = ""; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-utils"; + rev = "33ef720799ba98dc9eec773c662f070af4bac016"; + sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + }; + meta = { + description = "Gerbil Clan: Community curated Collection of Common Utilities"; + homepage = "https://github.com/fare/gerbil-utils"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index eb78eed35ee9..9de6dc42907a 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,15 +1,15 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: -callPackage ./build.nix { - version = "unstable-2020-02-27"; - git-version = "0.16-DEV-493-g1ffb74db"; - #gambit = gambit-unstable; - gambit = gambit; +callPackage ./build.nix rec { + version = "unstable-2020-05-17"; + git-version = "0.16-1-g36a31050"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; - sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; + rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; + sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; }; - inherit stdenv; + inherit gambit-support; + gambit = gambit-unstable; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b8d00984cd64..5140205ebc8a 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index cdc45956e7a3..736474d29a5f 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cb429e59c927..84a15e8a674b 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -294,6 +294,12 @@ with super; }; }); + mpack = super.mpack.override({ + buildInputs = [ pkgs.libmpack ]; + # the rockspec doesn't use the makefile so you may need to export more flags + USE_SYSTEM_LUA = "yes"; + USE_SYSTEM_MPACK = "yes"; + }); rapidjson = super.rapidjson.override({ preBuild = '' diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index a03662aa961d..b9a75734b8e4 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 26dd3a895ae4..08b248dd0f68 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; + sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; }; - cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy"; + cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index dce42380c503..7c673dea21ba 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.8.0"; + version = "1.9.1"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; + rev = "7bac6a150c9618465f5ad38cc0a5dbc4677c39ba"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; + sha256 = "0l0x89xv5brinafrvbz6hgs5kvmpl4ajcrsjdjh3myf7i0mvh3gm"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 978893d28ffd..8dcbe36850af 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib -, coreutils, procps, psmisc }: +, coreutils, procps, psmisc, nixosTests }: # NOTES: # @@ -172,7 +172,10 @@ in stdenv.mkDerivation rec { "-DZM_WEB_GROUP=${user}" ]; - passthru = { inherit dirName; }; + passthru = { + inherit dirName; + tests = nixosTests.zoneminder; + }; postInstall = '' PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 27add8e1d7c6..45acd8bb03a4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-11"; + version = "2020-05-16"; pname = "oh-my-zsh"; - rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2"; + rev = "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5"; + sha256 = "1h7q68n9nbmv9rgvzcx5ciisw8gh5p3ka0bz0abhmk00xsinhy09"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 58ada1086bcf..8cc9017a8fea 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , bison , pam + +, withTimestamp ? true }: stdenv.mkDerivation rec { @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5beb4fa289d..aa3e4153a43c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8204,10 +8204,13 @@ in fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; - gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; + gambit = callPackage ../development/compilers/gambit { }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; + gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; + gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; + gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; @@ -20981,6 +20984,10 @@ in polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + portfolio = callPackage ../applications/office/portfolio { + jre = openjdk11; + }; + ptex = callPackage ../development/libraries/ptex {}; qbec = callPackage ../applications/networking/cluster/qbec { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7c14cc95cf7..6c798eddbadc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3268,7 +3268,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; |