summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-03-15
|\
| * Merge pull request #13928 from grahamc/mysql-connectorRobin Gloster2016-03-15
| |\ | | | | | | mysql_jdbc: 5.1.32 -> 5.1.38
| | * mysql_jdbc: 5.1.32 -> 5.1.38Graham Christensen2016-03-14
| | |
| * | Merge pull request #13926 from doshitan/update-tarsnapjoachifm2016-03-15
| |\ \ | | |/ | |/| tarsnap: 1.0.36.1 -> 1.0.37
| | * tarsnap: 1.0.36.1 -> 1.0.37Tanner Doshier2016-03-14
| | |
| * | Merge pull request #13924 from NeQuissimus/grsecurity445Robin Gloster2016-03-15
| |\ \ | | |/ | |/| grsecurity: 4.4.4 -> 4.4.5
| | * grsecurity: 4.4.4 -> 4.4.5Tim Steinbach2016-03-14
| | |
| * | Merge pull request #13843 from ambrop72/kdevelop-473joachifm2016-03-14
| |\ \ | | |/ | |/| kdevelop: 4.7.1 -> 4.7.3
| | * kdevelop: 4.7.1 -> 4.7.3Ambroz Bizjak2016-03-12
| | |
| * | Merge pull request #13837 from peti/drop-old-postfix-versionsPeter Simons2016-03-14
| |\ \ | | | | | | | | Drop support for postfix 2.x from Nixpkgs and NixOS.
| | * | Drop support for postfix 2.x from Nixpkgs and NixOS.Peter Simons2016-03-11
| | | | | | | | | | | | | | | | | | | | Version 3.x has been stable for a long time; let's give up support for the obsolete versions.
| * | | ilbc: extract-cfile.awk has fallen off the internetGraham Christensen2016-03-14
| | | | | | | | | | | | | | | | Close #13923.
| * | | graphite2: security update 1.2.4 -> 1.3.6 (close #13918)Graham Christensen2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVE-2016-1977 CVE-2016-2790 CVE-2016-2791 CVE-2016-2792 CVE-2016-2793 CVE-2016-2794 CVE-2016-2795 CVE-2016-2796 CVE-2016-2797 CVE-2016-2798 CVE-2016-2799 CVE-2016-2800 CVE-2016-2801 CVE-2016-2802 vcunat fixed the tarball name and redirected to github.
| * | | eduke32: 20150420-5160 moved to the old releases directoryGraham Christensen2016-03-14
| | | | | | | | | | | | | | | | Close #13922.
| * | | d4x: Update download URL to fedora, d4k.krasu.ru no longer existsGraham Christensen2016-03-14
| | | |
| * | | Merge pull request #13897 from nbp/fix-ocaml-pkgs-platformzimbatm2016-03-14
| |\ \ \ | | | | | | | | | | Ensure that we can evaluate the platform attribute of ocaml packages.
| | * | | Ensure that we can evaluate the platform attribute of ocaml packages.Nicolas B. Pierron2016-03-13
| | | | |
| * | | | NixOS 16.09 is called FlounderDomen Kožar2016-03-14
| | | | | | | | | | | | | | | | | | | | chosen by @zimbatm as our documentation hero in 16.03
| * | | | tevent, ldb: security updates needed for sambaVladimír Čunát2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I managed to find no news or changelog on these, so it's rather a black box to me, but it's clear that (some) bumps were required for samba.
| * | | | libpsl: list 2016-02-25 -> 2016-03-10Tobias Geerinckx-Rice2016-03-14
| | | | |
| * | | | htop: add licence; myself as a de-facto maintainerTobias Geerinckx-Rice2016-03-14
| | | | |
| * | | | htop: fetchFromGitHub -> fetchurlTobias Geerinckx-Rice2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just call `fetchurl` on the ‘official’ download link. `fetchFromGitHub` was introduced in 54916ba, and stayed around when we moved back to a regular release. Which worked fine, but required keeping `autoreconfHook` and some `postPatch` hackery which can now both be dropped. Thanks to @kragniz for drawing my attention to this.
| * | | | Merge pull request #13919 from grahamc/sambaEelco Dolstra2016-03-14
| |\ \ \ \ | | | | | | | | | | | | samba: 4.3.1 -> 4.3.6 for CVE-2015-7560 CVE-2016-0771
| | * | | | stardict: 3.0.3 is broken by upstream deleting 3.0.3Graham Christensen2016-03-14
| | | | | |
| | * | | | g-wrap: Upstream sha256 changedGraham Christensen2016-03-14
| | | | | |
| | * | | | samba: 4.3.1 -> 4.3.6 for CVE-2015-7560 CVE-2016-0771Graham Christensen2016-03-14
| | | | | |
| * | | | | nixos/filesystems: Fix fs options type errorRickard Nilsson2016-03-14
| | | | | |
| * | | | | Merge pull request #13894 from joachifm/fix-python-ntfyRobin Gloster2016-03-14
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix ntfy
| | * | | | | pythonPackages.emoji: specify checkPhaseJoachim Fasting2016-03-14
| | | | | | |
| | * | | | | pythonPackages.ntfy: add missing inputsJoachim Fasting2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally needs emoji, sleekxmpp, and mock to build. Also change to request2 for py3k support. Fixes https://hydra.nixos.org/build/33157748
| | * | | | | pythonPackages.emoji: init at 0.3.9Joachim Fasting2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by ntfy
| | * | | | | pythonPackages.sleekxmpp: 1.2.5 -> 1.3.1Joachim Fasting2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also re-enable for !python3; readme states 2.x is supported; builds for me.
| * | | | | | Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712joachifm2016-03-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | smartgit: 7.1.0 -> 7.1.2
| | * | | | | | smartgithg: 7.1.0 -> 7.1.2Raymond Gauthier2016-03-14
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Also fixes broken download link.
| * | | | | | Merge pull request #13915 from joachifm/fix-swayRobin Gloster2016-03-14
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | sway: fix build
| | * | | | | sway: fix buildJoachim Fasting2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the manual requires docbook_xsl; in sandboxed environments, the build would fail due to being unable to download missing docbook resources. Also include some minor improvements to the build recipe: - use fetchFromGitHub - move build-time dependencies to nativeBuildInputs xref: https://github.com/NixOS/nixpkgs/pull/13900
| * | | | | | Merge pull request #13917 from DamienCassou/khal-needs-setuptools_scmDamien Cassou2016-03-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | khal: add setuptools_scm to dependencies
| | * | | | | | khal: add setuptools_scm to dependenciesDamien Cassou2016-03-14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required because vdirsyncer does not depend on it at runtime anymore.
| * | | | | | Merge pull request #13896 from nbp/import-top-levelEelco Dolstra2016-03-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace references to all-packages.nix, by references to the top-level
| | * | | | | | Replace references to all-packages.nix, by references to the top-level of ↵Nicolas B. Pierron2016-03-13
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | nixpkgs repository.
| * | | | | | Merge pull request #13911 from DamienCassou/testing-vdirsyncerRobin Gloster2016-03-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update vdirsyncer and add automated tests
| | * | | | | | vdirsyncer: 0.9.0 -> 0.9.2Damien Cassou2016-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also activate the automated testing
| | * | | | | | pytest-subtesthack: init at 0.1.1Damien Cassou2016-03-14
| | | | | | | |
| | * | | | | | pytest-localserver: init at 0.3.5Damien Cassou2016-03-14
| | | | | | | |
| * | | | | | | Merge pull request #13906 from Zer0-/gitlab_version_bumpRobin Gloster2016-03-14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Gitlab version bump
| | * | | | | | | Gitlab package version 8.5.1 -> 8.5.5Philipp Volguine2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -had to bump the versions on a few gem dependencies
| | * | | | | | | gitlab service startup fixPhilipp Volguine2016-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -gitlab-sidekiq was being started with a misspelled argument name which caused the mailer queue to never run and never send mail
| * | | | | | | | Merge pull request #13861 from abbradar/mjpg-streamerNikolay Amiantov2016-03-14
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | mjpg-streamer: update and add NixOS service
| | * | | | | | | mjpg-streamer service: initNikolay Amiantov2016-03-12
| | | | | | | | |
| | * | | | | | | mjpg-streamer: 182 -> 2016-03-08Nikolay Amiantov2016-03-12
| | | | | | | | |