2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-23 05:14:45 +00:00
Commit Graph

296870 Commits

Author SHA1 Message Date
R. RyanTM
3c7cf9655b exoscale-cli: 1.32.0 -> 1.32.1 2021-06-18 04:05:49 +00:00
Mica Semrick
492e221ff9 exiv2: 0.27.3 -> 0.27.4 2021-06-17 19:02:47 -07:00
R. RyanTM
1fa59c586f chezmoi: 2.0.14 -> 2.0.15 2021-06-18 01:47:06 +00:00
fortuneteller2k
13ce7d315a discocss: 0.1.1 -> 0.2.0 2021-06-18 09:24:46 +08:00
urlordjames
fae72ae3df drogon: init at 1.6.0 2021-06-17 21:24:16 -04:00
Vladyslav M
ea12a8ea17 broot: 1.4.0 -> 1.6.0 2021-06-18 10:20:50 +09:00
Victor Freire
f9d16c48af vscode-extensions.Ionide.Ionide-fsharp: init at 5.5.5 2021-06-18 10:02:40 +09:00
Victor Freire
b2cf7418e7 vscode-extensions.svsool.markdown-memo: init at 0.3.8 2021-06-18 10:01:33 +09:00
upkeep-bot
955df64c44 vscodium: 1.57.0 -> 1.57.1 2021-06-18 10:00:59 +09:00
fortuneteller2k
4cd1636190 yaru: add myself as maintainer, format 2021-06-18 09:57:31 +09:00
Sandro
53b46ef5b1
Merge pull request from SuperSandro2000/expect 2021-06-18 02:42:20 +02:00
Ryan Burns
bec5a8c533 ccache: fix tests on darwin 2021-06-17 17:42:17 -07:00
Robert Schütz
be2b5534e2 home-assistant: support ee_brightbox component 2021-06-18 02:41:43 +02:00
Robert Schütz
3945bf16f1 python3Packages.eebrightbox: init at 0.0.6 2021-06-18 02:34:09 +02:00
Robert Schütz
6f54f198d2 pythonPackages.calmjs-parse: init at 1.2.5 2021-06-18 02:34:09 +02:00
upkeep-bot
1642cf81b3 vscode: 1.57.0 -> 1.57.1 2021-06-18 00:28:30 +00:00
Martin Weinelt
34d8d085ca
Merge pull request from dotlambda/python-ecobee-api-init 2021-06-18 02:16:09 +02:00
github-actions[bot]
26f9b05859
Merge staging-next into staging 2021-06-18 00:10:09 +00:00
github-actions[bot]
2c3f9221df
Merge master into staging-next 2021-06-18 00:10:06 +00:00
deliciouslytyped
a71e906e3a trivial-builders: refactor writeTextFile to be overridable
This fixes , specifically with the goal of enabling overriding the
checkPhase argument. See `design notes` at the end for details.

This allows among other things, enabling bash extension for the `checkPhase`.
Previously using such bash extensions was prohibited by the `writeShellScript`
code because there was no way to enable the extension in the checker.

As an example:

```nix
(writeShellScript "foo" ''
  shopt -s extglob
  echo @(foo|bar)
'').overrideAttrs (old: {
  checkPhase = ''
    # use subshell to preserve outer environment
    (
      export BASHOPTS
      shopt -s extglob
      ${old.checkPhase}
    )
  '';
})
```

This commit also adds tests for this feature to `pkgs/tests/default.nix`,
under `trivial-overriding`. The test code is located at
`pkgs/build-support/trivial-builders/test-overriding.nix`.

Design notes:
-------------

Per discussion with @sternenseemann, the original approach of just wrapping
`writeTextFile` in `makeOverridable` had the issue that combined with `callPackage`
in the following form, would shadow the `.override` attribute of the `writeTextFile`:

```nix
with import <nixpkgs>;
callPackage ({writeShellScript}: writeShellScript "foo" "echo foo")
```

A better approach can be seen in this commit, where `checkPhase` is moved
from an argument of `writeTextFile`, which is substituted into `buildCommand`,
into an `mkDerivation` argument, which is substituted from the environment
and `eval`-ed. (see the source)

This way we can simple use `.overideAttrs` as usual, and this also makes
`checkPhase` a bit more conformant to `mkDerivation` naming, with respect to
phases generally being overridable attrs.

