alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
152113 commits 217 branches 121 tags 4.5 GiB
Commit graph

152113 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson 9f9723b179 nixpkgs module: Fix defaulting of localSystem and system 
Take two of #40708 (4fe2898608).

That PR attempted to bidirectionally default `config.nixpkgs.system` and
`config.nixpkgs.localSystem.system` to each be updated by the other. But
this is not possible with the way the module system works. Divergence in
certain cases in inevitable.

This PR is more conservative and just has `system` default `localSystem`
and `localSystem` make the final call as-is. This solves a number of
issues.

 - `localSystem` completely overrides `system`, just like with nixpkgs
 proper. There is no need to specify `localSystem.system` to clobber the
 old system.

 - `config.nixpkgs.localSystem` is exactly what is passed to nixpkgs. No
 spooky steps.

 - `config.nixpkgs.localSystem` is elaborated just as nixpkgs would so
 that all attributes are available, not just the ones the user
 specified.

The remaining issue is just that `config.nixpkgs.system` doesn't update
based on `config.nixpkgs.localSystem.system`. It should never be
referred to lest it is a bogus stale value because
`config.nixpkgs.localSystem` overwrites it.

Fixes #46320
 2018-09-07 16:43:56 -04:00
Alexey Shmalko d7b97051a2
Merge pull request #46307 from r-ryantm/auto-update/calamares 
calamares: 3.2.1 -> 3.2.2
 2018-09-07 23:39:42 +03:00
Alexey Shmalko e5e4fd8ede
Merge pull request #46327 from costrouc/costrouc/markerlib 
pythonPackages.markerlib: init at 0.6.0
 2018-09-07 23:38:16 +03:00
lewo 248eb0fe04
Merge pull request #46338 from nlewo/helm 
kubernetes-helm: fix darwin hash
 2018-09-07 22:37:03 +02:00
Markus Kowalewski 735a7de051
bashmount: add license 2018-09-07 22:15:14 +02:00
Markus Kowalewski 1e98674c79
zdelta: add license 2018-09-07 22:13:59 +02:00
Markus Kowalewski fd59d5642e
pigz: add license 2018-09-07 22:11:27 +02:00
Bastian Köcher dd0b3dafc9 androidndk: Add makeStandaloneToolchain support 
Example:
```
let
  toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64");
in
...
```
 2018-09-07 22:03:26 +02:00
Antoine Eiche 0b6da47fe3 kubernetes-helm: fix darwin hash 2018-09-07 22:01:15 +02:00
lewo b95454da65
Merge pull request #46256 from r-ryantm/auto-update/helm 
kubernetes-helm: 2.9.1 -> 2.10.0
 2018-09-07 21:58:13 +02:00
Timo Kaufmann db784d883c sage: re-add pkg-config aliases 
Those were removed because they were added to openblas itself. There was
an error with that however and it will take some time until the fix
makes its way through staging. For the time being, reverting this part
of 26d5d030fe will fix the sage build.
This commit should be reverted once
408eacbc89 is in master.
 2018-09-07 21:55:41 +02:00
Bastian Köcher 48bdf31f58 androidndk: Fix make_standalone_toolchain.py 
Python path needs to be absolute and the generated scripts will use also
an absolute path to `bash`.
 2018-09-07 21:42:49 +02:00
Bastian Köcher c6a51bf12b plasma5: 5.13.4 -> 5.13.5 2018-09-07 21:38:17 +02:00
Yuriy Taraday c098f143b4 chromium: 68.0.3440.106 -> 69.0.3497.81 
Also update to build with external gn.
 2018-09-07 23:34:47 +04:00
Timo Kaufmann 89ef631ab9
Merge pull request #46332 from timokau/youtube-dl-fix 
youtube-dl:  2018.08.28 -> 2018.09.01, fix youtube download
 2018-09-07 21:22:37 +02:00
Timo Kaufmann 8ef940a038 youtube-dl: fix youtube video download 2018-09-07 21:03:57 +02:00
Timo Kaufmann fa76f75c7b youtube-dl: 2018.08.28 -> 2018.09.01 2018-09-07 21:03:38 +02:00
Andreas Rammhold af8125c46f
Merge pull request #46329 from geistesk/openrct2-v0.2.1 
openrct2: 0.2.0 -> 0.2.1
 2018-09-07 20:48:23 +02:00
