Commit Graph

186106 Commits

Author SHA1 Message Date
Bas van Dijk
58ea28eb2c lib: allow sourceByRegex to be composed after cleanSourceWith
`sourceByRegex src regexes` should include a source file if one of the
regular expressions `regexes` matches the path of that file relative
to `src`.

However to compute this relative path `sourceByRegex` uses:

```
relPath = lib.removePrefix (toString src + "/") (toString path);
```

Note that `toString path` evaluates to an absolute file somewhere
under `src` and not under `/nix/store`.

The problem is that this doesn't work if `src` is a `cleanSourceWith`
invocation as well because `toString src` will then evaluate to
`src.outPath` which will evaluate to `builtins.filterSource ...` which
evaluates to a path in `/nix/store` which is not a prefix of `path`.

The solution is to replace `src` with `origSrc` where

```
origSrc = if isFiltered then src.origSrc else src;
isFiltered = src ? _isLibCleanSourceWith;
```

Test this by executing the following from the nixpkgs repo:

```
(cat << 'EOI'
let
  pkgs = import ./. {};
in pkgs.runCommand "test-sourceByRegex" {
  test_sourceByRegex =
    let
      src1 = pkgs.lib.sourceByRegex ./.  [ "^test-sourceByRegex.nix$" ];
      src2 = pkgs.lib.sourceByRegex src1 [ "^test-sourceByRegex.nix$" ];
    in src2 + "/test-sourceByRegex.nix";
} ''
 cp $test_sourceByRegex $out
''
EOI
) > test-sourceByRegex.nix
nix-build test-sourceByRegex.nix
```
2019-07-19 16:23:11 +02:00
R. RyanTM
663542ad04 gnome3.gnome-getting-started-docs: 3.32.1 -> 3.32.2 (#65073)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnome-getting-started-docs/versions
2019-07-19 14:45:17 +02:00
Mario Rodas
3f880f187d
Merge pull request #65045 from marsam/update-flow
flow: 0.102.0 -> 0.103.0
2019-07-19 07:13:00 -05:00
Ryan Mulligan
1209ee987e
Merge pull request #65056 from r-ryantm/auto-update/armadillo
armadillo: 9.500.2 -> 9.600.4
2019-07-19 05:11:39 -07:00
Tmplt
588513f1c6 msmtp: 1.8.4 -> 1.8.5 2019-07-19 13:20:29 +02:00
Vladyslav M
b686a0b55b
imv: 3.0.0 -> 3.1.2 (#65057)
imv: 3.0.0 -> 3.1.2
2019-07-19 12:38:13 +03:00
Vladyslav M
2fe2b2978e
janet: 1.0.0 -> 1.1.0 (#65050)
janet: 1.0.0 -> 1.1.0
2019-07-19 12:32:06 +03:00
Frederik Rietdijk
594ca3f1cf ccache.links: make it a function of unwrappedCC
That way we can use a ccacheStdenv with e.g. a different CC:

stdenv = overrideCC gcc8Stdenv (ccacheWrapper.override { unwrappedCC
= gcc8Stdenv.cc.cc; });
2019-07-19 11:27:56 +02:00
Chris Ostrouchov
2d5769884d pythonPackages.ibis-framework: init at 1.20 2019-07-19 09:43:35 +02:00
Chris Ostrouchov
784e957c74 python3Packages.ibis: init at 1.6.0 2019-07-19 09:43:35 +02:00
Uma Zalakain
882b201f58 Change maintainter's name 2019-07-19 09:21:18 +02:00
Mario Rodas
80d39388de pythonPackages.scrapy: 1.6.0 -> 1.7.1 2019-07-19 09:09:33 +02:00
Markus Hauck
6b3fe044fc imv: 3.0.0 -> 3.1.2 2019-07-19 08:52:00 +02:00
Joachim F
75a3bf5e5d
Merge pull request #65021 from joachifm/graphene-hardened-malloc
graphene-hardened-malloc: 190405.003.2019.04.01.19 -> 1
2019-07-19 06:51:56 +00:00
Michael Raskin
fe26928084
Merge pull request #65052 from r-ryantm/auto-update/bftpd
bftpd: 5.1 -> 5.2
2019-07-19 06:49:34 +00:00
Joachim Fasting
948d2e317b
graphene-hardened-malloc: 190405.003.2019.04.01.19 -> 1
The initial stable standalone release.

The integer numbered tags are the standalone releases, while the
PQ3B.190705.003.2019.07.01.21 style tags are part of GrapheneOS releases.

For us it probably makes the most sense to track the standalone releases.
2019-07-19 08:16:09 +02:00
R. RyanTM
144817f552 armadillo: 9.500.2 -> 9.600.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/armadillo/versions
2019-07-18 23:03:49 -07:00
R. RyanTM
45332a59a9 bftpd: 5.1 -> 5.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bftpd/versions
2019-07-18 22:05:23 -07:00
Andrew Chambers
37e1c1aeda janet: 1.0.0 -> 1.1.0 2019-07-19 15:12:03 +12:00
Benjamin Staffin
59b08e6759 discord: Fix desktop icon
The name used in the .desktop file needs to match the filename that
exists in $out/share/pixmaps/ for it to work.
2019-07-19 04:00:52 +02:00
worldofpeace
5aec0b77f1
Merge pull request #65046 from worldofpeace/fix-doc-build
nixos/doc: fix build
2019-07-18 20:55:02 -04:00
worldofpeace
00eef848b2 nixos/doc: fix build
Adjusts to options renamed in 90b1197301
2019-07-18 20:40:24 -04:00
worldofpeace
3531a229d1 nixos/pantheon: add gtk xdg desktop portal 2019-07-18 20:03:12 -04:00
worldofpeace
69f2836c1b
Merge pull request #64575 from pasqui23/portal
nixos/xdg: add portal option
2019-07-18 20:00:09 -04:00
Pasquale
90b1197301 nixos/xdg: add portal option
This factors the configuration out of the flatpak module.
2019-07-18 19:59:07 -04:00
worldofpeace
3e25412e3b
Merge pull request #65008 from dtzWill/feature/victor-mono-font
victor-mono: improvements from previous PR
2019-07-18 18:47:14 -04:00
Will Dietz
0cd0869462 victor-mono: improvements from previous PR
Fixes #64465.

Resolves conflicts with earlier merged PR,
notable differences in the result
(by our powers combined!):

* provide both ttf and otf versions
* quote URL, since folks seem to like those
* don't put fonts in ${pname} subdirs
  fontconfig's hashing/cache is mostly geared
  for the many-fonts-in-one-place situation,
  although this may be fixed in more recent versions.
  Anyway minor change and mostly went with not modifying
  what I had ;) so happy to adjust back if that
  better matches your senses/style/use.
* Drop leading 'A' from description,
  I think this is per policy written.. somewhere O:).
* alpha-sort the meta attributes, which is easy to rem
  and generally matches what most expressions do anyway :)

