about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
...
* | | | | | chromium: minor fixupsobadz2016-08-10
| | | | | | | | | | | | | | | | | | | | | | | | cc @aszlig
* | | | | | wscat: init at 1.0.1 (#17618)Robert2016-08-09
| | | | | |
* | | | | | nixos: remove rsync from base install and add explicit path in nixos-installobadz2016-08-09
| | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/NixOS/nixpkgs/commit/60b3f95ad86826faf95680a3529ced1c322d4d87#commitcomment-18507812
* | | | | | nixos-install: more robust way of sourcing fresh version of selfobadz2016-08-09
| | | | | |
* | | | | | rkt: 1.11.0 -> 1.12.0 (#17620)Stefan Junker2016-08-09
| |/ / / / |/| | | |
* | | | | jsonnet: 0.8.7 -> 0.8.9Dan Peebles2016-08-09
| | | | |
* | | | | fix typo (#17621)Fabian Schmitthenner2016-08-09
| | | | |
* | | | | texlive: drop unused lesstif parameterVladimír Čunát2016-08-09
| | | | | | | | | | | | | | | | | | | | Fixes #17359. /cc #16391.
* | | | | Merge pull request #17613 from despairblue/update/flowRobin Gloster2016-08-09
|\ \ \ \ \ | | | | | | | | | | | | flow: 0.28.0 -> 0.30.0
| * | | | | flow: 0.28.0 -> 0.30.0Danny Arnold2016-08-09
| | |/ / / | |/| | |
* | | | | systemd-cryptsetup-generator: Add note to revert 3efadce.Moritz Ulrich2016-08-09
| | | | |
* | | | | systemd-cryptsetup-generator: Fix installPhase.Moritz Ulrich2016-08-09
| | | | |
* | | | | nginx module: fixup events in configRobin Gloster2016-08-09
| | | | |
* | | | | nixos/tests/installer.nix: add libxml2 & libxslt to prevent download attemptsobadz2016-08-09
| | | | |
* | | | | Merge branch 'nixpkgs-git-revision-fix'aszlig2016-08-09
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #17218 in a better way in that it doesn't create a ".git-revision" file on every nixos-rebuild, because we already have ".git" available. Even if we don't nixos-rebuild can't create the "git-revision" file. Tested via: nix-build -E '(import ./nixos/tests/make-test.nix { name = "foo"; machine = {}; testScript = "startAll; $machine->execute(\"nixos-version >&2\");"; })' Closes: #17610 Acked-by: @bennofs
| * | | | | nixos/version: Try to get Git revison from .gitaszlig2016-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's first try if we can determine the Git revision from the .git directory and if that fails, fall back to get the info from the ".git-revision" file... and after that use something generic like "master". This should address #17218 in better way, because we don't need to create another redundant file in the source checkout of nixpkgs. I'm not going to route of falling back to using .git, because after 55d881e, we already have ".git-revision" files in people's Git repositories, which in turn means that nixos-version will report that old file every time even if the working tree has updated. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @bennofs, Profpatsch Reported-by: @devhell Fixes: #17218
| * | | | | Revert adding .git-revision unconditionallyaszlig2016-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1e534e234b0a92bf06361fa41b7ac8691fdbc769. We already should have a .git directory if it is managed via Git, otherwise there is no way to get the Git revision if neither .git-revision or .git is present. But having .git-revision _and_ .git present seems very much redundant to me. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @bennofs, @Profpatsch Issue: #17218
* | | | | | Merge pull request #17614 from kamilchm/vagrant-plugin-fixRobin Gloster2016-08-09
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | vagrant: FIX #16837 vagrant plugin install
| * | | | | vagrant: FIX #16837 vagrant plugin installKamil Chmielewski2016-08-09
|/ / / / /
* / / / / nginx module: fix cfg.config backwards compatibilityRobin Gloster2016-08-09
|/ / / / | | | | | | | | | | | | fixes #17604
* | | | matrix-synapse: 0.16.1-r1 -> 0.17.0 (#17605)Benjamin Saunders2016-08-09
| | | |
* | | | vagrant: use libarchive lib from Nix (#17597)Aneesh Agrawal2016-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently already replace the embedded bsdtar binaries with the corresponding ones from Nix. However, we also need to replace the libarchive shared library to prevent version mismatches between the embedded library and the Nix binaries. Also expose version on the derivation and use environment variables to make overriding the derivation easier.
* | | | Merge pull request #17608 from cmfwyp/calibre-desktop-entryPascal Wittmann2016-08-09
|\ \ \ \ | | | | | | | | | | calibre: add desktop entry files
| * | | | calibre: add desktop entry filescmfwyp2016-08-08
| | | | |
* | | | | Merge pull request #17577 from LnL7/darwin-ffmpegDaiderd Jordan2016-08-09
|\ \ \ \ \ | | | | | | | | | | | | ffmpeg: add extra darwin framework for 3.1
| * | | | | libsamplerate: fix missing darwin frameworksDaiderd Jordan2016-08-07
| | | | | |
| * | | | | libmikmod: fix missing darwin frameworkDaiderd Jordan2016-08-07
| | | | | |
| * | | | | ffmpeg: add extra darwin framework for 3.1Daiderd Jordan2016-08-07
| | | | | |
* | | | | | Merge pull request #17606 from jerith666/email-cwdRobin Gloster2016-08-09
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | email: adopt upstream fix for "$cwd undefined in configure"
| * | | | | email: adopt upstream fix for "$cwd undefined in configure"Matt McHenry2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | update to include https://github.com/deanproxy/eMail/pull/35
* | | | | | Merge pull request #17601 from cmfwyp/skypeweb-1.2.1Robin Gloster2016-08-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | pidgin-skypeweb: 2015-10-02 -> 1.2.1
| * | | | | | pidgin-skypeweb: 2015-10-02 -> 1.2.1cmfwyp2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source can be fetched with tags now that there are stable releases of pidgin-skypeweb.
* | | | | | | nodejs: ensure that all scripts in nodejs have proper shebangs (#17594)Rok Garbas2016-08-08
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #17600 from rexim/tzdataEelco Dolstra2016-08-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | tzdata: 2016e -> 2016f
| * | | | | | tzdata: 2016e -> 2016frexim2016-08-08
|/ / / / / /
* | | | | | Merge pull request #17468 from peterhoeg/kronometerThomas Tuegel2016-08-08
|\ \ \ \ \ \ | |/ / / / / |/| | | | | kronometer: init at 2.1.0
| * | | | | kronometer: init at 2.1.0Peter Hoeg2016-08-08
| | | | | |
* | | | | | fix invalid antiquotationsNikolay Amiantov2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/NixOS/nix/issues/1017
* | | | | | musescore: 2.0.2 -> 2.0.3Shea Levy2016-08-08
| | | | | |
* | | | | | Merge pull request #17596 from ttuegel/stage-1Nikolay Amiantov2016-08-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | nixos/stage-1: use `readlink -e` in builder
| * | | | | | nixos/stage-1: use `readlink -e` in builderThomas Tuegel2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The builder has this convoluted `while` loop which just replicates `readlink -e`. I'm sure there was a reason at one point, because the loop has been there since time immemorial. It kept getting copied around, I suspect because nobody bothered to understand what it actually did. Incidentally, this fixes #17513, but I have no idea why.
* | | | | | | Merge pull request #17595 from ttuegel/stage-1Nikolay Amiantov2016-08-08
|\| | | | | | | | | | | | | | | | | | | | nixos/stage-1: fix antiquotation
| * | | | | | nixos/stage-1: fix antiquotationThomas Tuegel2016-08-08
|/ / / / / /
* | | | | | qttools: fix CMake pathsThomas Tuegel2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #17585.
* | | | | | xfsprogs: 4.2.0 -> 4.5.0Tuomas Tynkkynen2016-08-08
| | | | | |
* | | | | | Merge pull request #17551 from womfoo/fix/xtreemfs-openssl-buildRobin Gloster2016-08-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | xtreemfs: fix build
| * | | | | | xtreemfs: fix buildKranium Gikos Mendoza2016-08-06
| | | | | | |
* | | | | | | idea.android-studio: Disable Hydra buildTuomas Tynkkynen2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://hydra.nixos.org/build/38305379
* | | | | | | gsimplecal: Broken on DarwinTuomas Tynkkynen2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has never had a successful Darwin build. http://hydra.nixos.org/build/38312308
* | | | | | | grive: Broken on DarwinTuomas Tynkkynen2016-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last successful build in 2014. http://hydra.nixos.org/build/38308131