Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27b488f28ede
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1ba4ab02072c
Choose a head ref
  • 5 commits
  • 7 files changed
  • 3 contributors

Commits on May 21, 2017

  1. nano: use https for meta.homepage 

    The http variant is a permanent redirect to https

(cherry picked from commit 16b6ee3)
    @joachifm
    joachifm committed May 21, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    77194b2 View commit details

  2. dnscrypt-proxy: 1.9.4 -> 1.9.5 

    See https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.5

(cherry picked from commit bfd3227)

Contains fixes for the cache plugin, nothing else of note.
    @joachifm
    joachifm committed May 21, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d606d25 View commit details

  3. manual: Fix addCheck example having arguments in wrong order. 

    `addCheck` takes first the type, then the check.

(cherry picked from commit 2df7d4d)
    @nh2 @joachifm
    nh2 authored and joachifm committed May 21, 2017
    Copy the full SHA
    daf0b31 View commit details

  4. treewide: s,enableParallelBuild(s),enableParallelBuilding,g 

    (cherry picked from commit 874b81b)
    @joachifm
    joachifm committed May 21, 2017
    Copy the full SHA
    9a64853 View commit details

  5. Opera: 44.0.2510.857 -> 45.0.2552.812 

    (cherry picked from commit 2f45539)
    @spamntaters @joachifm
    spamntaters authored and joachifm committed May 21, 2017
    Copy the full SHA
    1ba4ab0 View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/development/option-types.xml
View file
Original file line number Diff line number Diff line change
@@ -282,7 +282,7 @@ config.mod.two = { foo = 2; bar = "two"; };</screen></example>
<screen>
byte = mkOption {
description = "An integer between 0 and 255.";
type = addCheck (x: x &gt;= 0 &amp;&amp; x &lt;= 255) types.int;
type = addCheck types.int (x: x &gt;= 0 &amp;&amp; x &lt;= 255);
};</screen></example>

<example xml:id='ex-extending-type-check-2'><title>Overriding a type
2 changes: 1 addition & 1 deletion pkgs/applications/editors/nano/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
'';

meta = {
homepage = http://www.nano-editor.org/;
homepage = https://www.nano-editor.org/;
description = "A small, user-friendly console text editor";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/opera/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
let

mirror = https://get.geo.opera.com/pub/opera/desktop;
version = "44.0.2510.857";
version = "45.0.2552.812";

rpath = stdenv.lib.makeLibraryPath [

@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36";
sha256 = "0qhh7wwj3v8adz7ppjkpmfc04rxfjjhnnkawfvghlv77sjgnyml2";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym";
sha256 = "0xf1j8abk8f0kbjarsk1y1yna1zwrn0qc4fi1swjsxf5rx027fir";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";

2 changes: 1 addition & 1 deletion pkgs/applications/science/math/singular/default.nix
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
done
'';

enableParallelBuild = true;
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "A CAS for polynomial computations";
2 changes: 1 addition & 1 deletion pkgs/applications/video/kodi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt}
'';

enableParallelBuild = true;
enableParallelBuilding = true;

doCheck = true;

2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/lkl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {

makeFlags = "-C tools/lkl";

enableParallelBuilds = true;
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
4 changes: 2 additions & 2 deletions pkgs/tools/networking/dnscrypt-proxy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "dnscrypt-proxy-${version}";
version = "1.9.4";
version = "1.9.5";

src = fetchurl {
url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
sha256 = "07piwsjczamwvdpv1585kg4awqakip51bwsm8nqi6bljww4agx7x";
sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
};

configureFlags = optional stdenv.isLinux "--with-systemd";