cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
557771 commits 1 branch 0 tags 3.7 GiB
Commit graph

557771 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maximilian Bosch
ede5720a0d
flake/version overlay: review fixes 
* Improves the comments of `lib/flake-version-info.nix` and drops the
  `__`-prefix from the filename.
* `lib'` -> `lib0` in `nixpkgs/lib`.
* Drop the declaration of `trivial.version` in the overlay because this
  declaration already uses the final expressions of `versionSuffix` and
  `release` now.
* No need to fall back to `self.lastModified` anymore, this was a
  workaround for pre2.4 Nix.

Co-authored-by: Robert Hensing <robert@roberthensing.nl>
Co-authored-by: Silvan Mosberger <contact@infinisil.com>
 2023-12-10 13:25:24 +01:00
Maximilian Bosch
78f5ed053a
lib/trivial: drop rec in favor of lib fixpoint 
That way each expression uses the final version of other lib.trivial
declarations.

For instance, when replacing `versionSuffix` with the string `"fnord"`
in a lib overlay, `trivial.version` uses `"fnord"` as suffix now rather
than `pre-git`.
 2023-12-10 13:25:24 +01:00
Maximilian Bosch
bb7921d1d6
flake: also provide proper version info for lib's flake 
This effectively means that

    nixpkgs$ nix eval ./lib#lib.trivial.version
    "23.11.20231020.ee0d6b5"

now gives meaningful results as well.

See https://github.com/NixOS/nixpkgs/pull/257100#discussion_r1352075369
for the discussion around this.
 2023-12-09 11:45:45 +01:00
Maximilian Bosch
039f73f134
flake: fix lib.trivial.version when used from a flake 
A lot of fetchers from Nix's own `libfetchers` also provide the
information that `lib.trivial` aims to expose with
`version`/`versionSuffix`/`revision`. In fact you don't even need a
`nixpkgs` channel to get a proper version suffix because of that!

Unfortunately this isn't used currently. When using the
nixpkgs flake, but not `nixpkgs.lib.nixosSystem` to build a NixOS
configuration, the version will always be `YY.MMpre-git`. One example is
e.g. `colmena` which evaluates configurations via
`import (npkgs.path + "/nixos/lib/eval-config.nix")`.

This patch ensures that the version suffix (i.e. the normalized last
modified date + git revision) is correctly exposed in `lib.trivial`.
Additionally, the change is injected into the following locations:

* `lib`: with that, something like

      $ nix eval nixpkgs#lib.trivial.version
      23.05.20230921.cf8bf79

  is working fine (i.e. rather than `23.05pre-git`).

* `legacyPackages` to make sure that e.g. `legacyPackages.<system>.nixos`
  has correct version info. This also applies to everything else using
  `pkgs.lib.trivial` for that purpose.

* `overlays.default` which can be applied to a `nixpkgs` and changes the
  previous `pkgs.lib` from said `nixpkgs` to also contain the correct
  `version`/`revision`/etc..

  This is useful for people using `nixpkgs` as flake input, but
  importing it manually with

      import inputs.nixpkgs { }

Co-authored-by: Linus Heckemann <git@sphalerite.org>
 2023-12-09 11:45:44 +01:00
Rick van Schijndel
515794d98d
Merge pull request #270556 from NickCao/bibutils 
bibutils: fix cross compilation
 2023-12-09 11:01:10 +01:00
Rick van Schijndel
1f3c762a95
Merge pull request #271613 from Schweber/master 
hdrop: init at 0.2.4
 2023-12-09 10:58:04 +01:00
Rick van Schijndel
5eb361eeb0
Merge pull request #272357 from MikaelFangel/fix-xorriso 
xorriso: update hash
 2023-12-09 10:57:01 +01:00
Fabian Affolter
99953b22d3
Merge pull request #272891 from fabaff/checkSSLCert-bump 
checkSSLCert: 2.77.0 -> 2.78.0
 2023-12-09 09:36:37 +01:00
Fabian Affolter
ffe505d43c
Merge pull request #272852 from fabaff/meteofrance-api-bump 
python311Packages.meteofrance-api: 1.2.0 -> 1.3.0
 2023-12-09 09:36:07 +01:00