Reviewer feedback:

* use subdirs with fontname, seems preferred
* fix indent, whoops
2019-07-18 18:46:40 -04:00
worldofpeace
b2e0ab39a7
Merge pull request #64843 from nyarly/fish_system_wcwidth
fish: use internal wcwidth
2019-07-18 18:32:39 -04:00
Vladyslav M
9bda7eb77e
Merge pull request #64474 from xbreak/update/cfitsio-3470
cfitsio: 3.450 -> 3.47
2019-07-19 01:28:37 +03:00
Daiderd Jordan
04b3ad82f8
Merge pull request #65038 from LnL7/erlang-wx
erlang: remove wx conditional
2019-07-19 00:04:04 +02:00
Daiderd Jordan
6fb8e5c453
Merge pull request #65025 from cw789/update_elixir
elixir_1_9: 1.9.0 -> 1.9.1
2019-07-19 00:03:43 +02:00
Daiderd Jordan
89083ccf85
Merge pull request #64803 from serokell/elixir19
elixir: default 1.7.4 -> 1.9.0
2019-07-19 00:03:29 +02:00
Daiderd Jordan
8c4152dac3
Merge pull request #64801 from serokell/beam-erlangR21
beam-packages: default erlangR20 -> erlangR22
2019-07-19 00:03:07 +02:00
Judson
2c9c395a22
fish: use internal wcwidth
Fish 3.0 has an updated an more robust handling of unicode glyphs. Per
the original author of the INTERNAL_WCWIDTH flag, it was something of
misfeature, and they regret that NixOS came to rely on it.

