diff options
32 files changed, 304 insertions, 143 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 2a9cc44d5c5b..ec188e234543 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -1,5 +1,6 @@ <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="chap-functions"> <title>Functions reference</title> <para> @@ -444,6 +445,7 @@ merge:"diff3" <filename>./bin/start.sh</filename> -- relative paths are supported. </para> </section> + <xi:include href="shell.section.xml" /> <section xml:id="sec-pkgs-dockerTools"> <title>pkgs.dockerTools</title> @@ -521,7 +523,8 @@ merge:"diff3" <callout arearefs='ex-dockerTools-buildImage-2'> <para> <varname>tag</varname> specifies the tag of the resulting image. By - default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag. + default it's <literal>null</literal>, which indicates that the nix output + hash will be used as tag. </para> </callout> <callout arearefs='ex-dockerTools-buildImage-3'> @@ -667,12 +670,12 @@ merge:"diff3" <para> <varname>imageDigest</varname> specifies the digest of the image to be downloaded. Skopeo can be used to get the digest of an image, with its - <varname>inspect</varname> subcommand. Since a given <varname>imageName</varname> - may transparently refer to a manifest list of images which support - multiple architectures and/or operating systems, supply the `--override-os` - and `--override-arch` arguments to specify exactly which image you - want. By default it will match the OS and architecture of the host the - command is run on. + <varname>inspect</varname> subcommand. Since a given + <varname>imageName</varname> may transparently refer to a manifest list + of images which support multiple architectures and/or operating systems, + supply the `--override-os` and `--override-arch` arguments to specify + exactly which image you want. By default it will match the OS and + architecture of the host the command is run on. <programlisting> $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'" sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b @@ -695,16 +698,16 @@ merge:"diff3" </para> </callout> <callout arearefs='ex-dockerTools-pullImage-5'> - <para> - <varname>os</varname>, if specified, is the operating system of the fetched image. - By default it's <literal>linux</literal>. - </para> + <para> + <varname>os</varname>, if specified, is the operating system of the + fetched image. By default it's <literal>linux</literal>. + </para> </callout> <callout arearefs='ex-dockerTools-pullImage-6'> - <para> - <varname>arch</varname>, if specified, is the cpu architecture of the fetched image. - By default it's <literal>x86_64</literal>. - </para> + <para> + <varname>arch</varname>, if specified, is the cpu architecture of the + fetched image. By default it's <literal>x86_64</literal>. + </para> </callout> </calloutlist> </section> diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 1acea6a7547a..667a795a8d3a 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -16,18 +16,17 @@ stdenv.mkDerivation { } </programlisting> Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built - where available, or pre-built via Zulu). - Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>, - <literal>Aarch64</literal>) point to the (unfree) - <literal>oraclejdk</literal>. -</para> + where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in + Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the + (unfree) <literal>oraclejdk</literal>. + </para> <para> JAR files that are intended to be used by other packages should be installed - in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook - that add any JARs in the <filename>share/java</filename> directories of the - build inputs to the <envar>CLASSPATH</envar> environment variable. For - instance, if the package <literal>libfoo</literal> installs a JAR named + in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that + add any JARs in the <filename>share/java</filename> directories of the build + inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if + the package <literal>libfoo</literal> installs a JAR named <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute <programlisting> @@ -61,18 +60,17 @@ installPhase = <literal>${jre}/bin/java</literal> instead of <literal>${jdk}/bin/java</literal>, you prevent your package from depending on the JDK at runtime. -</para> + </para> -<para> + <para> Note all JDKs passthru <literal>home</literal>, so if your application requires environment variables like <envar>JAVA_HOME</envar> being set, that can be done in a generic fashion with the <literal>--set</literal> argument of <literal>makeWrapper</literal>: - <programlisting> --set JAVA_HOME ${jdk.home} </programlisting> -</para> + </para> <para> It is possible to use a different Java compiler than <command>javac</command> diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0634432fe95a..8c7c63c8c8d7 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -709,40 +709,50 @@ overrides = super: self: rec { <title>Citrix Receiver</title> <para> - The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> is a remote - desktop viewer which provides access to - <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> installations. + The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix + Receiver</link> is a remote desktop viewer which provides access to + <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> + installations. </para> <section xml:id="sec-citrix-base"> <title>Basic usage</title> + <para> - The tarball archive needs to be downloaded manually as the licenses agreements of the vendor - need to be accepted first. This is available at the - <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download page at citrix.com</link>. - Then run <literal>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</literal>. - With the archive available in the store the package can be built and installed with Nix. + The tarball archive needs to be downloaded manually as the licenses + agreements of the vendor need to be accepted first. This is available at + the + <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download + page at citrix.com</link>. Then run <literal>nix-prefetch-url + file://$PWD/linuxx64-$version.tar.gz</literal>. With the archive available + in the store the package can be built and installed with Nix. </para> <para> - <emphasis>Note: it's recommended to install <literal>Citrix Receiver</literal> using - <literal>nix-env -i</literal> or globally to ensure that the <literal>.desktop</literal> files - are installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't - be possible to open <literal>.ica</literal> files - automatically from the browser to start a Citrix connection.</emphasis> + <emphasis>Note: it's recommended to install <literal>Citrix + Receiver</literal> using <literal>nix-env -i</literal> or globally to + ensure that the <literal>.desktop</literal> files are installed properly + into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't be possible to + open <literal>.ica</literal> files automatically from the browser to start + a Citrix connection.</emphasis> </para> </section> + <section xml:id="sec-citrix-custom-certs"> <title>Custom certificates</title> + <para> - The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts several certificates - <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the Mozilla database</link> by default. - However several companies using Citrix might require their own corporate certificate. On distros with imperative + The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts + several certificates + <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the + Mozilla database</link> by default. However several companies using Citrix + might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>, - however this directory is a store path in <literal>nixpkgs</literal>. In order to work around this issue the package provides a simple - mechanism to add custom certificates without rebuilding the entire package using <literal>symlinkJoin</literal>: - + however this directory is a store path in <literal>nixpkgs</literal>. In + order to work around this issue the package provides a simple mechanism to + add custom certificates without rebuilding the entire package using + <literal>symlinkJoin</literal>: <programlisting> <![CDATA[with import <nixpkgs> { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index ea581421547d..cde27b8a5edf 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -29,7 +29,6 @@ } </programlisting> </listitem> - <listitem> <para> On darwin libraries are linked using absolute paths, libraries are @@ -47,19 +46,19 @@ } </programlisting> </listitem> - <listitem> <para> Even if the libraries are linked using absolute paths and resolved via their <literal>install_name</literal> correctly, tests can sometimes fail - to run binaries. This happens because the <varname>checkPhase</varname> + to run binaries. This happens because the <varname>checkPhase</varname> runs before the libraries are installed. </para> <para> This can usually be solved by running the tests after the <varname>installPhase</varname> or alternatively by using <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable - can be found in the <citerefentry><refentrytitle>dyld</refentrytitle> + can be found in the <citerefentry> + <refentrytitle>dyld</refentrytitle> <manvolnum>1</manvolnum></citerefentry> manpage. </para> <programlisting> @@ -77,7 +76,6 @@ } </programlisting> </listitem> - <listitem> <para> Some packages assume xcode is available and use <command>xcrun</command> diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index b2a2675c3e65..6b854e085549 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -6,18 +6,20 @@ <title>Reviewing contributions</title> <warning> <para> - The following section is a draft, and the policy for reviewing is still being - discussed in issues such as <link + The following section is a draft, and the policy for reviewing is still + being discussed in issues such as + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 - </link> and <link + </link> and + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>. </para> </warning> <para> - The nixpkgs project receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and - a way to contribute to the project. + The nixpkgs project receives a fairly high number of contributions via GitHub + pull-requests. Reviewing and approving these is an important task and a way + to contribute to the project. </para> <para> The high change rate of nixpkgs makes any pull request that remains open for @@ -40,10 +42,10 @@ to respect every community member and their work. </para> <para> - GitHub provides reactions as a simple and quick way to provide - feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanation so the - submitter has directions to improve their contribution. + GitHub provides reactions as a simple and quick way to provide feedback to + pull-requests or any comments. The thumb-down reaction should be used with + care and if possible accompanied with some explanation so the submitter has + directions to improve their contribution. </para> <para> Pull-request reviews should include a list of what has been reviewed in a @@ -117,8 +119,8 @@ <itemizedlist> <listitem> <para> - License can change with version updates, so it should be checked to match - the upstream license. + License can change with version updates, so it should be checked to + match the upstream license. </para> </listitem> <listitem> @@ -143,8 +145,8 @@ <listitem> <para> Pull-requests are often targeted to the master or staging branch, and - building the pull-request locally when it is submitted can trigger - many source builds. + building the pull-request locally when it is submitted can trigger many + source builds. </para> <para> It is possible to rebase the changes on nixos-unstable or @@ -605,11 +607,12 @@ policy. --> <para> - In a case a contributor leaves definitively the Nix community, he - should create an issue or post on <link + In a case a contributor leaves definitively the Nix community, he should + create an issue or post on + <link xlink:href="https://discourse.nixos.org">Discourse</link> with - references of packages and modules he maintains so the - maintainership can be taken over by other contributors. + references of packages and modules he maintains so the maintainership can be + taken over by other contributors. </para> </section> </chapter> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb5bf0f54f85..093a2aae86b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3700,6 +3700,11 @@ github = "siddharthist"; name = "Langston Barrett"; }; + siers = { + email = "veinbahs+nixpkgs@gmail.com"; + github = "siers"; + name = "Raitis Veinbahs"; + }; sifmelcara = { email = "ming@culpring.com"; github = "sifmelcara"; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix new file mode 100644 index 000000000000..b8ff73f2cb32 --- /dev/null +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which +}: + +stdenv.mkDerivation rec { + name = "faustlive-${version}"; + version = "2017-12-05"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faustlive"; + rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; + sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + }; + + buildInputs = [ + llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = "patchShebangs Build/Linux/buildversion"; + + meta = with stdenv.lib; { + description = "A standalone just-in-time Faust compiler"; + longDescription = '' + FaustLive is a standalone just-in-time Faust compiler. It tries to bring + together the convenience of a standalone interpreted language with the + efficiency of a compiled language. It's ideal for fast prototyping. + ''; + homepage = http://faust.grame.fr/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 5f5754a66053..6b0c4670544f 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "18wvfayib79lylv3g9ay3f85qanhrljvnfarwl9snfzklj4gkf2v"; + sha256 = "0vad1g234r9agvkdsry9xb6hmn6lg4mygfcy0mg68gibmrg7h1ji"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f5b4e5af93a0..f8c31ed5c1d4 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,36 +1,48 @@ -{stdenv}: +{stdenv, lib}: { name , type ? "Application" , exec -, icon ? "" -, comment ? "" +, icon ? null +, comment ? null , terminal ? "false" , desktopName -, genericName -, mimeType ? "" +, genericName ? null +, mimeType ? null , categories ? "Application;Other;" , startupNotify ? null -, extraEntries ? "" +, extraEntries ? null }: stdenv.mkDerivation { name = "${name}.desktop"; - buildCommand = '' + + buildCommand = let + + optionalEntriesList = [{k="Icon"; v=icon;} + {k="Comment"; v=comment;} + {k="GenericName"; v=genericName;} + {k="MimeType"; v=mimeType;} + {k="StartupNotify"; v=startupNotify;}]; + + valueNotNull = {k, v}: v != null; + entriesToKeep = builtins.filter valueNotNull optionalEntriesList; + + mkEntry = {k, v}: k + "=" + v; + optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; + + in + '' mkdir -p $out/share/applications cat > $out/share/applications/${name}.desktop <<EOF [Desktop Entry] Type=${type} Exec=${exec} - Icon=${icon} - Comment=${comment} Terminal=${terminal} Name=${desktopName} - GenericName=${genericName} - MimeType=${mimeType} Categories=${categories} + ${optionalEntriesString} + ${if extraEntries == null then ''EOF'' else '' ${extraEntries} - ${if startupNotify == null then ''EOF'' else '' - StartupNotify=${startupNotify} EOF''} ''; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index dbf92ad066f5..6d00f34e9787 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-23"; + name = "media-player-info-24"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in src = fetchurl { url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; + sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; }; buildInputs = [ udev systemd ]; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 26bed216acfa..c5be1c78a55f 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -42,7 +42,7 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_6; + elixir = elixir_1_7; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { inherit rebar erlang; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a0f37973ccd5..ce487c3c0e25 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, makeWrapper -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }: stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "1ikzly6vs28ilqvqm4kxzhqs8mp6l4l344rhak63dav7vv97nnlv"; + sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379"; }; - prebuiltName = "crystal-0.25.1-1"; + prebuiltName = "crystal-0.26.0-1"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.25.1/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0zjmbvbhi11p7s99jmvb3pac6zzsr792bxcfanrx503fjxxafgll"; - "i686-linux" = "0i0hgsq7xa53594blqw5qi6jrqja18spifmalg7df2mj3h13h3pz"; - "x86_64-darwin" = "1h369hzis1cigxbb6fgpahyq4d13gfgjc6adf300zc38yh8rvyy0"; + "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; }."${stdenv.system}"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libiconv ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ]; buildInputs = libs ++ [ llvm ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sifmelcara david50407 ]; + maintainers = with stdenv.lib.maintainers; [ manveru david50407 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 6552f5f44e3a..2896c0c09139 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,4 +1,9 @@ -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape}: +# Updating the dependencies for this package: +# +# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock +# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' +# +{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }: let crystalPackages = lib.mapAttrs (name: src: stdenv.mkDerivation { @@ -28,15 +33,16 @@ let }; in stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.2.1"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "0.2.0"; - sha256 = "1ds9zrvbmnfy744i9ri6v4w37aw7ccmdxzxmy8l97h045hzz9cp3"; + rev = version; + sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1"; }; + nativeBuildInputs = [ which ]; buildInputs = [ crystal zlib openssl duktape ]; buildPhase = '' diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 808b4710048b..069df52ba12d 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,8 +2,8 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.7.2"; - sha256 = "1j2cr4p3d44848v0gfl97p9kw2dslscnb1piyb7b3374iy345i0k"; + rev = "v1.7.3"; + sha256 = "0b98qjy43wsrc08am7lkhcdsxc7gplf9hcmbvd4p3dw4g107rk91"; }; ameba = { owner = "veelenga"; @@ -14,8 +14,8 @@ baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "24dbaf2180b872c0f0fc777b34e3759108959e6e"; - sha256 = "01p7hzsvms9cywdgs0rcs6mxdi94491wk55823fw2vxv24hvxnvk"; + rev = "v0.9.7"; + sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; }; diff = { owner = "MakeNowJust"; @@ -38,8 +38,8 @@ kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "09bb1fcd4073a374b3a61c99e48e05a866b23c08"; - sha256 = "0yyb59i897gr8cqjbf48d6s0znq68ibpxarxkxkgrqk7lbvrqqr7"; + rev = "v0.24.0"; + sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; }; kilt = { owner = "jeromegn"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d002f6eb31c1..e8b6cc93c2c1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.12"; + version = "7.0"; src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; + sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index b8f35c8539ac..1ee0970ffad2 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "granite-${version}"; - version = "5.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "015hkclcxirssg7a8s6mkns5xdk77m1jnkshlyfdw041nzyc5jh1"; + sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 9825d6ed64a9..b9cd31432fc3 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "3.2"; + version = "3.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "07ddsykbliiv0p717z1h5vzmvsx6lm75j32rhvmwqxp8m3kbap5m"; + sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix new file mode 100644 index 000000000000..685518efbd22 --- /dev/null +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + name = "libndtypes-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "ndtypes"; + rev = "v${version}"; + sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + }; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "Dynamic types for data description and in-memory computations"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix new file mode 100644 index 000000000000..c99c3f42bfc1 --- /dev/null +++ b/pkgs/development/libraries/libxnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, libndtypes +}: + +stdenv.mkDerivation rec { + name = "libxnd-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "xnd"; + rev = "v${version}"; + sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + }; + + buildInputs = [ libndtypes ]; + + configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'" + "XND_LINK='-L${libndtypes}/lib'" ]; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "General container that maps a wide range of Python values directly to memory"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f5ca69e59c84..566694e06b04 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.9"; + name = "gradle-4.10"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; + sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314"; }; }; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2ef6b4a1d548..877080508d40 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; + sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix new file mode 100644 index 000000000000..3ed5700954a4 --- /dev/null +++ b/pkgs/games/vitetris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + name = "vitetris-${version}"; + version = "0.57.2"; + + src = fetchFromGitHub { + owner = "vicgeralds"; + repo = "vitetris"; + rev = "v${version}"; + sha256 = "0px0h4zrpzr6xd1vz7w9gr6rh0z74y66jfzschkcvj84plld10k6"; + }; + + hardeningDisable = [ "format" ]; + + makeFlags = "INSTALL=install"; + + meta = { + description = "Terminal-based Tetris clone by Victor Nilsson"; + homepage = http://www.victornils.net/tetris/; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ siers ]; + + longDescription = '' + vitetris is a terminal-based Tetris clone by Victor Nilsson. Gameplay is much + like the early Tetris games by Nintendo. + + Features include: configurable keys, highscore table, two-player mode with + garbage, network play, joystick (gamepad) support on Linux or with Allegro. + ''; + }; +} diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 5211fd2a61bf..178fc7d91408 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,21 +5,15 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.3"; + name = "cryptsetup-2.0.4"; + + outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; + sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; - patches = [ - # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. - (fetchpatch { - url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; - sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; - }) - ]; - postPatch = '' patchShebangs tests ''; diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 53d8accb1856..2bce56e1e529 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.55-146"; + version = "4.14.66-147"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.55"; + modDirVersion = "4.14.66"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh"; + sha256 = "06v38jl4i7l8gl8zcpyp9vmjjhaqhbp7by15f82rxa724zppxi9x"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 65c995558a4f..78ab6b37532d 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -6,7 +6,7 @@ }: let - version = "2.7.7"; + version = "2.8.0"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "13a7810izfhz729kwij584vsrzz9jdyfzvbl9magl0nfyj8zj8m8"; + sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx"; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 247270f67c50..bfb98add9433 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.0"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; + sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index c6245f9b40d2..0c51b6b13cdd 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "virtlyst-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "Virtlyst"; rev = "v${version}"; - sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 55ab34228261..6d6fee0a2d32 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"; + sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 68d9df987d8c..bbbb19fc200b 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.2"; + name = "riemann-c-client-1.10.3"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "185wn6fqgrs16f9c0lkzw14477wmkgandz86h4miw7cgi7ki4l5i"; + sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c4a8f3a623be..d0b7ebf3fc83 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.5.0"; + name = "yubico-piv-tool-1.6.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1"; + sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index c90c67c77372..a57cafb54e25 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # 2018-05-12 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4863c26f79e1..e6b89ad5b98c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1406,6 +1406,10 @@ with pkgs; lief = callPackage ../development/libraries/lief {}; + libndtypes = callPackages ../development/libraries/libndtypes { }; + + libxnd = callPackages ../development/libraries/libxnd { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -20304,6 +20308,8 @@ with pkgs; vessel = pkgsi686Linux.callPackage ../games/vessel { }; + vitetris = callPackage ../games/vitetris { }; + vms-empire = callPackage ../games/vms-empire { }; voxelands = callPackage ../games/voxelands { @@ -21464,6 +21470,8 @@ with pkgs; faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; + faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; + fceux = callPackage ../misc/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; |