K900
790cc209ea
bintools-wrapper: fix static check platform
...
This was moved in 1a5bd697ad
,
the preceding check was updated from hostPlatform to targetPlatform, but these got missed.
2024-01-06 10:32:08 +03:00
github-actions[bot]
76201c62e0
Merge master into staging-next
2024-01-05 18:00:58 +00:00
Maciej Krüger
349e0c2870
Merge pull request #263345 from hacker1024/feature/pub2nix
...
dart: Use Nix instead of Pub
2024-01-05 16:34:07 +01:00
github-actions[bot]
1e290d634f
Merge master into staging-next
2024-01-05 00:02:27 +00:00
Peder Bergebakken Sundt
73148fa5a8
Merge pull request #272520 from nrabulinski/fix-fetchpijul
...
build-support/fetchpijul: Add cacert dependency, set impureEnvVars, and enable strictDeps
2024-01-05 00:51:05 +01:00
Vladimír Čunát
8a839514de
Merge branch 'master' into staging-next
2024-01-04 15:07:44 +01:00
adisbladis
dbc85690de
Merge pull request #277335 from adisbladis/buildenv-hoist-instantiation
...
build-support/buildenv: Hoist builder instantiation
2024-01-04 12:32:40 +13:00
K900
887e96e875
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-02 10:55:23 +03:00
Will Fancher
1570f54b75
Merge pull request #278128 from r-ryantm/auto-update/makeInitrdNGTool
...
makeInitrdNGTool: 0.1.0 -> 0.1.0
2024-01-01 18:14:05 -05:00
R. Ryantm
5ff7811393
makeInitrdNGTool: 0.1.0 -> 0.1.0
2024-01-01 20:10:05 +00:00
K900
6cbe5542b8
Merge pull request #276072 from lilyinstarlight/fix/cargo-workspace-root-fixup-pls
...
rustPlatform.importCargoLock: fix workspace_root detection
2024-01-01 18:42:49 +03:00
github-actions[bot]
a9cb88c7ae
Merge staging-next into staging
2023-12-31 06:01:28 +00:00
Jan Tojnar
80020c7db4
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/lua-modules/generated-packages.nix
; pkgs/development/lua-modules/overrides.nix
2023-12-31 02:31:32 +01:00
Sergei Trofimovich
a1422a7f8f
build-support/go: fix eval of vendorSha256
accesses
...
Before the change there was no way to poll for presence of
`vendorSha256` attribute:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; _3mux.vendorSha256 or "no hash"'
error: attribute 'vendorSha256' missing
292| passthru = passthru // { inherit go goModules vendorHash; } // { inherit (args') vendorSha256; };
| ^
After the change the poll happens as expected:
$ nix-instantiate --strict --eval --expr 'with import ./. {}; _3mux.vendorSha256 or "no hash"'
"no hash"
2023-12-30 12:03:28 +10:00
adisbladis
21d3b6284c
Merge pull request #277327 from adisbladis/emacs-build-support
...
build-support/emacs: refactor
2023-12-30 13:46:03 +13:00
Vladimír Čunát
895cd4b126
ReApply PR #276943 : "melpa2nix: update to work with Emacs HEAD"
...
This reverts commit 7b623c3388
(PR #277535 ),
reversing changes made to 0aa7301173
.
2023-12-29 14:00:46 +01:00
Vladimír Čunát
de84adb292
Merge branch 'master' into staging-next
2023-12-29 14:00:30 +01:00
Vladimír Čunát
915c004e36
Revert "melpa2nix: update to work with Emacs HEAD"
2023-12-29 13:58:55 +01:00
adisbladis
dda7578745
build-support/buildenv: Hoist builder instantiation
2023-12-29 03:04:46 +13:00
adisbladis
3618d1d247
build-support/emacs: refactor
...
- Remove superflous `let` with `defaultMeta`
These can just be assigned to meta directly instead.
- Hoist internal intermediate derivation
- Remove top-level `with lib`
- Inherit `lib`/`builtins` into scopes
2023-12-29 02:38:57 +13:00
github-actions[bot]
1528aeb0b6
Merge staging-next into staging
2023-12-28 06:01:31 +00:00
github-actions[bot]
f4041e23e9
Merge master into staging-next
2023-12-28 06:01:05 +00:00
FlafyDev
5a5db92870
buildDartApplication: remove customSourceBuilders from baseDerivation
2023-12-26 21:57:46 +02:00
FlafyDev
65b0c270c2
pub2nix: Add disclaimer why not to use fetchTarball
2023-12-26 21:54:30 +02:00
FlafyDev
b0a2d432da
buildDartApplication: fix note about fixed-output derivation
2023-12-26 21:50:50 +02:00
FlafyDev
e827619c11
buildDartApplication: remove unused pubGetScript and generatePubspecLock
2023-12-26 21:49:22 +02:00
Steve Purcell
4f12789c35
melpa2nix: update to work with Emacs HEAD
...
We now use a newer version of package-build, since
previously-necessary functions have been moved/removed from package.el
Emacs 30. See https://github.com/melpa/package-build/pull/87
Consequently, some changes are necessary to the corresponding patch
and to melpa2nix.el, which this commit also contains.
2023-12-26 16:55:28 +00:00
hacker1024
81a99463d8
buildDartApplication: Pass customSourceBuilders
through to pub2nix
2023-12-26 18:48:12 +02:00
hacker1024
23952fb641
buildDartApplication: Remove depsListFile
...
We get a dependency list with pub2nix now. We can no longer easily distinguish between development dependency dependencies and regular dependency dependencies, but we weren't doing this anyway.
2023-12-26 18:48:12 +02:00
hacker1024
2bd3e5d779
buildDartApplication: Use package source builders and setup hooks instead of package overrides
2023-12-26 18:48:08 +02:00
hacker1024
cf55bc7300
buildDartApplication: Generate LD_LIBRARY_PATH at build time
...
This allows setup hooks to add runtime dependencies.
2023-12-26 17:08:51 +02:00
hacker1024
1ae96d0704
buildDartApplication: Move package sources to nativeBuildInputs
...
They are only needed at build time, after all.
2023-12-26 17:08:51 +02:00
hacker1024
8494ee610b
flutter.buildFlutterApplication: Add pkg-config to nativeBuildInputs
2023-12-26 17:08:51 +02:00
hacker1024
f057034d6a
flutter.buildFlutterApplication: Don't assume jq and yq are available in extraPackageConfigSetup
2023-12-26 17:08:51 +02:00
hacker1024
53a3485bfc
flutter.buildFlutterApplication: Remove unneeded nativeBuildInputs
2023-12-26 17:08:51 +02:00
hacker1024
48bf6da955
buildDartApplication: Declare dependency sources as build inputs
2023-12-26 17:08:51 +02:00
hacker1024
18d9cd0c50
pub2nix.readPubspecLock: Add package versions to passthru
2023-12-26 17:08:51 +02:00
hacker1024
4e4c4c2ad0
buildDartApplication: Use overrides for dev dependencies as well
2023-12-26 17:08:51 +02:00
hacker1024
65d2cc04a3
dartHooks.dartConfigHook: Simplify packageRun function
2023-12-26 17:08:51 +02:00
hacker1024
d41348a68a
dartHooks.dartConfigHook: Add packageRun utility
2023-12-26 17:08:51 +02:00
hacker1024
bea71b1fe3
pub2nix.readPubspecLock: Add packagePath
convenience attribute
2023-12-26 17:08:50 +02:00
hacker1024
af6e82b47a
flutter.buildFlutterApplication: Use extraPackageConfigSetup
2023-12-26 17:06:18 +02:00
hacker1024
7e043f5f28
buildDartApplication: Accept additional package_config.json setup commands
2023-12-26 17:06:18 +02:00
hacker1024
4eb35ef711
buildDartApplication: Link the package_config.json in a separate derivation
2023-12-26 17:06:18 +02:00
hacker1024
4f623fa0a1
buildDartApplication: Refactor autoDepsList logic
2023-12-26 17:06:18 +02:00
hacker1024
34ce9c64c9
pub2nix.readPubspecLock: Include entire source in package derivations
...
This allows references to paths above the package being built, e.g. bc5d988f32/packages/libtokyo_flutter/pubspec.yaml (L42)
2023-12-26 17:05:28 +02:00
hacker1024
3081228cc4
dart: Use Nix instead of Pub
2023-12-26 17:05:20 +02:00
github-actions[bot]
aa8844a8a9
Merge staging-next into staging
2023-12-25 18:01:25 +00:00
Jan Tojnar
2ac16accc0
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/hahomematic/default.nix
2023-12-25 16:54:44 +01:00
Maciej Krüger
2e3a121acf
Merge pull request #276414 from linsui/dart
...
dart: fix fetchDartDeps
2023-12-25 10:21:21 +01:00