summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge branch 'staging-next' into stagingVladimír Čunát2018-08-13
|\ | | | | | | Commits from master, conflict resolutions, etc.
| * Merge branch 'master' into staging-nextVladimír Čunát2018-08-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
| | * reason: 3.3.2 -> 3.3.3Vladyslav Mykhailichenko2018-08-13
| | |
| | * ocamlModules.wasm: add wasm binaryLéo Gaspard2018-08-13
| | |
| | * Merge pull request #44985 from NixOS/siege-unixWout Mertens2018-08-13
| | |\ | | | | | | | | siege: build on all Unix
| | | * siege: build on all UnixWout Mertens2018-08-13
| | | | | | | | | | | | Confirmed to work on Darwin
| | * | Merge pull request #44983 from alyssais/patch-1Jörg Thalheim2018-08-13
| | |\ \ | | | |/ | | |/| environment.extraInit: fix description typo
| | | * environment.extraInit: fix description typoAlyssa Ross2018-08-13
| | | |
| | * | ansible: install man pages (#44980)Oleg Pykhalov2018-08-13
| | |/
| | * pythonPackages.browser-cookie3: init at 0.6.4 (#44562)Boris2018-08-13
| | |
| | * cstore_fdw: 1.6.0 -> 1.6.1 (#44792)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cstore_fdw/versions.
| | * x42-plugins: 20180320 -> 20180803 (#44659)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x42-plugins/versions.
| | * shaarli: 0.9.7 -> 0.10.0 (#44693)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shaarli/versions.
| | * skim: 0.5.0 -> 0.5.1 (#44700)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/skim/versions.
| | * ibus-engines.hangul: 1.5.0 -> 1.5.1 (#44771)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ibus-hangul/versions.
| | * groonga: 8.0.2 -> 8.0.5 (#44783)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions.
| | * jimtcl: 0.77 -> 0.78 (#44762)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jimtcl/versions.
| | * mate.mate-media: 1.20.1 -> 1.21.0 (#44745)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-media/versions.
| | * pony-stable: 0.1.4 -> 0.1.6 (#44715)R. RyanTM2018-08-13
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pony-stable/versions.
| | * protonmail-bridge: 1.0.5-1 -> 1.0.6-1 (#44950)Arnaud2018-08-13
| | |
| | * jameica: add darwin support (#44953)Florian Klink2018-08-13
| | |
| | * Merge pull request #44948 from Izorkin/servantBas van Dijk2018-08-13
| | |\ | | | | | | | | servant-sphinx-documentation: fix sha256sum
| | | * servant-sphinx-documentation: fix sha256sumIzorkin2018-08-12
| | | |
| | * | Revert "buildRustPackage: allow patches to fix Cargo.lock"Jörg Thalheim2018-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6e881ab72fbd0bb50b58668b457f7a79ceb8993. We need to fix checksums for this pull request first. Also see https://github.com/NixOS/nixpkgs/pull/44967
| | * | Merge pull request #44967 from Ekleog/rust-patchJörg Thalheim2018-08-13
| | |\ \ | | | | | | | | | | buildRustPackage: allow patches to fix Cargo.lock
| | | * | buildRustPackage: allow patches to fix Cargo.lockLéo Gaspard2018-08-13
| | | | |
| | * | | masterpdfeditor: 5.1.00 -> 5.1.12Peter Hoeg2018-08-13
| | | | |
| | * | | Merge pull request #42885 from smaret/gildasGabriel Ebner2018-08-13
| | |\ \ \ | | | | | | | | | | | | gildas: 20180601_a -> 20180701_a
| | | * | | gildas: update source urlSebastien Maret2018-08-10
| | | | | |
| | | * | | gildas: patch perl interpreter pathSebastien Maret2018-08-10
| | | | | |
| | | * | | gildas: fix architecture detection for aarch64Sebastien Maret2018-07-21
| | | | | |
| | | * | | gildas: apply upstream fix and restore parallel buildingSebastien Maret2018-07-06
| | | | | |
| | | * | | gildas: disable parallel buildingSebastien Maret2018-07-06
| | | | | |
| | | * | | gildas: 20180601_a -> 20180701_aSebastien Maret2018-07-02
| | | | | |
| | * | | | Merge pull request #44958 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.5Sarah Brofeldt2018-08-13
| | |\ \ \ \ | | | | | | | | | | | | | | dbeaver: 5.1.4 -> 5.1.5
| | | * | | | dbeaver: 5.1.4 -> 5.1.5Samuel Dionne-Riel2018-08-12
| | | | | | |
| | * | | | | Merge pull request #44964 from yrashk/powershell-6.0.4Sarah Brofeldt2018-08-13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | powershell: 6.0.3 -> 6.0.4
| | | * | | | | powershell: 6.0.3 -> 6.0.4Yurii Rashkovskii2018-08-13
| | | | | | | |
| | * | | | | | Merge pull request #44969 from carlosdagos/docs-hackage2nixPeter Simons2018-08-13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | docs: add some docs mentioning hackage2nix
| | | * | | | | | docs: add some docs for hackage2nixCarlos D2018-08-13
| | | |/ / / / /
| | * | | | | | Merge pull request #44942 from aanderse/masterMichael Raskin2018-08-13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | openscenegraph: 3.4.0 -> 3.6.2
| | | * | | | | | bumped openscenegraph version from 3.4 to 3.6.2 and added more options for ↵Aaron Andersen2018-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | building it
| | * | | | | | | bazel: fix darwin build on hydraUri Baghin2018-08-13
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #44691 from r-ryantm/auto-update/setbfreeSamuel Dionne-Riel2018-08-12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | setbfree: 0.8.5 -> 0.8.7
| | | * | | | | | setbfree: 0.8.5 -> 0.8.7R. RyanTM2018-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/setbfree/versions.
| | * | | | | | | Merge pull request #44686 from r-ryantm/auto-update/sigilSamuel Dionne-Riel2018-08-12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | sigil: 0.9.9 -> 0.9.10
| | | * | | | | | | sigil: 0.9.9 -> 0.9.10R. RyanTM2018-08-08
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sigil/versions.
| | * | | | | | | Merge pull request #44683 from r-ryantm/auto-update/vipsSamuel Dionne-Riel2018-08-12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | vips: 8.6.4 -> 8.6.5
| | | * | | | | | | vips: 8.6.4 -> 8.6.5R. RyanTM2018-08-08
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions.
| | * | | | | | | Merge pull request #44955 from nonfreeblob/fixSamuel Dionne-Riel2018-08-12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Delete outdated info
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-04 02:47:24 +0000