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: e072276cf2d8
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: cb9a3a0a3241
Choose a head ref
  • 7 commits
  • 5 files changed
  • 6 contributors

Commits on Jul 11, 2020

  1. gnomeExtensions.dash-to-panel: 31 -> 38

    @rawkode
    rawkode committed Jul 11, 2020
    Copy the full SHA
    2968735 View commit details

Commits on Jul 12, 2020

  1. diskonaut: 0.3.0 -> 0.9.0 

    remove special handling for checkPhase
Diskonaut now measures file sizes consistently and tests can be run
without modification

discussion: imsnif/diskonaut#50
implementation: imsnif/diskonaut#66
    @evanjs
    evanjs committed Jul 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    34f096d View commit details

  2. Merge pull request #93018 from evanjs/diskonaut/0.9.0 

    diskonaut: 0.3.0 -> 0.9.0
    @Ma27
    Ma27 authored Jul 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    28f1c45 View commit details

Commits on Jul 13, 2020

  1. install-grub.pl: Fix GRUB always reinstalling. (#92756) 

    See NixOS/nixpkgs#92520 (comment).

In #85895 I accidentally introduced a comparison between an array reference
and an array, which can never be true. Fixed by dereferencing.
    @nh2
    nh2 authored Jul 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    45325b1 View commit details

  2. gnome3.gnome-taquin: 3.36.3 -> 3.36.4

    @r-ryantm @jtojnar
    r-ryantm authored and jtojnar committed Jul 13, 2020
    Copy the full SHA
    2de809d View commit details

  3. gnome3.gnome-initial-setup: 3.36.3 -> 3.36.4

    @r-ryantm @jtojnar
    r-ryantm authored and jtojnar committed Jul 13, 2020
    Copy the full SHA
    0260f04 View commit details

  4. Merge pull request #92926 from rawkode/gnomeExtensions/update-dash-to… 

    …-panel

gnomeExtensions.dash-to-panel: 31 -> 38
    @jtojnar
    jtojnar authored Jul 13, 2020
    Copy the full SHA
    cb9a3a0 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/loader/grub/install-grub.pl
View file
Original file line number Diff line number Diff line change
@@ -652,7 +652,7 @@ sub readGrubState {
my $prevGrubState = readGrubState();
my @prevDeviceTargets = split/,/, $prevGrubState->devices;
my @extraGrubInstallArgs = getList('extraGrubInstallArgs');
my @prevExtraGrubInstallArgs = $prevGrubState->extraGrubInstallArgs;
my @prevExtraGrubInstallArgs = @{$prevGrubState->extraGrubInstallArgs};

my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference());
my $extraGrubInstallArgsDiffer = scalar (List::Compare->new( '-u', '-a', \@extraGrubInstallArgs, \@prevExtraGrubInstallArgs)->get_symmetric_difference());
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@

stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.36.3";
version = "3.36.4";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq";
sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "gnome-shell-dash-to-panel";
version = "31";
version = "38";

src = fetchFromGitHub {
owner = "home-sweet-gnome";
repo = "dash-to-panel";
rev = "v${version}";
sha256 = "0vh36mdncjvfp1jbinifznj5dw3ahsswwm3m9sjw5gydsbx6vh83";
sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "gnome-taquin";
version = "3.36.3";
version = "3.36.4";

src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4";
sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0";
};

passthru = {
11 changes: 3 additions & 8 deletions pkgs/tools/misc/diskonaut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "diskonaut";
version = "0.3.0";
version = "0.9.0";

src = fetchFromGitHub {
owner = "imsnif";
repo = "diskonaut";
rev = version;
sha256 = "0vnmch2cac0j9b44vlcpqnayqhfdfdwvfa01bn7lwcyrcln5cd0z";
sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5";
};

cargoSha256 = "03hqdg6pnfxnhwk0xwhwmbrk4dicjpjllbbai56a3391xac5wmi6";

# some tests fail due to non-portable (in terms of filesystems) measurements of block sizes
# try to re-enable tests once actual-file-size is added
# see https://github.com/imsnif/diskonaut/issues/50 for more info
doCheck = false;
cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf";

meta = with stdenv.lib; {
description = "Terminal disk space navigator";