Commit Graph

43 Commits

Author SHA1 Message Date
dramforever
7c7fa82b6c treewide: Don't stabilize fetchpatch GitHub compare URLs
The index hash length problem only happens with fetchpatch2, not
fetchpatch. Don't cargo cult fixing this when it's not a problem.

This reverts most of commit 6388411ec2,
except:

- Conflicts:
  - pkgs/development/ocaml-modules/mysql/default.nix was deleted
- fetchpatch2 changes were not reverted:
  - pkgs/by-name/gi/gixy/package.nix
  - pkgs/development/python-modules/mohawk/default.nix
  - pkgs/development/python-modules/pyexcel-ods/default.nix
2026-04-15 09:21:02 +08:00
Jörg Thalheim
6388411ec2 treewide: stabilize fetchpatch GitHub compare URLs
GitHub compare endpoints (/compare/A...B.patch) are not byte-stable:
commit message headers, abbreviated SHA length and index lines drift
over time, causing FOD hash mismatches on Hydra without source changes
(observed for gixy on staging).

Switch all such URLs to .diff?full_index=1, which omits commit headers
and uses full 40-char blob SHAs in index lines. Combined with fetchpatch
normalization this yields stable hashes.

For py-slvs also expand the abbreviated commit SHAs in the URL to full
40-char SHAs.
2026-04-14 11:32:06 +02:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
Silvan Mosberger
667d42c00d treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01: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
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
OPNA2608
2f076b5178 libsForQt5.qmltermwidget: Fetch patch to Lomiri's patch series
...to fix a crash in lomiri-terminal-app.
2024-01-15 09:23:25 -08:00
Fabián Heredia Montiel
884449105e Merge remote-tracking branch 'origin/master' into staging-next 2023-11-13 14:31:51 -06:00
OPNA2608
cd28d78749 libsForQt5.qmltermwidget: Apply Lomiri patches
So we can use it for lomiri-terminal-app
2023-11-12 21:27:43 +01:00
OPNA2608
427d085756 libsForQt5.qmltermwidget: Minor cleanups
- Clarify license
- Replace INSTALL_ROOT with proper $$PREFIX usage
- Minor style stuff
2023-11-12 21:21:41 +01:00
OPNA2608
e7bf1e3ec4 libsForQt5.qmltermwidget: Adopt 2023-11-12 21:18:59 +01:00
github-actions[bot]
33248a2caf Merge master into staging-next 2023-11-12 00:02:14 +00:00
Francesco Gazzetta
db7401360a maintainers: remove skeidel
* Has been inactive for over 3 years
  https://github.com/svenkeidel?tab=overview&from=2020-12-01&to=2020-12-31&org=NixOS
* Is not responsive
  https://github.com/NixOS/nixpkgs/pull/249917
2023-11-11 19:28:45 +00:00
Weijia Wang
af156474bd treewide: remove references to qtquick1 2023-10-28 15:19:57 +02:00
Gaetan Lepage
e0c84a0256 qmltermwidget: 2018-11-24 -> unstable-2022-01-09 2023-07-21 15:07:20 +02:00
Ben Siraphob
4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
Thomas Tuegel
5590e365e4 qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Fabian Möller
d8306e18ea qmltermwidget: fix build with gcc10 2021-01-07 18:20:34 +01:00
Michael Reilly
84cf00f980 treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
George Whewell
7875e817cf change qmltermwidget version to 2018-11-24 and add unstable to name 2018-12-12 16:32:28 +00:00
George Whewell
b2cbbb32ac qmltermwidget: update to latest master to fix cool-retro-term on darwin 2018-12-12 13:25:39 +00:00
George Whewell
5205aaa655 qmltermwidget: add missing utmp lib on darwin 2018-12-05 15:43:25 +00:00
adisbladis
05d803ab5f qmltermwidget: Use fetchFromGitHub 2018-01-15 01:47:42 +08:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Thomas Tuegel
210f688802 qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel
3f3d33a078 qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
Robin Gloster
c1866cade9 libsForQt5.qmltermwidget: fix build 2017-03-02 14:13:35 +01:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Nikolay Amiantov
005dab1a7a qmltermwidget: move to qmakeHook
This reverts commit 2d6ea2cc30.
2016-04-20 18:55:51 +03:00
aszlig
2d6ea2cc30 qmltermwidget: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qmltermwidget
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of qmltermwidget and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Sven Keidel
30ff95ea59 cool-retro-term: add missing dependencies and fix qmltermwidget 2016-01-01 12:00:11 +01:00
Louis Taylor
358885fd87 qmltermwidget: fix homepage url 2015-12-30 16:52:46 +00:00
Thomas Tuegel
4a3d7eae7e qmltermwidget: build with Qt 5.5 2015-09-27 15:08:49 -05:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Sven Keidel
b50cabf2d4 cool-old-term: rename to cool-retro-term (close #6071)
The project has changed its name to cool-retro-term. The project also added a
dependency that is included as a submodule. I added this dependency as a
separate expression.
2015-01-31 19:23:45 +01:00