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: 2dc559868c94
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: 7795a7ad5f03
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Dec 6, 2018

  1. rambox: 0.6.1 -> 0.6.2 

    (cherry picked from commit fb7abda)
    @Mic92
    Mic92 committed Dec 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    29eb612 View commit details

  2. rambox: 0.6.2 -> 0.6.3 

    (cherry picked from commit 7ff4f5b)
    @anpryl @Mic92
    anpryl authored and Mic92 committed Dec 6, 2018
    Copy the full SHA
    a7924af View commit details

  3. sd-image: Slims the ext4 filesystem even more. 

    This is to try and squeeze more lost space from the image, so that hydra
starts building it again.

The fsck previous to the resize2fs is required so resize2fs works.

The one afterwards is a sanity check.

Using `-M` from resize2fs will not give much saved space due to a known
(in the manual) issue.

```
[samueldr@aarch64:~/nixpkgs]$ ls -lh result-*/*/*.img
-r--r--r-- 1 root root 2.2G Jan  1  1970 result-original/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 2.1G Jan  1  1970 result-M/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 1.9G Jan  1  1970 result-slimmed/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
```

```
[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-original
/nix/store/c8k9n78gylx293rjh762fr05a069kxp2-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3844125000

[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-slimmed
/nix/store/962238skj5mnzhrsmjy23dyzmxk77sp4-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3447473208
```

(cherry picked from commit 61bdaad)
    @samueldr
    samueldr committed Dec 6, 2018
    Copy the full SHA
    7795a7a View commit details
Showing with 24 additions and 5 deletions.
  1. +19 −0 nixos/lib/make-ext4-fs.nix
  2. +5 −5 pkgs/applications/networking/instant-messengers/rambox/bare.nix
19 changes: 19 additions & 0 deletions nixos/lib/make-ext4-fs.nix
View file
Original file line number Diff line number Diff line change
@@ -94,5 +94,24 @@ pkgs.stdenv.mkDerivation {
cat errorlog
return 1
fi
(
# Resizes **snugly** to its actual limits (or closer to)
free=$(dumpe2fs $out | grep '^Free blocks:')
blocksize=$(dumpe2fs $out | grep '^Block size:')
blocks=$(dumpe2fs $out | grep '^Block count:')
blocks=$((''${blocks##*:})) # format the number.
blocksize=$((''${blocksize##*:})) # format the number.
# System can't boot with 0 blocks free.
# Add 16MiB of free space
fudge=$(( 16 * 1024 * 1024 / blocksize ))
size=$(( blocks - ''${free##*:} + fudge ))
echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
)
# And a final fsck, because of the previous truncating.
fsck.ext4 -n -f $out
'';
}
10 changes: 5 additions & 5 deletions pkgs/applications/networking/instant-messengers/rambox/bare.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
version = "0.6.1";
version = "0.6.3";

src = fetchFromGitHub {
owner = "saenzramiro";
repo = "rambox";
owner = "ramboxapp";
repo = "community-edition";
rev = version;
sha256 = "1cyxxgcv0qvm1la8yl5ag3j11spw7zvnj75zpf9c1y33pqmp44yc";
sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5";
};

nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;

nodejs = nodejs-8_x;
sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6";
};

patches = [ ./isDev.patch ];