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: 6655a13a56f3
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: 281cf62724b9
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Dec 19, 2019

  1. nixpkgs manual: document staging-next branch 

    (cherry picked from commit 62193ec)
    @FRidh
    FRidh committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5fef097 View commit details

  2. wireguard-tools: 0.0.20191127 -> 0.0.20191212 

    (cherry picked from commit bbb9f05)
    @d-xo @Ma27
    d-xo authored and Ma27 committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f80c916 View commit details

  3. wireguard-tools: 0.0.20191212 -> 0.0.20191219 

    (cherry picked from commit cbd6771)
    @ivan @Ma27
    ivan authored and Ma27 committed Dec 19, 2019
    Copy the full SHA
    7cb5ccd View commit details

  4. signal-desktop: 1.29.1 -> 1.29.2 

    (cherry picked from commit 096c2b4)
Reason: Avoid an expired (unusable) release in the stable release
(Signal-Desktop releases expire after 90 days).
    @primeos
    primeos committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a995672 View commit details

  5. Merge pull request #75936 from primeos/signal-desktop-backport 

    [19.09] signal-desktop: 1.29.1 -> 1.29.2 (backport)
    @primeos
    primeos authored Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    281cf62 View commit details
41 changes: 21 additions & 20 deletions doc/submitting-changes.xml
View file
Original file line number Diff line number Diff line change
@@ -375,31 +375,32 @@ Additional information.

<section xml:id="submitting-changes-master-branch">
<title>Master branch</title>

<itemizedlist>
<listitem>
<para>
It should only see non-breaking commits that do not cause mass rebuilds.
</para>
</listitem>
</itemizedlist>
<para>
The <literal>master</literal> branch is the main development branch.
It should only see non-breaking commits that do not cause mass rebuilds.
</para>
</section>

<section xml:id="submitting-changes-staging-branch">
<title>Staging branch</title>
<para>
The <literal>staging</literal> branch is a development branch where mass-rebuilds go.
It should only see non-breaking mass-rebuild commits.
That means it is not to be used for testing, and changes must have been well tested already.
If the branch is already in a broken state, please refrain from adding extra new breakages.
</para>
</section>

<itemizedlist>
<listitem>
<para>
It's only for non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.
</para>
</listitem>
<listitem>
<para>
If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. If any fixes for staging happen to be already in master, then master can be merged into staging.
</para>
</listitem>
</itemizedlist>
<section xml:id="submitting-changes-staging-next-branch">
<title>Staging-next branch</title>
<para>
The <literal>staging-next</literal> branch is for stabilizing mass-rebuilds submitted to the <literal>staging</literal> branch prior to merging them into <literal>master</literal>.
Mass-rebuilds should go via the <literal>staging</literal> branch.
It should only see non-breaking commits that are fixing issues blocking it from being merged into the <literal>master </literal> branch.
</para>
<para>
If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.
</para>
</section>

<section xml:id="submitting-changes-stable-release-branches">
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ let

in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.29.1"; # Please backport all updates to the stable channel.
version = "1.29.2"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "12n17d8b31si7gngvv8bhbcid46n18kznv875nyy34i6b97zavmh";
sha256 = "1w35x0p3znylgr0vx72x3kdm3cyg0xymqy12q8bygvijd0h6182d";
};

phases = [ "unpackPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20191127";
version = "0.0.20191219";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99";
sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d";
};

sourceRoot = "source/src/tools";