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: 70717a337f7a
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: 92d5b1b55f68
Choose a head ref
  • 9 commits
  • 9 files changed
  • 7 contributors

Commits on Jun 6, 2020

  1. palemoon: 28.9.1 -> 28.9.3

    (cherry picked from commit 5262ada)
    OPNA2608 committed Jun 6, 2020
    Copy the full SHA
    af29475 View commit details

Commits on Jun 8, 2020

  1. gcc: Fix MinGW exception handling so Rust works

    reasoning:
    sjlj (short jump long jump) exception handling makes no sense on x86_64, it's forcably slowing programs down as it produces a constant overhead. On x86_64 we have SEH (Structured Exception Handling) and we should use that. On i686, we do not have SEH, and have to use sjlj with dwarf2. Hence it's now conditional on x86_32
    
    (cherry picked from commit e27e475)
    (cherry picked from commit 58ffaee)
    cleverca22 authored and Ericson2314 committed Jun 8, 2020
    Copy the full SHA
    bf57132 View commit details
  2. gcc: Clean up configure flags

    No reason to have two conditional lists with the same condition.
    
    (cherry picked from commit f2a33e4)
    angerman authored and Ericson2314 committed Jun 8, 2020
    Copy the full SHA
    06e882b View commit details

Commits on Jun 9, 2020

  1. linux: 4.19.126 -> 4.19.127

    (cherry picked from commit 4c11426)
    NeQuissimus committed Jun 9, 2020
    Copy the full SHA
    a83164c View commit details
  2. linux: 5.4.44 -> 5.4.45

    (cherry picked from commit 505e54f)
    NeQuissimus committed Jun 9, 2020
    Copy the full SHA
    a91a07a View commit details
  3. linux: 5.6.16 -> 5.6.17

    (cherry picked from commit aa1479c)
    NeQuissimus committed Jun 9, 2020
    Copy the full SHA
    f6f6d50 View commit details
  4. Merge pull request #89702 from OPNA2608/backport-update-palemoon

    [20.03] palemoon: 28.9.1 -> 28.9.3
    AndersonTorres authored Jun 9, 2020
    Copy the full SHA
    7224539 View commit details
  5. coq_8_11: 8.11.1 → 8.11.2

    (cherry picked from commit 48f0d8b)
    vbgl committed Jun 9, 2020
    Copy the full SHA
    ca6e453 View commit details
  6. hydra-unstable: 2020-04-16 -> 2020-06-01

    Fixes #89305
    (cherry picked from commit c18016c)
    Ma27 committed Jun 9, 2020
    Copy the full SHA
    92d5b1b View commit details
6 changes: 3 additions & 3 deletions nixos/tests/hydra/db-migration.nix
Original file line number Diff line number Diff line change
@@ -61,15 +61,15 @@ with pkgs.lib;
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
)
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id" not in out
original.succeed(
"${next}/bin/switch-to-configuration test >&2"
)
original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id|integer|||" in out
original.succeed("hydra-backfill-ids")
@@ -79,7 +79,7 @@ with pkgs.lib;
)
original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id|integer||not null|" in out
original.wait_until_succeeds(
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/palemoon/default.nix
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@ let

in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.9.1";
version = "28.9.3";

src = fetchgit {
url = "https://github.com/MoonchildProductions/Pale-Moon.git";
rev = "${version}_Release";
sha256 = "1772by9r9l1l0wmj4hs89r3zyckcbrq1krb09bn3pxvjjywzvkfl";
sha256 = "1f8vfjyihlr2l79mkfgdcvwjnh261n6imkps310x9x3977jiq2wr";
fetchSubmodules = true;
};

1 change: 1 addition & 0 deletions pkgs/applications/science/logic/coq/default.nix
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ let
"8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz";
"8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn";
"8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0";
"8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
28 changes: 19 additions & 9 deletions pkgs/development/compilers/gcc/common/configure-flags.nix
Original file line number Diff line number Diff line change
@@ -24,6 +24,16 @@
assert cloog != null -> stdenv.lib.versionOlder version "5";
assert langJava -> stdenv.lib.versionOlder version "7";

# Note [Windows Exception Handling]
# sjlj (short jump long jump) exception handling makes no sense on x86_64,
# it's forcably slowing programs down as it produces a constant overhead.
# On x86_64 we have SEH (Structured Exception Handling) and we should use
# that. On i686, we do not have SEH, and have to use sjlj with dwarf2.
# Hence it's now conditional on x86_32 (i686 is 32bit).
#
# ref: https://stackoverflow.com/questions/15670169/what-is-difference-between-sjlj-vs-dwarf-vs-seh


let
inherit (stdenv)
buildPlatform hostPlatform targetPlatform
@@ -55,8 +65,16 @@ let
"--with-gnu-as"
"--with-gnu-ld"
"--disable-debug"
"--enable-sjlj-exceptions"
"--disable-win32-registry"
"--enable-hash-synchronization"
"--enable-libssp"
"--disable-nls"
# To keep ABI compatibility with upstream mingw-w64
"--enable-fully-dynamic-string"
] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
# See Note [Windows Exception Handling]
"--enable-sjlj-exceptions"
"--with-dwarf2"
] else [
(if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot"
else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
@@ -77,14 +95,6 @@ let
] ++ lib.optionals (targetPlatform.libc == "musl") [
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
] ++ lib.optionals crossMingw [
"--enable-sjlj-exceptions"
"--enable-hash-synchronization"
"--enable-libssp"
"--disable-nls"
"--with-dwarf2"
# To keep ABI compatibility with upstream mingw-w64
"--enable-fully-dynamic-string"
] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
);
14 changes: 11 additions & 3 deletions pkgs/development/tools/misc/hydra/default.nix
Original file line number Diff line number Diff line change
@@ -24,14 +24,22 @@
# so when having an older version, `pkgs.hydra-migration` should be deployed first.

hydra-unstable = callPackage ./common.nix {
version = "2020-04-16";
version = "2020-06-01";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "87837f1d82904bf48e11b5641258b6be2f663c3b";
sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5";
rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a";
sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4";
};
nix = nixFlakes;

patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch";
sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w";
})
];

tests = {
db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-unstable;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.126";
version = "4.19.127";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf";
sha256 = "0vsq5vjyh6n8acjnldfs0zny63l12fn2pssb8zbwidc8qmmqibw2";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.44";
version = "5.4.45";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp";
sha256 = "0bpy2lb3bqmkaqxzdmssgmhbjsys7d3lyfv4x919q0596jgh6gqh";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.6.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.6.16";
version = "5.6.17";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15";
sha256 = "17kzalz8z6svv6nwa3dbmf7nyvpb2wwwyabj19vdwf6v05a28fn3";
};
} // (args.argsOverride or {}))
2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
Original file line number Diff line number Diff line change
@@ -137,7 +137,7 @@ in rec {
version = "8.10.2";
};
coq_8_11 = callPackage ../applications/science/logic/coq {
version = "8.11.1";
version = "8.11.2";
};

coqPackages_8_5 = mkCoqPackages coq_8_5;