JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
284,511 Commits 1 Branch 0 Tags 12 GiB
ba666011a6
Commit Graph

284511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Dionne-Riel
ba666011a6 make-disk-image: Account for reserved disk space 
This is a bit of a thorny issue. See, the actual `diskSize` variable is
for the *total* disk size, not for the filesystem!

The automatic numbers are meant to compute the *filesystem* required
space. So we have to add any other reserved space!

We have different requirements for reserved space. E.g. there could be
none (when it's actually a filesystem image). There could also be 1MiB
for alignment for an MBR image, legacy+gpt needs 2MiB, then GPT with an
ESP ("bootSize") needs to take the boot partition and GPT size into
account too!

Though luckily(?) for this latter situation we can cheat! As noted in the
change, `bootSize` is NOT the boot partition size. It is actually the
offset where the target filesystem starts.
 2021-04-24 14:49:05 -04:00
Samuel Dionne-Riel
9b18a78c73 make-disk-image: Account for the ext4 reserved space 
Reserved space includes:

 - inodes space in use (2 blocks per)
 - about 5.2% of the space

The 5.2% reserved space was computed empirically when working on a
previous EXT4 image builder. It seems to stabilize around 5% even for
much larger filesystems.
 2021-04-24 14:49:04 -04:00
Samuel Dionne-Riel
05c13a03e2 make-disk-image: Get proper size for automatic size 
On some filesystems, `du` without `--apparent-size` will not give the
actual size for a file. Using `--apparent-size` will give us the actual
file size.

Though, this is not actually correct still. 1000 × 1 bytes is not 1000
bytes. It is 1000 × ceil(filesize/blockSize)*blockSize.

So instead of adding up the actual file sizes. We are adding up the
block sizes.

Note that this also changes the builder to work with *bytes*, rather
than with any other units. Doing maths on bytes is less likely to go
awry than doing it on other units.
 2021-04-24 14:49:04 -04:00
Martin Weinelt
0ca4f6b739
Merge pull request #120550 from fabaff/smhi 2021-04-24 20:22:21 +02:00
Guillaume Girol
1c62c0f370
Merge pull request #120537 from symphorien/nagios-restart 
nixos/nagios: use the correct option to restart on config change
 2021-04-24 17:58:19 +00:00
Thomas Gerbet
bdb7248944 binwalk: 2.2.0 -> 2.3.1 
Releases notes:
https://github.com/ReFirmLabs/binwalk/releases/tag/v2.3.1
https://github.com/ReFirmLabs/binwalk/releases/tag/v2.3.0
 2021-04-24 10:49:06 -07:00
Lassulus
118485230c
Merge pull request #119725 from helsinki-systems/feat/flexoptix-app 
flexoptix-app: Init at 5.9.0
 2021-04-24 19:34:18 +02:00
Domen Kožar
4b6cd9daa8
Merge pull request #120551 from NixOS/codeowners-workflows 
Add NixOS/Security as a reviewer for .github/workflows
 2021-04-24 18:28:34 +01:00
Martin Weinelt
324f9afad9
Merge pull request #120545 from jonringer/bump-steam 2021-04-24 19:25:58 +02:00
Graham Christensen
d6ed686eb2
Add NixOS/Security as a reviewer for .github/workflows 2021-04-24 13:21:42 -04:00
Izorkin
47d3e955fc nixos/mastodon/sandbox: add @privileged and @raw-io to SystemCallFilter 2021-04-24 19:12:10 +02:00
Graham Christensen
9d95ba3dd6 actions: add some permission restrictions 2021-04-24 13:07:57 -04:00
Fabian Affolter
e1054f07f1 home-assistant: enable smhi tests 2021-04-24 18:54:51 +02:00
Fabian Affolter
cee055528d home-assistant: update component-packages 2021-04-24 18:54:23 +02:00
Fabian Affolter
019cf935eb python3Packages.smhi-pkg: init at 1.0.14 2021-04-24 18:51:26 +02:00
Jonathan Ringer
69a4de6251
steamPackages.steam: use stable archive to avoid 404s 2021-04-24 09:48:44 -07:00
Jonathan Ringer
d79d927cca
steamPackages.steam: 1.0.0.69 -> 1.0.0.70 2021-04-24 09:37:38 -07:00
Martin Weinelt
b7e08de1e9
Merge pull request #119181 from SFrijters/wine-6.6 2021-04-24 17:59:07 +02:00
Martin Weinelt
192ae8f46a
Merge pull request #120474 from mweinelt/handlr 
handlr: 0.5.0 -> 0.6.1
 2021-04-24 17:54:08 +02:00
Martin Weinelt
9f48549762
Merge pull request #120532 from fabaff/homeconnect 2021-04-24 17:34:15 +02:00
John Ericson
d243aae0f3
Merge pull request #120470 from alyssais/doubles 
lib.systems.doubles.netbsd: expand
 2021-04-24 11:22:58 -04:00
Michele Guerini Rocco
a67aad9c01
Merge pull request #120522 from rnhmjoj/mkvtoolnix 
mkvtoolnix: 55.0.0 -> 56.0.0
 2021-04-24 17:16:32 +02:00
Symphorien Gibol
ddf567cd5a nixos/nagios: use the correct option to restart on config change 
X-ReloadIfChanged is incorrect, apparently https://github.com/NixOS/nixpkgs/pull/120324#discussion_r619472321
We restart instead of reloading because nagios unit file has no
ExecReload.
 2021-04-24 17:12:51 +02:00
Mario Rodas
53a3fc2856 ocamlPackages.sedlex_2: 2.2 -> 2.3 2021-04-24 17:04:32 +02:00
Fabian Affolter
766e698739 home-assistant: enable home_connect tests 2021-04-24 16:54:13 +02:00
Fabian Affolter
2400327661 home-assistant: update component-packages 2021-04-24 16:54:13 +02:00
Fabian Affolter
c6e9a834b7 python3Packages.homeconnect: init at 0.6.3 2021-04-24 16:54:13 +02:00
Jan Tojnar
ac0319febf
Merge pull request #120231 from bobby285271/master 
doc: Convert builders/images/* to markdown
 2021-04-24 16:36:26 +02:00
Martin Weinelt
abd57b544e
Merge pull request #120276 from mweinelt/python/some-libs 2021-04-24 13:38:42 +02:00
José Romildo Malaquias
68e02d1757
Merge pull request #118367 from romildo/upd.mate_ 
mate: update packages
 2021-04-24 08:03:19 -03:00
Sandro
e68638d6a0
Merge pull request #120437 from bachp/minio-2021-04-22T15-44-28Z 
minio: 2021-04-06T23-11-00Z -> 2021-04-22T15-44-28Z
 2021-04-24 12:43:28 +02:00
Sandro
8934a57c66
Merge pull request #120509 from rnhmjoj/pdns 
pdns-recursor: 4.4.2 -> 4.4.3
 2021-04-24 12:39:51 +02:00
rnhmjoj
60b30e4ef6
mkvtoolnix: 55.0.0 -> 56.0.0 2021-04-24 12:39:37 +02:00
Sandro
ec1fbe2241
Merge pull request #120465 from fabaff/bump-pymetno 
python3Packages.pymetno: 0.8.2 -> 0.8.3
 2021-04-24 12:38:07 +02:00
Luke Granger-Brown
080acfcc44
Merge pull request #115568 from r-ryantm/auto-update/sqlcipher 
sqlcipher: 4.4.2 -> 4.4.3
 2021-04-24 11:35:40 +01:00
Sandro
1341bcf1f8
Merge pull request #120496 from midchildan/fix/cryfs/darwin-binary-cache 
cryfs: disable tests on Darwin
 2021-04-24 12:33:48 +02:00
Sandro
d1bb63ed16
Merge pull request #120495 from fabaff/bump-angr 2021-04-24 12:33:30 +02:00
Luke Granger-Brown
57fd99043e
Merge pull request #120155 from LeSuisse/vault-0.7.1 
vault: 1.7.0 -> 1.7.1
 2021-04-24 11:32:08 +01:00
Michael Weiss
faf4d48554
Merge pull request #120506 from primeos/llvm 
llvmPackages_12: Finalize reorganizing the files
 2021-04-24 12:23:01 +02:00
Fabian Affolter
687c538dfb
Merge pull request #120504 from NixOS/SuperSandro2000-patch-1 
gdu: remove unused input
 2021-04-24 12:22:37 +02:00
Sandro
a855817309
Merge pull request #120505 from symphorien/checksystemd 
check_systemd: 2.2.1 -> 2.3.1
 2021-04-24 12:21:48 +02:00
Fabian Affolter
94fca3fbdb
Merge pull request #120477 from mweinelt/ajour 
ajour: 1.0.0 -> 1.1.0
 2021-04-24 12:21:36 +02:00
Sandro
6c538c0a4d
Merge pull request #120507 from rnhmjoj/ddcutil 
ddcutil: 1.0.1 -> 1.1.0
 2021-04-24 12:21:09 +02:00
rnhmjoj
754e384fce
pdns-recursor: 4.4.2 -> 4.4.3 2021-04-24 11:58:34 +02:00
Robert Schütz
5d41312d33
prs: 0.2.8 -> 0.2.9 (#120494) 
https://gitlab.com/timvisee/prs/-/blob/v0.2.9/CHANGELOG.md
 2021-04-24 11:50:58 +02:00
Michael Weiss
e4f8498c0b
llvmPackages_12: Create subdirectories for the last two packages 
For consistency. Now all packages will have their own subdirectory
(continuation of 781e69d19c).
 2021-04-24 11:43:29 +02:00
Michael Weiss
a902d99422
llvmPackages_12: Always use the attribute name for pname 
This might be a bit debatable but upstream uses "xx" instead of "++"
when using it as identifier / in the code (file/directory names, build
scripts, website URLs, etc.) so we should probably too.
And at least the attribute name and pname will be consistent now.
 2021-04-24 11:43:29 +02:00
Sandro
42a20abd27
Merge pull request #120200 from mweinelt/wordpress 
wordpress: 5.6.2 -> 5.7.1
 2021-04-24 11:32:42 +02:00
Fabian Affolter
dae1acad14
Merge pull request #120497 from SFrijters/python-survey-update 
python3Packages.survey: 3.4.2 -> 3.4.3
 2021-04-24 11:32:11 +02:00
Sandro
bc222c449e
gdu: remove unused input 2021-04-24 11:30:23 +02:00