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: 01bcf3f2f22f
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: 2456e8475ffd
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 25, 2018

  1. growPartition: fix volume resizing on EC2 NVME instances 

    The previous code for this accidentally picked up a "p" when computing the partition number.
This logic should be more robust

fixes #39491

(cherry picked from commit 3a47c7e)
    @Mic92
    Ihor Antonov authored and Mic92 committed Apr 25, 2018
    Copy the full SHA
    c9ab6a5 View commit details

  2. kdeApplications.mbox-importer: fix hydra build 

    build failed with "log limit exceeded", disable verbose logging

(cherry picked from commit 223aad2)
    @xeji
    xeji committed Apr 25, 2018
    Copy the full SHA
    74d8daf View commit details

  3. Merge pull request #39508 from xeji/kde-mbox-importer 

    kdeApplications.mbox-importer: fix hydra build [18.03]
    @Mic92
    Mic92 authored Apr 25, 2018

    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
    2456e84 View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −2 nixos/modules/system/boot/grow-partition.nix
  2. +0 −3 pkgs/applications/kde/mbox-importer.nix
11 changes: 9 additions & 2 deletions nixos/modules/system/boot/grow-partition.nix
View file
Original file line number Diff line number Diff line change
@@ -32,8 +32,15 @@ with lib;
rootDevice="${config.fileSystems."/".device}"
if [ -e "$rootDevice" ]; then
rootDevice="$(readlink -f "$rootDevice")"
parentDevice="$(lsblk -npo PKNAME "$rootDevice")"
TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}"
parentDevice="$rootDevice"
while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do
parentDevice="''${parentDevice%[0-9]}";
done
partNum="''${rootDevice#''${parentDevice}}"
if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then
parentDevice="''${parentDevice%p}"
fi
TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum"
udevadm settle
fi
'';
3 changes: 0 additions & 3 deletions pkgs/applications/kde/mbox-importer.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,4 @@ mkDerivation {
buildInputs = [
akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib
];
preHook = ''
set -x
'';
}