Co-authored-by: sterni <sternenseemann@systemli.org>
Co-authored-by: Naïm Favier <n@monade.li>
2021-06-18 01:39:59 +02:00
Martin Weinelt
6de87929ca
Merge pull request from dotlambda/pdunehd-init 2021-06-18 01:35:23 +02:00
Artturin
64c69fa288 mailspring: add wrapGAppsHook 2021-06-18 02:02:30 +03:00
Robert Schütz
7865fdd5d1 home-assistant: test ecobee component 2021-06-18 00:24:32 +02:00
Robert Schütz
4c1ec204d7 home-assistant: update component-packages.nix 2021-06-18 00:23:08 +02:00
Robert Schütz
27ad553518 python3Packages.python-ecobee-api: init at 0.2.13 2021-06-18 00:21:29 +02:00
Jan Tojnar
f07dcbef64
nixos/doc: Synchronize the Markdown generator with Nixpkgs
Switch to CommonMark with our extensions.
2021-06-18 00:07:00 +02:00
Alyssa Ross
204eb98e85 modemmanager: add freedesktop team to maintainers 2021-06-17 21:47:03 +00:00
Alyssa Ross
85cc349087 modemmanager: 1.14.12 -> 1.16.6 2021-06-17 21:47:03 +00:00
Alyssa Ross
309a4d2e99
libmbim: fix cross by disabling introspection 2021-06-17 21:46:25 +00:00
Alyssa Ross
43884eb1f3 vala.updateScript: init
 was replaced with , which was merged as
74c5472090, so I'm following the
instructions in the comment and enabling the updateScript. Seems to work.
2021-06-17 21:43:25 +00:00
Pavol Rusnak
a76f6b0285
lnd: 0.12.1-beta -> 0.13.0-beta 2021-06-17 23:41:20 +02:00
superherointj
710c80af0d linkerd_edge: 21.6.2 -> 21.6.3 2021-06-17 18:38:16 -03:00
Fabian Affolter
6afc384f86 python3Packages.pydaikin: 2.4.2 -> 2.4.3 2021-06-17 23:30:46 +02:00
Alyssa Ross
4542d4ce83 libqmi: 1.28.4 -> 1.28.6 2021-06-17 20:56:02 +00:00
Nicolas Berbiche
d3c232b4ff
nwg-menu: init at unstable-2021-06-12 2021-06-17 16:29:29 -04:00
Simon Bruder
a769486378
printrun: make gsettings schemas available 2021-06-17 22:04:12 +02:00
Babbaj
3979f8df9e
libpqxx: 6.4.5 -> 7.5.2 2021-06-17 15:55:41 -04:00
Alyssa Ross
a1c67e57be python3.pkgs.pycairo: 1.20.0 -> 1.20.1 2021-06-17 19:51:51 +00:00
Alyssa Ross
c06cb69ca0 networkmanager: fix updateScript
> Major NetworkManager releases are numbered 1.y.0, with y being an
> even number. For example, 1.0.0, 1.2.0, ..., 1.18.0. Minor stable
> releases are numbered 1.y.z, with y and z being even numbers. For
> example 1.4.2, 1.18.2.
2021-06-17 19:45:16 +00:00
Alyssa Ross
59420d6b6f makeDBusConf: make apparmor argument optional
The only in-tree use of this is the DBus NixOS module, which always
passes apparmor (but the services.dbus.apparmor option defaults to
"disabled").  Set the default in the function as well so other users
of the function can take advantage of it.
2021-06-17 19:44:46 +00:00
Alyssa Ross
a1e7ad079f vala: 0.52.2 -> 0.52.4 2021-06-17 19:36:03 +00:00
Alyssa Ross
a9ad29cb0b vala_0_50: 0.50.4 -> 0.50.9 2021-06-17 19:36:03 +00:00
Alyssa Ross
444da2fb29 vala_0_48: 0.48.17 -> 0.48.18 2021-06-17 19:36:03 +00:00
Maximilian Bosch
7c845e60cd
Merge pull request from r-ryantm/auto-update/go-jira
go-jira: 1.0.27 -> 1.0.28
2021-06-17 21:28:43 +02:00
Maximilian Bosch
6a8843c758
Merge pull request from ilikeavocadoes/master
notmuch: 0.31.4 -> 0.32.1
2021-06-17 21:24:02 +02:00
Alyssa Ross
9852c9e5b6 fontconfig: 2.13.92 -> 2.13.93
All the patches we had before are now included upstream.
2021-06-17 19:11:15 +00:00
R. RyanTM
7a53121581 kubernetes-helm: 3.6.0 -> 3.6.1 2021-06-17 19:09:20 +00:00
OPNA2608
c403c730d6 munt: Add maintainer, 2.4.1 -> 2.5.0 2021-06-17 21:07:07 +02:00
OPNA2608
ac70827524 opl3bankeditor,opn2bankeditor: Add maintainer, refactor, devendor deps 2021-06-17 21:06:42 +02:00
OPNA2608
dfc39e61f4 openmpt123: Add maintainer, 0.5.8 -> 0.5.9 2021-06-17 21:06:42 +02:00