Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db0abe98bfa7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5632aad4739c
Choose a head ref
  • 6 commits
  • 4 files changed
  • 6 contributors

Commits on Nov 16, 2018

  1. nixos/nix-daemon: default to build with all cores available 

    These days build systems are more robust w.r.t. to concurrency.
Most users will have at least two cores in their machines.
Therefore I suggest to increase the number of cores used for building.

fixes #50376
    @Mic92
    Mic92 committed Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ced57f7 View commit details

  2. Merge pull request #50440 from Mic92/nix-cores 

    nixos/nix-daemon: default to build with all cores available
    @edolstra
    edolstra authored Nov 16, 2018
    Copy the full SHA
    5835b27 View commit details

  3. valentina: don’t copy mailcap file into XDG MIME directory

    @jfrankenau
    jfrankenau committed Nov 16, 2018
    Copy the full SHA
    16a7db0 View commit details

  4. Update GCE image for 18.09 

    (cherry picked from commit e0eb712)
    @rbvermaa
    rbvermaa committed Nov 16, 2018
    Copy the full SHA
    02b6041 View commit details

  5. androidStudioPackages.{dev,canary}: 3.4.0.2 -> 3.4.0.3

    @primeos
    primeos committed Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    754aa03 View commit details

  6. Merge pull request #50449 from jfrankenau/fix-valentina-mailcap 

    valentina: don’t copy mailcap file into XDG MIME directory
    @Mic92
    Mic92 authored Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5632aad View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -117,11 +117,11 @@ in

buildCores = mkOption {
type = types.int;
default = 1;
default = 0;
example = 64;
description = ''
This option defines the maximum number of concurrent tasks during
one build. It affects, e.g., -j option for make. The default is 1.
one build. It affects, e.g., -j option for make.
The special value 0 means that the builder should use all
available CPU cores in the system. Some builds may become
non-deterministic with this option; use with care! Packages will
4 changes: 2 additions & 2 deletions nixos/modules/virtualisation/gce-images.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,6 @@ let self = {
"16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";

latest = self."18.03";
"18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz";
latest = self."18.09";
}; in self
6 changes: 3 additions & 3 deletions pkgs/applications/editors/android-studio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ let
sha256Hash = "12gzwnlvc1w5lywpdckdgwxy2yrhf0m0fvaljdsis2arw0x9qdh2";
};
latestVersion = { # canary & dev
version = "3.4.0.2"; # "Android Studio 3.4 Canary 3"
build = "183.5112304";
sha256Hash = "0dzk4ag1dirfq8l2q91j6hsfyi07wx52qcsmbjb9a2710rlwpdhp";
version = "3.4.0.3"; # "Android Studio 3.4 Canary 4"
build = "183.5129585";
sha256Hash = "10y09sy0h4yp39dwpp8x7kjvw8r7hvk0qllbbaqj76j33xa85793";
};
in rec {
# Old alias
1 change: 0 additions & 1 deletion pkgs/applications/misc/valentina/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/mime/packages
cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml
cp dist/debian/valentina.mime $out/share/mime/packages/valentina
'';

enableParallelBuilding = true;