diff options
112 files changed, 897 insertions, 270 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 480280428909..0107ed33d9e4 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -195,9 +195,10 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; + # TODO(@Ericson2314): Haromonize argument order of `g` with everything else overrideScope = g: makeScope newScope - (self_: let super = f self_; in super // g super self_); + (lib.fixedPoints.extends (lib.flip g) f); packages = f; }; in self; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f15d80a778c..5bb5045c6c73 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -673,6 +673,11 @@ github = "changlinli"; name = "Changlin Li"; }; + CharlesHD = { + email = "charleshdespointes@gmail.com"; + github = "CharlesHD"; + name = "Charles Huyghues-Despointes"; + }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 35a8afae4a7a..88be8b73ab37 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -6,16 +6,19 @@ , storePaths , volumeLabel , uuid ? "44444444-4444-4444-8888-888888888888" +, e2fsprogs +, libfaketime +, perl }: let - sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; }; + sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl]; + nativeBuildInputs = [e2fsprogs.bin libfaketime perl]; buildCommand = '' diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 311a5ff69670..2371be9d89a1 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -12,13 +12,12 @@ with lib; let - rootfsImage = import ../../../lib/make-ext4-fs.nix { - inherit pkgs; + rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ inherit (config.sdImage) storePaths; volumeLabel = "NIXOS_SD"; } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { uuid = config.sdImage.rootPartitionUUID; - }; + }); in { options.sdImage = { @@ -94,10 +93,10 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; - system.build.sdImage = pkgs.stdenv.mkDerivation { + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation { name = config.sdImage.imageName; - buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' mkdir -p $out/nix-support $out/sd-image @@ -138,7 +137,7 @@ in (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::) dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS ''; - }; + }) {}; boot.postBootCommands = '' # On the first boot do some maintenance tasks diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index a4eda3c52dce..a2c8e26f62c2 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -28,7 +28,7 @@ with lib; ++ (if pkgs.stdenv.system == "aarch64-linux" then [] else [ pkgs.grub2 pkgs.syslinux ]); - system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.platform.kernelTarget; fileSystems."/" = { fsType = "tmpfs"; @@ -86,7 +86,7 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} initrd initrd boot ''; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index ddf17599296a..31f8edca20ce 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -18,6 +18,16 @@ let (boolFlag "secure" cfg.secure) (boolFlag "noupnp" cfg.noUPnP) ]; + stopScript = pkgs.writeScript "terraria-stop" '' + #!${pkgs.runtimeShell} + + if ! [ -d "/proc/$1" ]; then + exit 0 + fi + + ${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter exit Enter + ${getBin pkgs.coreutils}/bin/tail --pid="$1" -f /dev/null + ''; in { options = { @@ -124,10 +134,10 @@ in serviceConfig = { User = "terraria"; - Type = "oneshot"; - RemainAfterExit = true; + Type = "forking"; + GuessMainPID = true; ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; - ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; + ExecStop = "${stopScript} $MAINPID"; }; postStart = '' diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index da29e08b3691..9d410a8b9ca4 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,7 +46,7 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs ''} @@ -74,7 +74,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosLabel" > $out/nixos-version - echo -n "$system" > $out/system + echo -n "${pkgs.stdenv.hostPlatform.system}" > $out/system mkdir $out/fine-tune childCount=0 @@ -175,7 +175,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.platform.kernelTarget; + default = pkgs.stdenv.hostPlatform.platform.kernelTarget; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index f8a00784034a..2d27611946e2 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -13,7 +13,7 @@ let }; # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; in diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index f974d07da9e5..9bec24c53f5b 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -15,7 +15,7 @@ let inherit configTxt; }; - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; diff --git a/nixos/release.nix b/nixos/release.nix index 1d1f8009f27c..b25c684ff47a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -83,7 +83,7 @@ let in tarball // { meta = { - description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; + description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}"; maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; @@ -106,7 +106,7 @@ let let configEvaled = import lib/eval-config.nix config; build = configEvaled.config.system.build; - kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; + kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; in pkgs.symlinkJoin { name = "netboot"; diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 72bec52b2663..4cd3010ec3d3 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,9 @@ -{ stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac -, libvorbis }: +{ stdenv, fetchurl +, flac, expat, libidn, qtbase, qtwebkit, libvorbis }: +assert stdenv.system == "x86_64-linux"; -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; -let - archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; -in stdenv.mkDerivation rec { - version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -16,37 +13,58 @@ stdenv.mkDerivation rec { # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. - src = if stdenv.system == "x86_64-linux" - then fetchurl { - url = archUrl name "amd64"; - sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; - } - else fetchurl { - url = archUrl name "i386"; - sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; - }; + src = fetchurl { + url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb"; + sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2"; + }; unpackPhase = '' ar vx ${src} - tar -xvf data.tar.lzma + tar xvf data.tar.xz + tar xvf control.tar.gz ''; - buildInputs = [ patchelf ]; + prePatch = '' + sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop + ''; - buildPhase = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/share/applications + + cp -r opt $out + find -name "*.so*" -exec cp "{}" $out/lib \; + ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin + ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications + + for i in 16 32 48 128 + do + iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps + + mkdir -p $iconDirectory + ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png + done ''; - dontPatchELF = true; - dontStrip = true; + postFixup = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + $out/opt/google/musicmanager/minidump_upload - installPhase = '' - mkdir -p "$out" - cp -r opt "$out" - mkdir "$out/bin" - ln -s "$out/opt/google/musicmanager/google-musicmanager" "$out/bin" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${stdenv.lib.makeLibraryPath [ + flac + expat + libidn + qtbase + qtwebkit + libvorbis + stdenv.cc.cc.lib + ]}" \ + $out/opt/google/musicmanager/MusicManager ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a420c5425565..bec845b815ce 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -202,6 +202,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index f3b77c708a7b..61086b96230e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -194,6 +194,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index ed77e6f4b471..24954a602ccc 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = https://www.geany.org/; - license = "GPL"; + license = licenses.gpl2; maintainers = []; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 7689ebad0f01..ac35560c7f63 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " +runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 8e18d531605c..15033b8b2b09 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,14 +9,14 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.4"; + version = "2.10.6"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z"; + sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; + nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 83ba02933fd5..dacfa908b516 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,28 +1,23 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.7"; + version = "3.8"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; - }; - - patches = fetchpatch { - url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; - sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; }; checkInputs = [ pytestcov - pytest-catchlog hypothesis pytest pylint flake8 + pyyaml ]; propagatedBuildInputs = [ @@ -30,6 +25,14 @@ with python3.pkgs; buildPythonApplication rec { beautifulsoup4 requests urllib3 + flask + flask-api + flask-bootstrap + flask-paginate + flask_wtf + arrow + werkzeug + click ]; preCheck = '' @@ -43,7 +46,7 @@ with python3.pkgs; buildPythonApplication rec { --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; - installPhase = '' + postInstall = '' make install PREFIX=$out mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix new file mode 100644 index 000000000000..b5ae9fb567ca --- /dev/null +++ b/pkgs/applications/misc/dozenal/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: + +stdenv.mkDerivation rec { + version = "12010904"; + name = "dozenal-${version}"; + src = fetchFromGitHub { + owner = "dgoodmaniii"; + repo = "dozenal"; + rev = "v${version}"; + sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209"; + }; + makeFlags = [ + # author do not use configure and prefix directly using $prefix + "prefix=$(out)" + # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down + "XFORMS_FLAGS=-UXFORMS" + "LUALIB=-llua" + "bindir=$(prefix)/bin/" + ]; + # some include hardcodes the lua libraries path. This is a patch for that + patches = [ ./lua-header.patch ]; + preBuild = "cd dozenal"; + buildInputs = [ ncurses hdate lua5_2 ]; + # I remove gdozdc, as I didn't figure all it's dependency yet. + postInstall = "rm $out/bin/gdozdc"; + + meta = { + description = "A complete suite of dozenal (base twelve) programs"; + longDescription = '' + Programs + + doz --- a converter; converts decimal numbers into dozenal. Accepts + input in standard or exponential notation (i.e., "1492.2" or "1.4922e3"). + dec --- a converter; converts dozenal numbers into decimal. Accepts input + in standard or exponential notation (i.e., "X44;4" or "X;444e2"). + dozword --- converts a dozenal number (integers only) into words, + according to the Pendlebury system. + dozdc --- a full-featured scientific calculator which works in the + dozenal base. RPN command line. + tgmconv --- a converter for all standard measurements; converts to and + from TGM, Imperial, customary, and SI metric. + dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or + other characters) as desired, and can also transform transdecimal digits + from 'X' to 'E' into any character or sequence of characters desired. + dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it + outputs the date and time in dozenal, as well as containing some TGM + extensions. + dozstring --- a simple byte converter; absorbs a string either from + standard input or a command line argument, leaving it identical but + for the numbers, which it converts into dozenal. Options for padding + and for not converting specific numbers. + doman --- a converter which takes a dozenal integer and + emits its equivalent in a non-place-value system, such as + Roman numerals. Arbitrary ranks and symbols may be used. + Defaults to dozenal Roman numerals. + ''; + homepage = https://github.com/dgoodmaniii/dozenal/; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/applications/misc/dozenal/lua-header.patch new file mode 100644 index 000000000000..45b76e159a11 --- /dev/null +++ b/pkgs/applications/misc/dozenal/lua-header.patch @@ -0,0 +1,16 @@ +diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c +--- dozenal-12010904/dozenal/dozcal/call_lua.c 2017-09-04 19:25:01.000000000 +0200 ++++ dozenal-patched/dozenal/dozcal/call_lua.c 2018-06-13 10:19:57.821950327 +0200 +@@ -38,9 +38,9 @@ + #include"utility.h" + #include"conv.h" + #include"proc_date.h" +-#include<lua5.2/lua.h> +-#include<lua5.2/lauxlib.h> +-#include<lua5.2/lualib.h> ++#include<lua.h> ++#include<lauxlib.h> ++#include<lualib.h> + + void bail(lua_State *L, int err_code, char *filename); + int file_prefix(char **s, char *t); diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix new file mode 100644 index 000000000000..e2f5f653d47c --- /dev/null +++ b/pkgs/applications/misc/hdate/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.6.02"; + name = "hdate-${version}"; + src = fetchurl { + url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; + sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; + }; + meta = { + description = "Hebrew calendar and solar astronomical times library and utilities"; + homepage = https://sourceforge.net/projects/libhdate/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 8293e0434cdf..a6a489492e31 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.47"; + version = "0.47.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1h62ix285mx977mgawyanyvsqqic1xx0gmi1r5wn43w9yc29wr0z"; + sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 061a6612ee7e..47487029ea01 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "8021a62ea0dfe0ed2e6107f5ccd37e0d4a92a996"; - sha256 = "1c32sqfz78g9wxvpng8n9r404lf2lgjn9b24mg8y3rxylx29gks7"; + rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac"; + sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/gobuffalo/envy"; - rev = "2d0f467653f3d961ce9ada4d32a230bdcb3bfe11"; - sha256 = "0p9raqrsqg2z1hq2kbvbq5qcwqihjqf28xnfh62214p7ak9b9x8n"; + rev = "3c96536452167a705ca5a70b831d3810e1e10452"; + sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs"; }; } { @@ -347,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483"; + sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9"; }; } { @@ -446,8 +446,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "aaf60122140d3fcf75376d319f0554393160eb50"; - sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; + rev = "922f4815f713f213882e8ef45e0d315b164d705c"; + sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w"; }; } { @@ -464,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded"; - sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi"; + rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5"; + sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy"; }; } { diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 0c894fb0b612..d3fff65a3995 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.11.2"; + version = "0.11.3"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0vmxgyxrgaqijwd51ldd8pkz7jn9hdcfib1dqr0ai614286v69hw"; + sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73"; }; buildInputs = [ diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index f30c6a639489..e101005e44ec 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd +, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "19dx3hlj40cqwph98pcifkm6axfszfr0v9k6sr3caw4ycml84ci1"; + sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq"; }; nativeBuildInputs = [ autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; preBuild = '' makeFlagsArray=( @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { postInstall = with gnome3; '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + + wrapProgram $out/bin/tilix \ + --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index d28e241e746f..06c84759a590 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.2.3"; + version = "6.2.4"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1wdpz7vxhn9mcc7kxhrz9c5dwd492akirz351wfi4xxy5np6p6kp"; + sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix new file mode 100644 index 000000000000..b97ede413963 --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, makeDesktopItem, patchelf +, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb +, cups , libGL, glib, nss, nspr, expat, alsaLib +, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine +}: + +let + libPath = stdenv.lib.makeLibraryPath + [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb + libGL glib nss nspr expat alsaLib + qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine + ]; + in + stdenv.mkDerivation rec { + name = "eagle-${version}"; + version = "9.1.2"; + + src = fetchurl { + url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; + sha256 = "0y7ahl9z5a7l9cjk8hzmyv6ga8chlry5rr8v116q5mnsgs4i11an"; + }; + + desktopItem = makeDesktopItem { + name = "eagle"; + exec = "eagle"; + icon = "eagle"; + comment = "Schematic capture and PCB layout"; + desktopName = "Eagle"; + genericName = "Schematic editor"; + categories = "Application;Development;"; + }; + + buildInputs = + [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb + libGL glib nss nspr expat alsaLib + qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine + ]; + + doConfigure = false; + doBuild = false; + + installPhase = '' + # Extract eagle tarball + mkdir "$out" + tar -xzf "$src" -C "$out" + + # Install manpage + mkdir -p "$out"/share/man/man1 + ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1 + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \ + "$out"/eagle-${version}/eagle + + mkdir -p "$out"/bin + ln -s "$out"/eagle-${version}/eagle "$out"/bin/eagle + + # Remove bundled libraries that are available in nixpkgs + # TODO: There still may be unused bundled libraries + rm "$out"/eagle-${version}/lib/libQt5*.so.5 + rm "$out"/eagle-${version}/lib/{libxcb-*.so.*,libX*.so.*,libxshmfence.so.1} + rm "$out"/eagle-${version}/lib/{libEGL.so.1,libglapi.so.0,libgbm.so.1} + + # No longer needed (we don't use the bundled Qt libraries) + rm -r "$out"/eagle-${version}/libexec + rm -r "$out"/eagle-${version}/plugins + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png + ''; + + meta = with stdenv.lib; { + description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; + homepage = https://www.autodesk.com/products/eagle/overview; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.rittelle ]; + }; + } diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index b9294ef3639a..9b8827187b26 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Build LD_PRELOAD library that redirects license file access to the home # directory of the user mkdir -p "$out"/lib - gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl + gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle7_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" diff --git a/pkgs/applications/science/electronics/eagle/eagle_fixer.c b/pkgs/applications/science/electronics/eagle/eagle7_fixer.c index da9da4dcbd3a..da9da4dcbd3a 100644 --- a/pkgs/applications/science/electronics/eagle/eagle_fixer.c +++ b/pkgs/applications/science/electronics/eagle/eagle7_fixer.c diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 18b13e11d350..18a5281bebb0 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GiNaC is Not a CAS"; homepage = http://www.ginac.de/; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index a53829347053..4de683cdce90 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; description = "A program to draw implicit surfaces and curves"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 71c62b758682..90d16d846608 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -104,4 +104,10 @@ stdenv.mkDerivation rec { inherit rubyEnv; ruby = rubyEnv.wrappedRuby; }; + + meta = with stdenv.lib; { + description = "Web-based Git-repository manager"; + homepage = https://gitlab.com; + license = licenses.mit; + }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 882ee3047f0b..2fa93af48310 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = https://containerd.tools/; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 7172b172ef2f..c1ec514640d5 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = https://runc.io/; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = platforms.linux; }; } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 221e19ca5eda..67c67c881776 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,6 +1,6 @@ { pkgs , kernel ? pkgs.linux -, img ? pkgs.stdenv.platform.kernelTarget +, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 99871abe5d46..875e10259276 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "18-02-16"; + version = "18.08.17"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; + sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "Numix icon theme (square version)"; homepage = https://numixproject.org; license = licenses.gpl3; - platforms = platforms.linux; # Maybe other non-darwin Unix + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 3ffd024305de..09d68084e775 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { ** ** Ideally in the future this would be less of a hack and could be ** done by Chez itself. Alternatively, there could just be a big - ** case statement matching to the different stdenv.platform values... + ** case statement matching to the different stdenv.hostPlatform.platform + ** values... */ postInstall = '' m="$(ls ./work/boot)" diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 1e9e62efb636..90e5cfe74119 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -2,10 +2,10 @@ , makeWrapper, unzip, which , curl, tzdata, gdb, darwin , callPackage, targetPackages, ldc -, version ? "2.081.1" -, dmdSha256 ? "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z" -, druntimeSha256 ? "1vl8ag6rjvqqmc5bn5jk3yfynjb9ggy3hw1awwl7c76bq4f7nbif" -, phobosSha256 ? "0h1jdc3yai1l42bxjdlyi9hf9qadh76v925rjk2q4ibv2fzl56b7" +, version ? "2.081.2" +, dmdSha256 ? "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62" +, druntimeSha256 ? "0dqfsy34q2q7mk2gsi4ix3vgqg7szg3m067fghgx53vnvrzlpsc0" +, phobosSha256 ? "1dan59lc4wggsrv5aax7jsxnzg7fz37xah84k1cbwjb3xxhhkd9n" }: let diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 2f4cb10bd4db..51544783d8c6 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; installFlags = "INSTALL_PREFIX=\${out}"; - + postInstall = '' for i in $out/lib/fpc/*/ppc*; do ln -fs $i $out/bin/$(basename $i) @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { bootstrap = startFPC; }; - meta = { + meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.freepascal.org; + maintainers = [ maintainers.raskin ]; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; inherit version; }; } diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index f503427b326e..233372caa800 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -36,9 +36,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = { + meta = with stdenv.lib; { description = "GNU Common Lisp compiler working via GCC"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index bb3649302187..e39d6ae8e206 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.10.0" -, ldcSha256 ? "0wc3vlblsz4qdwa9ay9plv9nvfd07zj2byqqffaa4a5gvjwf5dlr" +, version ? "1.11.0" +, ldcSha256 ? "0w4z261gzji31hn1xdnmi9dfkbyydpy6rz8aj4456q5w8yp4yil5" }: let diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 0c9625c04d5c..96d19725c8bb 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "0.8.0-RC1"; + version = "0.9.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "e5b7a9bb6f1007146a440ddfff871cc312075e5d69b9ab7e279ad7c3514f7065"; + sha256 = "1c24692081231415cb560ff1288ede3f0d28c8b994ce8ca7c7b06edf7978bfb8"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3164d23ca53e..d363d2e87b69 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -212,6 +212,9 @@ self: super: builtins.intersectAttrs super { # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; + # Disable tests because they require a mattermost server + mattermost-api = dontCheck super.mattermost-api; + # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 8790b56e5019..54616abc4ba8 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -129,10 +129,12 @@ rec { > haskell.lib.appendConfigureFlag haskellPackages.servant "--profiling-detail=all-functions" */ - appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); + appendConfigureFlag = drv: x: appendConfigureFlags drv [x]; + appendConfigureFlags = drv: xs: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ xs; }); appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; }); appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; }); + /* removeConfigureFlag drv x is a Haskell package like drv, but with all cabal configure arguments that are equal to x removed. diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index bfbc48e753b7..ecbb1abb40ca 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -13,6 +13,12 @@ in stdenv.mkDerivation rec { buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + # Apparently this package fails to build correctly with modern compilers, which at least + # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. + # These flags were stolen from: + # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52 + NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp"; + patches = [ # needed to build gnome3.gjs (fetchpatch { diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index d1ddb17ba2fc..a1741513642f 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv"; + sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5f70a7571bae..5cd004c8d136 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0"; + sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index a2e5f69202c4..9aeb12344ece 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -38,4 +38,11 @@ stdenv.mkDerivation { cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms ''; + + meta = with stdenv.lib; { + description = "Font configuration files, patches, scripts and source packages (Infinality & friends)"; + homepage = https://github.com/bohoomil/fontconfig-ultimate; + license = licenses.mit; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index d0850128ebcc..100c00eea497 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { + meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.agpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a4e0bcfb52b0..4cff22457403 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (rec { homepage = https://people.gnome.org/~veillard/gamin/; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0758d1252274..dc0ca5fffa3a 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +, meson, ninja, glibcLocales, git, vala, glib, zlib +}: stdenv.mkDerivation rec { name = "gcab-${version}"; @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.lgpl21; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 40e9b0ed90d5..a9b79dac7b88 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { The Google Data APIs provide a simple protocol for reading and writing data on the web. ''; + + license = licenses.asl20; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a4eab462046c..cba31f45d557 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ cmake vtk ]; propagatedBuildInputs = [ ]; - meta = { + meta = with stdenv.lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; homepage = http://gdcm.sourceforge.net/; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ bsd3 asl20 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 94536f8f5b69..3fb50e98c1c8 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; maintainers = [ maintainers.eelco ]; + license = licenses.lgpl21; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 4a72e1fa9b04..c8b7b3b8eca5 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,18 +3,18 @@ , libwebp, gnome3, libintl }: let - version = "0.4.6"; + version = "0.4.8"; in stdenv.mkDerivation rec { name = "gegl-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1rcsa60z09jjayk0q6jam4w8rivh400a08bv2xykiv5qyr1yp5zk"; + sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; }; - # needs fonts otherwise, don't know how to pass them - configureFlags = [ "--disable-docs" ]; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 07db27dcc791..469dcbf75bbe 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Well integrated set of translation tools and documentation"; longDescription = '' @@ -76,8 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gettext/; - maintainers = with lib.maintainers; [ zimbatm vrthra ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ zimbatm vrthra ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index c70bda034871..941a7c27feaf 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { + description = "A library for reading and writing gif images"; branch = "4.1"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index 804da49fda93..b0a115eb4a51 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; + homepage = https://github.com/mono/gio-sharp; + license = licenses.mit; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index c9431420194a..0b2fb9fef6c3 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = https://developer.gnome.org/gnet/; + license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 6118d9c41d6f..90dc647233d8 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pth-2.0.7"; - + src = fetchurl { url = "mirror://gnu/pth/${name}.tar.gz"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; - meta = { + meta = with stdenv.lib; { description = "The GNU Portable Threads library"; homepage = http://www.gnu.org/software/pth; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3e..7d342330491c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,8 +103,6 @@ EOF # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index e1a9336e3a56..a7dddd141246 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -6,7 +6,7 @@ let arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix new file mode 100644 index 000000000000..86b3271990d5 --- /dev/null +++ b/pkgs/development/python-modules/dominate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "dominate"; + version = "2.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9s9j9xmhkzw7apqx170fyvc0f800fd4a5jfn8xvj9k6vryd32b"; + }; + + doCheck = !isPy3k; + + meta = with lib; { + homepage = https://github.com/Knio/dominate/; + description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; + license = licenses.lgpl3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix new file mode 100644 index 000000000000..cee93a759200 --- /dev/null +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, markdown }: + +buildPythonPackage rec { + pname = "Flask-API"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w"; + }; + + propagatedBuildInputs = [ flask markdown ]; + + meta = with lib; { + homepage = https://github.com/miracle2k/flask-assets; + description = "Browsable web APIs for Flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix new file mode 100644 index 000000000000..7c12b79bb2f3 --- /dev/null +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask, visitor, dominate }: + +buildPythonPackage rec { + pname = "Flask-Bootstrap"; + version = "3.3.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j1s2bplaifsnmr8vfxa3czca4rz78xyhrg4chx39xl306afs26b"; + }; + + propagatedBuildInputs = [ flask visitor dominate ]; + + meta = with lib; { + homepage = https://github.com/mbr/flask-bootstrap; + description = "Ready-to-use Twitter-bootstrap for use in Flask."; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix new file mode 100644 index 000000000000..7af4aa2b8dd4 --- /dev/null +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, flask }: + +buildPythonPackage rec { + pname = "flask-paginate"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with lib; { + homepage = https://github.com/lixxu/flask-paginate; + description = "Pagination support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix new file mode 100644 index 000000000000..78dc29bbeb0e --- /dev/null +++ b/pkgs/development/python-modules/visitor/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "visitor"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02j87v93c50gz68gbgclmbqjcwcr7g7zgvk7c6y4x1mnn81pjwrc"; + }; + + meta = with lib; { + homepage = https://github.com/mbr/visitor; + description = "A tiny pythonic visitor implementation"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 34b9e53f6e47..690db9a30e1a 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.11"; + version = "8.12"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "13x4m4rn7rix64baclcm2jqbizkj38njif2ba0ycmvyjm62smfwv"; + sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y"; }; - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper jre ]; + + unpackPhase = ":"; installPhase = '' - mkdir -p $out/checkstyle - cp $src $out/checkstyle/checkstyle-all.jar + runHook preInstall + install -D $src $out/checkstyle/checkstyle-all.jar + makeWrapper ${jre}/bin/java $out/bin/checkstyle \ + --add-flags "-jar $out/checkstyle/checkstyle-all.jar" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 0cbb753fbf5b..b1703cd45dd5 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.081.1"; + version = "2.081.2"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z"; + sha256 = "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62"; name = "dmd"; }) (fetchFromGitHub { diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix new file mode 100644 index 000000000000..7c697bc5e576 --- /dev/null +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchFromGitHub, jdk, maven, writeText, makeWrapper, jre_headless, pcsclite }: + +# TODO: This is quite a bit of duplicated logic with gephi. Factor it out? +stdenv.mkDerivation rec { + pname = "global-platform-pro"; + version = "0.3.10-rc11"; # Waiting for release https://github.com/martinpaljak/GlobalPlatformPro/issues/128 + describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "martinpaljak"; + repo = "GlobalPlatformPro"; + rev = "v${version}"; + sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; + }; + + # This patch hardcodes the return of a git command the build system tries to + # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository, + # this command can only fail at build-time. As a consequence, we include the + # `describeVersion` variable defined above here. + # + # See upstream issue https://github.com/martinpaljak/GlobalPlatformPro/issues/129 + patches = [ (writeText "${name}-version.patch" '' + diff --git a/pom.xml b/pom.xml + index 1e5a82d..1aa01fe 100644 + --- a/pom.xml + +++ b/pom.xml + @@ -121,14 +121,10 @@ + </execution> + </executions> + <configuration> + - <executable>git</executable> + + <executable>echo</executable> + <outputFile>target/generated-resources/pro/javacard/gp/pro_version.txt</outputFile> + <arguments> + - <argument>describe</argument> + - <argument>--tags</argument> + - <argument>--always</argument> + - <argument>--long</argument> + - <argument>--dirty</argument> + + <argument>${describeVersion}</argument> + </arguments> + </configuration> + </plugin> + '') ]; + + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src patches; + nativeBuildInputs = [ jdk maven ]; + installPhase = '' + # Download the dependencies + while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do + echo "timeout, restart maven to continue downloading" + done + + # And keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files + # with lastModified timestamps inside + find "$out/.m2" -type f \ + -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \ + -delete + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; + }; + + nativeBuildInputs = [ jdk maven makeWrapper ]; + + buildPhase = '' + cp -dpR "${deps}/.m2" ./ + chmod -R +w .m2 + mvn package --offline -Dmaven.repo.local="$(pwd)/.m2" + ''; + + installPhase = '' + mkdir -p "$out/lib/java" "$out/share/java" + cp -R target/apidocs "$out/doc" + cp target/gp.jar "$out/share/java" + makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ + --add-flags "-jar '$out/share/java/gp.jar'" \ + --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" + ''; + + meta = with stdenv.lib; { + description = "Command-line utility for managing applets and keys on Java Cards"; + longDescription = '' + This command-line utility can be used to manage applets and keys + on Java Cards. It is made available as the `gp` executable. + + The executable requires the PC/SC daemon running for correct execution. + If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. + ''; + homepage = https://github.com/martinpaljak/GlobalPlatformPro; + license = with licenses; [ lgpl3 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index 98813f143cbb..35f7a2bfdea1 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -19,6 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/robfig/glock; description = "A command-line tool to lock Go dependencies to specific revisions"; + license = licenses.mit; maintainers = [ maintainers.rushmorem ]; }; } diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 4bc3e77dbaa7..8fbbcdb6e5f7 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - name = "Literate-2017-05-28"; + name = "Literate-2018-08-20"; src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; - rev = "23928d64bb19b5101dbcc794da6119beaf59f679"; - sha256 = "094lramvacarzj8443ns18zyv7dxnivwi7kdk5xi5r2z4gx338iq"; + rev = "737567e49c9e12ac56222c147191da58ea1521e2"; + sha256 = "19v8v66lv8ayg3irqkbk7ln5lkmgwpx4wgz8h3yr81arl40bbzqs"; }; buildInputs = [ dmd dub ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 2020dc93d0f7..90c377c4472f 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.32.1"; + version = "0.32.2"; src = fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "b96fc5af62adf0567cc376c6b90cc401c9216bb01eb4767189208a29fbae5e5b" else + "0f0p17mbr24zhzm2cf77ddy6yj4k0k181dzf4gxdf8szd5vxpliy" else "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; }; diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 288debb72f6c..c5f899f9bb42 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.11.3"; - sha256 = "1q3fc791ng1sgk0i5qnxpxri7235nkjm50zx1z34c759vhgpaz2p"; + version = "8.11.4"; + sha256 = "02d6a9sq81mbvap6h1ckwrang6wrxbkg0xxzn06wn2vbv7k7vkpv"; } diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index f654dfc1573f..b9694811fa51 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -13,12 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU_combined SDL freeglut SDL_mixer autoconf automake libtool ]; - meta = { + meta = with stdenv.lib; { description = "An air combat simulator"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/gl-117; + maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index f5ba2ef218d1..c8f1af34fa92 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: -stdenv.mkDerivation { +stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { @@ -15,10 +15,11 @@ stdenv.mkDerivation { # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; - meta = { + meta = with stdenv.lib; { homepage = https://segaretro.org/Gens/GS; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 90aac9776435..6fba977e0085 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.3"; + version = "6.2.4"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "019q5xsrhl6x8ngy0mzjdakm7m63gxyw8v7a223zwpw0i86l8hms"; + sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 5dc52c766f18..d57600035256 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,7 +3,7 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gcc -, pkgsi686Linux, newScope, platform, config +, pkgsi686Linux, newScope, config , targetPlatform, buildPlatform , overrides ? {} , buildPackages, pkgs diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 1e4f3d8d5836..15470479a3a2 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8485b0e60328..61bd2a229ab6 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; - + src = fetchurl { url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; @@ -27,9 +27,10 @@ stdenv.mkDerivation { mkdir -p $out/share/usb ''; - meta = { + meta = with stdenv.lib; { homepage = http://linux-hotplug.sourceforge.net/?selected=usb; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 309b5f6c74e8..84d1dd8a378e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -22,7 +22,7 @@ ${optionalString (versionAtLeast version "4.10") '' BUG_ON_DATA_CORRUPTION y ''} -${optionalString (stdenv.platform.kernelArch == "x86_64") '' +${optionalString (stdenv.hostPlatform.platform.kernelArch == "x86_64") '' DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory # Reduce attack surface by disabling various emulations diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index b491d5bbda7e..533cd90a2d3c 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mmc-utils-${version}"; - version = "2015-11-18"; + version = "2018-03-27"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "44f94b925894577f9ffcf2c418dd013a5e582648"; - sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x"; + rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; + sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 0263d17ead02..b1e01f705dcf 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; makeFlags = concatStringsSep " " [ - "ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 64e4005f53f3..a191d7a721d5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.7"; + version = "17.11.9-2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. src = fetchFromGitHub { owner = "SchedMD"; repo = "slurm"; - # The release tags use - instead of ., and have an extra -1 suffix. - rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; - sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; + # The release tags use - instead of . + rev = "${builtins.replaceStrings ["."] ["-"] name}"; + sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 50951c8cb82b..047729aa937f 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.8"; + version = "2.7.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15"; + sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 5665b0536543..b760b080ab78 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.4.1"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "e8044316cd897ad29b3c5284de06652e1568c4d5861e3147ec2191fbacd8d9ff"; + sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index f63a61bf2197..ee09024dc0eb 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.23"; + name = "nsd-4.1.24"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1zc59cj1851scwhwy3k6aals3fk13njyhda37k4a353bcyyxh3pn"; + sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; }; prePatch = '' diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index 3858720bed5c..efa62e261b74 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "facette-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; repo = "facette"; rev = "${version}"; - sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257"; + sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; }; nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; buildInputs = [ rrdtool ]; @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://facette.io/; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; + broken = true; # not really broken, it just requires an internet connection to build. see #45382 }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 82c159ebc82a..500f612eb02e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -36,7 +36,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "20"; + minor = "21"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; + sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index fe4d285713f6..c1fe1a84d15f 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.1"; + version = "3.4.5"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp"; + sha256 = "1fzzj227r5xjls6j5mkjam8pnhbyiqv1799n8k812pk4fqvq4lxg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 9002987c387b..7436c06d7b84 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -44,18 +44,18 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.37"; - sha256 = "0kiksqsbmmfva1blbpg2wl4c3w7j6dzzqmwp6028g7bh303c47qa"; + version = "5.6.39"; + sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; }; unifiStable = generic { - version = "5.7.23"; - sha256 = "14jkhp9jl341zsyk5adh3g98mhqwfbd42c7wahzc31bxq8a0idp7"; + version = "5.8.28"; + sha256 = "1zyc6n54dwqy9diyqnzlwypgnj3hqcv0lfx47s4rkq3kbm49nwnl"; }; unifiTesting = generic { - version = "5.8.14"; - suffix = "-7ef9535d1b"; - sha256 = "09gr7zkck6npjhhmd27c9ymyna6anwj3w9v9zjicz9skbrddkccq"; + version = "5.9.22"; + suffix = "-d2a4718971"; + sha256 = "1xxpvvn0815snag4bmmsdm8zh0cb2qjrhnvlkgn8i478ja1r3n54"; }; } diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 8ee6afaa8499..657bd423f3f4 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -43,4 +43,10 @@ stdenv.mkDerivation rec { passthru = { inherit env ruby; }; + + meta = with stdenv.lib; { + description = "Web-based conference planning and management system"; + homepage = https://github.com/frab/frab; + license = licenses.mit; + }; } diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index e70a7ba9b50c..6fe568966e9f 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,30 +1,20 @@ -{ lib, python2, fetchurl }: +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: -python2.pkgs.buildPythonApplication rec { +buildGoPackage rec { name = "cli53-${version}"; - version = "0.4.4"; + version = "0.8.12"; - src = fetchurl { - url = "mirror://pypi/c/cli53/${name}.tar.gz"; - sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "'argparse', " "" - ''; + goPackagePath = "github.com/barnybug/cli53"; - checkPhase = '' - ${python2.interpreter} -m unittest discover -s tests - ''; - - # Tests do not function - doCheck = false; + src = fetchFromGitHub { + owner = "barnybug"; + repo = "cli53"; + rev = "2624c7c4b38a33cdbd166dad1d3e512830f453e4"; + sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; + }; - propagatedBuildInputs = with python2.pkgs; [ - argparse - boto - dnspython - ]; + goDeps = ./deps.nix; meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix index 0cb0360e499d..4742bc00851b 100644 --- a/pkgs/tools/admin/cli53/deps.nix +++ b/pkgs/tools/admin/cli53/deps.nix @@ -1,3 +1,93 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev [ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "3e7014382cdc91695381614d0110a3cff997ba72"; + sha256 = "1xnjhmb31k63k13aiiiispc7vkgnlxkbihslwwfsjc7b86vrllm5"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"; + sha256 = "0mp18hlhnazg3sd02fhv88kbbipmhcrkb6n8imq8gk2dvmxk64ch"; + }; + } + { + goPackagePath = "github.com/gucumber/gucumber"; + fetch = { + type = "git"; + url = "https://github.com/gucumber/gucumber"; + rev = "71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc"; + sha256 = "1h1d9j515v1nyqsyb73v4ahlvm9n6z7hgl2ld8dryr4sw8q7ybw3"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "e4205768578dc90c2669e75a2f8a8bf77e3083a4"; + sha256 = "0247qcc9i41wrm73ivqs2wvy3vi3nb44m3nh27lnhd4a0ilir6wv"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a422bbe96644373c5753384a59d678f7d261ff10"; + sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } ] diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index 5a3451810a12..286403c70c4b 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Samba mounted via FUSE"; - homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 416dde364c6a..f4aa9a52fce3 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -181,13 +181,12 @@ rec { inherit (s) url sha256; }; - meta = { + meta = with stdenv.lib; { inherit (s) version; description = "Distributed storage system"; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - platforms = with stdenv.lib.platforms; - linux ++ freebsd; + homepage = https://www.gluster.org; + license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 + maintainers = [ maintainers.raskin ]; + platforms = with platforms; linux ++ freebsd; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 758e130e4adf..6a1c12e3e722 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, python, buildPythonApplication # Propagated to blivet , useNixUdev ? true +# Needed by NixOps +, udevSoMajor ? null # Propagated dependencies , pkgs, urlgrabber }: diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 4e371ffd2b07..3708bc9c0fc6 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -19,6 +19,8 @@ buildPerlPackage rec { sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; }; + outputs = [ "out" ]; + nativeBuildInputs = [ makeWrapper gawk ]; buildInputs = [ gnuplot perl ] diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index d50adaa387fa..f2be9fafc605 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; + license = { + # Essentially a BSD license with one modifaction: + # Permission to modify the software is granted, but not the right to + # distribute the complete modified source code. Modifications are to + # be distributed as patches to the released version. Permission to + # distribute binaries produced by compiling modified sources is granted, + # provided you: ... + url = https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright; + }; maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4a5a19fefcab..e2688e930cf6 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, + ApplicationServices, python27, libpng ? null }: @@ -12,18 +13,17 @@ stdenv.mkDerivation rec { sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; }; - buildInputs = - [ pkgconfig glib libxml2 fftw orc lcms - imagemagick openexr libtiff libjpeg - libgsf libexif python27 libpng - expat - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 fftw orc lcms + imagemagick openexr libtiff libjpeg + libgsf libexif python27 libpng expat ] + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; meta = with stdenv.lib; { homepage = http://www.vips.ecs.soton.ac.uk; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 01fbe67e5f20..b8a2b3913955 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "0fiif6b8g2hdb05s028dbcpav6ax0qap2hbsr9p2bld4z7j7321m"; + sha256 = "0ms1hmv6qx15p47l07h7szwq0bgphhskc0xca2l641159h55r6dg"; + fetchSubmodules = true; }; - cargoSha256 = "0w0y3sfrpk8sn9rls90kjqrqr62pd690ripdfbvb5ipkzizp429l"; + cargoSha256 = "1dzm44kcx3plh74qr4wghl3wqwr62hcxzlcv7mhh0vvk3z36c8d4"; nativeBuildInputs = [ cmake pkgconfig zlib ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 026c626ff77e..931058cca2f8 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.125"; + version = "5.127"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "1nx9vpyfn9zs8iyqnqdlskr8lqh4zlciijwd9qfpzmd50lkwh8jh"; + sha256 = "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb"; }; doCheck = true; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 889f9d56d93c..48ca8ad65c75 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x"; + sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2"; }; - cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q"; + cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 9f489fee7ec6..9369c31fdeb5 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation { sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; - meta = { + meta = with stdenv.lib; { description = "Command-line dutch dictionary application"; homepage = http://www.djcbsoftware.nl/code/gnuvd/; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index b1704c3b46c6..e376568d3503 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,25 +1,23 @@ { stdenv, rustPlatform, fetchFromGitHub }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { - owner = "mattgreen"; + owner = "watchexec"; repo = "watchexec"; - rev = "${version}"; - sha256 = "1jib51dbr6s1iq21inm2xfsjnz1730nyd3af1x977iqivmwdisax"; + rev = version; + sha256 = "0zp5s2dy5zbar0virvy1izjpvvgwbz7rvjmcy6bph6rb5c4bhm70"; }; - cargoSha256 = "0sm1jvx1y18h7y66ilphsqmkbdxc76xly8y7kxmqwdi4lw54i9vl"; + cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; - homepage = https://github.com/mattgreen/watchexec; + homepage = https://github.com/watchexec/watchexec; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 2b19c8e6a057..adcb59135ee1 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; - meta = { + meta = with stdenv.lib; { homepage = http://fping.org/; description = "Send ICMP echo probes to network hosts"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; all; + maintainers = with maintainers; [ the-kenny ]; + license = licenses.bsd0; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 19a90e2c13c9..8c4462c36bcf 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p11"; + name = "ntp-4.2.8p12"; src = fetchurl { url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; + sha256 = "0m04ndn0674kcf9x0aggjya07a3hlig2nlzzpwk7vmqka0mj56vh"; }; # The hardcoded list of allowed system calls for seccomp is diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ac7e01482283..2853c595e431 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { }; preConfigure = '' + substituteInPlace ./osdep/ManagedRoute.cpp \ + --replace '/usr/sbin/ip' '${iproute}/bin/ip' + + substituteInPlace ./osdep/ManagedRoute.cpp \ + --replace '/sbin/ip' '${iproute}/bin/ip' + substituteInPlace ./osdep/LinuxEthernetTap.cpp \ --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 64553392e851..c536cbbaaad4 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { name = "proselint-${version}"; - version = "0.10.0"; + version = "0.10.2"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${name}.tar.gz"; - sha256 = "0kmr95mf2gij40qy4660ryfanw13vxlhpmivqia1mdbii8iziyhg"; + sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; }; propagatedBuildInputs = [ click future six ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e91bdd3a7d..302ff26ed40f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -180,6 +180,8 @@ with pkgs; fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; + graph-easy = callPackage ../tools/graphics/graph-easy { }; packer = callPackage ../development/tools/packer { }; @@ -1216,6 +1218,8 @@ with pkgs; pythonPackages = python3Packages; }; + dozenal = callPackage ../applications/misc/dozenal { }; + dpic = callPackage ../tools/graphics/dpic { }; dragon-drop = callPackage ../tools/X11/dragon-drop { @@ -1362,6 +1366,8 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; + hdate = callPackage ../applications/misc/hdate { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hebcal = callPackage ../tools/misc/hebcal {}; @@ -13735,9 +13741,7 @@ with pkgs; nmon = callPackage ../os-specific/linux/nmon { }; # GNU/Hurd core packages. - gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { - inherit platform; - }); + gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { }); hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -13858,7 +13862,7 @@ with pkgs; kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") + ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -16248,7 +16252,16 @@ with pkgs; inherit (ocamlPackages) google-drive-ocamlfuse; - google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + google-musicmanager = callPackage ../applications/audio/google-musicmanager { + inherit (qt5) qtbase qtwebkit; + # Downgrade to 1.34 to get libidn.so.11 + libidn = (libidn.overrideAttrs (oldAttrs: { + src = fetchurl { + url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + })).out; + }; googler = callPackage ../applications/misc/googler { python = python3; @@ -20928,7 +20941,12 @@ with pkgs; adms = callPackage ../applications/science/electronics/adms { }; - eagle = callPackage ../applications/science/electronics/eagle { }; + # Since version 8 Eagle requires an Autodesk account and a subscription + # in contrast to single payment for the charged editions. + # This is the last version with the old model. + eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { }; + + eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; @@ -21883,7 +21901,9 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vips = callPackage ../tools/graphics/vips { }; + vips = callPackage ../tools/graphics/vips { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; nip2 = callPackage ../tools/graphics/nip2 { }; virglrenderer = callPackage ../development/libraries/virglrenderer { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0a2a9f386a13..7f09630debfc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11371,6 +11371,22 @@ let }; }; + NetSFTPForeign = buildPerlPackage rec { + name = "Net-SFTP-Foreign-1.89"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7"; + }; + propagatedBuildInputs = [ pkgs.openssl ]; + patchPhase = '' + sed -i "s|$ssh_cmd = 'ssh'|$ssh_cmd = '${pkgs.openssh}/bin/ssh'|" lib/Net/SFTP/Foreign/Backend/Unix.pm + ''; + meta = { + description = "Secure File Transfer Protocol client"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetServerCoro = buildPerlPackage rec { name = "Net-Server-Coro-1.3"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67f88e8bcafd..6a8e621b5400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { docrep = callPackage ../development/python-modules/docrep { }; + dominate = callPackage ../development/python-modules/dominate { }; + emcee = callPackage ../development/python-modules/emcee { }; email_validator = callPackage ../development/python-modules/email-validator { }; @@ -5365,12 +5367,16 @@ in { flask = callPackage ../development/python-modules/flask { }; + flask-api = callPackage ../development/python-modules/flask-api { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; flask-babel = callPackage ../development/python-modules/flask-babel { }; + flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { }; + flask-caching = callPackage ../development/python-modules/flask-caching { }; flask-common = callPackage ../development/python-modules/flask-common { }; @@ -5395,6 +5401,8 @@ in { flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; + flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -17290,6 +17298,8 @@ EOF vine = callPackage ../development/python-modules/vine { }; + visitor = callPackage ../development/python-modules/visitor { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 5b802aea0758..06978d1067bf 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -82,11 +82,8 @@ let platformCompat = self: super: let inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { - stdenv = super.stdenv // { - inherit (super.stdenv.buildPlatform) platform; - }; inherit buildPlatform hostPlatform targetPlatform; - inherit (buildPlatform) system platform; + inherit (buildPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); |