Commit Graph

62 Commits

Author SHA1 Message Date
piegames
68927918d0 treewide: Fix indentation in strings
The indentation stripping semantics of strings are fairly bad and have a
few gotchas where the resulting string has not the intended indentation.
This commit fixes most if not all such instances in Nixpkgs.

I tried to strive a balance between keeping the diff small and
reformatting/refactoring the code to look better. In general,
reformatting should be left to Nixfmt.

Note that this causes a lot of rebuilds by design. All changes need to
be thoroughly vetted and reviewed for correctness. There is no automatic
way to prove correctness.

List of files to fix generated by running
https://gerrit.lix.systems/c/lix/+/2092 on Nixpkgs and looking at the
warnings.
2024-10-22 21:36:42 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Peder Bergebakken Sundt
3a83109945
treewide: change ${pname} to string literal, pt2 (#336195)
* aescrypt: change `${pname}` to string literal

* bandwidth: change `${pname}` to string literal

* bc: change `${pname}` to string literal

* bdfresize: change `${pname}` to string literal

* birdfont: change `${pname}` to string literal

* brltty: change `${pname}` to string literal

* calamares: change `${pname}` to string literal

* ccal: change `${pname}` to string literal

* clac: change `${pname}` to string literal

* colord-gtk4: change `${pname}` to string literal

* colord: change `${pname}` to string literal

* colorless: change `${pname}` to string literal

* cunit: change `${pname}` to string literal

* datamash: change `${pname}` to string literal

* dateutils: change `${pname}` to string literal

* desktop-file-utils: change `${pname}` to string literal

* digitemp: change `${pname}` to string literal

* ding-libs: change `${pname}` to string literal

* docbook2mdoc: change `${pname}` to string literal

* dtach: change `${pname}` to string literal

* empty: change `${pname}` to string literal

* entr: change `${pname}` to string literal

* envsubst: change `${pname}` to string literal

* ethtool: change `${pname}` to string literal

* fdtools: change `${pname}` to string literal

* filebench: change `${pname}` to string literal

* findutils: change `${pname}` to string literal

* fortune: change `${pname}` to string literal

* fpart: change `${pname}` to string literal

* fxlinuxprintutil: change `${pname}` to string literal

* gbdfed: change `${pname}` to string literal

* getopt: change `${pname}` to string literal

* github-copilot-cli: change `${pname}` to string literal

* gparted: change `${pname}` to string literal

* hddtemp: change `${pname}` to string literal

* hdfview: change `${pname}` to string literal

* hpcg: change `${pname}` to string literal

* hpl: change `${pname}` to string literal

* ink: change `${pname}` to string literal

* ised: change `${pname}` to string literal

* isoimagewriter: change `${pname}` to string literal

* kronometer: change `${pname}` to string literal

* libsForQt5.qt5ct: change `${pname}` to string literal

* lilo: change `${pname}` to string literal

* lockfileProgs: change `${pname}` to string literal

* map-cmd: change `${pname}` to string literal

* mcrypt: change `${pname}` to string literal

* most: change `${pname}` to string literal

* mrtg: change `${pname}` to string literal

* ms-sys: change `${pname}` to string literal

* multitime: change `${pname}` to string literal

* nbench: change `${pname}` to string literal

* osinfo-db-tools: change `${pname}` to string literal

* parallel-full: change `${pname}` to string literal

* phoronix-test-suite: change `${pname}` to string literal

* pod2mdoc: change `${pname}` to string literal

* powerline-rs: change `${pname}` to string literal

* recoverjpeg: change `${pname}` to string literal

* recutils: change `${pname}` to string literal

* routino: change `${pname}` to string literal

* rpm-ostree: change `${pname}` to string literal

* screen: change `${pname}` to string literal

* sharedown: change `${pname}` to string literal

* statserial: change `${pname}` to string literal

* taoup: change `${pname}` to string literal

* texi2mdoc: change `${pname}` to string literal

* tmpwatch: change `${pname}` to string literal

* toilet: change `${pname}` to string literal

* triehash: change `${pname}` to string literal

* ttfautohint: change `${pname}` to string literal

* txt2man: change `${pname}` to string literal

* urjtag: change `${pname}` to string literal

* uudeview: change `${pname}` to string literal

* uutils-coreutils: change `${pname}` to string literal

* vttest: change `${pname}` to string literal

* wacomtablet: change `${pname}` to string literal

* xcd: change `${pname}` to string literal

* xdaliclock: change `${pname}` to string literal

* xjobs: change `${pname}` to string literal

* feishin: change `${pname}` to string literal

* gifsicle: change `${pname}` to string literal

* nzbhydra2: change `${pname}` to string literal

* vatprism: change `${pname}` to string literal

* webfs: change `${pname}` to string literal

* yggstack: change `${pname}` to string literal
2024-08-20 17:23:37 -07:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Anderson Torres
9ffac6dc44 treewide: remove vrthra from meta.maintainers [all orphans]
Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642

Inactive since 2017
2024-07-07 12:20:32 -03:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Daniel Nagy
b4d62a957e
screen: change license to gpl3Plus
According to the `COPYING` file in the repository, the license is GPL3+.

https://git.savannah.gnu.org/cgit/screen.git/tree/COPYING?h=v.4.9.1
2024-06-09 12:15:00 +02:00
Sigmanificient
d48a9bb622 treewide: remove unused fetchpatch arguments 2024-06-04 12:40:25 +02:00
Janne Heß
1a2b257d74 screen: 4.9.0 -> 4.9.1 2023-08-21 17:18:48 +02:00
Robert Scott
99c5f3cec1 screen: add patch from CVE-2023-24626 2023-04-25 21:20:36 +01:00
Martin Weinelt
be9bc07aa1
screen: fix build with libxcrypt 2022-10-09 18:10:32 +02:00
Artturin
14a22ed0b1 screen: add enable-rxvt_osc
to match arch configure options ba9c439ee2/trunk/PKGBUILD (L37-L47)

and aports and void
2022-09-01 19:22:56 +03:00
Alyssa Ross
4762a265d4 pkgsMusl.screen: fix build
The patch was causing the build to fail.

The description of the gist the patch is from says:

> Patch for GNU Screen HEAD on OS X, which disables the error message
> "/var/run/utmp: No such file or directory" on launch.

I don't see that message with pkgsMusl.screen, so I think we don't
need the patch any more.
2022-03-03 13:57:27 +00:00
Nick Cao
6629a88714
screen: drop outdated hack for cross compilation 2022-02-09 12:54:02 +08:00
Scott Worley
55be92724a screen: 4.8.0 -> 4.9.0 2022-02-04 18:00:48 -08:00
Scott Worley
6a5850edaa screen: Fix patch fetch URL 2022-02-03 10:18:25 -08:00
Sergei Trofimovich
9d3d02f9c1
screen: disable parallel build (#147990)
Parallel build fails for missing generated header dependencies:

    screen.h:48:10: fatal error: comm.h: No such file or directory
        48 | #include "comm.h"
           |          ^~~~~~~~

Upstream fixes are intermingled with added features and are not
straightforward to backport. Let's disable parallelism until next
release.
2021-11-30 04:04:12 -05:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Martin Weinelt
c3b5487720 screen: apply patch for CVE-2021-26937
encoding.c in GNU Screen through 4.8.0 allows remote attackers to cause
a denial of service (invalid write access and application crash) or
possibly have unspecified other impact via a crafted UTF-8 character
sequence.

Fixes: CVE-2021-26937
2021-02-21 18:24:23 +01:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Lancelot SIX
dd3814abc6 screen: 4.7.0 -> 4.8.0
See https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00003.html
for release information
2020-02-05 23:58:17 +01:00
Lancelot SIX
b8ef3d0727
screen: 4.6.2 -> 4.7.0
See https://lists.gnu.org/archive/html/info-gnu/2019-10/msg00000.html
for release information.
2019-10-04 17:00:17 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Jascha Geerds
ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
volth
4b17b8bba4
screen: fix cross-compiling 2018-10-12 13:14:25 +00:00
Will Dietz
d67638cc13 screen: fix utmp messages w/musl
/dev/null/utmp
2018-02-13 09:44:58 -06:00
Lancelot SIX
131b7c2890
screen: 4.6.1 -> 4.6.2
See http://lists.gnu.org/archive/html/info-gnu/2017-10/msg00006.html
for release information
2017-10-23 15:58:51 +02:00
Lancelot SIX
aed23cfc0c screen: 4.6.0 -> 4.6.1
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00005.html
for release announcement
2017-07-13 15:08:53 +02:00
Lancelot SIX
e795cd9b18
screen: 4.5.1 -> 4.6.0
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00015.html
for release information
2017-06-29 09:51:54 +02:00
Lancelot SIX
6d9a3f0dcd screen: 4.5.0 -> 4.5.1 for CVE-2017-5618
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00010.html
for release announcement
2017-02-28 13:11:21 +01:00
Lancelot SIX
38b4ae5549
screen: 4.4.0 -> 4.5.0
See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00007.html
for release announcement.
2017-01-19 09:19:51 +01:00
Rahul Gopinath
64260e70f2 screen: 4.3.1 -> 4.4.0
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
2016-06-20 15:24:32 -07:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Allan Espinosa
37341582bb screen: include the utmp from the apple_sdk 2015-12-18 00:12:31 -06:00
Robert Helgesson
c4ab553c92 screen: patch CVE-2015-6806
Fixes a possible denial of service of the screen tool. Patch sourced
from upstream GIT repository.
2015-12-11 00:22:21 +01:00
Allan Espinosa
80ac72bbab screen: fix utmp.c compile problem in darwin
Apply the patch specified in http://savannah.gnu.org/bugs/?45359
2015-10-06 22:46:48 +09:00
Jascha Geerds
db53d84a98 screen: 4.3.0 -> 4.3.1 2015-06-30 22:59:15 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
William A. Kennington III
01c2ad2525 screen: 4.2.1 -> 4.3.0 2015-06-16 14:28:12 -07:00
Eelco Dolstra
997531d172 Document screen incompatibility 2014-12-15 19:55:37 +01:00
Sergey Mironov
efcb363ea9 screen: enable 256 colors 2014-10-12 20:47:47 +04:00
Benjamin Podszun
141d1a1253 nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +02:00
Eelco Dolstra
25ca1c30e2 screen: Only depend on PAM on Linux 2013-11-06 10:47:58 +01:00
Peter Simons
b4f10018cd screen: meta section cosmetic 2013-09-28 13:23:34 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Jan Malakhovski
16972d2415 screen: fix some annoying bugs by importing patches from ArchLinux 2013-03-17 12:24:49 +00:00
Aristid Breitkreuz
8ade26c373 pull screenrc configuration from /etc/screenrc 2013-01-27 20:21:49 +01:00