mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-06 20:23:39 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
d865fb67ab
@ -20483,6 +20483,12 @@
|
||||
github = "thefossguy";
|
||||
githubId = 44400303;
|
||||
};
|
||||
thehans255 = {
|
||||
name = "Hans Jorgensen";
|
||||
email = "foss-contact@thehans255.com";
|
||||
github = "thehans255";
|
||||
githubId = 15896573;
|
||||
};
|
||||
thekostins = {
|
||||
name = "Konstantin";
|
||||
email = "anisimovkosta19@gmail.com";
|
||||
|
||||
@ -689,6 +689,7 @@ with lib.maintainers; {
|
||||
dandellion
|
||||
sumnerevans
|
||||
nickcao
|
||||
teutat3s
|
||||
];
|
||||
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
|
||||
shortName = "Matrix";
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -576,6 +576,7 @@ while read -u 3 mountPoint; do
|
||||
mount -t "$fsType" /dev/root /tmp-iso
|
||||
mountFS tmpfs /iso size="$fsSize" tmpfs
|
||||
|
||||
echo "copying ISO contents to RAM..."
|
||||
cp -r /tmp-iso/* /mnt-root/iso/
|
||||
|
||||
umount /tmp-iso
|
||||
|
||||
@ -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";
|
||||
}
|
||||
)
|
||||
]);
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "castopod";
|
||||
version = "1.10.5";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/66de724407be8f940af5eb1d633fbbc3/castopod-1.10.5.tar.gz";
|
||||
sha256 = "0ssdgqxqldg2f6ni54k5vlndnjjy9lah47q1crpz5nnkkjgvc96y";
|
||||
url = "https://code.castopod.org/adaures/castopod/uploads/0f1fbf6eb849b208e26b53d930b9e22f/castopod-1.11.0.tar.gz";
|
||||
sha256 = "09l4q8v809jnvgx9vpa1fyjhgqdbbrwkyk591kx5k1gg935rmgnx";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zita-at1";
|
||||
version = "0.6.2";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr";
|
||||
sha256 = "sha256-NSYTJmgOmL/CgGI/rBGQuqmccZEzvwYgchb7e4XqmmM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wlgreet";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qfEzr8tAE1+PK7xs1NQ1q6d/GlFA7/kSWXbJDOCrEsw=";
|
||||
hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y=";
|
||||
cargoHash = "sha256-+YGhfEq2RltPq5oLLh1h+vGphDpoGZNVdvzko3P1iUQ=";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ gcc-unwrapped ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "color-theme-solarized";
|
||||
version = "0.pre+unstable=2017-10-24";
|
||||
version = "0-unstable-2017-10-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sellout";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
trivialBuild {
|
||||
pname = "copilot";
|
||||
version = "unstable-2023-12-26";
|
||||
version = "0-unstable-2023-12-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerolfx";
|
||||
repo = "copilot.el";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "evil-markdown";
|
||||
version = "0.pre+unstable=2021-07-21";
|
||||
version = "0-unstable-2021-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Somelauw";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "font-lock-plus";
|
||||
version = "208+unstable=2018-01-01";
|
||||
version = "208-unstable-2018-01-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "git-undo";
|
||||
version = "0.pre+unstable=2019-12-21";
|
||||
version = "0-unstable-2019-12-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwiegley";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "helm-words";
|
||||
version = "0.pre+unstable=2019-03-12";
|
||||
version = "0-unstable-2019-03-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "isearch-plus";
|
||||
version = "3434+unstable=2021-08-23";
|
||||
version = "3434-unstable-2021-08-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "isearch-prop";
|
||||
version = "0.pre+unstable=2019-05-01";
|
||||
version = "0-unstable-2019-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacsmirror";
|
||||
|
||||
@ -88,6 +88,8 @@ melpaBuild {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts coreutils git gnused
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "unstable-2024-02-03";
|
||||
version = "1.0.0-unstable-2024-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zbelial";
|
||||
|
||||
@ -15,8 +15,6 @@ trivialBuild rec {
|
||||
hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://emacswiki.org/emacs/RectangleMark";
|
||||
description = "Mark a rectangle of text with highlighting";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "sunrise-commander";
|
||||
version = "unstable=2021-09-27";
|
||||
version = "0-unstable-2021-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunrise-commander";
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "voicemacs";
|
||||
version = "unstable-2022-02-16";
|
||||
version = "0-unstable-2022-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcaw";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "yes-no";
|
||||
version = "2017-10-01";
|
||||
version = "0-unstable-2017-10-01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "youtube-dl";
|
||||
version = "0.pre+unstable=2018-10-12";
|
||||
version = "1.0-unstable-2018-10-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
@ -15,8 +15,6 @@ trivialBuild {
|
||||
sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4=";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emacs youtube-dl download manager";
|
||||
homepage = "https://github.com/skeeto/youtube-dl-emacs";
|
||||
|
||||
@ -19,11 +19,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "poke";
|
||||
version = "4.0";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ArqyLLH6YVOhtqknyLs81Y1QhUPBRIQqbX7nTxmXOnc=";
|
||||
hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" "lib" ]
|
||||
|
||||
@ -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
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "libretro-core-info";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-core-info";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tIuDDueYocvRDbA8CTR5ubGI7/Up02zUENw/HaDwC0U=";
|
||||
hash = "sha256-dMMX9i2xPKay6BKC52fYxElcGSllHkSZyOXX/t3l6Io=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -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
|
||||
''
|
||||
@ -29,8 +29,8 @@ installSanePath = path: ''
|
||||
fi
|
||||
'';
|
||||
disableBackend = backend: ''
|
||||
grep -q '${backend}' $out/etc/sane.d/dll.conf || { echo '${backend} is not a default plugin in $SANE_CONFIG_DIR/dll.conf'; exit 1; }
|
||||
substituteInPlace $out/etc/sane.d/dll.conf --replace '${backend}' '# ${backend} disabled in nixos config'
|
||||
grep -w -q '${backend}' $out/etc/sane.d/dll.conf || { echo '${backend} is not a default plugin in $SANE_CONFIG_DIR/dll.conf'; exit 1; }
|
||||
sed -i 's/\b${backend}\b/# ${backend} disabled by nixos config/' $out/etc/sane.d/dll.conf
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -75,6 +75,9 @@ in
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk17;
|
||||
};
|
||||
}.${pname}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-1gi+hWrVL+mBB8pHMXnX/8kzRCQqGuut/+wO/9yBABs=";
|
||||
hash_darwin = "sha256-Zz2U5zQWScID7rAE6FmTADecs4zR430KZVen+hsl+KI=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-skYFjXBvv+2u/K770Dd3uxFYFer6GGx/EgWfAgzE9pI=";
|
||||
hash_linux = "sha256-67rXlDJeDSpcpEhNQq0rVS2bSWPy3GXVnTo6dwKAnZU=";
|
||||
version = "125.0.6422.78";
|
||||
"sha256-NhnJdnrzTj8gQiyp4PzmXHx6ltsxUVrz0AL9x8nGibA=";
|
||||
hash_linux = "sha256-iyhxx7KIpGPMYgf/I1hLUK8M49kWmgTy+UOXf5WBEWY=";
|
||||
version = "125.0.6422.141";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
@ -15,8 +15,8 @@
|
||||
version = "2024-04-10";
|
||||
};
|
||||
};
|
||||
hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU=";
|
||||
version = "125.0.6422.112";
|
||||
hash = "sha256-8Qe1hgDEjvdAf2ao4CIieC7l2pTSIPLTZb+vdctUEo0=";
|
||||
version = "125.0.6422.141";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -27,11 +27,11 @@
|
||||
version = "2024-04-10";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-vHnXIrDdHGIe8byb41CiEWq3FPTecKg006dU7+iESKA=";
|
||||
rev = "125.0.6422.112-1";
|
||||
hash = "sha256-ZYYizL3hFSEQUdDDZIvsEzidq5td+UoaWdertY/pqOc=";
|
||||
rev = "125.0.6422.141-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU=";
|
||||
version = "125.0.6422.112";
|
||||
hash = "sha256-8Qe1hgDEjvdAf2ao4CIieC7l2pTSIPLTZb+vdctUEo0=";
|
||||
version = "125.0.6422.141";
|
||||
};
|
||||
}
|
||||
|
||||
@ -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=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.5.7";
|
||||
version = "7.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ym4qSjLKT3b494IaxMAgrYHMWklHu7Vlc81nFRxAiOc=";
|
||||
sha256 = "sha256-buhRRgwCOVTnlVLzAL4T9ymgMTIcvelHyv6mfPK61eM=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
k3sVersion = "1.27.13+k3s1";
|
||||
k3sCommit = "b23f142da8589854cc7ee45da08d96b5ad1ee1ff";
|
||||
k3sRepoSha256 = "052998644il0qra7cdpvmy007gw16k2rvyg418m1j02pm9a3zn10";
|
||||
k3sVendorHash = "sha256-rQZZnleRekkU1+I38LmFnnatZPuS+K1jbBwA+Dmc0jo=";
|
||||
k3sVersion = "1.27.14+k3s1";
|
||||
k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b";
|
||||
k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap";
|
||||
k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.12.2";
|
||||
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubecm";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunny0826";
|
||||
repo = "kubecm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zspAtLomgdIymP3xj3VG2rAhMJAquJCNWRdAM5wPcLg=";
|
||||
hash = "sha256-Lz7mCbEEiCmNPmJ8RkxJLEOOdyvLZl3pT3qL2/kHYuA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eWKGmVkvMP/vN03pWiShPzZN0vSkhneSK48S4AVBdkM=";
|
||||
vendorHash = "sha256-JJ2B9sUrfo4fiRsxA8mBjvKP0mduIZMaGN8gFC1cTA4=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gR/gpoldtwW0bVjWr5xwbfcKb6VJ43otWnSFrcYerII=";
|
||||
hash = "sha256-vJ9HXpvkuZWOZtsoJhcpM0KGGiyd+D5HTQBHwb8l/II=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -50,5 +50,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/nix-community/nixops-gce";
|
||||
license = licenses.mit;
|
||||
maintainers = nixops.meta.maintainers;
|
||||
broken = true; # never built on Hydra
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,5 +52,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/NixOS/nixops-hetzner";
|
||||
license = licenses.mit;
|
||||
maintainers = nixops.meta.maintainers;
|
||||
broken = true; # never built on Hydra
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,5 +48,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/lukebfox/nixops-hetznercloud";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ lukebfox ];
|
||||
broken = true; # never built on Hydra
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,5 +48,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/nix-community/nixops-libvirtd";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ aminechikhaoui ];
|
||||
broken = true; # never built on Hydra
|
||||
};
|
||||
}
|
||||
|
||||
@ -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=";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,44 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
, substituteAll
|
||||
, cargo
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, blueprint-compiler
|
||||
, wrapGAppsHook4
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libxml2
|
||||
, openssl
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, glib-networking
|
||||
, librsvg
|
||||
, gst_all_1
|
||||
, gitUpdater
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitLab,
|
||||
substituteAll,
|
||||
cargo,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
rustc,
|
||||
blueprint-compiler,
|
||||
wrapGAppsHook4,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
clapper,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
libxml2,
|
||||
openssl,
|
||||
sqlite,
|
||||
webkitgtk,
|
||||
glib-networking,
|
||||
librsvg,
|
||||
gst_all_1,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
hash = "sha256-buXFQ/QAFOcdcywlacySuq8arqPEJIti1nK+yl3yWck=";
|
||||
hash = "sha256-s8h/OIJJzMmsCsaQJ0SOjCAVXfYQbjOupdDtLOqM9d0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"news-flash-2.3.0-alpha.0" = "sha256-WITvnqeEDp793AlZ3gj8Tg0dfccuOj0Us5H5FaEtkxk=";
|
||||
"clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0=";
|
||||
"news-flash-2.3.0-alpha.0" = "sha256-ZgX6tQmPDMSpLcYD04u2ReQXdzeGzQTwGaUy/y4z4do=";
|
||||
"newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ=";
|
||||
};
|
||||
};
|
||||
@ -62,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs build-aux/cargo.sh
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -79,36 +84,40 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
blueprint-compiler
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
libxml2
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk
|
||||
buildInputs =
|
||||
[
|
||||
clapper
|
||||
gtk4
|
||||
libadwaita
|
||||
libxml2
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk
|
||||
|
||||
# TLS support for loading external content in webkitgtk WebView
|
||||
glib-networking
|
||||
# TLS support for loading external content in webkitgtk WebView
|
||||
glib-networking
|
||||
|
||||
# SVG support for gdk-pixbuf
|
||||
librsvg
|
||||
] ++ (with gst_all_1; [
|
||||
# Audio & video support for webkitgtk WebView
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
]);
|
||||
# SVG support for gdk-pixbuf
|
||||
librsvg
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
# Audio & video support for webkitgtk WebView
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v.";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v."; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern feed reader designed for the GNOME desktop";
|
||||
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
|
||||
maintainers = with maintainers; [
|
||||
kira-bruneau
|
||||
stunkymonkey
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "io.gitlab.news_flash.NewsFlash";
|
||||
};
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://signal.org/";
|
||||
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr ];
|
||||
maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr teutat3s ];
|
||||
mainProgram = pname;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0=";
|
||||
hash = "sha256-CAofRnG9BWaNtP8zL5YfE9+ofc5+sgniTbPGsnEtlVY=";
|
||||
}
|
||||
|
||||
@ -84,7 +84,7 @@ let
|
||||
changelog = "https://slack.com/release-notes";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
maintainers = with maintainers; [ mmahut teutat3s ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
|
||||
mainProgram = "slack";
|
||||
};
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tangram";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonnyp";
|
||||
repo = "Tangram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6QOkvsYFgFFyxnDlA5Xpl3FnsSZOj9ooehCPOmpKe8M=";
|
||||
hash = "sha256-vN9zRc8Ac9SI0lIcuf01A2WLqLGtV3DUiNzCSmc2ri4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "whatsapp-for-linux";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eneshecan";
|
||||
repo = "whatsapp-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ=";
|
||||
hash = "sha256-hUIyn6BhAPoszBTHKa4qSj6IRa+8cUS0Gis/qjDDnyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@ rec {
|
||||
|
||||
thunderbird-115 = (buildMozillaMach rec {
|
||||
pname = "thunderbird";
|
||||
version = "115.11.0";
|
||||
version = "115.11.1";
|
||||
application = "comm/mail";
|
||||
applicationName = "Mozilla Thunderbird";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "002f783cff7f2b50d9a29f20061fe55a1f64487b38a18dcb49217c3d7b99c2852af842decbd0347939aaf4c4c73ae66a8b04527ccd1b6db7f87aab402cb84ca1";
|
||||
sha512 = "1a1f438c7047908788bc983aa681c3293ce02da006477b491a49ced5941433ca3381e01f76afc6bb5572415025acfd0fa657f063ef26b3a63646594c27202717";
|
||||
};
|
||||
extraPatches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "magic-vlsi";
|
||||
version = "8.3.465";
|
||||
version = "8.3.483";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
|
||||
sha256 = "sha256-cb9A8rpjD3x3fJo+xexlyzn+/3M5iUJmSoBraom9zd8=";
|
||||
sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "systemc";
|
||||
version = "2.3.4";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accellera-official";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0sj8wlkp68cjhmkd9c9lvm3lk3sckczpz7w9vby64inc1f9fnf0b";
|
||||
sha256 = "sha256-qeQUrPhD+Gb1lResM7NZzO/vEgJd3NE6lbnM380VVa0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -44,6 +44,11 @@ mkOpenModelicaDerivation ({
|
||||
$(find ./OMCompiler -name 'Makefile*')
|
||||
'';
|
||||
|
||||
env.CFLAGS = toString [
|
||||
"-Wno-error=dynamic-exception-spec"
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
for entry in $(find $out -name libipopt.so); do
|
||||
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, libxml2
|
||||
, openmodelica
|
||||
, mkOpenModelicaDerivation
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
mkOpenModelicaDerivation rec {
|
||||
@ -12,10 +13,23 @@ mkOpenModelicaDerivation rec {
|
||||
omdir = "OMSimulator";
|
||||
omdeps = [ openmodelica.omcompiler ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "OMSimulator/";
|
||||
hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ readline libxml2 boost ];
|
||||
|
||||
env.CFLAGS = toString [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The OpenModelica FMI & SSP-based co-simulation environment";
|
||||
homepage = "https://openmodelica.org";
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, callPackage
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, cmake
|
||||
, coreutils
|
||||
@ -25,7 +24,7 @@
|
||||
, libGL
|
||||
, libxcrypt
|
||||
, libxml2
|
||||
, llvm_13
|
||||
, llvm_16
|
||||
, lsof
|
||||
, lz4
|
||||
, xz
|
||||
@ -41,7 +40,6 @@
|
||||
, xxHash
|
||||
, zlib
|
||||
, zstd
|
||||
, libAfterImage
|
||||
, giflib
|
||||
, libjpeg
|
||||
, libtiff
|
||||
@ -58,7 +56,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.30.06";
|
||||
version = "6.32.00";
|
||||
|
||||
passthru = {
|
||||
tests = import ./tests { inherit callPackage; };
|
||||
@ -66,13 +64,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw=";
|
||||
hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI=";
|
||||
};
|
||||
|
||||
clad_src = fetchgit {
|
||||
url = "https://github.com/vgvassilev/clad";
|
||||
rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files!
|
||||
hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI=";
|
||||
rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files!
|
||||
hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
@ -90,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
lapack
|
||||
libxcrypt
|
||||
libxml2
|
||||
llvm_13
|
||||
llvm_16
|
||||
lz4
|
||||
xz
|
||||
gsl
|
||||
@ -98,7 +96,6 @@ stdenv.mkDerivation rec {
|
||||
openblas
|
||||
openssl
|
||||
xxHash
|
||||
libAfterImage
|
||||
giflib
|
||||
libjpeg
|
||||
libtiff
|
||||
@ -116,17 +113,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./sw_vers.patch
|
||||
|
||||
# compatibility with recent XRootD
|
||||
# https://github.com/root-project/root/pull/13752
|
||||
(fetchpatch {
|
||||
url = "https://github.com/root-project/root/commit/3d3cda6c520791282298782189cdb8ca07ace4b9.diff";
|
||||
hash = "sha256-O3aXzrOEQiPjZgbAj9TL6Wt/adN1kKFwjooeaFRyT4I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/root-project/root/commit/6e7798e62dbed1ffa8b91a180fa5a080b7c04ba3.diff";
|
||||
hash = "sha256-47/J631DBnVlvM1Pm9iicKXDKAqN8v9hjAstQuHmH8Q=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@ -142,18 +128,13 @@ stdenv.mkDerivation rec {
|
||||
# This should probably be fixed upstream with a flag to disable the
|
||||
# connectivity check!
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'if(NO_CONNECTION)' 'if(FALSE)'
|
||||
substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \
|
||||
--replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)'
|
||||
--replace 'if(clad AND NO_CONNECTION)' 'if(FALSE)'
|
||||
# Make sure that clad is not downloaded when building
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
|
||||
# Make sure that clad is finding the right llvm version
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm'
|
||||
# Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32
|
||||
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
|
||||
--replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})'
|
||||
--replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm'
|
||||
|
||||
substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
|
||||
--replace 'add_clang_symlink(''${link} clang)' ""
|
||||
@ -197,9 +178,6 @@ stdenv.mkDerivation rec {
|
||||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ];
|
||||
|
||||
postInstall = ''
|
||||
for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
|
||||
wrapProgram "$out/bin/$prog" \
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "14.2.0";
|
||||
version = "14.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+OJ8aUA/VFOAzdCRcOCQKm6/RjRe13TITP1DAWqoAQI=";
|
||||
hash = "sha256-7wsN95I8Xa5CXh1Mg3Wv4gyTSRzZMqJ06ALLsud3l2k=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -12,10 +12,19 @@ stdenv.mkDerivation rec {
|
||||
pname = "gitnuro";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar";
|
||||
hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw=";
|
||||
};
|
||||
src = fetchurl (
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
{
|
||||
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar";
|
||||
hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
{
|
||||
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-arm_aarch64-${version}.jar";
|
||||
hash = "sha256-6TRQfIhaKBjNPn3tEVWoUF92JAmwlHUtQZE8gKEZ/ZI=";
|
||||
}
|
||||
else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"
|
||||
);
|
||||
|
||||
icon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg";
|
||||
@ -56,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A FOSS Git multiplatform client based on Compose and JGit";
|
||||
homepage = "https://gitnuro.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
mainProgram = "gitnuro";
|
||||
|
||||
@ -272,7 +272,7 @@ rec {
|
||||
To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline vdemeester periklis ];
|
||||
maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
|
||||
mainProgram = "docker";
|
||||
};
|
||||
});
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tart";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
|
||||
hash = "sha256-Wf6JfEOUkCpUB0qsAGqh5v/sTV+iQ2NUmXKLyLgxgV0=";
|
||||
hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
telegram-desktop.overrideAttrs (old: rec {
|
||||
pname = "64gram";
|
||||
version = "1.1.23";
|
||||
version = "1.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec {
|
||||
rev = "v${version}";
|
||||
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-0/1qxz8MCDve8eazb9WT8t/UqWs/I1Mo9orhVXkxmqc=";
|
||||
hash = "sha256-pAtV/uKWCh9sODCYXf6gM8B0i2o5OiVH7z2iLjIZKP0=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ad-miner";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mazars-Tech";
|
||||
repo = "AD_Miner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o1RXuyX2dV0fQwXEeTgmeMYKXiKAqrl+fV8zi1J16Ic=";
|
||||
hash = "sha256-MoU38UEhk9eUa+slXnYG1eOyDW79J0q5XiM+1UYIGaM=";
|
||||
};
|
||||
|
||||
# All requirements are pinned
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
darwin,
|
||||
expat,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
ffmpeg,
|
||||
ffms,
|
||||
fftw,
|
||||
@ -120,7 +121,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"relro"
|
||||
];
|
||||
|
||||
patches = lib.optionals (!useBundledLuaJIT) [
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "move-iconv-include-to-charset_conv.h.patch";
|
||||
url = "https://github.com/arch1t3cht/Aegisub/commit/b8f4c98c4cbc698e4adbba302c2dc328fe193435.patch";
|
||||
hash = "sha256-dCm/VG+8yK7qWKWF4Ew/M2hbbAC/d3hiuRglR9BvWtw=";
|
||||
})
|
||||
] ++ lib.optionals (!useBundledLuaJIT) [
|
||||
./000-remove-bundled-luajit.patch
|
||||
];
|
||||
|
||||
|
||||
@ -1,19 +1,17 @@
|
||||
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
|
||||
index 99397a9..f3ef28f 100755
|
||||
index 58cedb7..89e77a4 100755
|
||||
--- a/auto_cpufreq/core.py
|
||||
+++ b/auto_cpufreq/core.py
|
||||
@@ -144,26 +144,10 @@ except PermissionError:
|
||||
|
||||
@@ -136,26 +136,8 @@ except PermissionError:
|
||||
|
||||
# display running version of auto-cpufreq
|
||||
def app_version():
|
||||
+ print("auto-cpufreq version: @version@")
|
||||
+ print("Git commit: v@version@")
|
||||
|
||||
-
|
||||
- print("auto-cpufreq version: ", end="")
|
||||
|
||||
-
|
||||
- # snap package
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- print(getoutput("echo \(Snap\) $SNAP_VERSION"))
|
||||
- print(getoutput(r"echo \(Snap\) $SNAP_VERSION"))
|
||||
- # aur package
|
||||
- elif dist_name in ["arch", "manjaro", "garuda"]:
|
||||
- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True)
|
||||
@ -28,6 +26,8 @@ index 99397a9..f3ef28f 100755
|
||||
- except Exception as e:
|
||||
- print(repr(e))
|
||||
- pass
|
||||
def verify_update():
|
||||
# Specify the repository and package name
|
||||
# IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY
|
||||
+ print("auto-cpufreq version: @version@")
|
||||
+ print("Git commit: v@version@")
|
||||
|
||||
def check_for_update():
|
||||
# returns True if a new release is available from the GitHub repo
|
||||
100
pkgs/by-name/au/auto-cpufreq/package.nix
Normal file
100
pkgs/by-name/au/auto-cpufreq/package.nix
Normal file
@ -0,0 +1,100 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
gtk3,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "auto-cpufreq";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdnanHodzic";
|
||||
repo = "auto-cpufreq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bet/WOVveLIA+0Mvly4AsielR+r/AJXIgHdWrtc7i/U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
python3Packages.poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
distro
|
||||
psutil
|
||||
pygobject3
|
||||
poetry-dynamic-versioning
|
||||
setuptools
|
||||
pyinotify
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "auto_cpufreq" ];
|
||||
|
||||
patches = [
|
||||
# hardcodes version output
|
||||
(substituteAll {
|
||||
src = ./fix-version-output.patch;
|
||||
inherit version;
|
||||
})
|
||||
|
||||
# patch to prevent script copying and to disable install
|
||||
./prevent-install-and-copy.patch
|
||||
# patch to prevent update
|
||||
./prevent-update.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace auto_cpufreq/core.py \
|
||||
--replace-fail '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle
|
||||
substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \
|
||||
--replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq
|
||||
substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \
|
||||
--replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" $out/share/pixmaps/auto-cpufreq.png
|
||||
substituteInPlace auto_cpufreq/gui/app.py \
|
||||
--replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" $out/share/auto-cpufreq/scripts/style.css
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# copy script manually
|
||||
cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq
|
||||
|
||||
# copy css file
|
||||
mkdir -p $out/share/auto-cpufreq/scripts
|
||||
cp scripts/style.css $out/share/auto-cpufreq/scripts/style.css
|
||||
|
||||
# systemd service
|
||||
mkdir -p $out/lib/systemd/system
|
||||
cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system
|
||||
|
||||
# desktop icon
|
||||
mkdir -p $out/share/applications
|
||||
mkdir $out/share/pixmaps
|
||||
cp scripts/auto-cpufreq-gtk.desktop $out/share/applications
|
||||
cp images/icon.png $out/share/pixmaps/auto-cpufreq.python3Packages
|
||||
|
||||
# polkit policy
|
||||
mkdir -p $out/share/polkit-1/actions
|
||||
cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions
|
||||
'';
|
||||
|
||||
meta = {
|
||||
mainProgram = "auto-cpufreq";
|
||||
homepage = "https://github.com/AdnanHodzic/auto-cpufreq";
|
||||
description = "Automatic CPU speed & power optimizer for Linux";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ Technical27 ];
|
||||
};
|
||||
}
|
||||
@ -1,123 +1,8 @@
|
||||
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
|
||||
index 99397a9..48a377a 100755
|
||||
--- a/auto_cpufreq/core.py
|
||||
+++ b/auto_cpufreq/core.py
|
||||
@@ -350,30 +334,13 @@ def get_current_gov():
|
||||
|
||||
|
||||
def cpufreqctl():
|
||||
- """
|
||||
- deploy cpufreqctl script
|
||||
- """
|
||||
-
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- # deploy cpufreqctl.auto-cpufreq script
|
||||
- if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
|
||||
+ # scripts are already in the correct place
|
||||
+ pass
|
||||
|
||||
|
||||
def cpufreqctl_restore():
|
||||
- """
|
||||
- remove cpufreqctl.auto-cpufreq script
|
||||
- """
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
|
||||
- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
|
||||
-
|
||||
+ # no need to restore
|
||||
+ pass
|
||||
|
||||
def footer(l=79):
|
||||
print("\n" + "-" * l + "\n")
|
||||
@@ -400,30 +367,8 @@ def remove_complete_msg():
|
||||
|
||||
|
||||
def deploy_daemon():
|
||||
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # deploy cpufreqctl script func call
|
||||
- cpufreqctl()
|
||||
-
|
||||
- # turn off bluetooth on boot
|
||||
- bluetooth_disable()
|
||||
-
|
||||
- auto_cpufreq_stats_path.touch(exist_ok=True)
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq install script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq remove script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # output warning if gnome power profile is running
|
||||
- gnome_power_detect_install()
|
||||
- gnome_power_svc_disable()
|
||||
-
|
||||
- # output warning if TLP service is detected
|
||||
- tlp_service_detect()
|
||||
-
|
||||
- call("/usr/local/bin/auto-cpufreq-install", shell=True)
|
||||
+ # prevent needless copying and system changes
|
||||
+ pass
|
||||
|
||||
|
||||
def deploy_daemon_performance():
|
||||
@@ -463,40 +408,7 @@ def deploy_daemon_performance():
|
||||
|
||||
# remove auto-cpufreq daemon
|
||||
def remove_daemon():
|
||||
-
|
||||
- # check if auto-cpufreq is installed
|
||||
- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"):
|
||||
- print("\nauto-cpufreq daemon is not installed.\n")
|
||||
- sys.exit(1)
|
||||
-
|
||||
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # turn on bluetooth on boot
|
||||
- bluetooth_enable()
|
||||
-
|
||||
- # output warning if gnome power profile is stopped
|
||||
- gnome_power_rm_reminder()
|
||||
- gnome_power_svc_enable()
|
||||
-
|
||||
- # run auto-cpufreq daemon remove script
|
||||
- call("/usr/local/bin/auto-cpufreq-remove", shell=True)
|
||||
-
|
||||
- # remove auto-cpufreq-remove
|
||||
- os.remove("/usr/local/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # delete override pickle if it exists
|
||||
- if os.path.exists(governor_override_state):
|
||||
- os.remove(governor_override_state)
|
||||
-
|
||||
- # delete stats file
|
||||
- if auto_cpufreq_stats_path.exists():
|
||||
- if auto_cpufreq_stats_file is not None:
|
||||
- auto_cpufreq_stats_file.close()
|
||||
-
|
||||
- auto_cpufreq_stats_path.unlink()
|
||||
-
|
||||
- # restore original cpufrectl script
|
||||
- cpufreqctl_restore()
|
||||
+ pass
|
||||
|
||||
|
||||
def gov_check():
|
||||
|
||||
diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq
|
||||
index b89d925..b73974c 100755
|
||||
--- a/bin/auto-cpufreq
|
||||
+++ b/bin/auto-cpufreq
|
||||
@@ -189,41 +189,9 @@
|
||||
diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
|
||||
index 4343b8d..dc286f6 100755
|
||||
--- a/auto_cpufreq/bin/auto_cpufreq.py
|
||||
+++ b/auto_cpufreq/bin/auto_cpufreq.py
|
||||
@@ -199,41 +199,9 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta
|
||||
print("https://github.com/AdnanHodzic/auto-cpufreq/#donate")
|
||||
footer()
|
||||
elif install:
|
||||
@ -160,4 +45,118 @@ index b89d925..b73974c 100755
|
||||
+ print("remove is disabled in the nix package")
|
||||
elif update:
|
||||
root_check()
|
||||
if os.getenv("PKG_MARKER") == "SNAP":
|
||||
custom_dir = "/opt/auto-cpufreq/source"
|
||||
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
|
||||
index 58cedb7..c50b0e1 100755
|
||||
--- a/auto_cpufreq/core.py
|
||||
+++ b/auto_cpufreq/core.py
|
||||
@@ -391,30 +391,13 @@ def get_current_gov():
|
||||
|
||||
|
||||
def cpufreqctl():
|
||||
- """
|
||||
- deploy cpufreqctl script
|
||||
- """
|
||||
-
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- # deploy cpufreqctl.auto-cpufreq script
|
||||
- if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
|
||||
+ # scripts are already in the correct place
|
||||
+ pass
|
||||
|
||||
|
||||
def cpufreqctl_restore():
|
||||
- """
|
||||
- remove cpufreqctl.auto-cpufreq script
|
||||
- """
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
|
||||
- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
|
||||
-
|
||||
+ # no need to restore
|
||||
+ pass
|
||||
|
||||
def footer(l=79):
|
||||
print("\n" + "-" * l + "\n")
|
||||
@@ -441,30 +424,8 @@ def remove_complete_msg():
|
||||
|
||||
|
||||
def deploy_daemon():
|
||||
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # deploy cpufreqctl script func call
|
||||
- cpufreqctl()
|
||||
-
|
||||
- # turn off bluetooth on boot
|
||||
- bluetooth_disable()
|
||||
-
|
||||
- auto_cpufreq_stats_path.touch(exist_ok=True)
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq install script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq remove script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # output warning if gnome power profile is running
|
||||
- gnome_power_detect_install()
|
||||
- gnome_power_svc_disable()
|
||||
-
|
||||
- # output warning if TLP service is detected
|
||||
- tlp_service_detect()
|
||||
-
|
||||
- call("/usr/local/bin/auto-cpufreq-install", shell=True)
|
||||
+ # prevent needless copying and system changes
|
||||
+ pass
|
||||
|
||||
|
||||
def deploy_daemon_performance():
|
||||
@@ -504,40 +465,7 @@ def deploy_daemon_performance():
|
||||
|
||||
# remove auto-cpufreq daemon
|
||||
def remove_daemon():
|
||||
-
|
||||
- # check if auto-cpufreq is installed
|
||||
- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"):
|
||||
- print("\nauto-cpufreq daemon is not installed.\n")
|
||||
- sys.exit(1)
|
||||
-
|
||||
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # turn on bluetooth on boot
|
||||
- bluetooth_enable()
|
||||
-
|
||||
- # output warning if gnome power profile is stopped
|
||||
- gnome_power_rm_reminder()
|
||||
- gnome_power_svc_enable()
|
||||
-
|
||||
- # run auto-cpufreq daemon remove script
|
||||
- call("/usr/local/bin/auto-cpufreq-remove", shell=True)
|
||||
-
|
||||
- # remove auto-cpufreq-remove
|
||||
- os.remove("/usr/local/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # delete override pickle if it exists
|
||||
- if os.path.exists(governor_override_state):
|
||||
- os.remove(governor_override_state)
|
||||
-
|
||||
- # delete stats file
|
||||
- if auto_cpufreq_stats_path.exists():
|
||||
- if auto_cpufreq_stats_file is not None:
|
||||
- auto_cpufreq_stats_file.close()
|
||||
-
|
||||
- auto_cpufreq_stats_path.unlink()
|
||||
-
|
||||
- # restore original cpufrectl script
|
||||
- cpufreqctl_restore()
|
||||
+ pass
|
||||
|
||||
|
||||
def gov_check():
|
||||
152
pkgs/by-name/au/auto-cpufreq/prevent-update.patch
Normal file
152
pkgs/by-name/au/auto-cpufreq/prevent-update.patch
Normal file
@ -0,0 +1,152 @@
|
||||
diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
|
||||
index 4343b8d..183c2e9 100755
|
||||
--- a/auto_cpufreq/bin/auto_cpufreq.py
|
||||
+++ b/auto_cpufreq/bin/auto_cpufreq.py
|
||||
@@ -235,47 +235,7 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta
|
||||
remove_daemon()
|
||||
remove_complete_msg()
|
||||
elif update:
|
||||
- root_check()
|
||||
- custom_dir = "/opt/auto-cpufreq/source"
|
||||
- for arg in sys.argv:
|
||||
- if arg.startswith("--update="):
|
||||
- custom_dir = arg.split("=")[1]
|
||||
- sys.argv.remove(arg)
|
||||
-
|
||||
- if "--update" in sys.argv:
|
||||
- update = True
|
||||
- sys.argv.remove("--update")
|
||||
- if len(sys.argv) == 2:
|
||||
- custom_dir = sys.argv[1]
|
||||
-
|
||||
- if os.getenv("PKG_MARKER") == "SNAP":
|
||||
- print("Detected auto-cpufreq was installed using snap")
|
||||
- # refresh snap directly using this command
|
||||
- # path wont work in this case
|
||||
-
|
||||
- print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.")
|
||||
- #check for AUR
|
||||
- elif subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0 and subprocess.run(["bash", "-c", "pacman -Q auto-cpufreq >/dev/null 2>&1"]).returncode == 0:
|
||||
- print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.")
|
||||
- else:
|
||||
- is_new_update = check_for_update()
|
||||
- if not is_new_update:
|
||||
- return
|
||||
- ans = input("Do you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower()
|
||||
- if not os.path.exists(custom_dir):
|
||||
- os.makedirs(custom_dir)
|
||||
- if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")):
|
||||
- shutil.rmtree(os.path.join(custom_dir, "auto-cpufreq"))
|
||||
- if ans in ['', 'y', 'yes']:
|
||||
- remove_daemon()
|
||||
- remove_complete_msg()
|
||||
- new_update(custom_dir)
|
||||
- print("enabling daemon")
|
||||
- run(["auto-cpufreq", "--install"])
|
||||
- print("auto-cpufreq is installed with the latest version")
|
||||
- run(["auto-cpufreq", "--version"])
|
||||
- else:
|
||||
- print("Aborted")
|
||||
+ print("update is disabled in the nix package")
|
||||
|
||||
elif completions:
|
||||
if completions == "bash":
|
||||
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
|
||||
index 58cedb7..8b44712 100755
|
||||
--- a/auto_cpufreq/core.py
|
||||
+++ b/auto_cpufreq/core.py
|
||||
@@ -17,8 +17,7 @@ import importlib.metadata
|
||||
from math import isclose
|
||||
from pathlib import Path
|
||||
from shutil import which
|
||||
-from subprocess import getoutput, call, run, check_output, DEVNULL
|
||||
-import requests
|
||||
+from subprocess import getoutput, call, run, DEVNULL
|
||||
import re
|
||||
|
||||
# execution timestamp used in countdown func
|
||||
@@ -158,55 +157,7 @@ def app_version():
|
||||
pass
|
||||
|
||||
def check_for_update():
|
||||
- # returns True if a new release is available from the GitHub repo
|
||||
-
|
||||
- # Specify the repository and package name
|
||||
- # IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY
|
||||
- # Fetch the latest release information from GitHub API
|
||||
- latest_release_url = f"https://api.github.com/repos/AdnanHodzic/auto-cpufreq/releases/latest"
|
||||
- try:
|
||||
- response = requests.get(latest_release_url)
|
||||
- if response.status_code == 200:
|
||||
- latest_release = response.json()
|
||||
- else:
|
||||
- message = response.json().get("message")
|
||||
- print("Error fetching recent release!")
|
||||
- if message is not None and message.startswith("API rate limit exceeded"):
|
||||
- print("GitHub Rate limit exceeded. Please try again later within 1 hour or use different network/VPN.")
|
||||
- else:
|
||||
- print("Unexpected status code:", response.status_code)
|
||||
- return False
|
||||
- except (requests.exceptions.ConnectionError, requests.exceptions.Timeout,
|
||||
- requests.exceptions.RequestException, requests.exceptions.HTTPError) as err:
|
||||
- print("Error Connecting to server!")
|
||||
- return False
|
||||
-
|
||||
- latest_version = latest_release.get("tag_name")
|
||||
-
|
||||
- if latest_version is not None:
|
||||
- # Get the current version of auto-cpufreq
|
||||
- # Extract version number from the output string
|
||||
- output = check_output(['auto-cpufreq', '--version']).decode('utf-8')
|
||||
- try:
|
||||
- version_line = next((re.search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None)
|
||||
- except AttributeError:
|
||||
- print("Error Retrieving Current Version!")
|
||||
- exit(1)
|
||||
- installed_version = "v" + version_line
|
||||
- #Check whether the same is installed or not
|
||||
- # Compare the latest version with the installed version and perform update if necessary
|
||||
- if latest_version == installed_version:
|
||||
- print("auto-cpufreq is up to date")
|
||||
- return False
|
||||
- else:
|
||||
- print(f"Updates are available,\nCurrent version: {installed_version}\nLatest version: {latest_version}")
|
||||
- print("Note that your previous custom settings might be erased with the following update")
|
||||
- return True
|
||||
- else:
|
||||
- # Handle the case where "tag_name" key doesn't exist
|
||||
- print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!")
|
||||
-
|
||||
-
|
||||
+ pass
|
||||
|
||||
def new_update(custom_dir):
|
||||
os.chdir(custom_dir)
|
||||
diff --git a/poetry.lock b/poetry.lock
|
||||
index 2a99ca6..9bc26e2 100644
|
||||
--- a/poetry.lock
|
||||
+++ b/poetry.lock
|
||||
@@ -1,4 +1,4 @@
|
||||
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
|
||||
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
|
||||
|
||||
[[package]]
|
||||
name = "attrs"
|
||||
@@ -1300,4 +1300,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
|
||||
[metadata]
|
||||
lock-version = "2.0"
|
||||
python-versions = "^3.8"
|
||||
-content-hash = "ee73b2db6a43cac87120f38c93d0a8a297bec52f1346b55bc0ca2992aa464482"
|
||||
+content-hash = "1ba0c404ffea01a611e7c74f9c104de44a914b0a6fad2350470f15880931ae42"
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 876d80c..7190356 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -25,7 +25,6 @@ python = "^3.8"
|
||||
psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"}
|
||||
click = "^8.1.0"
|
||||
distro = "^1.8.0"
|
||||
-requests = "^2.31.0"
|
||||
PyGObject = "^3.46.0"
|
||||
pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"}
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.48.1";
|
||||
version = "2.48.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-v24gS80s7dTDlOO9ouf+Am7KyZPTBWzjG+HyBfFZynw=";
|
||||
hash = "sha256-Ikxp8PJ72UCRYmaoloruVdIpi46nF41bi7RK0rPvs1E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8KcseMkYww+Ccaw+ovwXhakO9ira2TRI4uQ5TbCZcSE=";
|
||||
vendorHash = "sha256-151l+yen1QI5DiYJgBvWV/OlbnE72ecmMtHUBRhxQM4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clipcat";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrelkd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e95h8YBVLcy9vubdJpfmeystT2Qw0Y8kap9IbTJW+s8=";
|
||||
hash = "sha256-i+5hUwarJHa3QzHPqJ0N/gztKWoRCKXsEbX3Q/1PQ9Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+73vnGcdCDRMrav/Pi4Z37IlbArJ/SlYishz9KhF4x0=";
|
||||
cargoHash = "sha256-lPH2v+OfO/NCLdAVvPbIgAeVAOWHjhNIOap94p0+NR0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.34";
|
||||
version = "1.0.36";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -10,10 +10,10 @@ buildGoModule {
|
||||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fxo7TQjFrp2BbXz7bwMC5AuacKpyi5UmAMEVBmR91ko=";
|
||||
hash = "sha256-i2XCys/fXNS7aXxpAPVqFpuQGempcsBEbVuphXPpBIc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pM6win2W6HqjIg9QBblDl3ptKEI6sANliXkpwlFnTb0=";
|
||||
vendorHash = "sha256-fTrKqhfUg+/4xid9YWkTNkXm3HGaoeeJU0RIMW2mtq8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easily Manage AWS ECS Resources in Terminal 🐱";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
let
|
||||
pname = "gate";
|
||||
version = "0.36.7";
|
||||
version = "0.37.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -14,10 +14,10 @@ buildGoModule {
|
||||
owner = "minekube";
|
||||
repo = "gate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WHxpx20O/HuCWqbY4zTxcjyIhW3+FQtTz5sUGAda71g=";
|
||||
hash = "sha256-TsyiAPhSjz7xzvxx6EJswwUasMr/GCf+QXcSFgaG1Ko=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dswNJQWqN+u/mnpbj9se2j9uEi0ewNTXVlN3WnNbcyg=";
|
||||
vendorHash = "sha256-Ls99x08erFM6iP0UlMteafD4FCiq6HMF2ME89jyOEdE=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1
|
||||
installShellCompletion --cmd hurl \
|
||||
--bash completions/hurl.bash \
|
||||
--zsh completions/_hurl \
|
||||
--fish completions/hurl.fish
|
||||
|
||||
installShellCompletion --cmd hurlfmt \
|
||||
--zsh completions/_hurlfmt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -11,12 +11,12 @@
|
||||
}:
|
||||
flutterPackages.v3_19.buildFlutterApplication rec {
|
||||
pname = "intiface-central";
|
||||
version = "2.5.6";
|
||||
version = "2.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intiface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EcOFiaWqljNZIvsCkhuCEChEC51ERxM74EYE6u7Q4U8=";
|
||||
hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE=";
|
||||
};
|
||||
patches = [
|
||||
./corrosion.patch
|
||||
@ -28,7 +28,7 @@ flutterPackages.v3_19.buildFlutterApplication rec {
|
||||
name = "${pname}-${version}-cargo-deps";
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
|
||||
hash = "sha256-tkJcwT2lt8+FT9GZ0ROrm1jkOxoq875O3wZkgZl22r4=";
|
||||
hash = "sha256-tPkLZmHReY1TU2qcY4aGWsQPhLFowrqxTPwmTHZ5fDE=";
|
||||
};
|
||||
cargoRoot = "intiface-engine-flutter-bridge";
|
||||
|
||||
|
||||
@ -230,6 +230,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.18.0"
|
||||
},
|
||||
"console": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "console",
|
||||
"sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"convert": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@ -466,6 +476,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.6.18+2"
|
||||
},
|
||||
"flutter_multi_slider": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_multi_slider",
|
||||
"sha256": "3c4603999f5c399b57b5a85086cf92c8870e726fe07fd63bc3968bd3e564518b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.1"
|
||||
},
|
||||
"flutter_rust_bridge": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@ -508,6 +528,16 @@
|
||||
"source": "hosted",
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"get_it": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "get_it",
|
||||
"sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.7.0"
|
||||
},
|
||||
"github": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@ -738,6 +768,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"msix": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "msix",
|
||||
"sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.16.7"
|
||||
},
|
||||
"multicast_dns": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
|
||||
@ -22,12 +22,11 @@
|
||||
, pkg-config
|
||||
, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport
|
||||
, vulkanSupport ? false
|
||||
, mpiSupport ? false # Increases the runtime closure by ~700M
|
||||
, rpcSupport ? false
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, ninja
|
||||
, git
|
||||
, mpi
|
||||
}:
|
||||
|
||||
let
|
||||
@ -35,7 +34,7 @@ let
|
||||
# otherwise we get libstdc++ errors downstream.
|
||||
# cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11
|
||||
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
|
||||
inherit (lib) cmakeBool cmakeFeature optionals;
|
||||
inherit (lib) cmakeBool cmakeFeature optionals optionalString;
|
||||
|
||||
darwinBuildInputs =
|
||||
with darwin.apple_sdk.frameworks;
|
||||
@ -103,7 +102,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs
|
||||
++ optionals cudaSupport cudaBuildInputs
|
||||
++ optionals mpiSupport [ mpi ]
|
||||
++ optionals openclSupport [ clblast ]
|
||||
++ optionals rocmSupport rocmBuildInputs
|
||||
++ optionals blasSupport [ blas ]
|
||||
@ -120,7 +118,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(cmakeBool "LLAMA_CUDA" cudaSupport)
|
||||
(cmakeBool "LLAMA_HIPBLAS" rocmSupport)
|
||||
(cmakeBool "LLAMA_METAL" metalSupport)
|
||||
(cmakeBool "LLAMA_MPI" mpiSupport)
|
||||
(cmakeBool "LLAMA_RPC" rpcSupport)
|
||||
(cmakeBool "LLAMA_VULKAN" vulkanSupport)
|
||||
]
|
||||
++ optionals cudaSupport [
|
||||
@ -144,6 +142,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
++ optionals metalSupport [
|
||||
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
|
||||
(cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
|
||||
] ++ optionals rpcSupport [
|
||||
"-DLLAMA_RPC=ON"
|
||||
# This is done so we can move rpc-server out of bin because llama.cpp doesn't
|
||||
# install rpc-server in their install target.
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
# upstream plans on adding targets at the cmakelevel, remove those
|
||||
@ -153,7 +156,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
mv $out/bin/server $out/bin/llama-server
|
||||
mkdir -p $out/include
|
||||
cp $src/llama.h $out/include/
|
||||
'';
|
||||
'' + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server";
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = "llama-cpp";
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.121";
|
||||
version = "1.123";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-3+th4alWV+i9kRT4F5tx8kOD4j8emcN2melcyN/mMMQ=";
|
||||
hash = "sha256-tXsJyz8O6Resenjp4ODS3YAYjE8pM0j/JiaCRQWmT9g=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
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=";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-hello";
|
||||
version = "0.1.10";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-hello";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-naYouinDYgdGwySVxdEOZpNTK0vwnIyUKTkPgYaneew=";
|
||||
hash = "sha256-WKDj68hQDPNsqyDG9kB1SklRIl/BSfVl7ebjVKA+33c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
39
pkgs/by-name/pl/plymouth-proxzima-theme/package.nix
Normal file
39
pkgs/by-name/pl/plymouth-proxzima-theme/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "plymouth-proxzima-theme";
|
||||
version = "0-unstable-2023-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PROxZIMA";
|
||||
repo = "proxzima-plymouth";
|
||||
rev = "b6e335a631e057942700de5c523198a5b8061d9c";
|
||||
hash = "sha256-f4CtXKsZPc/gZMVD+MJrHMrMw7TTFUndhUT4YLpfORU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/plymouth/themes/proxzima
|
||||
cp proxzima/* $out/share/plymouth/themes/proxzima
|
||||
substituteInPlace $out/share/plymouth/themes/proxzima/proxzima.plymouth \
|
||||
--replace-fail "/usr/" "$out/"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "A techno Plymouth theme with crazy animation";
|
||||
homepage = "https://github.com/PROxZIMA/proxzima-plymouth";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ johnrtitor ];
|
||||
};
|
||||
}
|
||||
43
pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix
Normal file
43
pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "plymouth-vortex-ubuntu-theme";
|
||||
version = "0-unstable-2024-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emanuele-scarsella";
|
||||
repo = "vortex-ubuntu-plymouth-theme";
|
||||
rev = "331a201918a3b026dd200659403c1cf779c718f0";
|
||||
hash = "sha256-RSWfuKCdsuFA2e5kb0OXnxW+QV7b2iHVvZEKVHoLgMw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/plymouth/themes/vortex-ubuntu
|
||||
cp vortex-ubuntu/* $out/share/plymouth/themes/vortex-ubuntu
|
||||
substituteInPlace $out/share/plymouth/themes/vortex-ubuntu/vortex-ubuntu.plymouth \
|
||||
--replace-fail "/usr/" "$out/"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Animated Plymouth boot theme with rotating Ubuntu logo";
|
||||
longDescription = ''
|
||||
Animated Plymouth theme with the Ubuntu logo and a futuristic and elegant look.
|
||||
Disk encryption password prompt is supported.
|
||||
'';
|
||||
homepage = "https://github.com/emanuele-scarsella/vortex-ubuntu-plymouth-theme";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ johnrtitor ];
|
||||
};
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mwBzLbKB/bO0Yl4VMA3roqiVs0FmmF1vfB+e+xhHe9c=";
|
||||
hash = "sha256-3zTxmjk5fHo58eV6AO9oDJHbq9O5dcsdHypAOOQF5BY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
|
||||
|
||||
let
|
||||
version = "1.1.364";
|
||||
version = "1.1.365";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "pyright";
|
||||
rev = "${version}";
|
||||
hash = "sha256-7XQ/DGba00sEg/DxcKuX2ehc4V96557yvtGXFFyHD74=";
|
||||
hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710=";
|
||||
};
|
||||
|
||||
patchedPackageJSON = runCommand "package.json" { } ''
|
||||
@ -37,7 +37,7 @@ let
|
||||
pname = "pyright-internal";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/pyright-internal";
|
||||
npmDepsHash = "sha256-ce3338ugei4R7CYKn3676ijpgYKcuyY8CgkWbf8unKw=";
|
||||
npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -51,7 +51,7 @@ buildNpmPackage rec {
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/pyright";
|
||||
npmDepsHash = "sha256-E6txhG+1DNcAR9Nia8ggWL0tDaTXs9sF4je5nDqroys=";
|
||||
npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4=";
|
||||
|
||||
postPatch = ''
|
||||
chmod +w ../../
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
version = "0.31.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d3Jjs/a2EgdqRBTjXKwDDRnU6orb7RQGl1CVz9b9SdI=";
|
||||
hash = "sha256-JpuCX2ae9me+zHxQj5jqQlgDci2NV+TEVUAqnuTn3cA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2MugS0/MO85lQvDbiFwnsX4LYdk7TACDFR8OOLEFGUQ=";
|
||||
cargoHash = "sha256-gkRblCHUFiprZeYtu43GIGBZqCq5l/HEGaQN91XbfSs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
95
pkgs/by-name/ri/ringracers/package.nix
Normal file
95
pkgs/by-name/ri/ringracers/package.nix
Normal file
@ -0,0 +1,95 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, curl
|
||||
, nasm
|
||||
, game-music-emu
|
||||
, libpng
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
, libvpx
|
||||
, libyuv
|
||||
, zlib
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ringracers";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KartKrewDev";
|
||||
repo = "RingRacers";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X2rSwZOEHtnSJBpu+Xf2vkxGUAZSNSXi6GCuGlM6jhY=";
|
||||
};
|
||||
|
||||
assets = fetchzip {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-assets";
|
||||
url = "https://github.com/KartKrewDev/RingRacers/releases/download/v${finalAttrs.version}/Dr.Robotnik.s-Ring-Racers-v${finalAttrs.version}-Assets.zip";
|
||||
hash = "sha256-sHeI1E6uNF0gBNd1e1AU/JT9wyZdkCQgYLiMPZqXAVc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
nasm
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
game-music-emu
|
||||
libpng
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
libvpx
|
||||
libyuv
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}"
|
||||
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
||||
"-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
|
||||
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "ringracers";
|
||||
exec = "ringracers";
|
||||
icon = "ringracers";
|
||||
comment = "This is Racing at the Next Level";
|
||||
desktopName = "Dr. Robotnik's Ring Racers";
|
||||
startupWMClass = ".ringracers-wrapped";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png
|
||||
install -Dm755 bin/ringracers $out/bin/ringracers
|
||||
|
||||
wrapProgram $out/bin/ringracers \
|
||||
--set RINGRACERSWADDIR "${finalAttrs.assets}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
|
||||
homepage = "https://kartkrew.org";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ donovanglover thehans255 ];
|
||||
mainProgram = "ringracers";
|
||||
};
|
||||
})
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripunzip";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "ripunzip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WcqN3Li0UiEhntKlQkGUrkP9N1I3NrjaGzIs9Q5i4y4=";
|
||||
hash = "sha256-qDY81SxTVfGBCZU2jxuOswyTqzN7Mk3q7Ns6+ShRUnU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CezigBDU632UVaeFNv+iM2dQQUabKhOP43etp6vjxTg=";
|
||||
cargoHash = "sha256-8AKmIzMrxpQBDrW8C/OFZYvFn+u4yvWbMXSsCC0NX+Y=";
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
|
||||
|
||||
@ -14,9 +14,9 @@
|
||||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "srm-cuarzo";
|
||||
version = "0.5.6-1";
|
||||
version = "0.5.6-2";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-REILtx4tPAWX4JnBjC0EU5dnnZhbVHhlVAWKo7n7sdA=";
|
||||
hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit (self) rev hash;
|
||||
@ -42,12 +42,6 @@ stdenv.mkDerivation (self: {
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/meson.build \
|
||||
--replace "/usr/include/drm" "${libdrm.dev}/include/drm" \
|
||||
--replace "/usr/include/libdrm" "${libdrm.dev}/include/libdrm"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# The root meson.build file is in src/
|
||||
cd src
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "1.11.5";
|
||||
version = "1.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GQZQJdhQxg2i61Wiazeag6XBYPmOdQ1nAv5ROJH50ns=";
|
||||
hash = "sha256-k7IKzklqGP676xd6ptIfbPLqAxUwaBZUz1dZ88pJReU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc=";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-plugin-docs";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-plugin-docs";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-1ZJPy/kRYKcwr/k/u8ux5Eo1LIkrNpVyXrd9ff+Na6I=";
|
||||
sha256 = "sha256-UPTiIY2aW6XDmJnMb1ATNWe3BvZQnPL0BweC/gxtztQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dBDvh3aIHu8iGwFt+29SdCl1gICwO7LnxQ7Wux+2tOk=";
|
||||
vendorHash = "sha256-ZSHCP0eZWCvSObbUOSl0ohiiX79MyGC2ALowzvMXMv4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -1,26 +1,29 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
|
||||
, openssl, libiconv, CoreServices, Security }:
|
||||
, openssl, libiconv, CoreServices, Security, SystemConfiguration }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trunk-ng";
|
||||
version = "0.17.11";
|
||||
version = "0.17.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctron";
|
||||
repo = "trunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZaSWfuz0w9bkilpDv4EAt6gn6ZdKOLTYJlJMQqtZAwY=";
|
||||
hash = "sha256-SnE0z9Wa4gtX/ts0vG9pYnnxumILHTSV9/tVYkCHFck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = if stdenv.isDarwin
|
||||
then [ libiconv CoreServices Security ]
|
||||
then [ libiconv CoreServices Security SystemConfiguration ]
|
||||
else [ openssl ];
|
||||
|
||||
# requires network
|
||||
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
|
||||
|
||||
cargoHash = "sha256-O3e8v0r76VeMYODah2RYTmwr9WNAX+HPhYVmDuP2gfg=";
|
||||
cargoHash = {
|
||||
darwin = "sha256-TwpGw3LH3TmZSbC4DkoOYpQdOpksXXoAoiacyZAefTU=";
|
||||
linux = "sha256-AivISmT/r8xa/vSXUN8sU7z67t1hcyMQM+t6oXmIOhU=";
|
||||
}.${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ctron/trunk";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg";
|
||||
version = "2024.04.26";
|
||||
version = "2024.05.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Bu1sZhk8fqG5D7m/0QK3uI97stXx8l8y30lnffTr9h0=";
|
||||
hash = "sha256-R9iQIEmraXOzPi6rOd7wVV9BMC/wDDEveLIRJmAVISI=";
|
||||
};
|
||||
|
||||
installPhase = let
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user