geistesk 22deabca39 openrct2: 0.2.0 -> 0.2.1 2018-09-07 20:31:27 +02:00
R. RyanTM 0bb9b3c233 pmd: 6.5.0 -> 6.7.0 (#46213) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
pmd
 2018-09-07 20:14:07 +02:00
R. RyanTM 64c13ec01c smenu: 0.9.13 -> 0.9.14 (#46189) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
smenu
 2018-09-07 20:12:53 +02:00
Chris Ostrouchov 2895560f4f
pythonPackages.markerlib: init at 0.6.0 2018-09-07 14:08:35 -04:00
xeji a60e79425b
Merge pull request #46019 from veprbl/pr/geant4_overhaul 
geant4 overhaul
 2018-09-07 20:08:17 +02:00
R. RyanTM 2729373cd1 clib: 1.8.0 -> 1.8.1 (#46292) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clib/versions
 2018-09-07 19:19:10 +02:00
Timo Kaufmann c04198a992
Merge pull request #46324 from Ma27/weechat-script-fixes 
weechat: fix quoting for ${}  syntax
 2018-09-07 19:02:41 +02:00
Timo Kaufmann b11cfc2622
Merge pull request #46325 from timokau/sage-numpy-1.15.1 
sage: fix numpy and scipy integration
 2018-09-07 18:52:55 +02:00
Michael Raskin 114959bcb6
Merge pull request #46319 from 7c6f434c/sbcl-1.4.10 
sbcl: 1.4.7 -> 1.4.10
 2018-09-07 16:47:23 +00:00
Maximilian Bosch e2b4644f9c
weechat: fix quoting for ${} syntax 
In my previous PR I missed that ${sec.foobar} (syntax to retrieve
secrets in a weechat runtime) breaks the shell evaluation.

Furthermore `;` shall be used rather than `\n` to concat scripts and the
init config.
 2018-09-07 18:41:04 +02:00
Timo Kaufmann 7521f2863d sage: fix numpy and scipy integration 2018-09-07 18:36:52 +02:00
Claas Augner 9466627d36 phpPackages.xdebug26: 2.6.0 -> 2.6.1 (#46205) 2018-09-07 17:57:37 +02:00
Claas Augner da63c86e3e phpPackages.psysh: 0.9.6 -> 0.9.8 (#46206) 2018-09-07 17:56:43 +02:00
Claas Augner 6ae3f9a3f7 phpPackages.composer: 1.6.5 -> 1.7.2 (#46203) 2018-09-07 17:56:17 +02:00
xeji 0287b49d70
Merge pull request #46315 from romildo/upd.deepin-mutter 
deepin-mutter: init at 3.20.34
 2018-09-07 17:52:04 +02:00
R. RyanTM 79ba556020 bear: 2.3.12 -> 2.3.13 (#46308) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bear/versions
 2018-09-07 17:48:26 +02:00
Dmitry Kalinkin 8d063d92a4 geant4: limit platforms to linux 2018-09-07 11:36:28 -04:00
xeji 6f3ff5acc7
Merge pull request #46186 from costrouc/costrouc/python-ncclient 
pythonPackages.ncclient: refactor + init pythonPackages.selectors2
 2018-09-07 17:33:58 +02:00
Timo Kaufmann e326c0156d
Merge pull request #45728 from Ma27/nixos/weechat-module 
nixos/weechat: add module
 2018-09-07 17:19:46 +02:00
Silvan Mosberger 00c6f85d18
Merge pull request #44341 from shmish111/riemann-options 
nixos/riemann: refactor config
 2018-09-07 16:41:59 +02:00
Sarah Brofeldt 4ae70b7771
Merge pull request #46111 from stites/noti 
noti: init at 3.1.0
 2018-09-07 16:35:18 +02:00
Michael Raskin d7861ab8b6 sbcl: 1.4.7 -> 1.4.10 2018-09-07 17:32:42 +03:00
stites f1c30cf772 noti: init at 3.1.0 2018-09-07 10:28:03 -04:00
stites 82f980828d add stites to maintainers list 2018-09-07 10:27:03 -04:00
Chris Ostrouchov a726956b42
pythonPackages.ncclient: refactor 
adding selectors2 as dependency of ncclient. Added recently 20 days
ago in August. 8ef20f2828
 2018-09-07 10:22:22 -04:00
Chris Ostrouchov 11c3fe2258
pythonPackages.selectors2: init at 2.0.1 
Added package becuase now dependency of ncclient.
 2018-09-07 10:22:22 -04:00
José Romildo Malaquias 2b49b7f608 deepin-mutter: init at 3.20.34 2018-09-07 10:22:12 -03:00
Michael Weiss 6d81d8254c monkeysphere: Correctly wrap the keytrans aliases (subcommands) 2018-09-07 15:20:50 +02:00
José Romildo Malaquias d113ca46a7 clutter: enable evdev input (needed by some Deepin packages) 2018-09-07 10:06:41 -03:00
José Romildo Malaquias 9691049220 cogl: Add GL_ARB_shader_texture_lod and copy_sub_image support 2018-09-07 10:05:17 -03:00
Jörg Thalheim 8f6e805be4
Merge pull request #46301 from r-ryantm/auto-update/bcc 
linuxPackages.bcc: 0.6.1 -> 0.7.0
 2018-09-07 13:57:35 +01:00
Michael Raskin f9a0679297
Merge pull request #46157 from taku0/firefox-bin-62.0 
firefox,  firefox-bin: 61.0.2 -> 62.0,  firefox-esr: 60.1.0esr -> 60.2.0esr, remove 52.9.0esr [Critical security fixes]
 2018-09-07 12:10:47 +00:00