Bobby Rong
9391a02a86
Merge pull request #272496 from bobby285271/upd/hypnotix 
hypnotix: 4.0 -> 4.2
 2023-12-09 16:31:25 +08:00
Félix
29558c0722
spotdl: 4.2.2 -> 4.2.4 (#272641) 
Some tests have been renamed. We also disable some new tests requiring
network connectivity.
 2023-12-09 07:39:50 +01:00
Vladimír Čunát
2f878b30c5
Merge #272685: xdg-desktop-portal: disable known flaky tests 2023-12-09 07:05:30 +01:00
R. Ryantm
d02151974a datafusion-cli: 32.0.0 -> 33.0.0 2023-12-09 03:19:54 +00:00
Peder Bergebakken Sundt
e43bbcfaec
Merge pull request #272557 from ambroisie/update-tandoor-recipes 
tandoor-recipes: 1.5.6 -> 1.5.10
 2023-12-09 03:12:36 +01:00
Peder Bergebakken Sundt
ec9940bc4f
Merge pull request #217658 from poweredbypie/kak-lsp-14.2.0 
kak-lsp: Fix missing Perl dependency
 2023-12-09 02:36:23 +01:00
Peder Bergebakken Sundt
cbef97d927
Merge pull request #268707 from vaci/aeron-cpp 
aeron-cpp: init at 1.42.1
 2023-12-09 02:34:19 +01:00
Peder Bergebakken Sundt
df37b17e76
Merge pull request #222508 from vaci/vaci/aeron-maven 
aeron: 1.40.0 -> 1.42.1
 2023-12-09 02:32:09 +01:00
Lassulus
b8ca5f4f46
Merge pull request #137003 from yayayayaka/add-pkg-jigasi 
jigasi: init at 1.1-311-g3de47d0 + module
 2023-12-09 02:28:50 +01:00
Peder Bergebakken Sundt
5976668449
Merge pull request #262105 from Luflosi/update/raspberrypi-eeprom 
raspberrypi-eeprom: 2023.01.11-138c0 -> 2023.10.30-2712
 2023-12-09 02:16:57 +01:00
Peder Bergebakken Sundt
0aca9bc27e
Merge pull request #269224 from eclairevoyant/nomnatong 
nomnatong: init at 5.07
 2023-12-09 02:11:10 +01:00
Peder Bergebakken Sundt
d54e864217
Merge pull request #203480 from onthestairs/init-lttoolbox 
lttoolbox: init at 3.7.1
 2023-12-09 01:53:15 +01:00
Weijia Wang
884a94700a
Merge pull request #265832 from r-ryantm/auto-update/python310Packages.guppy3 
python310Packages.guppy3: 3.1.4 -> 3.1.4.post1
 2023-12-09 01:32:57 +01:00
Weijia Wang
0542d3fd03
Merge pull request #265884 from r-ryantm/auto-update/python310Packages.m2crypto 
python310Packages.m2crypto: 0.39.0 -> 0.40.1
 2023-12-09 01:31:18 +01:00
Weijia Wang
faead40448
Merge pull request #272608 from Defelo/uiua 
uiua: 0.5.1 -> 0.6.1
 2023-12-09 01:27:27 +01:00
Weijia Wang
3441be91ae
Merge pull request #271287 from aidalgol/heroic-2.11 
heroic: 2.10.0 -> 2.11.0
 2023-12-09 01:16:19 +01:00
Weijia Wang
12a0a9da15
Merge pull request #271395 from kashw2/grype 
grype: 0.69.1 -> 0.73.4
 2023-12-09 01:13:27 +01:00
Weijia Wang
e7fabe8d3f
Merge pull request #271598 from h7x4/pkgs-usbview-update 
usbview: 2.0 -> 3.1
 2023-12-09 01:12:59 +01:00
Weijia Wang
4bf0db679d
Merge pull request #272228 from aaronjheng/cue 
cue: 0.6.0 -> 0.7.0
 2023-12-09 01:09:01 +01:00
Weijia Wang
08adace709
Merge pull request #272042 from pinpox/update-satty-0.8.0 
satty: 0.7.0 -> 0.8.0
 2023-12-09 01:08:40 +01:00
Weijia Wang
b3814139f4
Merge pull request #272243 from star-szr/carapace-0.28.5 
carapace: 0.28.4 -> 0.28.5
 2023-12-09 01:07:07 +01:00
Weijia Wang
aa0fd04b4b
Merge pull request #272293 from gaelreyrol/mercure-update-0.15.6 
mercure: 0.15.5 -> 0.15.6
 2023-12-09 01:06:41 +01:00
Weijia Wang
be8af62aea
Merge pull request #272037 from kashw2/bruno 
bruno: 1.3.0 -> 1.3.1
 2023-12-09 01:00:39 +01:00
Weijia Wang
114817f8eb
Merge pull request #272700 from kashw2/pscale 
pscale: 0.162.0 -> 0.172.0
 2023-12-09 01:00:04 +01:00
Weijia Wang
5cae9b1f03
Merge pull request #272582 from vs49688/supersonic-081 
supersonic: 0.8.0 -> 0.8.1
 2023-12-09 00:59:08 +01:00
Weijia Wang
7f2d865a7c
Merge pull request #272598 from kashw2/infracosts 
infracost: 0.10.30 -> 0.10.31
 2023-12-09 00:58:24 +01:00
Weijia Wang
2709babda6
Merge pull request #272690 from magnetophon/surge-XT 
surge-XT: 1.2.0 -> 1.2.3
 2023-12-09 00:55:39 +01:00
Weijia Wang
53aea4e8a4
Merge pull request #272682 from anthonyroussel/updates/ccid 
ccid: 1.5.2 -> 1.5.4
 2023-12-09 00:54:02 +01:00
Weijia Wang
29c3c36d5d
Merge pull request #272500 from newAM/svdtools-0.3.6 
svdtools: 0.3.4 -> 0.3.6
 2023-12-09 00:52:55 +01:00
Weijia Wang
5a1e4b8949
Merge pull request #272803 from ruby0b/pyload-ng-0.5.0b3.dev75 
pyload-ng: 0.5.0b3.dev72 -> 0.5.0b3.dev75
 2023-12-09 00:51:07 +01:00
Stig
13849335b2
Merge pull request #272754 from anthonyroussel/perl-ChipcardPCSC 
perlPackages.ChipcardPCSC: 1.4.14 -> 1.4.16
 2023-12-09 00:40:24 +01:00
Nick Cao
5496347877
Merge pull request #272873 from maxhbr/maxhbr/update-zoom-us 
zoom-us: 5.16.6.24664 -> 5.16.10.25689
 2023-12-08 18:24:59 -05:00
Yaya
181cc6ce34
electron_28-bin: init at v28.0.0 (#272762) 2023-12-09 00:24:27 +01:00
Martin Weinelt
4fef1f7abf
Merge pull request #272944 from mweinelt/python-3.12.1 
python312: 3.12.0 -> 3.12.1
 2023-12-09 00:13:00 +01:00
Lassulus
016851b51f
Merge pull request #272338 from tebriel/abcde-perl-ssl-fix 
abcde: Include IOSocketSSL which is required for included MusicBrainz package
 2023-12-08 23:49:36 +01:00
Thomas Gerbet
a87dd3d3d9
Merge pull request #272513 from r-ryantm/auto-update/cosign 
cosign: 2.2.1 -> 2.2.2
 2023-12-08 23:14:03 +01:00
Silvan Mosberger
bf67c02b1b
Merge pull request #272744 from hercules-ci/lib-lists-sortOn 
`lib.lists.sortOn`: init
 2023-12-08 23:11:05 +01:00
Thiago Kenji Okada
eaa482cddd
Merge pull request #272322 from TornaxO7/bump/rio 
rio: v0.0.28 -> v0.0.29
 2023-12-08 22:09:42 +00:00
Weijia Wang
9aedfde2aa
Merge pull request #272486 from r-ryantm/auto-update/clusterctl 
clusterctl: 1.5.3 -> 1.6.0
 2023-12-08 23:01:46 +01:00
Weijia Wang
2d0e419819
Merge pull request #272539 from mjm/beeper-3.89.3 
beeper: 3.85.17 -> 3.89.3
 2023-12-08 23:01:31 +01:00
Weijia Wang
57e50236a3
Merge pull request #272571 from mfrischknecht/update-python-qt 
python-qt: 3.3.0 -> 3.4.2
 2023-12-08 23:01:01 +01:00