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

Commits on Jun 8, 2020

  1. formatting: fix missing leading whitespace

    @1000101
    1000101 committed Jun 8, 2020
    Copy the full SHA
    277bbb8 View commit details

  2. Merge pull request #89789 from 1000101/formatting 

    formatting: fix missing leading whitespace
    @mmahut
    mmahut authored Jun 8, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    df1f883 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/science/misc/sasview/xhtml2pdf.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
#xhtml2pdf specifically requires version "1.0b10" of html5lib
html5 = html5lib.overrideAttrs( oldAttrs: rec{
html5 = html5lib.overrideAttrs( oldAttrs: rec {
name = "${oldAttrs.pname}-${version}";
version = "1.0b10";
src = oldAttrs.src.override {
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/8086tiny/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

assert sdlSupport -> (SDL != null);

stdenv.mkDerivation rec{
stdenv.mkDerivation rec {

pname = "8086tiny";
version = "1.25";
2 changes: 1 addition & 1 deletion pkgs/development/libraries/celt/0.5.1.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec{
callPackage ./generic.nix (args // rec {
version = "0.5.1.3";

src = fetchurl {
2 changes: 1 addition & 1 deletion pkgs/development/libraries/celt/0.7.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec{
callPackage ./generic.nix (args // rec {
version = "0.7.1";

src = fetchurl {
2 changes: 1 addition & 1 deletion pkgs/development/libraries/celt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec{
callPackage ./generic.nix (args // rec {
version = "0.11.3";

src = fetchurl {
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pandocfilters/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, fetchPypi
}:

buildPythonPackage rec{
buildPythonPackage rec {
version = "1.4.2";
pname = "pandocfilters";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/periodictable/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:

buildPythonPackage rec{
buildPythonPackage rec {
pname = "periodictable";
version = "1.5.2";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/toolz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, nose
}:

buildPythonPackage rec{
buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/trezor_agent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
, pinentry
}:

buildPythonPackage rec{
buildPythonPackage rec {
pname = "trezor_agent";
version = "0.10.0";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/x11_hash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, fetchPypi
}:

buildPythonPackage rec{
buildPythonPackage rec {
version = "1.4";
pname = "x11_hash";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/yenc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, isPy3k
}:

buildPythonPackage rec{
buildPythonPackage rec {
pname = "yenc";
version = "0.4.0";
src = fetchurl {
2 changes: 1 addition & 1 deletion pkgs/tools/admin/scaleway-cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:

buildGoPackage rec{
buildGoPackage rec {
pname = "scaleway-cli";
version = "1.20";