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: 740d76371e6c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c40ac69ec3cd
Choose a head ref
  • 7 commits
  • 6 files changed
  • 7 contributors

Commits on Jul 31, 2017

  1. xrdp: abs path to garbage directory

    Volth committed Jul 31, 2017
    Copy the full SHA
    fdbdccf View commit details

  2. linux-testing: 4.13-rc2 -> 4.13-rc3 

    Tested via building the linux_testing attribute, but didn't test it at
runtime (yet).

Diffed unpacked tarball against my local git clone and the contents
match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jul 31, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    aszlig
    GPG key ID: 1DE8E48E57DB5436
    Verified
    Learn about vigilant mode
    Copy the full SHA
    979817d View commit details

  3. osc: update to version 0.159.0-4-g2d44589 (current git master)

    @peti
    peti committed Jul 31, 2017
    Copy the full SHA
    701d2c8 View commit details

  4. Removed deprecation warning for networking.extraHosts

    @regellosigkeitsaxiom @globin
    regellosigkeitsaxiom authored and globin committed Jul 31, 2017
    Copy the full SHA
    a74c0c6 View commit details

  5. Merge pull request #27785 from volth/xrdp-0.9.3-1 

    xrdp: abs path to garbage directory
    @fpletz
    fpletz authored Jul 31, 2017
    Copy the full SHA
    f90c4be View commit details

  6. fbida: fix build failure

    @7c6f434c
    7c6f434c committed Jul 31, 2017
    Copy the full SHA
    b2d19a4 View commit details

  7. gnupg: 2.1.21 -> 2.1.22 

    https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000411.html
    @GeNTooFReaK @globin
    GeNTooFReaK authored and globin committed Jul 31, 2017
    1
    Copy the full SHA
    c40ac69 View commit details
3 changes: 0 additions & 3 deletions nixos/modules/config/networking.nix
View file
Original file line number Diff line number Diff line change
@@ -199,9 +199,6 @@ in

config = {

warnings = optional (cfg.extraHosts != "")
"networking.extraHosts is deprecated, please use networking.hosts instead";

environment.etc =
{ # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana-etc + "/etc/services";
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/fbida/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ];

makeFlags = [ "prefix=$(out)" "verbose=yes" ];
makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ];

patchPhase =
''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/remote/xrdp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ let
./bootstrap
'';
dontDisableStatic = true;
configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];
configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];

installFlags = [ "DESTDIR=$(out)" "prefix=" ];

6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.13-rc2";
modDirVersion = "4.13.0-rc2";
version = "4.13-rc3";
modDirVersion = "4.13.0-rc3";
extraMeta.branch = "4.13";

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif";
sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl";
};

features.iwlwifi = true;
4 changes: 2 additions & 2 deletions pkgs/tools/security/gnupg/21.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";

version = "2.1.21";
version = "2.1.22";

src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks";
sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6";
};

buildInputs = [
6 changes: 3 additions & 3 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14927,13 +14927,13 @@ in {
});

osc = buildPythonPackage {
name = "osc-0.156.0-94-gd8ba394";
name = "osc-0.159.0-4-g2d44589";
disabled = isPy3k;
src = pkgs.fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8";
sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0";
rev = "2d44589886845af7da911aaec9403344e396cd91";
sha256 = "0s8p7gkp64w6r5rnxpbvl2dgb5p85kq2skcqm6qxn5ddadhw2sfz";
};
buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];