jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
284,380 Commits 266 Branches 122 Tags 5.3 GiB
7d112134de
Commit Graph

21078 Commits

Author SHA1 Message Date
Samuel Dionne-Riel
7d112134de nixosTests.installer: Fix grub1 test being unreliable 
The kernel sometimes assigns `/dev/sdb` to the 8GiB disk. This, in turn,
means the test will fail because we're targeting the wrong disk.

```
machine # [    0.000000] sd 2:0:0:0: [sda] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB)
machine # [    0.000000] sd 3:0:0:0: [sdb] 1048576 512-byte logical blocks: (537 MB/512 MiB)
```

```
machine # [    0.000000] sd 2:0:0:0: [sdb] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB)
machine # [    0.000000] sd 3:0:0:0: [sda] 1048576 512-byte logical blocks: (537 MB/512 MiB)
```

Note how the "sd x:0:0:0:` ID is stable. That is because QEMU **is**
told to give specific identifiers to the disks. So using the
dev/disk/by-id/ identifiers is stable.

* * *

Tested by forcing the sda/sdb swap this way:

    diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
    index 24c55081f9a..2eee224351b 100644
    --- a/nixos/tests/installer.nix
    +++ b/nixos/tests/installer.nix
    @@ -702,12 +702,19 @@ in {
               + " mkpart primary linux-swap 1M 1024M"
               + " mkpart primary ext2 1024M -1s",
               "udevadm settle",
    +      )
    +      print(machine.succeed("find /dev/disk/ '!' -type d -printf '%p → %l\n' | sort"))
    +      machine.succeed(
               "mkswap ${grubDevice}-part1 -L swap",
               "swapon -L swap",
               "mkfs.ext3 -L nixos ${grubDevice}-part2",
               "mount LABEL=nixos /mnt",
               "mkdir -p /mnt/tmp",
           )
    +      machine.succeed("echo success")
    +      machine.succeed(
    +          'if [[ "$(find ${grubDevice} -printf \'%l\')" != "../../sdb" ]]; then exit 22; else true; fi'
    +      )
         '';
         grubVersion = 1;
         # /dev/sda is not stable, even when the SCSI disk number is.

And ran this way:

     $ until (clear; tmux clear ; time env -i nix-build nixos/release-combined.nix -A nixos.tests.installer.grub1.x86_64-linux); do echo derp; done
 2021-04-25 19:59:29 -04:00
Luke Granger-Brown
4fb91cbafe Revert "treewide: use auto diskSize for make-disk-image" 
This reverts commit f3aa040bcbf39935e7e9ac7a7296eac9da7623ec.
 2021-04-24 02:38:36 +00:00
Luke Granger-Brown
f521b12b0e Revert "nixos/amazon-image: (temporarily) use fixed disk size again" 
This reverts commit 6a8359a92ab501ae62739e9d3302f48e3e73c750.
 2021-04-24 02:38:25 +00:00
Luke Granger-Brown
d97478e369
Merge pull request #120481 from lukegb/temp-ec2-fixed-disk 
nixos/amazon-image: (temporarily) use fixed disk size again
 2021-04-24 03:32:58 +01:00
Sandro
e3e6b73701
Merge pull request #119706 from nyanotech/master 
nixos/printers: fix ensureDefaultPrinter
 2021-04-24 03:49:09 +02:00
Luke Granger-Brown
6a8359a92a nixos/amazon-image: (temporarily) use fixed disk size again 
As a temporary workaround for #120473 while the image builder is patched
to correctly look up disk sizes, partially revert
f3aa040bcbf39935e7e9ac7a7296eac9da7623ec for EC2 disk images only.

We retain the type allowing "auto" but set the default back to the
previous value.
 2021-04-24 00:43:47 +00:00
Aaron Andersen
d734de7e7e
Merge pull request #119914 from evils/vnstat 
nixos.vnstat: homedir -> statedir
 2021-04-23 19:23:17 -04:00
Evils
7ff0ccc324 nixos/vnstat: homedir -> statedir 
before, a nixos update that didn't trigger the chmod would break vnstat

and use a vnstatd group
 2021-04-24 00:31:58 +02:00
Maximilian Bosch
f62b42f405
Merge pull request #120125 from BBBSnowball/pr-add-config-nextcloud-imagick-rename-option 
nixos/nextcloud: Rename option disableImagemagick to enableImagemagick
 2021-04-23 23:27:34 +02:00
Aaron Andersen
5f2a8deb17
Merge pull request #120324 from pennae/restart-sshguard 
nixos/sshguard: restart sshguard when services/backend changes
 2021-04-23 16:56:30 -04:00
