1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Commit graph

222692 commits

Author SHA1 Message Date
worldofpeace 00823d47e7
Merge pull request #85788 from pbogdan/fix-manual
nixos/manual: fix build
2020-04-22 12:03:43 -04:00
Piotr Bogdan 830733db24 nixos/manual: fix build 2020-04-22 16:56:44 +01:00
adisbladis 4340329136
Merge pull request #85782 from adisbladis/p7zip-unfree
p7zip: Make unfree features (rar support) optional
2020-04-22 17:43:45 +02:00
Frederik Rietdijk 8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Michael Weiss 1a047c4a8e
sway: Make it possible to use exec in extraSessionCommands
This is useful for use-cases like this (logging to journald):
```
programs.sway.extraSessionCommands = ''
  if [ -z "$_SWAY_DID_SYSTEMD_CAT" ]; then
    export _SWAY_DID_SYSTEMD_CAT=1
    exec ${config.systemd.package}/bin/systemd-cat -t sway "$0" "$@"
  fi
  # ... (potentially also another exec)
'';
```

Without this change the rest of the extraSessionCommands won't be
executed after the exec since the whole extraSessionCommands block would
be skipped during the re-execution (_SWAY_WRAPPER_ALREADY_EXECUTED is
already set).
2020-04-22 17:09:20 +02:00
adisbladis 955e235da3
p7zip: Make unfree features (rar support) optional 2020-04-22 16:06:50 +01:00
Emily 95f82e2a45 p7zip: remove non-free RAR support
7-Zip's RAR implementation is built on the non-free UnRAR source code;
DOC/License.txt says:

      Licenses for files are:
    
        1) CPP/7zip/Compress/Rar* files:  GNU LGPL + unRAR restriction
        2) All other files:  GNU LGPL
    
      The GNU LGPL + unRAR restriction means that you must follow both 
      GNU LGPL rules and unRAR restriction rules.
    
    ...
    
      unRAR restriction
      -----------------
    
        The decompression engine for RAR archives was developed using source 
        code of unRAR program.
        All copyrights to original unRAR code are owned by Alexander Roshal.
    
        The license for original unRAR code has the following restriction:
    
        The unRAR sources cannot be used to re-create the RAR compression algorithm, 
        which is proprietary. Distribution of modified unRAR sources in separate form 
        or as a part of other software is permitted, provided that it is clearly
        stated in the documentation and source comments that the code may
        not be used to develop a RAR (WinRAR) compatible archiver.

