summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge pull request #39788 from obsidiansystems/aarch32-for-masterJohn Ericson2018-04-30
|\
| * Merge remote-tracking branch 'upstream/master' into aarch32John Ericson2018-04-30
| |\
| * | treewide: isArm -> isAarch32John Ericson2018-04-25
* | | Merge branch 'netbsd'Matthew Bauer2018-04-30
|\ \ \
| * | | netbsd.games: disable some broken linux gamesMatthew Bauer2018-05-01
| * | | netbsd: cleanup bootstrappingMatthew Bauer2018-04-30
| * | | netbsd.games: cleanupMatthew Bauer2018-04-29
* | | | Merge pull request #39666 from dtzWill/fix/stdenv-system-nixWill Dietz2018-04-30
|\ \ \ \
| * | | | nix: fix stdenv.system check -- should be hostPlatformWill Dietz2018-04-28
* | | | | Merge pull request #38831 from rdnetto/improve-cross-refsGraham Christensen2018-04-30
|\ \ \ \ \
| * | | | | Fixed indentationReuben D'Netto2018-04-17
| * | | | | Added cross-references to NixOS manualReuben D'Netto2018-04-12
| * | | | | Modified .editorconfig to apply indentation style to docbook filesReuben D'Netto2018-04-05
* | | | | | Merge pull request #39785 from grahamc/xmlformat-initGraham Christensen2018-04-30
|\ \ \ \ \ \
| * | | | | | xmlformat: init at 1.04Graham Christensen2018-04-30
|/ / / / / /
* | | | | | Merge pull request #39773 from dtzWill/feature/platforms-musl-tooWill Dietz2018-04-30
|\ \ \ \ \ \
| * | | | | | more platforms.gnu -> gnu ++ linux changes, manuallyWill Dietz2018-04-30
| * | | | | | mtools: optimistically extend platforms (gnu + darwin) => unixWill Dietz2018-04-30
| * | | | | | treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linuxWill Dietz2018-04-30
| * | | | | | tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linuxWill Dietz2018-04-30
* | | | | | | Merge pull request #39776 from dtzWill/fix/nss-mdns-muslWill Dietz2018-04-30
|\ \ \ \ \ \ \
| * | | | | | | nss-mdns: fix build w/muslWill Dietz2018-04-30
|/ / / / / / /
* | | | | | | Merge pull request #39746 from r-ryantm/auto-update/nextcloudxeji2018-05-01
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | nextcloud: 13.0.1 -> 13.0.2R. RyanTM2018-04-30
* | | | | | | Merge pull request #39713 from sephalon/pcsc-scm-scl011xeji2018-05-01
|\ \ \ \ \ \ \
| * | | | | | | pcsc-scm-scl011: clean up unpack phaseStefan Wiehler2018-04-30
* | | | | | | | Merge pull request #39759 from r-ryantm/auto-update/mwicxeji2018-05-01
|\ \ \ \ \ \ \ \
| * | | | | | | | mwic: 0.7.4 -> 0.7.5R. RyanTM2018-04-30
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #39760 from r-ryantm/auto-update/miniupnpdxeji2018-05-01
|\ \ \ \ \ \ \ \
| * | | | | | | | miniupnpd: 2.0.20180410 -> 2.0.20180422R. RyanTM2018-04-30
| |/ / / / / / /
* | | | | | | | Merge pull request #39764 from r-ryantm/auto-update/html-xml-utilsxeji2018-05-01
|\ \ \ \ \ \ \ \
| * | | | | | | | html-xml-utils: 7.6 -> 7.7R. RyanTM2018-04-30
| |/ / / / / / /
* | | | | | | | vit: enable on allMatthew Justin Bauer2018-04-30
* | | | | | | | Merge pull request #39751 from r-ryantm/auto-update/pam_u2fxeji2018-04-30
|\ \ \ \ \ \ \ \
| * | | | | | | | pam_u2f: 1.0.5 -> 1.0.6R. RyanTM2018-04-30
| |/ / / / / / /
* | | | | | | | Merge pull request #39732 from r-ryantm/auto-update/riot-webxeji2018-04-30
|\ \ \ \ \ \ \ \
| * | | | | | | | riot-web: 0.14.0 -> 0.14.1R. RyanTM2018-04-30
| |/ / / / / / /
* | | | | | | | Merge pull request #38766 from davidak/tealdeerxeji2018-04-30
|\ \ \ \ \ \ \ \
| * | | | | | | | tealdeer: init at 1.0.0davidak2018-04-11
* | | | | | | | | Merge pull request #39722 from r-ryantm/auto-update/wireguardJörg Thalheim2018-04-30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | linuxPackages.wireguard: 0.0.20180413 -> 0.0.20180420R. RyanTM2018-04-30
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #39320 from mt-caret/sweep-visualizer-fixxeji2018-04-30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ffmpeg library clash fixMasayuki Takeda2018-04-22
* | | | | | | | | | Merge pull request #39432 from woffs/tuxpaintxeji2018-04-30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tuxpaint: init at 0.9.22Frank Doepper2018-04-24
* | | | | | | | | | | Merge pull request #39379 from flokli/pdf-quenchJörg Thalheim2018-04-30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pdf-quench: use poppler_gi from top-levelFlorian Klink2018-04-30
| * | | | | | | | | | | pdf-quench: no manual shebang patchJörg Thalheim2018-04-30
| * | | | | | | | | | | pdf-quench: init at 1.0.5Florian Klink2018-04-23
| * | | | | | | | | | | goocanvas_2: support gobjectIntrospectionFlorian Klink2018-04-23