Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
@@ -140,6 +140,7 @@ rec {
|
||||
|
||||
qemuArch =
|
||||
if final.isAarch32 then "arm"
|
||||
else if final.isS390 && !final.isS390x then null
|
||||
else if final.isx86_64 then "x86_64"
|
||||
else if final.isx86 then "i386"
|
||||
else final.uname.processor;
|
||||
@@ -193,7 +194,7 @@ rec {
|
||||
then "${pkgs.runtimeShell} -c '\"$@\"' --"
|
||||
else if final.isWindows
|
||||
then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"
|
||||
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
|
||||
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null
|
||||
then "${qemu-user}/bin/qemu-${final.qemuArch}"
|
||||
else if final.isWasi
|
||||
then "${pkgs.wasmtime}/bin/wasmtime"
|
||||
|
||||
@@ -61,7 +61,7 @@ with lib;
|
||||
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
|
||||
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
|
||||
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
|
||||
qt5 = super.qt5.overrideScope' (const (super': {
|
||||
qt5 = super.qt5.overrideScope (const (super': {
|
||||
qtbase = super'.qtbase.override { withGtk3 = false; };
|
||||
}));
|
||||
stoken = super.stoken.override { withGTK3 = false; };
|
||||
|
||||
@@ -398,7 +398,7 @@ in
|
||||
systemd.services.hydra-evaluator =
|
||||
{ wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "hydra-init.service" ];
|
||||
after = [ "hydra-init.service" "network.target" ];
|
||||
after = [ "hydra-init.service" "network.target" "network-online.target" ];
|
||||
path = with pkgs; [ hydra-package nettools jq ];
|
||||
restartTriggers = [ hydraConf ];
|
||||
environment = env // {
|
||||
|
||||
@@ -366,21 +366,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "beframe";
|
||||
ename = "beframe";
|
||||
version = "0.1.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar";
|
||||
sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/beframe.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bind-key";
|
||||
@@ -1674,16 +1659,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "erc";
|
||||
ename = "erc";
|
||||
version = "5.5";
|
||||
version = "5.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/erc-5.5.tar";
|
||||
sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
|
||||
url = "https://elpa.gnu.org/packages/erc-5.4.1.tar";
|
||||
sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/erc.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -2627,10 +2612,10 @@
|
||||
elpaBuild {
|
||||
pname = "kind-icon";
|
||||
ename = "kind-icon";
|
||||
version = "0.2.0";
|
||||
version = "0.1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar";
|
||||
sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r";
|
||||
url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar";
|
||||
sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli";
|
||||
};
|
||||
packageRequires = [ emacs svg-lib ];
|
||||
meta = {
|
||||
@@ -3062,10 +3047,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "4.1.1";
|
||||
version = "3.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar";
|
||||
sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
|
||||
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@@ -3746,10 +3731,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.42";
|
||||
version = "0.4.39";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar";
|
||||
sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar";
|
||||
sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@@ -3836,10 +3821,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.4.0";
|
||||
version = "1.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar";
|
||||
sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar";
|
||||
sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@@ -4437,10 +4422,10 @@
|
||||
elpaBuild {
|
||||
pname = "shell-command-plus";
|
||||
ename = "shell-command+";
|
||||
version = "2.4.2";
|
||||
version = "2.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
|
||||
sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm";
|
||||
url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
|
||||
sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@@ -4911,10 +4896,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy-magit-section";
|
||||
ename = "taxy-magit-section";
|
||||
version = "0.12.2";
|
||||
version = "0.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar";
|
||||
sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1";
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
|
||||
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
|
||||
};
|
||||
packageRequires = [ emacs magit-section taxy ];
|
||||
meta = {
|
||||
@@ -5050,10 +5035,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.0.2";
|
||||
version = "2.6.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar";
|
||||
sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar";
|
||||
sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@@ -5155,10 +5140,10 @@
|
||||
elpaBuild {
|
||||
pname = "triples";
|
||||
ename = "triples";
|
||||
version = "0.2.6";
|
||||
version = "0.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
|
||||
sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
|
||||
url = "https://elpa.gnu.org/packages/triples-0.2.3.tar";
|
||||
sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@@ -5426,10 +5411,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico-posframe";
|
||||
ename = "vertico-posframe";
|
||||
version = "0.7.2";
|
||||
version = "0.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar";
|
||||
sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny";
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar";
|
||||
sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a";
|
||||
};
|
||||
packageRequires = [ emacs posframe vertico ];
|
||||
meta = {
|
||||
|
||||
@@ -9,6 +9,8 @@ in
|
||||
|
||||
agda2-mode = callPackage ./manual-packages/agda2-mode { };
|
||||
|
||||
bqn-mode = callPackage ./manual-packages/bqn-mode { };
|
||||
|
||||
cask = callPackage ./manual-packages/cask { };
|
||||
|
||||
control-lock = callPackage ./manual-packages/control-lock { };
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.pre+date=2022-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
repo = "bqn-mode";
|
||||
rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
|
||||
hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emacs mode for BQN programming language";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sternenseemann AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@@ -3182,10 +3182,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "22.12.20230301220803";
|
||||
version = "22.9.20230207171612";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar";
|
||||
sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
|
||||
sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7644,6 +7644,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
|
||||
};
|
||||
|
||||
smartyank-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "smartyank.nvim";
|
||||
version = "2023-02-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "smartyank.nvim";
|
||||
rev = "7e3905578f646503525b2f7018b8afd17861018c";
|
||||
sha256 = "19lp8cpnp3ynr6vc5si3gsfpdw78xs8krmaqlbjsx478ig316y7z";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/";
|
||||
};
|
||||
|
||||
snap = buildVimPluginFrom2Nix {
|
||||
pname = "snap";
|
||||
version = "2022-08-03";
|
||||
|
||||
@@ -642,6 +642,7 @@ https://github.com/mopp/sky-color-clock.vim/,,
|
||||
https://github.com/kovisoft/slimv/,,
|
||||
https://github.com/mrjones2014/smart-splits.nvim/,,
|
||||
https://github.com/gorkunov/smartpairs.vim/,,
|
||||
https://github.com/ibhagwan/smartyank.nvim/,,
|
||||
https://github.com/camspiers/snap/,,
|
||||
https://github.com/norcalli/snippets.nvim/,,
|
||||
https://github.com/shaunsingh/solarized.nvim/,HEAD,
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.3.1059",
|
||||
"version": "0.3.1426",
|
||||
"dependencies": {
|
||||
"d3": "^7.3.0",
|
||||
"d3-graphviz": "^4.1.0",
|
||||
"vscode-languageclient": "8.0.0-next.14",
|
||||
"@types/node": "~14.17.5",
|
||||
"anser": "^2.1.1",
|
||||
"d3": "^7.6.1",
|
||||
"d3-graphviz": "^5.0.2",
|
||||
"vscode-languageclient": "^8.0.2",
|
||||
"@types/node": "~16.11.7",
|
||||
"@types/vscode": "~1.66.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.16.0",
|
||||
"@typescript-eslint/parser": "^5.16.0",
|
||||
"@vscode/test-electron": "^2.1.3",
|
||||
"@typescript-eslint/eslint-plugin": "^5.30.5",
|
||||
"@typescript-eslint/parser": "^5.30.5",
|
||||
"@vscode/test-electron": "^2.1.5",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^8.11.0",
|
||||
"tslib": "^2.3.0",
|
||||
"typescript": "^4.6.3",
|
||||
"typescript-formatter": "^7.2.2",
|
||||
"vsce": "^2.7.0"
|
||||
"eslint": "^8.19.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"ovsx": "^0.5.2",
|
||||
"prettier": "^2.7.1",
|
||||
"tslib": "^2.4.0",
|
||||
"typescript": "^4.7.4",
|
||||
"vsce": "^2.9.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2022-05-17";
|
||||
releaseTag = "2023-03-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = releaseTag;
|
||||
sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM=";
|
||||
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
|
||||
};
|
||||
|
||||
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps";
|
||||
|
||||
@@ -48,4 +48,4 @@ else
|
||||
./"$node_packages"/generate.sh
|
||||
fi
|
||||
|
||||
echo "Remember to also update the revisionTag and hash in default.nix!"
|
||||
echo "Remember to also update the releaseTag and hash in default.nix!"
|
||||
|
||||
@@ -47,13 +47,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-62";
|
||||
version = "7.1.1-0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI=";
|
||||
hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@@ -40,8 +40,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Describe your shell commands in natural language";
|
||||
homepage = "https://github.com/dylanjcastillo/shell-genie";
|
||||
# https://github.com/dylanjcastillo/shell-genie/issues/3
|
||||
license = licenses.unfree;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ newScope, config, stdenv, fetchurl, makeWrapper
|
||||
, llvmPackages_14
|
||||
, llvmPackages_15
|
||||
, ed, gnugrep, coreutils, xdg-utils
|
||||
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
|
||||
@@ -19,7 +18,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
llvmPackages = llvmPackages_14;
|
||||
llvmPackages = llvmPackages_15;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
|
||||
@@ -54,9 +53,6 @@ let
|
||||
inherit (upstream-info.deps.gn) url rev sha256;
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (chromiumVersionAtLeast "111") rec {
|
||||
llvmPackages = llvmPackages_15;
|
||||
stdenv = llvmPackages_15.stdenv;
|
||||
});
|
||||
|
||||
browser = callPackage ./browser.nix {
|
||||
|
||||
@@ -19,22 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "111.0.5563.64",
|
||||
"sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x",
|
||||
"sha256bin64": "1cl7zbsl0ndp5x1g0p1q511mn72iy72sqxycmlrccs9j8jmaiqgw",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "112.0.5615.12",
|
||||
"sha256": "1kkpfaqr3rzxlj7kn2l8gchvq17w03mcf3aajqv193jazcb083ci",
|
||||
"sha256bin64": "1ci3vmr6q665rp8h7b1y7gmkv4zczjw5ryf0yycwfcll087ym6g6",
|
||||
"version": "112.0.5615.20",
|
||||
"sha256": "0qxifnc2xk2zkmpzc1pzd95ym3i829qzgzd83qh7ah9p64c76f9y",
|
||||
"sha256bin64": "11c7k87fnfhaynhpp2rjzpzydrl096fjx3gw589nvq1lckbg9nsd",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-02-17",
|
||||
@@ -44,10 +31,23 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "113.0.5638.0",
|
||||
"sha256": "0v4hminx765swv0iakg5qw7rk6zc67cn5p9x625jaizz50ahpfib",
|
||||
"sha256bin64": "07snjlizj30mzcm5fbsg6ibd4jqmcwiykdwrpqmdqq902c3gwc3r",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-02-24",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fe330c0ae1ec29db30b6f830e50771a335e071fb",
|
||||
"sha256": "0fj8kfck53hbfz30m8p0mfcqbjs9cjrlfzi03l3h7n7yd88js8i4"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "110.0.5481.177",
|
||||
"sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv",
|
||||
"sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2",
|
||||
"version": "111.0.5563.65",
|
||||
"sha256": "1wg84pd50zi5268snkiahnp5191c66bqkbvdz2z8azivm95lwqwp",
|
||||
"sha256bin64": null,
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
@@ -56,8 +56,8 @@
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "110.0.5481.177-1",
|
||||
"sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n"
|
||||
"rev": "111.0.5563.65-1",
|
||||
"sha256": "06mfm2gaz1nbwqhn2jp34pm52rw1q99i9fq7wh19m0qasdpidis9"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, substituteAll
|
||||
, pam
|
||||
, python3
|
||||
, libxslt
|
||||
@@ -88,7 +89,6 @@
|
||||
, gdb
|
||||
, commonsLogging
|
||||
, librdf_rasqal
|
||||
, wrapGAppsHook
|
||||
, gnome
|
||||
, glib
|
||||
, ncurses
|
||||
@@ -102,15 +102,32 @@
|
||||
, mkDerivation ? null
|
||||
, qtbase ? null
|
||||
, qtx11extras ? null
|
||||
, qtwayland ? null
|
||||
, ki18n ? null
|
||||
, kconfig ? null
|
||||
, kcoreaddons ? null
|
||||
, kio ? null
|
||||
, kwindowsystem ? null
|
||||
, wrapQtAppsHook ? null
|
||||
, variant ? "fresh"
|
||||
, symlinkJoin
|
||||
, postgresql
|
||||
# The rest are used only in passthru, for the wrapper
|
||||
, kauth ? null
|
||||
, kcompletion ? null
|
||||
, kconfigwidgets ? null
|
||||
, kglobalaccel ? null
|
||||
, kitemviews ? null
|
||||
, knotifications ? null
|
||||
, ktextwidgets ? null
|
||||
, kwidgetsaddons ? null
|
||||
, kxmlgui ? null
|
||||
, phonon ? null
|
||||
, qtdeclarative ? null
|
||||
, qtquickcontrols ? null
|
||||
, qtsvg ? null
|
||||
, qttools ? null
|
||||
, solid ? null
|
||||
, sonnet ? null
|
||||
} @ args:
|
||||
|
||||
assert builtins.elem variant [ "fresh" "still" ];
|
||||
@@ -354,33 +371,24 @@ in
|
||||
|
||||
# It installs only things to $out/lib/libreoffice
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin $out/share/desktop
|
||||
|
||||
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
|
||||
|
||||
for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
|
||||
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
|
||||
done
|
||||
|
||||
ln -s $out/bin/soffice $out/bin/libreoffice
|
||||
mkdir -p $out/share
|
||||
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
|
||||
|
||||
for f in $out/share/applications/*.desktop; do
|
||||
substituteInPlace "$f" \
|
||||
--replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
|
||||
done
|
||||
|
||||
cp -r sysui/desktop/icons "$out/share"
|
||||
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
|
||||
|
||||
# Install dolphin templates, like debian does
|
||||
install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
|
||||
|
||||
mkdir -p $dev
|
||||
cp -r include $dev
|
||||
'' + optionalString kdeIntegration ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapQtApp $prog
|
||||
done
|
||||
'';
|
||||
|
||||
# Wrapping is done in ./wrapper.nix
|
||||
dontWrapQtApps = true;
|
||||
|
||||
configureFlags = [
|
||||
@@ -464,8 +472,7 @@ in
|
||||
jdk17
|
||||
libtool
|
||||
pkg-config
|
||||
]
|
||||
++ [ (if kdeIntegration then wrapQtAppsHook else wrapGAppsHook) ];
|
||||
];
|
||||
|
||||
buildInputs = with xorg; [
|
||||
ArchiveZip
|
||||
@@ -557,20 +564,56 @@ in
|
||||
zip
|
||||
zlib
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gstreamer
|
||||
])
|
||||
++ passthru.gst_packages
|
||||
++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]
|
||||
++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
jdk = jre';
|
||||
inherit kdeIntegration;
|
||||
# For the wrapper.nix
|
||||
inherit gtk3;
|
||||
# Although present in qtPackages, we need qtbase.qtPluginPrefix and
|
||||
# qtbase.qtQmlPrefix
|
||||
inherit qtbase;
|
||||
gst_packages = with gst_all_1; [
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gstreamer
|
||||
];
|
||||
qmlPackages = [
|
||||
ki18n
|
||||
knotifications
|
||||
qtdeclarative
|
||||
qtquickcontrols
|
||||
qtwayland
|
||||
solid
|
||||
sonnet
|
||||
];
|
||||
qtPackages = [
|
||||
kauth
|
||||
kcompletion
|
||||
kconfigwidgets
|
||||
kglobalaccel
|
||||
ki18n
|
||||
kio
|
||||
kitemviews
|
||||
ktextwidgets
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
phonon
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtsvg
|
||||
qttools
|
||||
qtwayland
|
||||
sonnet
|
||||
];
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
@@ -1,33 +1,101 @@
|
||||
{ lib, runCommand
|
||||
, libreoffice, dbus, bash, substituteAll
|
||||
, coreutils, gnugrep
|
||||
, dolphinTemplates ? true
|
||||
{ lib
|
||||
, stdenv
|
||||
# The unwrapped libreoffice derivation
|
||||
, unwrapped
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, substituteAll
|
||||
# For Emulating wrapGAppsHook
|
||||
, gsettings-desktop-schemas
|
||||
, hicolor-icon-theme
|
||||
, dconf
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
# Configuration options for the wrapper
|
||||
, extraMakeWrapperArgs ? []
|
||||
, dbusVerify ? stdenv.isLinux
|
||||
, dbus
|
||||
}:
|
||||
runCommand libreoffice.name {
|
||||
inherit (libreoffice) jdk meta;
|
||||
inherit coreutils dbus gnugrep libreoffice bash;
|
||||
|
||||
let
|
||||
makeWrapperArgs = builtins.concatStringsSep " " ([
|
||||
"--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"
|
||||
"--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk3}/share/gsettings-schemas/${unwrapped.gtk3.name}"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "$out/share"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
|
||||
"--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share"
|
||||
"--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":"
|
||||
"${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}"
|
||||
] ++ lib.optionals unwrapped.kdeIntegration [
|
||||
"--prefix" "QT_PLUGIN_PATH" ":" "${
|
||||
lib.makeSearchPath
|
||||
unwrapped.qtbase.qtPluginPrefix
|
||||
(builtins.map lib.getBin unwrapped.qtPackages)
|
||||
}"
|
||||
"--prefix" "QML2_IMPORT_PATH" ":" "${
|
||||
lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix
|
||||
(builtins.map lib.getBin unwrapped.qmlPackages)
|
||||
}"
|
||||
] ++ [
|
||||
# Add dictionaries from all NIX_PROFILES
|
||||
"--run" (lib.escapeShellArg ''
|
||||
for PROFILE in $NIX_PROFILES; do
|
||||
HDIR="$PROFILE/share/hunspell"
|
||||
if [ -d "$HDIR" ]; then
|
||||
export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
|
||||
fi
|
||||
done
|
||||
'')
|
||||
] ++ lib.optionals dbusVerify [
|
||||
# If no dbus is running, start a dedicated dbus daemon
|
||||
"--run" (lib.escapeShellArg ''
|
||||
if ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
|
||||
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
|
||||
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
|
||||
mkdir -p "$dbus_tmp_dir"
|
||||
fi
|
||||
if ! test -d "$dbus_tmp_dir"; then
|
||||
dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus"
|
||||
mkdir -p "$dbus_tmp_dir"
|
||||
fi
|
||||
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
|
||||
"${dbus}"/bin/dbus-daemon \
|
||||
--nopidfile \
|
||||
--nofork \
|
||||
--config-file "${dbus}"/share/dbus-1/session.conf \
|
||||
--address "unix:path=$dbus_socket_dir/session" &> /dev/null &
|
||||
dbus_pid=$!
|
||||
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
|
||||
fi
|
||||
'')
|
||||
] ++ [
|
||||
"--chdir" "${unwrapped}/lib/libreoffice/program"
|
||||
"--inherit-argv0"
|
||||
] ++ extraMakeWrapperArgs
|
||||
);
|
||||
in runCommand "${unwrapped.name}-wrapped" {
|
||||
inherit (unwrapped) meta;
|
||||
paths = [ unwrapped ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru = {
|
||||
inherit unwrapped;
|
||||
# For backwards compatibility:
|
||||
libreoffice = lib.warn "libreoffice: Use the unwrapped attributed, using libreoffice.libreoffice is deprecated." unwrapped;
|
||||
inherit (unwrapped) kdeIntegration;
|
||||
};
|
||||
} (''
|
||||
mkdir -p "$out/bin"
|
||||
substituteAll "${./wrapper.sh}" "$out/bin/soffice"
|
||||
chmod a+x "$out/bin/soffice"
|
||||
|
||||
for i in $(ls "${libreoffice}/bin/"); do
|
||||
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
|
||||
ln -s ${unwrapped}/share $out/share
|
||||
ln -s ${unwrapped}/lib $out/lib
|
||||
for i in sbase scalc sdraw smath swriter simpress soffice unopkg; do
|
||||
makeWrapper ${unwrapped}/lib/libreoffice/program/$i $out/bin/$i ${makeWrapperArgs}
|
||||
'' + lib.optionalString dbusVerify ''
|
||||
# Delete the dbus socket directory after libreoffice quits
|
||||
sed -i 's/^exec -a "$0" //g' $out/bin/"$i"
|
||||
echo 'code="$?"' >> $out/bin/$i
|
||||
echo 'test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }' >> $out/bin/$i
|
||||
echo 'exit "$code"' >> $out/bin/$i
|
||||
'' + ''
|
||||
done
|
||||
|
||||
mkdir -p "$out/share"
|
||||
ln -s "${libreoffice}/share"/* $out/share
|
||||
'' + lib.optionalString dolphinTemplates ''
|
||||
# Add templates to dolphin "Create new" menu - taken from debian
|
||||
|
||||
# We need to unpack the core source since the necessary files aren't available in the libreoffice output
|
||||
unpackFile "${libreoffice.src}"
|
||||
|
||||
install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"
|
||||
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
|
||||
cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
|
||||
'')
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
#!@bash@/bin/bash
|
||||
export JAVA_HOME="${JAVA_HOME:-@jdk@}"
|
||||
#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
|
||||
|
||||
if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null &&
|
||||
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
|
||||
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
|
||||
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
|
||||
mkdir -p "$dbus_tmp_dir"
|
||||
fi
|
||||
if ! test -d "$dbus_tmp_dir"; then
|
||||
dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus"
|
||||
mkdir -p "$dbus_tmp_dir"
|
||||
fi
|
||||
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
|
||||
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null &
|
||||
dbus_pid=$!
|
||||
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
|
||||
fi
|
||||
|
||||
for PROFILE in $NIX_PROFILES; do
|
||||
HDIR="$PROFILE/share/hunspell"
|
||||
if [ -d "$HDIR" ]; then
|
||||
export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
|
||||
fi
|
||||
done
|
||||
|
||||
"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@"
|
||||
code="$?"
|
||||
|
||||
test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }
|
||||
exit "$code"
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pdfmixtool";
|
||||
version = "1.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "scarpetta";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc=";
|
||||
hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,12 +36,11 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix incompatibility with qpdf11
|
||||
# fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff";
|
||||
hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g=";
|
||||
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
|
||||
hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.24.1";
|
||||
version = "2.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W0wl9I5FblbUBi1kZ7X+lhnhDahrggm9ooTaTWqATLg=";
|
||||
hash = "sha256-Z0Z8mMTk1uAgegL4swJswCJ3D5Zi7DMTai9oQXH+2WM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
, withCaca ? withFullDeps # Textual display (ASCII art)
|
||||
, withCelt ? withFullDeps # CELT decoder
|
||||
, withCrystalhd ? withFullDeps
|
||||
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64))
|
||||
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch))
|
||||
, withCudaLLVM ? withFullDeps
|
||||
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
|
||||
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
|
||||
@@ -57,8 +57,8 @@
|
||||
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
|
||||
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
|
||||
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
|
||||
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
|
||||
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
|
||||
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
|
||||
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
|
||||
, withOpencl ? withFullDeps
|
||||
|
||||
@@ -7,7 +7,7 @@ Check for any minor version changes.
|
||||
|
||||
*/
|
||||
|
||||
{ newScope
|
||||
{ makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl, python3
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
@@ -119,6 +119,9 @@ let
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
|
||||
in {
|
||||
|
||||
# remove before 23.11
|
||||
overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
|
||||
|
||||
inherit callPackage qtCompatVersion qtModule srcs;
|
||||
|
||||
mkDerivationWith =
|
||||
@@ -225,4 +228,4 @@ let
|
||||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
};
|
||||
|
||||
in lib.makeScope newScope addPackages
|
||||
in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages
|
||||
|
||||
+2639
-2904
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-x4OtYUJjRDSDd0FzlbMf7syjUIVxKsqgEfRWS1wgvPo=";
|
||||
hash = "sha256-A2jk8gXqKeQ3b2p9/bkPat1NdhUOFdJCZeSFg//D/hA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.18";
|
||||
version = "2.5.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pf9/mjbyC859WT8ZreFq5u6YER/tRgsQuqIgt6mdPqE=";
|
||||
hash = "sha256-+EY2x9PQ8MQsvLg4p1Oki5JLqYHatTsANLBwqS1y7kw=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "12.2.7";
|
||||
version = "13.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CtOicqS4PBDcsLrIyu3vek5Gi73vfE2vZfIo83mJgS4=";
|
||||
hash = "sha256-uQ5e85KHFaJCgpALFCYVs+nY0fZIE4UIYdNOn6VrIWM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1xreFjoHmdMirpxjVya30cw31fBaCPt877yqTr9By+A=";
|
||||
hash = "sha256-CBPBmzghuc+kvBt50qmU+jHyUdGgLgNX3jcVm9CC7/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.4.9";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6hv85lWr2/qRzLrER6IYdmcvgiPKi1tt4fQaiqGwFQY=";
|
||||
hash = "sha256-mkCICKuo9NYkfjjbuDInq+ENwZsQJMf5C1HS+8nafJI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.1.13";
|
||||
version = "0.1.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/KUPePiy3ROZY+orJYZQLiAaQ5kY5eAe4v1hOS5Zmck=";
|
||||
hash = "sha256-Z/W49P1T8XgCmKWLTO/eI7ArAB9QKWUbJWRTlRnjJ7E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "screenlogicpy";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "dieselrabbit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VZ2WZpty7PXxU0uqJ/dftUNBW3QEIXrLghKxsW9lsgE=";
|
||||
hash = "sha256-cnQ3YqVz0AfEVma/RfQuB5kOBxo59qJJBn7PwaEe8Ro=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "timeago";
|
||||
version = "1.0.15";
|
||||
version = "1.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hustcc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03vm7c02l4g2d1x33w382i1psk8i3an7xchk69yinha33fjj1cag";
|
||||
sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -1,30 +1,50 @@
|
||||
{ lib
|
||||
, symlinkJoin
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, cudaSupport ? torch.cudaSupport or false # by default uses the value from torch
|
||||
, fetchFromGitHub
|
||||
, ninja
|
||||
, which
|
||||
, lib
|
||||
, libjpeg_turbo
|
||||
, libpng
|
||||
, ninja
|
||||
, numpy
|
||||
, scipy
|
||||
, pillow
|
||||
, torch
|
||||
, pytest
|
||||
, cudaSupport ? torch.cudaSupport or false # by default uses the value from torch
|
||||
, scipy
|
||||
, symlinkJoin
|
||||
, torch
|
||||
, which
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (torch) gpuTargetString;
|
||||
inherit (torch.cudaPackages) cudatoolkit cudnn;
|
||||
inherit (torch) cudaPackages gpuTargetString;
|
||||
inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion;
|
||||
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib ];
|
||||
# NOTE: torchvision doesn't use cudnn; torch does!
|
||||
# For this reason it is not included.
|
||||
cuda-common-redist = with cudaPackages; [
|
||||
cuda_cccl # <thrust/*>
|
||||
libcublas # cublas_v2.h
|
||||
libcusolver # cusolverDn.h
|
||||
libcusparse # cusparse.h
|
||||
];
|
||||
|
||||
cuda-native-redist = symlinkJoin {
|
||||
name = "cuda-native-redist-${cudaVersion}";
|
||||
paths = with cudaPackages; [
|
||||
cuda_cudart # cuda_runtime.h
|
||||
cuda_nvcc
|
||||
] ++ cuda-common-redist;
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
|
||||
cuda-redist = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
paths = cuda-common-redist;
|
||||
};
|
||||
|
||||
pname = "torchvision";
|
||||
version = "0.14.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
@@ -33,18 +53,22 @@ in buildPythonPackage rec {
|
||||
hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libpng ninja which ]
|
||||
++ lib.optionals cudaSupport [ cudatoolkit_joined ];
|
||||
nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ];
|
||||
|
||||
TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
|
||||
TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
|
||||
|
||||
buildInputs = [ libjpeg_turbo libpng ]
|
||||
++ lib.optionals cudaSupport [ cudnn ];
|
||||
buildInputs = [ libjpeg_turbo libpng ] ++ lib.optionals cudaSupport [ cuda-redist ];
|
||||
|
||||
propagatedBuildInputs = [ numpy pillow torch scipy ];
|
||||
|
||||
preBuild = lib.optionalString cudaSupport ''
|
||||
preConfigure = ''
|
||||
export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/"
|
||||
export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/"
|
||||
''
|
||||
# NOTE: We essentially override the compilers provided by stdenv because we don't have a hook
|
||||
# for cudaPackages to swap in compilers supported by NVCC.
|
||||
+ lib.optionalString cudaSupport ''
|
||||
export CC=${cudatoolkit.cc}/bin/cc
|
||||
export CXX=${cudatoolkit.cc}/bin/c++
|
||||
export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++
|
||||
export TORCH_CUDA_ARCH_LIST="${gpuTargetString}"
|
||||
export FORCE_CUDA=1
|
||||
'';
|
||||
@@ -52,6 +76,7 @@ in buildPythonPackage rec {
|
||||
# tries to download many datasets for tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "torchvision" ];
|
||||
checkPhase = ''
|
||||
HOME=$TMPDIR py.test test --ignore=test/test_datasets_download.py
|
||||
'';
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.8.33";
|
||||
version = "1.8.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pyu8umkR8ncDVkSLJbxqnLFRlZQR29GnkCSxDNHQUGg=";
|
||||
hash = "sha256-h3Bfdd5v8lder5N+75P/u9rSxxhvpw5mf/T4bNYWdOY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA=";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "toast";
|
||||
version = "0.46.1";
|
||||
version = "0.46.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepchowfun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3ng1nVl5eqpa3YWqT/RYZo9sBl6Zkyc8NabG1GpjapQ=";
|
||||
sha256 = "sha256-WsNBBivfw0tUF3TsJBbg7A13IcFEqclF9MR55xogI5Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-22DtD0PeuDK1Gwy28ZD02LJYgOYuowf+pDQjHXiT6+A=";
|
||||
cargoHash = "sha256-hZA5iWZ2KKifvHRx5p9LM/la80ezyzV2XOuxq0lRYB0=";
|
||||
|
||||
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails
|
||||
|
||||
|
||||
@@ -2,26 +2,26 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "runelite";
|
||||
version = "2.1.5";
|
||||
version = "2.5.0";
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar";
|
||||
sha256 = "4BX188QIjIFTxng2ktqlKn7AqQ9tdBcKWmgOj/5yd10=";
|
||||
hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ==";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png";
|
||||
sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1";
|
||||
hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ==";
|
||||
};
|
||||
|
||||
# The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually
|
||||
jogl = fetchurl {
|
||||
url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar";
|
||||
sha256 = "S60qxyWY9RfyhLFygn/OxZFWnc8qVRtTFdWMbdu+2U0=";
|
||||
hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg==";
|
||||
};
|
||||
gluegen = fetchurl {
|
||||
url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20200429/gluegen-rt-2.4.0-rc-20200429-natives-linux-amd64.jar";
|
||||
sha256 = "eF8S5sQkJFDtW8rcVBKIyeyKm5Ze5rXK5r/yosZcHjU=";
|
||||
url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar";
|
||||
hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A==";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@@ -4,17 +4,19 @@
|
||||
, installShellFiles
|
||||
, buildGoModule
|
||||
, go
|
||||
, makeWrapper
|
||||
, viceroy
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "7.0.1";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6M1vdwtw+qjKldW642JN2sanaKV3u9J1qWAoLRNupzE=";
|
||||
hash = "sha256-Bwof1Np0eSjmBXQ6dqFmw3TA/2u+VzzyIn/95m9eXVo=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -31,10 +33,11 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-oQwlhlZHpUvGaOyozBpK5W9glzo8VKH7S3vih5c15OA=";
|
||||
vendorHash = "sha256-/tdvIX839NkhUoj/bfJ/68K8RtPCidydNQZCdDvizzU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
# Flags as provided by the build automation of the project:
|
||||
@@ -49,14 +52,19 @@ buildGoModule rec {
|
||||
];
|
||||
preBuild = let
|
||||
cliConfigToml = fetchurl {
|
||||
url = "https://web.archive.org/web/20230207211120/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-Vkl8V5AkiJMZLswSN0vTnz7S7/5lXftlWD5UZh//vUw=";
|
||||
url = "https://web.archive.org/web/20230308181550/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-Y2KBTiUQlugKjfhOY+8W7/IUSjgeRVc2NgmL+nhb6aQ=";
|
||||
};
|
||||
in ''
|
||||
cp ${cliConfigToml} ./pkg/config/config.toml
|
||||
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/fastly --prefix PATH : ${lib.makeBinPath [ viceroy ]} \
|
||||
--set FASTLY_VICEROY_USE_PATH 1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd fastly \
|
||||
|
||||
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
|
||||
"SBINDIR=$(out)/sbin"
|
||||
"DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
|
||||
"HDRDIR=$(dev)/include/iproute2"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
"SHARED_LIBS=n"
|
||||
# all build .so plugins:
|
||||
"TC_CONFIG_NO_XT=y"
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.31.1.6733-bc0674160";
|
||||
version = "1.31.1.6782-77dfff442";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "0nj9n250lhin58xlqvn2l0pjxdbajj0bla2wrgan8gs2m45nk3q9";
|
||||
sha256 = "1ssnqkyghjpc81jmh67j5bwqqbvjb9aaan9j1yp2rj89fgg9br2c";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "0a5h151gh1ja3frqzaqw3pj1kyh5p0wgnfmmxiz0q3zx1drjs611";
|
||||
sha256 = "0mnqbh5cfpvbhq2s0jg207cy45dm6dkz3d88qgwsi8spwfaj84p7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.11.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.11.1"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = version;
|
||||
hash = "sha256-i5ZGq51ZKEkyt6+d/Q4NzGS/zEaoqNql2IPZ2xlTV6k=";
|
||||
hash = "sha256-+gTs+TAv3gchtwGbiYwXjIfMYFWfkGW9Jk1Aru3mA3s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-03-08";
|
||||
version = "2023-03-09";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pUFgjdVEtvIJu1BBLQRwtL3IqJYZ6iZ8MttfWhscg20=";
|
||||
hash = "sha256-GOO8IQUWfgqD8pjynfIz4McAqr/F1JF0uN6aeOOqQyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,11 +12,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libxml2 libzip ];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://ebook-tools.sourceforge.net";
|
||||
description = "Tools and library for dealing with various ebook file formats";
|
||||
|
||||
@@ -23055,12 +23055,11 @@ with pkgs;
|
||||
|
||||
qt5 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.15) {
|
||||
inherit newScope;
|
||||
inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit darwin;
|
||||
inherit buildPackages;
|
||||
inherit (__splicedPackages)
|
||||
makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
|
||||
bison cups dconf harfbuzz libGL perl gtk3 python3
|
||||
darwin buildPackages;
|
||||
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
});
|
||||
|
||||
@@ -23070,7 +23069,7 @@ with pkgs;
|
||||
|
||||
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1
|
||||
# Current users: mumble, murmur
|
||||
qt5_openssl_1_1 = qt5.overrideScope' (_: super: {
|
||||
qt5_openssl_1_1 = qt5.overrideScope (_: super: {
|
||||
qtbase = super.qtbase.override {
|
||||
openssl = openssl_1_1;
|
||||
libmysqlclient = libmysqlclient.override {
|
||||
@@ -31233,7 +31232,7 @@ with pkgs;
|
||||
|
||||
libreoffice = hiPrio libreoffice-still;
|
||||
|
||||
libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice;
|
||||
libreoffice-unwrapped = libreoffice.unwrapped;
|
||||
|
||||
libreoffice-args = {
|
||||
inherit (perlPackages) ArchiveZip IOCompress;
|
||||
@@ -31254,7 +31253,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||
libreoffice = libsForQt5.callPackage ../applications/office/libreoffice
|
||||
unwrapped = libsForQt5.callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
kdeIntegration = true;
|
||||
variant = "fresh";
|
||||
@@ -31262,20 +31261,20 @@ with pkgs;
|
||||
});
|
||||
|
||||
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||
libreoffice = callPackage ../applications/office/libreoffice
|
||||
unwrapped = callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
variant = "fresh";
|
||||
});
|
||||
});
|
||||
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
|
||||
libreoffice-fresh-unwrapped = libreoffice-fresh.unwrapped;
|
||||
|
||||
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||
libreoffice = callPackage ../applications/office/libreoffice
|
||||
unwrapped = callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
variant = "still";
|
||||
});
|
||||
});
|
||||
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
|
||||
libreoffice-still-unwrapped = libreoffice-still.unwrapped;
|
||||
|
||||
libresprite = callPackage ../applications/editors/libresprite {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
|
||||
|
||||
Reference in New Issue
Block a user