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: 57b77e961718
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfd3227686d8
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 21, 2017

  1. linuxPackages.phc-intel: remove use of features.grsecurity 

    I believe this is the final reference to features.grsecurity.
See also e6c65ec
    @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
    881385d View commit details

  2. nano: use https for meta.homepage 

    The http variant is a permanent redirect to https
    @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
    16b6ee3 View commit details

  3. dnscrypt-proxy: 1.9.4 -> 1.9.5 

    See https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.5
    @joachifm
    joachifm committed May 21, 2017
    Copy the full SHA
    bfd3227 View commit details
Showing with 3 additions and 5 deletions.
  1. +1 −1 pkgs/applications/editors/nano/default.nix
  2. +0 −2 pkgs/os-specific/linux/phc-intel/default.nix
  3. +2 −2 pkgs/tools/networking/dnscrypt-proxy/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/editors/nano/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,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; [
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/phc-intel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
assert stdenv.isLinux;
# Don't bother with older versions, though some might even work:
assert stdenv.lib.versionAtLeast kernel.version "4.10";
# Disable on grsecurity kernels, which break module building:
assert !kernel.features ? grsecurity;

let
release = "0.4.0";
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";