forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into expe…
…rimental/cups-1.6-and-1.7 * commit 'refs/top-bases/experimental/cups-1.6-and-1.7': (206 commits) nixos/peerflix: add test to release.nix nixos: add peerflix module rescuetime: add version rescuetime: fix typo linux: 3.18.0-rc6 -> 3.18.0-rc7 nixos/networking: Fix more harmless errors rescuetime: a time tracking service virtualbox: Fix extension pack installation. nodePackages: hack version override sed some more to support github packages, until better solution is found rubyLibs: add tmuxinator, update deluge: 1.3.7 -> 1.3.10 munin: 2.0.21 -> 2.0.25 setuptools: 5.8 -> 7.0 afl: 0.68b -> 0.79b i3: make i3-save-workspace work virtualbox: Allow /nix/store being world-writable. zeromq: 4.0.4 -> 4.0.5 nixos/tests: add networking-proxy.nix to release Improve readability - from NixOS#5058 (comment) Ensure nix-daemon sees the proxy defined options ... Conflicts: nixos/modules/services/printing/cupsd.nix
- Loading branch information
Showing
234 changed files
with
9,981 additions
and
4,655 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.