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

Commits on Nov 9, 2020

  1. Copy the full SHA
    22b73d1 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0950c98 View commit details
  3. Copy the full SHA
    3ca5220 View commit details
  4. Copy the full SHA
    0e19ef3 View commit details
  5. Copy the full SHA
    2c9497b View commit details
  6. Copy the full SHA
    88bf1b3 View commit details
  7. Copy the full SHA
    433c1a7 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/pbkdf2-sha512.c
Original file line number Diff line number Diff line change
@@ -35,4 +35,4 @@ int main(int argc, char** argv)
fwrite(key, 1, key_length, stdout);

return 0;
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/editors/qxmledit/qxmledit.json
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@
"repo": "qxmledit",
"rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1",
"sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834"
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/science/physics/xflr5/default.nix
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.esclear ];
platforms = platforms.linux;
};
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/windowlab/default.nix
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux;
};
}
}
2 changes: 1 addition & 1 deletion pkgs/build-support/docker/detjson.py
Original file line number Diff line number Diff line change
@@ -37,4 +37,4 @@ def main():
json.dump(j, sys.stdout, sort_keys=True)

if __name__ == '__main__':
main()
main()
2 changes: 1 addition & 1 deletion pkgs/build-support/fetchsvnrevision/default.nix
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ runCommand: subversion: repository:
rev=$(echo p | svn ls -v --depth empty ${repository} |awk '{ print $1 }')
echo "[ \"$rev\" ]" > $out
echo Latest revision is $rev
'')
'')
2 changes: 1 addition & 1 deletion pkgs/development/idris-modules/TODO.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* Build the RTS separately from Idris
* idris2nix
* Only require gmp, rts when compiling executables
* Only require gmp, rts when compiling executables
Original file line number Diff line number Diff line change
@@ -9,4 +9,4 @@ runCommand "update-python-libraries" {
cp ${./update-python-libraries.py} $out
patchShebangs $out
substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"'
''
''
2 changes: 1 addition & 1 deletion pkgs/development/libraries/aspell/aspell-with-dicts.nix
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ in buildEnv {
done
popd
'';
}
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/protobuf/2.5.nix
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ callPackage ./generic.nix (args // rec {
url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
};
})
})
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/itm-tools/default.nix
Original file line number Diff line number Diff line change
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ hh sb0 ];
};
}
}
2 changes: 1 addition & 1 deletion pkgs/games/keen4/builder.sh
Original file line number Diff line number Diff line change
@@ -28,4 +28,4 @@ for i in *; do
fi
done
EOF
chmod +x $out/bin/keen4
chmod +x $out/bin/keen4
4 changes: 2 additions & 2 deletions pkgs/servers/mlflow-server/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
let
py = python3.pkgs;
in
py.toPythonApplication
py.toPythonApplication
(py.mlflow.overridePythonAttrs(old: rec {
pname = "mlflow-server";

@@ -34,4 +34,4 @@ py.toPythonApplication
cp ${gunicornScript} $gpath
chmod 555 $gpath
'';
}))
}))
10 changes: 5 additions & 5 deletions pkgs/tools/graphics/diagrams-builder/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
If user need access to more haskell package for building his
diagrams, he simply has to pass these package through the
extra packages function as follow in `config.nix`:
~~~
diagrams-builder.override {
extraPackages = self : [myHaskellPackage];
@@ -15,7 +15,7 @@
let

# Used same technique as for the yiCustom package.
wrappedGhc = ghcWithPackages
wrappedGhc = ghcWithPackages
(self: [ diagrams-builder ] ++ extraPackages self);
ghcVersion = wrappedGhc.version;

@@ -25,7 +25,7 @@ let
--set NIX_GHC ${wrappedGhc}/bin/ghc \
--set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
'';

backends = ["svg" "cairo" "ps"];

in
@@ -35,10 +35,10 @@ stdenv.mkDerivation {

buildInputs = [ makeWrapper ];

buildCommand = with stdenv.lib;
buildCommand = with stdenv.lib;
concatStrings (intersperse "\n" (map exeWrapper backends));

# Will be faster to build the wrapper locally then to fetch it from a binary cache.
preferLocalBuild = true;
meta = diagrams-builder.meta;
}
}
2 changes: 1 addition & 1 deletion pkgs/tools/misc/jugglinglab/default.nix
Original file line number Diff line number Diff line change
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ wnklmnn ];
platforms = platforms.all;
};
}
}