Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
/ nixpkgs-channels Public archive
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: e8cf1234d77a
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: f75784a33bd8
Choose a head ref
  • 8 commits
  • 2 files changed
  • 3 contributors

Commits on May 5, 2020

  1. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 5, 2020
    Copy the full SHA
    fad00a9 View commit details

Commits on May 8, 2020

  1. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 8, 2020
    Copy the full SHA
    4e78311 View commit details

Commits on May 9, 2020

  1. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d4548b View commit details

  2. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    438ee1a View commit details

  3. python2: 2.7.17 -> 2.7.18 (security, backport) 

    Closes NixOS/nixpkgs#79729

Scurity fixes and official EOL note.

(cherry picked from commit cf1a683)
    @FRidh
    FRidh committed May 9, 2020
    Copy the full SHA
    6ac7ed8 View commit details

Commits on May 11, 2020

  1. Merge staging-20.03 into release-20.03

    @FRidh
    FRidh committed May 11, 2020
    Copy the full SHA
    3ffd8dc View commit details

  2. clipboard-indicator: removed broken flag. (#83088) 

    (cherry picked from commit 4755186)
    @dasj19 @bjornfor
    dasj19 authored and bjornfor committed May 11, 2020
    Copy the full SHA
    e2af3a6 View commit details

  3. gnomeExtensions.clipboard-indicator: 30 -> 34 

    (cherry picked from commit 024a6dc)
    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed May 11, 2020
    Copy the full SHA
    f75784a View commit details
Showing with 5 additions and 6 deletions.
  1. +3 −4 pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
  2. +2 −2 pkgs/development/interpreters/python/default.nix
7 changes: 3 additions & 4 deletions pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gnome3 }:
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
pname = "gnome-shell-extension-clipboard-indicator";
version = "30";
version = "34";

src = fetchFromGitHub {
owner = "Tudmotu";
repo = "gnome-shell-extension-clipboard-indicator";
rev = "v${version}";
sha256 = "1fmgmxv2y678bj0kmymkgnnglcpqk8ww053izlq46xg7s27jjdf6";
sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s";
};

uuid = "clipboard-indicator@tudmotu.com";
@@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jonafato ];
platforms = platforms.linux;
homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator;
broken = versionAtLeast gnome3.gnome-shell.version "3.26";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,10 +53,10 @@ in {
sourceVersion = {
major = "2";
minor = "7";
patch = "17";
patch = "18";
suffix = "";
};
sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd";
sha256 = "0hzgxl94hnflis0d6m4szjx0b52gah7wpmcg5g00q7am6xwhwb5n";
inherit (darwin) configd;
inherit passthruFun;
};