Luke Granger-Brown
6e4f8b06f5
Merge pull request #120349 from lukegb/debug-release-2009 
nixos/test-driver: use a variety of different Tesseract settings for OCR
 2021-04-23 21:04:02 +01:00
Luke Granger-Brown
4de343cccf nixos/test-driver: use a variety of different Tesseract settings for OCR 
When performing OCR, some of the Tesseract settings perform better than
others on a variety of different workloads, but they mostly take
~negligible incremental time to run compared to the overhead of running
the ImageMagick filters.

After this commit, we try using all three of the current Tesseract
models (classic, LSTM, and classic+LSTM) to generate output text. This
fixes chromium-90's tests at release-20.09, and should make cases where
you're looking for *specific* text better, with the tradeoff of running
Tesseract multiple times.

To make it sensible to cherrypick this into release-20.09, this doesn't
change the existing API surface for the test driver. In particular,
get_screen_text continues to have the existing behaviour.
 2021-04-23 18:42:35 +00:00
Jörg Thalheim
4230f632cc
Merge pull request #120254 from Luflosi/ipfs-simplify-systemd-unit 
nixos/ipfs: remove separate ipfs-init systemd unit
 2021-04-23 17:00:37 +01:00
pennae
265d31bcbd nixos/sshguard: restart sshguard when services/backend changes 
backends changing shouldn't be very likely, but services may well change. we
should restart sshguard from nixos-rebuild instead of merely plopping down a new
config file and waiting for the user to restart sshguard.
 2021-04-23 16:16:37 +02:00
Luflosi
b32b56cd54
nixos/ipfs: remove separate ipfs-init systemd unit 
There is no need for a separate unit. Simplify the NixOS module by adding the shell code to preStart of the main unit, where the other initialization code already is.
 2021-04-22 21:13:05 +02:00
Lassulus
bdf8e0fc31
Merge pull request #120195 from Mic92/quagga 
quagga: remove
 2021-04-22 20:10:08 +02:00
lassulus
f3aa040bcb treewide: use auto diskSize for make-disk-image 2021-04-22 19:52:49 +02:00
Alyssa Ross
9e400a8b93 nixos/users-groups: check format of passwd entries 
Things will get quite broken if an /etc/passwd entry contains a
colon (which terminates a field), or a newline (which terminates a
record).  I know because I just accidentally made a user whose home
directory path contained a newline!

So let's make sure that can't happen.
 2021-04-22 13:18:38 +00:00
Jörg Thalheim
40945d399d
quagga: remove 
Upstream repositories do no longer exists. There has been no release in
a while. - Not a good combination for a network daemon running as root
in C that parses network packets...
 2021-04-22 12:48:48 +02:00
Michael Weiss
3e01d42024
maintainers: remove tavyc 
Their last commit was dcc84d8 from 2017.
Thank you for your contributions.
 2021-04-22 11:34:25 +02:00
Jörg Thalheim
63f8170ca4
Merge pull request #120023 from Mic92/nano 
configuration template: improve docs on nano
 2021-04-22 07:14:01 +01:00
Sandro
027250d7be
Merge pull request #119379 from Philipp-M/oci-containers-env-file 
nixos/oci-containers: add support for environment file(s)
 2021-04-22 03:15:14 +02:00
Benjamin Koch
8122221c9b nixos/nextcloud: Rename services.nextcloud.nginx.disableImagemagick to services.nextcloud.nginx.enableImagemagick 
Enable options are preferred. Suggested here:
https://github.com/NixOS/nixpkgs/pull/115372#issuecomment-821900334
 2021-04-22 02:17:12 +02:00
Fabian Affolter
eef5121007
Merge pull request #120105 from Luflosi/fix-typo-in-cpu-freq-description 
nixos/cpu-freq: fix typo in description
 2021-04-22 00:55:45 +02:00
Luflosi
e205a4800f
nixos/cpu-freq: fix typo in description 
This typo was introduced when the option was first added in 2011, almost 10 years ago (ae82e7b048e8ef1f402e0e9cfbaf3b1d04bf8052).
 2021-04-21 22:03:18 +02:00
Luflosi
5ff547e729
nixos/ipfs: fix typo in comment 
This typo was introduced in 4044d81d5cea617e58ec9682f9cc447dde326850.
 2021-04-21 21:49:48 +02:00
Oleksii Filonenko
c2900f685f
Merge pull request #111518 from Jaculabilis/nebula 
nixos/nebula: add basic module
 2021-04-21 11:17:30 +03:00