The unrar licensing is [infamously restrictive and non-free][fedora];
it's inappropriate for us to keep the RAR support while labelling the
package as free software (and indeed there's a commented-out line
pointing out that the current `meta.license` is false). Unfortunately,
the 7-Zip upstream seems uninterested in replacing the code with a
freely-licensed alternative (see [7-Zip ticket #1229][7zip]).

[fedora]: https://fedoraproject.org/wiki/Licensing:Unrar
[7zip]: https://sourceforge.net/p/sevenzip/feature-requests/1229/

An alternative solution would be to mark the p7zip package as non-free
instead; I decided not to because its other functionality (especially
`.7z` support) is freely-licensed and useful, and there are free
software alternatives for extracting RAR files (e.g. in nixpkgs there's
`archiver`, which is written in a memory-safe language, and `unar`,
which at least doesn't have two patches for CVEs that haven't been
addressed upstream...).

I checked that `7z(1)` fails gracefully on `.rar` files now:
    
    emily@renko ~/tmp> curl -L -O https://www.philippwinterberg.com/download/example.rar
      % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                     Dload  Upload   Total   Spent    Left  Speed
    100 5715k  100 5715k    0     0  6716k      0 --:--:-- --:--:-- --:--:-- 6716k
    emily@renko ~/tmp> 7z x example.rar
    
    7-Zip [64] 16.02 : Copyright (c) 1999-2016 Igor Pavlov : 2016-05-21
    p7zip Version 16.02 (locale=en_CA.UTF-8,Utf16=on,HugeFiles=on,64 bits,8 CPUs x64)
    
    Scanning the drive for archives:
    1 file, 5853119 bytes (5716 KiB)
    
    Extracting archive: example.rar
    ERROR: example.rar
    Can not open the file as archive
    
        
    Can't open as archive: 1
    Files: 0
    Size:       0
    Compressed: 0
2020-04-22 15:01:48 +00:00
Christoph Hrdinka 63acac6435
Merge pull request #85679 from Omoroca13/pcsx2
pcsx2: unstable-2020-01-05 -> 1.6.0-rc
2020-04-22 16:10:01 +02:00
Martin Milata d5b14e58c4 tensor: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 1d8ea89504 candle: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 2e8962bb6e colord-kde: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 8dd46d4ffe luckybackup: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 65050cd7e5 firebird-emu: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 7dce1c5202 glogg: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 9384f48860 iannix: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata ec922277e4 pro-office-calculator: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata adae9f1260 rocket: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata cc8d12118c qt-box-editor: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata 4ee9179a11 aqemu: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata a0a076b857 awesomebump: use qt5's mkDerivation
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
2020-04-22 15:23:10 +02:00
Martin Milata eae808331c bibletime: use qt5's mkDerivation 2020-04-22 15:23:09 +02:00
Martin Milata 98f126615f bomi: use qt5's mkDerivation
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
2020-04-22 15:23:09 +02:00
Martin Milata 21d3ce5887 dfasma: use qt5's mkDerivation 2020-04-22 15:23:09 +02:00
Martin Milata 22af8e8ed7 mindforger: use qt5's mkDerivation 2020-04-22 15:23:09 +02:00
Martin Milata affebc8600 okteta: use qt5's mkDerivation 2020-04-22 15:22:37 +02:00
Martin Milata 9f0dba1302 openbrf: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 606a15d9d8 phototonic: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 2986699ab0 qcomicbook: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 5f70a209da qmediathekview: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata e036261b15 qstopmotion: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 4b7193b67a ricochet: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 86aab71590 swift-im: use qt5's mkDerivation 2020-04-22 15:21:50 +02:00
Martin Milata 461843af71 traverso: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata 01de13ad6f valentina: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata 904fc69424 write_stylus: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata 7d1c2c05c5 caneda: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata 5858162f5e calaos_installer: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata f9ef2c194a yabause: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata b98fa7cdb8 httraqt: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Martin Milata 83102fcbae enyo-doom: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Alyssa Ross 81902419dd mblaze: install msuck and mblow
There are lots of other scripts in contrib that we should probably
also install, but I didn't feel like taking the time to review them
all and figure out what dependencies they would need.

It would have been a shame to add a mandatory dependency on Ruby (and
all that entails) to a package that otherwise has basically no
dependencies, so I've made the Ruby dependency optional.
2020-04-22 12:52:47 +00:00
Peter Hoeg f690b34603
Merge pull request #83054 from peterhoeg/u/icr
crystal: change all crystal programs to use buildCrystalPackage and update pkgs
2020-04-22 20:31:35 +08:00
worldofpeace f9ef9244a9
Merge pull request #85768 from NixOS/revert-85488-ldc-bootstrap
Revert "ldc: 1.17.0 -> 1.20.1"
2020-04-22 08:15:23 -04:00
worldofpeace 31d630c3a4
Revert "ldc: 1.17.0 -> 1.20.1" 2020-04-22 08:14:40 -04:00
Michael Weiss 2319f0c168
python3Packages.google_api_python_client: 1.8.1 -> 1.8.2 2020-04-22 14:12:55 +02:00
Domen Kožar a63762ace8
Merge pull request #72091 from xwvvvvwx/reproducible-pytest4
python3Packages.pytest4: deterministic bytecode
2020-04-22 14:05:09 +02:00
Max Wittig 50ba3f7ad8
gitlab-runner: 12.9.0 -> 12.10.0 (#85748) 2020-04-22 12:04:50 +00:00
Jan Tojnar a6a50f2393
Merge pull request #82007 from geistesk/cbeams-1.0.1 2020-04-22 13:59:40 +02:00
Jörg Thalheim 43790ee675
nixpkgs-review: 2.2.0 -> 2.3.0 2020-04-22 12:54:42 +01:00
Domen Kožar ace7b93131
Merge pull request #72420 from minijackson/waylandpp-0.2.7
waylandpp: 0.2.5 -> 0.2.7, make it split-output package
2020-04-22 13:12:06 +02:00