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: fa9414bb45e8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 884a0b091bad
Choose a head ref
Loading
2 changes: 1 addition & 1 deletion doc/builders/packages/emacs.section.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Emacs {#sec-emacs}

## Configuring Emacs
## Configuring Emacs {#sec-emacs-config}

The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override:

4 changes: 2 additions & 2 deletions lib/strings.nix
Original file line number Diff line number Diff line change
@@ -569,9 +569,9 @@ rec {
standard GNU Autoconf scripts.
Example:
enableFeature true "shared" "foo"
enableFeatureAs true "shared" "foo"
=> "--enable-shared=foo"
enableFeature false "shared" (throw "ignored")
enableFeatureAs false "shared" (throw "ignored")
=> "--disable-shared"
*/
enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}";
2 changes: 1 addition & 1 deletion nixos/modules/misc/documentation.nix
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ in
manualCache = pkgs.runCommandLocal "man-cache" { }
''
echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf
${pkgs.man-db}/bin/mandb -C man.conf -psc
${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1
'';
in
''
2 changes: 1 addition & 1 deletion nixos/modules/programs/fish.nix
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ in
programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;

# Required for man completions
documentation.man.generateCaches = true;
documentation.man.generateCaches = lib.mkDefault true;

environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
4 changes: 2 additions & 2 deletions pkgs/applications/misc/polybar/default.nix
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;

stdenv.mkDerivation rec {
pname = "polybar";
version = "3.4.3";
version = "3.5.0";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0fsfh3xv0c0hz10xqzvd01c0p0wvzcnanbyczi45zhaxfrisb39w";
sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji";
fetchSubmodules = true;
};

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"stable": {
"version": "87.0.4280.66",
"sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
"sha256bin64": "09hjhxjihhxq5i2wadpa0g72a6iis0igarr8arrcah4122icdr77",
"version": "87.0.4280.88",
"sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
"sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb",
"deps": {
"gn": {
"version": "2020-09-09",
@@ -12,9 +12,9 @@
}
},
"chromedriver": {
"version": "87.0.4280.20",
"sha256_linux": "1cpk7mb32z3a7c7cbaaxskpv91il3i8kgsdp2q8zw9w762kql953",
"sha256_darwin": "06mx2yk6xy46azvkbyvhqm11prxbh67pfi50fcwxb0zqllbq7scr"
"version": "87.0.4280.88",
"sha256_linux": "141mr2jiy3nslwd3s43m4i6plkv9wv5fgi78cn7mz0ac9x6fpcgx",
"sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
}
},
"beta": {
Loading