jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,865 Commits 266 Branches 122 Tags 5.3 GiB
ece9d8867b
Commit Graph

15 Commits

Author SHA1 Message Date
Eelco Dolstra
f173da375d
Use only one build of qemu in VM tests 
Previously we were using two or three (qemu_kvm, qemu_test, and
qemu_test with a different dbus when minimal.nix is included).

(cherry picked from commit 8bfa4ce82ea7d23a1d4c6073bcc044e6bf9c4dbe)
 2016-12-20 10:52:46 +01:00
Domen Kožar
c56c3b6596 nixos/lib/testing.nix: make 'config' a free variable 
cc @edolstra
 2016-03-29 14:16:54 +01:00
Eelco Dolstra
2cd7c1f198 Unify NixOS and Nixpkgs channel structure 
This is primarily to ensure that

  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz

and

  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

and

  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz

behave consistently.

It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.

Fixes #7659.
 2015-08-05 17:37:11 +02:00
Eelco Dolstra
7c30ce9562 Remove zipTwoLists 
This function is redundant (we also have zipLists).
 2015-07-28 15:04:18 +02:00
Sander van der Burg
8d29cb2b00 In a test VM it's impossible to connect to itself, so fix this 2015-02-19 21:13:49 +00:00
William A. Kennington III
9a697d775a Revert "Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"" 
This reverts commit 2f697bf6931b24cdd428e22effbf6427a85afd42.
 2014-08-31 09:46:26 -07:00
William A. Kennington III
3d037ebb94 Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" 
This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
 2014-08-31 09:46:16 -07:00
Rob Vermaas
ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6" 
This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing
changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
 2014-08-31 10:58:54 +02:00
Rob Vermaas
2f697bf693 Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c" 
This reverts commit 704e91bab005eabe968a3b140222fb0cf7afd4db.
 2014-08-31 10:58:50 +02:00
Rickard Nilsson
704e91bab0 Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c 2014-08-30 19:54:37 +02:00
William A. Kennington III
86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
Eelco Dolstra
e8baaba044 Add a regression test for hostname / nss_myhostname 
Issue #1248.
 2013-11-26 18:52:34 +01:00
Eelco Dolstra
a2600b7bc3 Terrible backward compatibility hack 2013-10-11 13:36:09 +02:00
Eelco Dolstra
31203732b3 Update the release expressions and the channel generators 2013-10-10 13:28:22 +02:00
Eelco Dolstra
5c1f8cbc70 Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00