mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d84394f4f3
@ -44,7 +44,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- Cinnamon has been updated to 6.0. Please be aware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions.
|
||||
|
||||
- GNOME has been updated to 46 "Kathmandu", which introduces an enhanced Files app, support for OneDrive in Online Accounts, and more changes. Refer to the [release notes](https://release.gnome.org/46/) for more details.
|
||||
- GNOME has been updated to 46 "Kathmandu". Refer to the [release notes](https://release.gnome.org/46/) for more details. Notably this release brings experimental VRR support, default GTK renderer changes and WebDAV support in Online Accounts. This release we have also stopped including the legacy and unsupported Adwaita-Dark theme by default.
|
||||
|
||||
- Lomiri (formerly known as Unity8) desktop mode, using Mir 2.x to function as a Wayland compositor, is now available and can be installed with `services.desktopManager.lomiri.enable = true`. Note that some core applications, services and indicators have yet to be packaged, and some functions may remain incomplete, but the base experience should be there.
|
||||
|
||||
@ -765,3 +765,50 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
- Lisp modules: previously deprecated interface based on `common-lisp.sh` has now been removed.
|
||||
|
||||
- The `systemd-confinement` module extension is now compatible with `DynamicUser=true` and thus `ProtectSystem=strict` too.
|
||||
|
||||
|
||||
## Nixpkgs Library {#sec-release-24.05-nixpkgs-lib}
|
||||
|
||||
### Additions and Improvements {#sec-release-24.05-lib-additions-improvements}
|
||||
|
||||
New functions:
|
||||
- [`lib.asserts.assertEachOneOf`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.asserts.assertEachOneOf): Check that each value is one of the allowed ones.
|
||||
- [`lib.attrsets.longestValidPathPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.longestValidPathPrefix): The longest prefix of an attribute path that refers to an existing attribute in a nesting of attribute sets.
|
||||
- [`lib.attrsets.mapCartesianProduct`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapCartesianProduct): Apply a function to the cartesian product of attribute set value combinations.
|
||||
- [`lib.trivial.xor`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.trivial.xor): Boolean "exclusive or"
|
||||
- [`lib.lists.ifilter0`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.ifilter0): Filter a list for elements that satisfy a predicate function. The predicate function is called with both the index and value for each element.
|
||||
- [`lib.lists.sortOn`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.sortOn): Sort a list based on the default comparison of a derived property.
|
||||
- [`lib.path.hasStorePathPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.hasStorePathPrefix): Whether a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path) has a [store path](https://nixos.org/manual/nix/stable/store/store-path.html#store-path) as a prefix.
|
||||
- [`lib.filesystem.packagesFromDirectoryRecursive`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.filesystem.packagesFromDirectoryRecursive): Transform a directory tree containing package files suitable for `callPackage` into a matching nested attribute set of derivations.
|
||||
- [`lib.fileset.toList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fileset.toList): The list of file paths contained in a given file set.
|
||||
- [`lib.fileset.maybeMissing`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fileset.maybeMissing): Create a file set from a path that may or may not exist.
|
||||
- [`lib.derivations.optionalDrvAttr`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.derivations.optionalDrvAttr): Conditionally set a derivation attribute.
|
||||
- [`lib.strings.makeIncludePath`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.makeIncludePath): Construct an include search path (such as `C_INCLUDE_PATH`) containing the header files for a set of packages or paths.
|
||||
|
||||
Improvements:
|
||||
- [`lib.fixedPoints.extends`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fixedPoints.extends): Better documentation
|
||||
- [`lib.customisation.makeScope`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.customisation.makeScope): Better documentation
|
||||
- [`lib.derivations.lazyDerivation`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.derivations.lazyDerivation): Now supports multiple outputs with an `outputs` argument
|
||||
- [`lib.gvariant`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-gvariant): Better error message for integers and attribute set values
|
||||
- [`lib.filesets.gitTracked`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fileset.gitTracked): Now works within store paths
|
||||
|
||||
Misc:
|
||||
- The [`lib/` directory](https://github.com/NixOS/nixpkgs/tree/release-24.05/lib) is a self-contained flake now, including a working [`lib.trivial.version`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.trivial.version) (but note that fetching a subtree by itself is not supported in Nix yet)
|
||||
- [Various minor performance improvements](https://github.com/NixOS/nixpkgs/issues?q=author%3Aadisbladis+label%3A%226.topic%3A+lib%22+created%3A%3C2024-05-31+)
|
||||
|
||||
Module System:
|
||||
- New types:
|
||||
- [`types.attrTag`](https://nixos.org/manual/nixos/unstable/#sec-option-types-sums): A tagged union type
|
||||
- `types.nonEmptyListOf`: A non-empty list
|
||||
- Improved types:
|
||||
- `types.uniq`/`unique` now check the wrapped type
|
||||
|
||||
### Deprecations {#sec-release-24.05-lib-deprecations}
|
||||
|
||||
- [`lib.options.mdDoc`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mdDoc) is obsolete and now emits a warning. The core ecosystem has completely migrated to markdown, so marking markdown as markdown is redundant.
|
||||
- `lib.attrsets.zipWithNames` is now a deprecated alias of [`lib.attrsets.zipAttrsWithNames`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.attrsets.zipAttrsWithNames)
|
||||
- `lib.attrsets.cartesianProductOfSets` has been renamed to [`lib.attrsets.cartesianProduct`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.attrsets.cartesianProduct)
|
||||
|
||||
### Internal {#sec-release-24.05-lib-internal}
|
||||
- `lib` now has [Readme for contributing](https://github.com/NixOS/nixpkgs/tree/master/lib#readme).
|
||||
- Some function's documentation is now written using the [accepted doc comment syntax](https://github.com/NixOS/rfcs/pull/145).
|
||||
|
||||
@ -52,7 +52,7 @@ in
|
||||
description = "Whether to enable seamless mode. When activated windows from the guest appear next to the windows of the host.";
|
||||
};
|
||||
|
||||
draganddrop = mkOption {
|
||||
dragAndDrop = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = "Whether to enable drag and drop support.";
|
||||
@ -111,5 +111,10 @@ in
|
||||
systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless";
|
||||
}
|
||||
)
|
||||
(
|
||||
mkIf cfg.dragAndDrop {
|
||||
systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop";
|
||||
}
|
||||
)
|
||||
]);
|
||||
}
|
||||
|
||||
@ -4912,18 +4912,18 @@ let
|
||||
};
|
||||
|
||||
aliases = super: {
|
||||
_13xforever = super."13xforever";
|
||||
_1Password = super."1Password";
|
||||
_2gua = super."2gua";
|
||||
_4ops = super."4ops";
|
||||
Arjun.swagger-viewer = super.arjun.swagger-viewer;
|
||||
jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls;
|
||||
jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components;
|
||||
matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher
|
||||
ms-vscode.go = super.golang.go;
|
||||
ms-vscode.PowerShell = super.ms-vscode.powershell;
|
||||
rioj7.commandOnAllFiles = super.rioj7.commandonallfiles;
|
||||
WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime;
|
||||
_13xforever = throw "_13xforever is deprecated in favor of 13xforever"; # Added 2024-05-29
|
||||
_1Password = throw "_1Password is deprecated in favor of 1Password"; # Added 2024-05-29
|
||||
_2gua = throw "_2gua is deprecated in favor of 2gua"; # Added 2024-05-29
|
||||
_4ops = throw "_4ops is deprecated in favor of 4ops"; # Added 2024-05-29
|
||||
Arjun.swagger-viewer = throw "Arjun.swagger-viewer is deprecated in favor of arjun.swagger-viewer"; # Added 2024-05-29
|
||||
jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29
|
||||
jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29
|
||||
matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29
|
||||
ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29
|
||||
ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29
|
||||
rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29
|
||||
WakaTime.vscode-wakatime = throw "WakaTime.vscode-wakatime is deprecated in favor of wakatime.vscode-wakatime"; # Added 2024-05-29
|
||||
};
|
||||
|
||||
# TODO: add overrides overlay, so that we can have a generated.nix
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, boehmgc
|
||||
, boost
|
||||
, cairo
|
||||
, callPackage
|
||||
, cmake
|
||||
, desktopToDarwinBundle
|
||||
, fetchurl
|
||||
@ -172,6 +173,8 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vector graphics editor";
|
||||
homepage = "https://www.inkscape.org";
|
||||
|
||||
@ -6,7 +6,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.
|
||||
<id>org.inkscape.input.eps</id>
|
||||
<dependency type="extension">org.inkscape.input.pdf</dependency>
|
||||
- <dependency type="executable" location="path">ps2pdf</dependency>
|
||||
+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency>
|
||||
+ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency>
|
||||
<param name="crop" type="bool" gui-hidden="true">true</param>
|
||||
<param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction"
|
||||
gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right.">
|
||||
@ -18,7 +18,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.i
|
||||
<id>org.inkscape.input.postscript_input</id>
|
||||
<dependency type="extension">org.inkscape.input.pdf</dependency>
|
||||
- <dependency type="executable" location="path">ps2pdf</dependency>
|
||||
+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency>
|
||||
+ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency>
|
||||
<param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction"
|
||||
gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right.">
|
||||
<option value="None">Disabled</option>
|
||||
|
||||
27
pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix
Normal file
27
pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ inkscape, runCommand, writeTextFile }:
|
||||
|
||||
let
|
||||
svg_file = writeTextFile {
|
||||
name = "test.svg";
|
||||
text = ''
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="50" height="50" version="1.1">
|
||||
<ellipse cx="1" cy="1" rx="1" ry="1" />
|
||||
</svg>'';
|
||||
};
|
||||
in
|
||||
runCommand "inkscape-test-eps"
|
||||
{
|
||||
nativeBuildInputs = [ inkscape ];
|
||||
} ''
|
||||
echo ps test
|
||||
inkscape ${svg_file} --export-type=ps -o test.ps
|
||||
inkscape test.ps -o test.ps.svg
|
||||
|
||||
echo eps test
|
||||
inkscape ${svg_file} --export-type=eps -o test.eps
|
||||
inkscape test.eps -o test.eps.svg
|
||||
|
||||
# inkscape does not return an error code, only does not create files
|
||||
[[ -f test.ps.svg && -f test.eps.svg ]] && touch $out
|
||||
''
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "125.0.2535.51";
|
||||
version = "126.0.2592.24";
|
||||
revision = "1";
|
||||
hash = "sha256-ZOuC4+1Vp+i/vA783h+ilz97YwPwLMwk5eoc2hR5Y9E=";
|
||||
hash = "sha256-OK38ss0M+GNP/wKLVheyKBgji3Df/qyrxaKvJayNZMM=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "126.0.2578.1";
|
||||
version = "126.0.2592.11";
|
||||
revision = "1";
|
||||
hash = "sha256-L1w8d0IdqCps7BuyL3AWMzPPkZtwLuiA+Z/dWSlEJU8=";
|
||||
hash = "sha256-hUeVnGN5lxZmNsYojt7Fl0n7XF76Arw8Z3C16+fHRVA=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "125.0.2535.51";
|
||||
version = "125.0.2535.67";
|
||||
revision = "1";
|
||||
hash = "sha256-bpI3ePjjJLAoF/+ygXWYV1RY/FxOjs6/V8N0XWcal70=";
|
||||
hash = "sha256-82bkiyKWJqVLB4jBaGu4EdJ0ukl44yKopDecAkrzuU0=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
k3sVersion = "1.29.4+k3s1";
|
||||
k3sCommit = "94e29e2ef5d79904f730e2024c8d1682b901b2d5";
|
||||
k3sRepoSha256 = "0kkhd2fnlmjanzvwgdclmbg6azw3r1a2lj5207716pavxmb9ld7y";
|
||||
k3sVendorHash = "sha256-wOX+ktGPFYUKLZBK/bQhWWG+SnRCkNYnk3Tz8wpMo5A=";
|
||||
k3sVersion = "1.29.5+k3s1";
|
||||
k3sCommit = "4e53a32306759581f4ed938bcd18b6fa20b83230";
|
||||
k3sRepoSha256 = "169hzl23chs4qblicmqj3j10jg1xdq8s9717bd3pzx7wzz9s9mqw";
|
||||
k3sVendorHash = "sha256-QreiB4JMtfBjHlkAyflQAW2rnfgay62UD6emx8TgUpM=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.13.0";
|
||||
k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
k3sVersion = "1.30.0+k3s1";
|
||||
k3sCommit = "14549535f13c63fc239ba055d36d590e68b01503";
|
||||
k3sRepoSha256 = "1dph6clzzanlx7dbdzpamnw7gpw98j850my28lcb3zdzhvhsc74b";
|
||||
k3sVendorHash = "sha256-YBWiIf8F71ibR7sCiYtmsAcY1MsvkhTD/K45tOHQC5w=";
|
||||
k3sVersion = "1.30.1+k3s1";
|
||||
k3sCommit = "80978b5b9a97908c5520c5ee51984e544e168859";
|
||||
k3sRepoSha256 = "085dmq49iwvlxpj9c528nfrvd67snkgpm5drj8ahfjv1nkjp0yy1";
|
||||
k3sVendorHash = "sha256-XtTahFaWnuHzKDI/U4d/j4C4gRxH163MCGEEM4hu/WM=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.13.0";
|
||||
k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj";
|
||||
|
||||
@ -81,6 +81,18 @@ rec {
|
||||
};
|
||||
|
||||
nomad_1_7 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.7.7";
|
||||
sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc=";
|
||||
vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
nomad_1_8 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.8.0";
|
||||
sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo=";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.11.34";
|
||||
version = "3.11.35";
|
||||
pyproject = true;
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g5TmjR3N/21JgXoRy56PN5A+Jbow2DFaAu0ammLtPxw=";
|
||||
hash = "sha256-L3A0bU35IfFfwDIbcNVAU4jGb00jODgq7Z67RQrT4u0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -19,11 +19,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "briar-desktop";
|
||||
version = "0.5.0-beta";
|
||||
version = "0.6.0-beta";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar";
|
||||
hash = "sha256-J93ODYAiRbQxG2BF7P3H792ymAcJ3f07l7zRSw8kM+E=";
|
||||
hash = "sha256-ITlg2THQwP91nVxHhLfXPBtC4e3EU9V7D/15XqWC7FE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -65,13 +65,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.0.3";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PA7mKHPzPDFdwKXAHvHnDvHF+mTmm59jkoeUeiCP6vE=";
|
||||
hash = "sha256-jmg/Yq80MasbW93BTo6p5EcEfNQVadeDmkYtiX7Ov1E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -28,26 +28,32 @@ assert enableKvm -> !enableHardening;
|
||||
# The web services use Java infrastructure.
|
||||
assert enableWebService -> javaBindings;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
buildType = "release";
|
||||
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
||||
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
||||
version = "7.0.14";
|
||||
virtualboxVersion = "7.0.14";
|
||||
virtualboxSha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9";
|
||||
|
||||
kvmPatchVersion = "20240502";
|
||||
kvmPatchHash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0=";
|
||||
|
||||
# The KVM build is not compatible to VirtualBox's kernel modules. So don't export
|
||||
# modsrc at all.
|
||||
withModsrc = !enableKvm;
|
||||
|
||||
virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { };
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
inherit (lib) optional optionals optionalString getDev getLib;
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "virtualbox";
|
||||
inherit version;
|
||||
version = finalAttrs.virtualboxVersion;
|
||||
|
||||
inherit buildType virtualboxVersion virtualboxSha256 kvmPatchVersion kvmPatchHash virtualboxGuestAdditionsIso;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
sha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9";
|
||||
url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2";
|
||||
sha256 = finalAttrs.virtualboxSha256;
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ optional withModsrc "modsrc";
|
||||
@ -74,7 +80,7 @@ in stdenv.mkDerivation {
|
||||
prePatch = ''
|
||||
set -x
|
||||
sed -e 's@MKISOFS --version@MKISOFS -version@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${optionalString pythonBindings python3}@' \
|
||||
-e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
|
||||
${optionalString (!headless) ''
|
||||
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
|
||||
@ -103,7 +109,7 @@ in stdenv.mkDerivation {
|
||||
# No update patch disables check for update function
|
||||
# https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/${version}-dfsg-1/debian/patches/16-no-update.patch";
|
||||
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch";
|
||||
hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY=";
|
||||
})]
|
||||
++ [ ./extra_symbols.patch ]
|
||||
@ -120,14 +126,11 @@ in stdenv.mkDerivation {
|
||||
})
|
||||
# While the KVM patch should not break any other behavior if --with-kvm is not specified,
|
||||
# we don't take any chances and only apply it if people actually want to use KVM support.
|
||||
++ optional enableKvm (fetchpatch
|
||||
(let
|
||||
patchVersion = "20240502";
|
||||
in {
|
||||
name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch";
|
||||
url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch";
|
||||
hash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0=";
|
||||
}))
|
||||
++ optional enableKvm (fetchpatch {
|
||||
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
|
||||
url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch";
|
||||
hash = finalAttrs.kvmPatchHash;
|
||||
})
|
||||
++ [
|
||||
./qt-dependency-paths.patch
|
||||
# https://github.com/NixOS/nixpkgs/issues/123851
|
||||
@ -139,10 +142,6 @@ in stdenv.mkDerivation {
|
||||
postPatch = ''
|
||||
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
|
||||
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
|
||||
'' + optionalString headless ''
|
||||
# Fix compile error in version 6.1.6
|
||||
substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \
|
||||
--replace PSHCLFORMATDATA PSHCLFORMATS
|
||||
'';
|
||||
|
||||
# first line: ugly hack, and it isn't yet clear why it's a problem
|
||||
@ -163,6 +162,9 @@ in stdenv.mkDerivation {
|
||||
VBOX_WITH_RUNPATH := $out/libexec/virtualbox
|
||||
VBOX_PATH_APP_PRIVATE := $out/share/virtualbox
|
||||
VBOX_PATH_APP_DOCS := $out/doc
|
||||
|
||||
VBOX_WITH_UPDATE_AGENT :=
|
||||
|
||||
${optionalString javaBindings ''
|
||||
VBOX_JAVA_HOME := ${jdk}
|
||||
''}
|
||||
@ -196,14 +198,14 @@ in stdenv.mkDerivation {
|
||||
-i AutoConfig.kmk
|
||||
sed -e 's@arch/x86/@@' \
|
||||
-i Config.kmk
|
||||
substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#"
|
||||
substituteInPlace Config.kmk --replace-fail "VBOX_WITH_TESTCASES = 1" "#"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = ''
|
||||
source env.sh
|
||||
kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}"
|
||||
kmk -j $NIX_BUILD_CORES BUILD_TYPE="${finalAttrs.buildType}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@ -212,7 +214,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
# Install VirtualBox files
|
||||
mkdir -p "$libexec"
|
||||
find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \
|
||||
find out/linux.*/${finalAttrs.buildType}/bin -mindepth 1 -maxdepth 1 \
|
||||
-name src -o -exec cp -avt "$libexec" {} +
|
||||
|
||||
mkdir -p $out/bin
|
||||
@ -250,12 +252,12 @@ in stdenv.mkDerivation {
|
||||
''}
|
||||
|
||||
${optionalString withModsrc ''
|
||||
cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
|
||||
cp -rv out/linux.*/${finalAttrs.buildType}/bin/src "$modsrc"
|
||||
''}
|
||||
|
||||
mkdir -p "$out/share/virtualbox"
|
||||
cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox"
|
||||
ln -s "${virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso"
|
||||
ln -s "${finalAttrs.virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso"
|
||||
'';
|
||||
|
||||
preFixup = optionalString (!headless) ''
|
||||
@ -285,10 +287,10 @@ in stdenv.mkDerivation {
|
||||
fromSource
|
||||
binaryNativeCode
|
||||
];
|
||||
license = licenses.gpl2;
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [ sander friedrichaltheide blitz ];
|
||||
maintainers = with lib.maintainers; [ sander friedrichaltheide blitz ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "VirtualBox";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
{ config, stdenv, kernel, fetchurl, lib, pam, libxslt
|
||||
, libX11, libXext, libXcursor, libXmu
|
||||
, glib, alsa-lib, libXrandr, dbus
|
||||
, glib, libXrandr, dbus, xz
|
||||
, pkg-config, which, zlib, xorg
|
||||
, yasm, patchelf, makeWrapper, makeself, nasm
|
||||
, linuxHeaders, openssl, libpulseaudio}:
|
||||
|
||||
with lib;
|
||||
, yasm, patchelf, makeself
|
||||
, linuxHeaders, openssl}:
|
||||
|
||||
let
|
||||
buildType = "release";
|
||||
@ -21,17 +19,21 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
|
||||
|
||||
nativeBuildInputs = [ patchelf makeWrapper pkg-config which yasm ];
|
||||
buildInputs = kernel.moduleBuildDependencies ++ [ libxslt libX11 libXext libXcursor
|
||||
glib nasm alsa-lib makeself pam libXmu libXrandr linuxHeaders openssl libpulseaudio xorg.xorgserver ];
|
||||
nativeBuildInputs = [ patchelf pkg-config which yasm makeself xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies;
|
||||
buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ];
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
|
||||
|
||||
prePatch = ''
|
||||
rm -r src/VBox/Additions/x11/x11include/
|
||||
rm -r src/VBox/Additions/3D/mesa/mesa-*/
|
||||
rm -r src/libs/openssl-*/
|
||||
rm -r src/libs/curl-*/
|
||||
rm -r src/libs/libpng-*/
|
||||
rm -r src/libs/libxml2-*/
|
||||
rm -r src/libs/liblzma-*/
|
||||
rm -r src/libs/zlib*/
|
||||
'';
|
||||
|
||||
patches = [
|
||||
@ -81,6 +83,10 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
VBOX_USE_SYSTEM_XORG_HEADERS := 1
|
||||
VBOX_USE_SYSTEM_GL_HEADERS := 1
|
||||
VBOX_NO_LEGACY_XORG_X11 := 1
|
||||
SDK_VBoxLibPng_INCS :=
|
||||
SDK_VBoxLibXml2_INCS :=
|
||||
SDK_VBoxLibLzma_INCS := ${xz.dev}/include
|
||||
SDK_VBoxLibLzma_LIBS := ${xz.out}/lib
|
||||
|
||||
SDK_VBoxOpenSslStatic_INCS := ${openssl.dev}/include/ssl
|
||||
|
||||
@ -92,6 +98,9 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
VBOX_WITH_GUEST_CONTROL := 1
|
||||
VBOX_WITHOUT_LINUX_GUEST_PACKAGE := 1
|
||||
VBOX_WITH_PAM :=
|
||||
VBOX_WITH_UPDATE_AGENT :=
|
||||
VBOX_WITH_AUDIO_ALSA :=
|
||||
VBOX_WITH_AUDIO_PULSE :=
|
||||
|
||||
VBOX_BUILD_PUBLISHER := _NixOS
|
||||
LOCAL_CONFIG
|
||||
|
||||
@ -34,16 +34,14 @@ in stdenv.mkDerivation {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
|
||||
|
||||
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||
buildInputs = [ virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies;
|
||||
nativeBuildInputs = [ patchelf makeWrapper virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies;
|
||||
buildInputs = [ ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# Build kernel modules.
|
||||
cd src
|
||||
find . -type f | xargs sed 's/depmod -a/true/' -i
|
||||
cd vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS
|
||||
cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS
|
||||
# Run just make first. If we only did make install, we get symbol warnings during build.
|
||||
make
|
||||
cd ../..
|
||||
@ -61,6 +59,8 @@ in stdenv.mkDerivation {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
||||
# Install kernel modules.
|
||||
cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS
|
||||
make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers
|
||||
@ -70,7 +70,6 @@ in stdenv.mkDerivation {
|
||||
install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf
|
||||
install -D -m 755 sbin/VBoxService $out/bin/VBoxService
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -m 755 bin/VBoxClient $out/bin
|
||||
install -m 755 bin/VBoxControl $out/bin
|
||||
install -m 755 bin/VBoxDRMClient $out/bin
|
||||
|
||||
@ -34,7 +34,9 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then
|
||||
virtualBoxOldShaSum=$(oldHash ${attr}Extpack)
|
||||
extpackOldShaSum=$(oldHash ${attr}Extpack)
|
||||
|
||||
update-source-version $attr $latestVersion $virtualBoxShaSum
|
||||
sed -e "s/virtualboxVersion =.*;/virtualboxVersion = \"$latestVersion\";/g" \
|
||||
-e "s/virtualboxSha256 =.*;/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \
|
||||
-i $virtualboxNixFile
|
||||
sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile
|
||||
sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \
|
||||
-i $guestAdditionsIsoNixFile
|
||||
|
||||
889
pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock
generated
889
pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -6,11 +6,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, glib
|
||||
, gtk4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, libxml2
|
||||
, rustc
|
||||
, wrapGAppsHook4
|
||||
, openssl
|
||||
@ -22,19 +18,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netease-cloud-music-gtk";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gmg137";
|
||||
repo = "netease-cloud-music-gtk";
|
||||
rev = version;
|
||||
hash = "sha256-75zovq7Q370L+bRczTCCC34G2w8xeMMUK5EUTfKAc+w=";
|
||||
hash = "sha256-uoC9J09U2aI1dhaKc3TxIyFwRrPRxDrzaV+RyoZ6mKo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"netease-cloud-music-api-1.3.1" = "sha256-ZIc5zj9ZtLBYlZqBR7iUW+KmD71M+OYDiv0dkZrpFos=";
|
||||
"netease-cloud-music-api-1.3.2" = "sha256-QRz9Sdu+0I7SwujoTBKWPQMjPDdX8ZyVlFwMw9pM7UY=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -46,11 +42,7 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
glib # glib-compile-resources
|
||||
gtk4 # gtk4-update-icon-cache
|
||||
appstream-glib # appstream-util
|
||||
desktop-file-utils # update-desktop-database
|
||||
libxml2 # xmllint
|
||||
wrapGAppsHook4
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nezha-agent";
|
||||
version = "0.16.9";
|
||||
version = "0.16.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WK9aTKRSpBrqEKje168Gmn6ROLFxE/fuYp10Ywtr4ks=";
|
||||
hash = "sha256-aNonfJxEjK19+Um8tVCi/My88YGajr59+ubIPor5gOI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII=";
|
||||
|
||||
2
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
2
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
@ -13002,7 +13002,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zed"
|
||||
version = "0.137.5"
|
||||
version = "0.137.6"
|
||||
dependencies = [
|
||||
"activity_indicator",
|
||||
"anyhow",
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.137.5";
|
||||
version = "0.137.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tztJzNY8H76ynMKWPbreQq87CYp/Iq2nDodObmEf8pg=";
|
||||
hash = "sha256-1shK+Q8LTRaIXDqDLdJVsB4sAg2u5Kz0NXKf5jCniOU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -108,6 +108,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ toonn jtojnar ];
|
||||
# Not quite accurate since it's a font, not a program, but clearly
|
||||
# indicates we're not actually building it from source.
|
||||
sourceProvenance = sourceTypes.binaryNativeCode;
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
glib
|
||||
itstool
|
||||
desktop-file-utils
|
||||
];
|
||||
@ -54,6 +55,8 @@ stdenv.mkDerivation rec {
|
||||
exiv2
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, vala
|
||||
, gtk3
|
||||
, libxml2
|
||||
@ -24,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "7.2.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0=";
|
||||
sha256 = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
@ -56,11 +54,6 @@ stdenv.mkDerivation rec {
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# The GTK theme is hardcoded.
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
, openexr
|
||||
, OpenCL
|
||||
, suitesparse
|
||||
, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -71,13 +72,14 @@ stdenv.mkDerivation rec {
|
||||
libraw
|
||||
libwebp
|
||||
gexiv2
|
||||
luajit
|
||||
openexr
|
||||
suitesparse
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
OpenCL
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
] ++ lib.optionals withLuaJIT [
|
||||
luajit
|
||||
];
|
||||
|
||||
# for gegl-4.0.pc
|
||||
@ -97,6 +99,8 @@ stdenv.mkDerivation rec {
|
||||
# Disabled due to multiple vulnerabilities, see
|
||||
# https://github.com/NixOS/nixpkgs/pull/73586
|
||||
"-Djasper=disabled"
|
||||
] ++ lib.optionals (!withLuaJIT) [
|
||||
"-Dlua=disabled"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -62,7 +62,7 @@ let
|
||||
if type == "gem" then
|
||||
fetchurl {
|
||||
urls = map (
|
||||
remote: "${remote}/gems/${gemName}-${version}.gem"
|
||||
remote: "${remote}/gems/${gemName}-${suffix}.gem"
|
||||
) (attrs.source.remotes or [ "https://rubygems.org" ]);
|
||||
inherit (attrs.source) sha256;
|
||||
}
|
||||
@ -80,6 +80,8 @@ let
|
||||
suffix =
|
||||
if type == "git" then
|
||||
builtins.substring 0 12 attrs.source.rev
|
||||
else if platform != "ruby" then
|
||||
"${version}-${platform}"
|
||||
else
|
||||
version;
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.10.7";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iaPdFDoYmukv1T+HSaGRrbvjvkioX5PlCc9t2VHGJ30=";
|
||||
hash = "sha256-v2EBN9zp6ssY0hWJQnhsIlRU3L7oOad46bvDUILGIv0=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-bSCgjSXdPOWgftlInl3MailtiXslLH/TZw95FiEnCxQ=";
|
||||
vendorHash = "sha256-efXYFVs+W6jkShWrU21WCiQqfaNX/9HLD8CxesbkR0s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.20.2";
|
||||
version = "0.21.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
|
||||
hash = "sha256-T/qbf6nMORVWD2G/hJtAlUlg7xep7Bw5zZnBvYoL5cQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
4
pkgs/development/tools/ruff/Cargo.lock
generated
4
pkgs/development/tools/ruff/Cargo.lock
generated
@ -1903,7 +1903,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argfile",
|
||||
@ -2064,7 +2064,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_linter"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"annotate-snippets 0.9.2",
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ECFBciJjVmz8yvZci6dV4L3o4objkbU5HwB2qy0Mqv4=";
|
||||
hash = "sha256-1WQQpIdGFWEq6HzFFA5qRC3wnqtUvdzC/6VIkDY1pZI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.43.5";
|
||||
version = "1.43.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kkm7tU+pV/GHAqiiylX2quC+NhzFBKxcp12f2bH93lY=";
|
||||
hash = "sha256-8yBcSiaav28AevAH5wh0VwpMR5U5Vong8D+UFCx/wjo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Lr8aMHMZlfgwQhl0R13f5C9fdicxgPSB+5VtNqbDP38=";
|
||||
cargoHash = "sha256-o8DsFtn3+gtIMO5LS3mHbQS1iWT46iC9ZHr8hEOXZrs=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -587,12 +587,12 @@ in rec {
|
||||
session-wizard = mkTmuxPlugin rec {
|
||||
pluginName = "session-wizard";
|
||||
rtpFilePath = "session-wizard.tmux";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "27medkamal";
|
||||
repo = "tmux-session-wizard";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-IfSgX02vXdpzyu1GRF1EvzVCqqOEiTjeXtl1EvNr7EI=";
|
||||
sha256 = "sha256-nJaC5aX+cR/+ks3I/lW/tUnVG0CrEYfsIjPDisgMrTE=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/27medkamal/tmux-session-wizard";
|
||||
@ -610,9 +610,11 @@ in rec {
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
substituteInPlace $target/session-wizard.tmux \
|
||||
--replace \$CURRENT_DIR/session-wizard.sh $target/session-wizard.sh
|
||||
wrapProgram $target/session-wizard.sh \
|
||||
for f in .gitignore Dockerfile flake.* scripts tests; do
|
||||
rm -rf $target/$f
|
||||
done
|
||||
substituteInPlace $target/session-wizard.tmux --replace \$CURRENT_DIR $target
|
||||
wrapProgram $target/bin/t \
|
||||
--prefix PATH : ${with pkgs; lib.makeBinPath ([ fzf zoxide coreutils gnugrep gnused ])}
|
||||
'';
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redis_exporter";
|
||||
version = "1.59.0";
|
||||
version = "1.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oliver006";
|
||||
repo = "redis_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/nfAB4h5VvAzuludQ7Zx3OoJThyyD5nS6B5pOSbQYFs=";
|
||||
sha256 = "sha256-eqS/qlrktlKiM1GAYI0CoJxjxc4a1ODyosEFITnmKTE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Nns8hpKwxL1GQfjVt9+rnmjGjmdm2TB+8wob7ze4RrI=";
|
||||
vendorHash = "sha256-nrEglhb22LANgm6hiZToPVPfGpkpxpJ7TQlLW0Z7+/4=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.BuildVersion=${version}"
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxmark3";
|
||||
version = "4.18341";
|
||||
version = "4.18589";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YeBrrzCiDgl4WdhWYatm9sOAtBAECIv/f+OzB/RTdeg=";
|
||||
hash = "sha256-e/FoyaHU/uH2yovEqtkrCXwHMlF94Acxl2lUA422Pig=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10936,6 +10936,7 @@ with pkgs;
|
||||
nomad_1_5
|
||||
nomad_1_6
|
||||
nomad_1_7
|
||||
nomad_1_8
|
||||
;
|
||||
|
||||
nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user