Removes the flag from the Nix expression.

Flag was added originally to Nixpkgs in 68076b7d49

It is being removed entirely from upstream fish:
https://github.com/fish-shell/fish-shell/pull/5777.
2019-07-18 15:00:29 -07:00
Daiderd Jordan
574cb4a8df
erlang: remove wx conditional
The wxmac build has been fixed and there's erlang_nox now.
2019-07-18 23:42:32 +02:00
Robert Helgesson
d7ef88bc38
fira-code: 1.206 -> 1.207 2019-07-18 23:36:51 +02:00
Graham Christensen
3f4ed94173
Merge pull request #64731 from risicle/ris-dosbox-0.74-3
dosbox: 0.74-2 -> 0.74-3, fixing CVE-2019-7165, CVE-2019-12594
2019-07-18 17:35:51 -04:00
Vladimír Čunát
65a1b179f3
Merge #65010: libxkbcommon: fix build on darwin 2019-07-18 23:28:57 +02:00
Mario Rodas
2f56bec54f
flow: 0.102.0 -> 0.103.0 2019-07-18 16:20:00 -05:00
worldofpeace
9b13b95570
Merge pull request #65033 from 0x4A6F/master-routinator
routinator: 0.4.0 -> 0.5.0
2019-07-18 17:17:24 -04:00
Will Dietz
ce684695bf
Merge pull request #64535 from dtzWill/update/txr-220
txr: 117 -> 220
2019-07-18 15:21:15 -05:00
Will Dietz
7f8bbe3ecf
Merge pull request #64508 from dtzWill/update/yubikey-personalization-1.20.0
yubikey-personalization: 1.19.3 -> 1.20.0
2019-07-18 15:13:43 -05:00
worldofpeace
f60744b578
Merge pull request #65036 from svalaskevicius/fix-crash-in-electron5
electron_5: fix crash when using file chooser dialog
2019-07-18 15:40:51 -04:00
Michael Weiss
d345900b98
androidStudioPackages.beta: 3.5.0.17 -> 3.5.0.18 2019-07-18 21:37:28 +02:00
Léo Gaspard
2db3a7d1e6
Merge pull request #64381 from mguentner/synapse_1_1_0
matrix-synapse: 1.0.0 -> 1.1.0
2019-07-18 21:13:59 +02:00
Sarunas Valaskevicius
683a10fe08 electron_5: fix crash when using file chooser dialog 2019-07-18 15:07:28 -04:00
Michael Peyton Jones
7f249190c9 asciidoctor: disable epubcheck by default (#65018)
`epubcheck` pulls in Java, which can be problematic on some platforms,
and some fairly core software uses asciidoctor to build docs.
2019-07-18 17:16:26 +00:00
Peter Simons
c768e1ff48
Merge pull request #64794 from peti/t/postfix-module
nixos: add 'localRecipients' config option for Postfix
2019-07-18 19:14:36 +02:00
Orivej Desh
5d86f9a9ce nccl: 2.4.2-1 -> 2.4.8-1 2019-07-18 17:04:43 +00:00
0x4A6F
ac8dc5d13c
routinator: 0.4.0 -> 0.5.0 2019-07-18 16:54:26 +00:00