Jörg Thalheim
e9cf66e042
configuration template: improve docs on nano 2021-04-21 05:43:50 +02:00
Martin Weinelt
1c4f6dd00e
Merge pull request #119929 from expipiplus1/patch-3 
modules.matrix-appservice-irc: allow connecting to unix sockets
 2021-04-21 00:54:11 +02:00
Jörg Thalheim
20e0c6d583
configuration template: add hint to install editor (#105771) 
fixes #25376
 2021-04-20 21:20:03 +01:00
Jörg Thalheim
a8e7d96eb2
Merge pull request #118961 from Izorkin/update-redis-sandbox 
nixos/redis: enable sandbox mode
 2021-04-20 21:12:10 +01:00
Sandro
6a5576e420
Merge pull request #119798 from yorickvP/mv-oauth2_proxy 2021-04-20 21:49:50 +02:00
Anderson Torres
30b7492d9b
Merge pull request #118228 from lourkeur/teck-programmer 
teck-programmer: init at 1.1.1
 2021-04-20 15:08:00 -03:00
Bernardo Meurer
411d6aeb06
nixos/modules/config/iproute2: avoid using iproute alias 2021-04-20 01:01:33 -07:00
Joe Hermaszewski
03ea3ba1ed
modules.matrix-appservice-irc: allow connecting to unix sockets 
In order to connect to postgres sockets.

This took a while to track down :/
 2021-04-20 15:48:50 +08:00
Louis Bettens
10d375bde1 nixos/teck: init 2021-04-20 09:10:43 +02:00
Sandro
b0899c7d3b
Merge pull request #119058 from Riey/kime 2021-04-19 20:45:19 +02:00
Lorenz Leutgeb
0b0cd3f6aa
mxisd: remove (#119372) 
* mxisd: remove

See EOL notice at https://github.com/kamax-matrix/mxisd/blob/master/EOL.md#end-of-life-notice

* mxisd: Add throwing EOL notice
 2021-04-19 11:26:08 -04:00
Maciej Krüger
9f566fc6bc
Merge pull request #119813 from mkg20001/http3 2021-04-19 14:31:02 +02:00
Daniël de Kok
cf00ef6548
Merge pull request #119783 from danieldk/remove-cuda-9 
cudatoolkit-{9,9_0,9_1,9_2}: remove
 2021-04-19 08:30:10 +02:00
Michele Guerini Rocco
27b95afbb8
Merge pull request #119529 from Lassulus/searx_1.0.0 
searx: 0.18.0 -> 1.0.0
 2021-04-19 00:38:09 +02:00
rnhmjoj
d0d77ec032
nixos/tests/searx: fix for 1.0 update 2021-04-19 00:13:05 +02:00
Maciej Krüger
9530794548
nginx: add vhost.http3 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-04-18 20:20:24 +02:00
Riey
767cc9fa4d
input methods: add kime 2021-04-19 03:05:07 +09:00
Sandro
b0b878ad56
Merge pull request #119788 from jojosch/dnsdist-configfile-name 
nixos/dnsdist: dndist.conf -> dnsdist.conf
 2021-04-18 19:24:20 +02:00
sternenseemann
f85086f6c3 nixos/tests/packagekit: fix test machine evaluation 
aa22be179a4dfb9633089ebc7c65c6d6c18a83d5 dropped the backend setting
which was used in the test, breaking evaluation of the test in the
process. Kind of defeats the purpose of a test if it isn't executed
before merging a change to a module…
 2021-04-18 18:40:06 +02:00
Yorick van Pelt
279c7d43ee
nixos/oauth2_proxy: fix package name in nixos module 2021-04-18 14:21:38 +02:00
Johannes Schleifenbaum
dc282fc3f3
nixos/dnsdist: dndist.conf -> dnsdist.conf 2021-04-18 13:34:28 +02:00
Daniël de Kok
f75286e063 cudatoolkit-{9,9_0,9_1,9_2}: remove 
Remove old CUDA toolkits (and corresponding CuDNN versions).

- Not supported by upstream anymore.
- We do not use them in nixpkgs.
- We do not test or actively maintain them.
- Anything but ancient GPUs is supported by newer toolkits.

Fixes #107131.
 2021-04-18 11:55:10 +02:00
Jörg Thalheim
fc02b14738
Merge pull request #117071 from mohe2015/hotfix-zfs-grub 
nixos/zfs: Fix regression that prevents people to boot from zfs using grub if they didn't add zfs to boot.initrd.supportedFilesystems
 2021-04-17 16:01:22 +01:00