Commit Graph

86 Commits

Author SHA1 Message Date
Robert Schütz
34ab5d3a78 formats.yaml_1_1: use remarshal v2 2026-07-30 09:55:06 -07:00
Sandro Jäckel
d0eb0fce71 release-python: update current python version 2026-01-10 22:53:32 +01:00
Wolfgang Walther
d0c0b875f7 treewide: remove __recurseIntoDerivationForReleaseJobs
This attribute was supposed to be set on derivations, to make the
release tools recurse into them. The remaining uses were all on regular
attrsets, though, so this is safe to remove.
2025-08-31 20:54:49 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Vladimír Čunát
2116eb760b release: disallow aliases (#316680)
This merge needed some conflict resolution,
relatively minor if viewed against the first parent.
2025-06-30 20:38:17 +02:00
Martin Weinelt
22c3b2e39f release-python: drop lib-tests
It is unclear why these were added in the first place and now with Nix
2.3 getting its vulnerable mark it has become a nuisance.
2025-06-29 16:58:11 +02:00
Martin Weinelt
0fad395f7e release-python.nix: update remarshal reference for pkgs.formats.yaml 2025-01-27 10:58:04 +01:00
Emily
8725e466ef release: forbid use of lib.fileset in Nixpkgs
Due to Nix bug <https://github.com/NixOS/nix/issues/11503>,
`builtins.filterSource` and chroot stores interact in a confusing
and broken way that breaks `lib.fileset`. This means that uses of
the API inside Nixpkgs keep breaking the NixOS installer, blocking
the channel. The resulting error messages are inscrutable (they look
like “the installer test is trying to download `curl`…?” and
eventually bottom out in a derivation that has the wrong `outPath`
because of the chroot store causing an incorrect `lib.fileset` result).

Whenever this happens, someone (well, in practice K900 or I)
has to bisect the change that introduced it and remove the use of
`lib.fileset`. This has happened at least three times in the past
four months (I believe I might actually be missing one here, but
these are the ones I remember and could easily dig up):

* <https://github.com/NixOS/nixpkgs/pull/340046>
* <https://github.com/NixOS/nixpkgs/pull/352491>
* <https://github.com/NixOS/nixpkgs/pull/369459>

The options I see here are:

1. Forbid use of `lib.fileset` within Nixpkgs until the Nix bug is
   fixed. This is the approach taken here. External users of Nixpkgs
   can continue to use the API as normal, but using it from within
   something that affects any release jobset `outPath`s will cause an
   evaluation failure with a hopefully‐helpful error message.

2. Forbid `lib.fileset` and also all of the other library APIs that use
   `builtins.filterSource`. I’m happy to do this, but so far none of
   those have broken the installer, so I decided to start small and
   worry about the others if they end up causing a problem in practice.

3. Forbid `builtins.filterSource` directly. This is hard and would
   require more invasive `builtins.scopedImport` crimes to do at
   evaluation time. I think this would realistically have to be done in
   something like nixpkgs-vet instead and I didn’t have much luck
   shoehorning a check like this into that codebase when I tried.

4. Fix the Nix bug. This would be great! But also it doesn’t seem to be
   happening any time soon, it seems difficult to fix in a way that
   doesn’t subtly break compatibility with the previous semantics, and
   arguably the fix would need backporting all the way back to 2.3
   given our minimum version policy.

5. Do nothing; have people continue to innocuously use `lib.fileset`
   throughout Nixpkgs, breaking the installer whenever one of them
   sneaks in to that closure, causing the channel to be blocked and
   requiring expensive bisections to narrow down the inscrutable test
   failure to the package using `lib.fileset`, which then needs moving
   back off it. This sucks for the people who keep having to track it
   down, holds back important channel bumps, and the criteria for when
   it’s okay to use `lib.fileset` are not realistically possible to
   teach to all contributors.

I'd be happy to work on (2) as an alternative; (3) would be difficult
and seems like overkill, (4) is not really something I trust myself
to do and wouldn’t address the immediate problem, and (5) isn’t
sustainable. I think that the current approach here is the best
trade‐off for now, as `lib.fileset` seems to be the only prominent
user of the `builtins.filterSource` API that works with full store
paths, exposing it to the Nix bug. It’s unfortunate to lose the
nice API, but since we can’t rely on it to produce correct results
and the channels keep getting blocked as a result, I don’t think
we really have an alternative right now.
2024-12-31 15:01:04 +00:00
Silvan Mosberger
4f0dadbf38 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 b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Martin Weinelt
bade6f8186 release-python: update to python312, add afdko
Failing afdko builds are channel blocking, for example due to the usage
of noto-fonts-color-emoji in the test closure of xfce.
2024-07-06 16:37:27 +02:00
Martin Weinelt
b0b4d2d06d pkgs/top-level: stop permitting openssl 1.1
A year has passed and a limited number of packages still rely on this, so
it is probably safe to remove these.
2024-06-24 02:25:04 +02:00
Jan Tojnar
1c87deda62 release: disallow aliases
Having multiple attributes point to the same derivation makes debugging
harder because you often cannot just grep the canonical attribute name.
It is even annoying when multiple aliases are chained.

Having Hydra build aliases is recognized as redundant
2d0a7c4eee
so let’s do the same with their evaluation.

This commit will make Hydra ignore aliases when evaluating.

A nice benefit of this is that it will allow us to warn users when
an attribute is renamed, to assist them with early migration. Since
tracing messages during evaluation are not allowed because of Hydra,
we can currently only choose between having a silent alias and throwing.

This was last attempted in 2018 but ended up being reverted
because of widespread use of aliases that was not caught by CI:
8c025c67d5
CI has since been improved:
cda5aa2ac7
2024-06-04 09:36:06 +02:00
Philip Taron
f5f26f0bbc Avoid with lib; at the top level in pkgs/top-level/release-python.nix 2024-03-08 14:55:07 -08:00
Adam Joseph
80472e3754 treewide: add __attrsFailEvaluation and __recurseIntoDerivationForReleaseJobs 2023-12-15 05:13:46 -08:00
Martin Weinelt
002861bb57 release-python.nix: remove dreamed-up config option
For some reason I had the impression this option existed, but it doesn't.

Sadly `nixpkgs.config` is a freeform type attrset, that wouldn't even
bark at me, so I didn't notice this will testing.
2023-12-12 17:53:28 +01:00
Martin Weinelt
18523dedab release-python.nix: allow evaluation with openssl_1_1
Home Assistant is a big part of nixpkgs python ecosystem and how I
started participating in python maintenance.

Recently it started including `openssl_1_1` in its transitive dependency
closure, which resulted in its exclusion from python-updates.

This is detrimental to the health of the `home-assistant` ecosystem,
since it would not be built and tested anymore.

Permitting `openssl_1_1` for python-updates, as was done for
`release.nix`, will allow me to get in contact with the upstream, to
hopefully arrive at a favorable outcome.
2023-12-12 04:08:43 +01:00
Martin Weinelt
73fd4ebd2f release-python.nix: add nixos-render-docs to tested set 2023-09-27 15:35:23 +02:00
Martin Weinelt
f1a3b9747f release-python.nix: Update tested set to python311 2023-09-27 15:34:41 +02:00
Felix Buehler
bc3d5934d7 treewide: use lib.optionals 2023-02-14 19:11:59 +01:00
Martin Weinelt
01667337f1 release-python.nix: add buildcatrust to tested set
This is the tool that manages our certificate store.
2022-03-02 21:31:38 +01:00
Jonathan Ringer
80f0e03f10 release-python.nix: add test job sets 2022-02-11 17:05:05 -08:00
Martin Weinelt
ae1d80dcca release-python.nix: add aarch64-linux
Reduce the number of surprises when we go from staging to staging-next
with python-unstable.
2021-10-11 01:22:09 +02:00
Silvan Mosberger
c1e96ff74f release*: Support nixpkgsArgs for all release-*.nix files
This is a bit dirty because there's no easy way to propagate these
function arguments while still allowing --arg from the command line
2020-09-11 18:22:01 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
John Ericson
b477851f34 top-level: Less indirection for lib in release*.nix 2017-04-17 17:13:01 -04:00
John Ericson
f073df60d6 Replace ./../* with ../* in Nix expressions (#16414) 2016-06-22 10:39:50 +02:00
Nicolas B. Pierron
6313a5698a Replace references to all-packages.nix, by references to the top-level of nixpkgs repository. 2016-03-13 18:25:52 +00:00
Domen Kožar
c6c58dc92d release-python.nix: automatically detect buildPythonPackage 2015-11-21 21:44:12 +01:00
Domen Kožar
2ebaf14eba release-python.nix: drop darwin and i686-linux, add py35 2015-11-21 21:44:12 +01:00
Domen Kožar
7d8a6c6a42 rewrite release-python.nix to reflect reality 2015-11-21 21:44:12 +01:00
Andrey Arapov
9f623a820d Adds a new package: cherrytree - A hierarchical note taking application
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
2015-01-31 02:17:00 +01:00
Florian Friesdorf
bc75a33988 release-python: heavily reduce list of built packages 2014-06-20 14:17:50 +02:00
vi
2c05eb96bc Supplementary derivation for s3cmd, building from git HEAD. 2014-06-02 16:08:36 +08:00
Jaka Hudoklin
3673ba6150 network-manager: Fix all plugins to use gnome3 and gtk3, like nm-applet does
I think this makes sense, because now all the plugins will be gnome3 gtk3
based, the same way nm-applet is.

I also removed networkmanager_pptp_gnome variation of networkmanager_pptp
package, because i think no variation is needed and gnome support should
be on by default like in other packages.
2014-05-20 20:37:29 +02:00
宋文武
d14b9e9850 get rid of old webkit and webkit_gtk2 packages 2014-03-30 09:02:07 +08:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Shea Levy
55e6303d6a Add full llvm build, update libc++ and dragonegg
Some packages in the llvm suite (e.g. compiler-rt) cannot be built
separate from the build of llvm, and while some others (e.g. clang) can
the combined build is much better tested (we've had to work around
annoying issues before). So this puts llvm, clang, clang-tools-extra,
compiler-rt, lld, lldb, and polly all into one big build (llvmFull).
This build includes a static llvm, as dynamic is similarly less tested
and has known failures.

This also updates libc++ and dragonegg. libc++ now builds against
libc++abi as a separate package rather than building it during the
libc++ build.

The clang purity patch is gone. Instead, we simply set --sysroot to
/var/empty for pure builds, as all impure paths are either looked up in
the gcc prefix (which we hard-code at compile time) or in the sysroot.
This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in
the normal Linux paths by default, which is the proper behavior IMO.

polly required an updated isl. When stdenv-updates is merged, perhaps we
can update the isl used by gcc and avoid having two versions.

Since llvm on its own is now separate from the llvm used by clang, I've
removed myself as maintainer from llvm and will leave maintenance of
that to those who are interested in llvm separate from clang.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 05:42:38 -05:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Song Wenwu
4262c4bb9d vala: update to 0.23.1, remove old versions
set license to lgpl2Plus
add myself to maintainers
and some cleanup
2014-01-07 17:31:52 +08:00
Eelco Dolstra
4728ec3f99 Fix some references to apacheAntOpenJDK 2014-01-06 14:36:13 +01:00
Eelco Dolstra
c180be8cf5 icedtea: Remove
It has apparently never worked.  Also drop xerces and xalan, which
were only used by icedtea.
2014-01-06 14:36:13 +01:00
Eelco Dolstra
cd5a9f4980 clooj: Update to 0.4.4
Also, merge the wrapper into the main package.
2014-01-06 14:36:13 +01:00
Shea Levy
a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Eelco Dolstra
8398b23e10 clojure: Update to 1.5.1
Also, merge the wrapper into the main package, and get rid of the
binary variant.
2014-01-03 14:48:21 +01:00
Eelco Dolstra
ec685e30de kaffe: Remove
It no longer builds and doesn't seem very maintained.
2014-01-03 13:51:23 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Mathijs Kwik
d2ccef5140 ffmpeg: order and cleanup versions 2013-12-23 11:03:09 +01:00
Eelco Dolstra
06f4398b46 Remove broken and obsolete versions of gcj and ghdl 2013-11-04 21:11:00 +01:00