Merge master into staging-next
This commit is contained in:
commit
2ae4a931aa
|
@ -19,10 +19,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "ack";
|
pname = "ack";
|
||||||
ename = "ack";
|
ename = "ack";
|
||||||
version = "1.10";
|
version = "1.11";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/ack-1.10.tar";
|
url = "https://elpa.gnu.org/packages/ack-1.11.tar";
|
||||||
sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw";
|
sha256 = "0fsi3lgfkyv9gxwcs0q5c9fawksz6x0pqarjagcndnd7jlbxjw7z";
|
||||||
};
|
};
|
||||||
packageRequires = [];
|
packageRequires = [];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -234,10 +234,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "async";
|
pname = "async";
|
||||||
ename = "async";
|
ename = "async";
|
||||||
version = "1.9.6";
|
version = "1.9.7";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/async-1.9.6.tar";
|
url = "https://elpa.gnu.org/packages/async-1.9.7.tar";
|
||||||
sha256 = "0qyf1niqjhzaphb50q1znkwqzpdvqw3drivkzrqxrs747k7pm3my";
|
sha256 = "0wwjgvj42irznwz6rjh8yiz4p9hswgi6ak57anjn256c4zx8xaz2";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1071,10 +1071,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "denote";
|
pname = "denote";
|
||||||
ename = "denote";
|
ename = "denote";
|
||||||
version = "0.6.1";
|
version = "1.0.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/denote-0.6.1.tar";
|
url = "https://elpa.gnu.org/packages/denote-1.0.0.tar";
|
||||||
sha256 = "1yxfnwq2b32xrl52g61a9g3i53m94iybx0n8hh6nbmcv5x4y43ya";
|
sha256 = "1gywi22x12p7hkliwy84i7pvyis5ja22fybz5shkdmkcl12mx631";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1086,10 +1086,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "detached";
|
pname = "detached";
|
||||||
ename = "detached";
|
ename = "detached";
|
||||||
version = "0.9.0";
|
version = "0.9.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/detached-0.9.0.tar";
|
url = "https://elpa.gnu.org/packages/detached-0.9.1.tar";
|
||||||
sha256 = "1br1s2kwb5ji4ad5m89grpyvjffhc3xxydgja9q796cx6zwrnavp";
|
sha256 = "1hzvqb18bpdpmnk469cmkayvddm37knd3mjj7m6zv3qsjw17n6f1";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1247,6 +1247,21 @@
|
||||||
license = lib.licenses.free;
|
license = lib.licenses.free;
|
||||||
};
|
};
|
||||||
}) {};
|
}) {};
|
||||||
|
doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "doc-toc";
|
||||||
|
ename = "doc-toc";
|
||||||
|
version = "1.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.gnu.org/packages/doc-toc-1.0.tar";
|
||||||
|
sha256 = "07yan1jmp6q87rhm8bmglswnhzlh5r9j35x5sqm5yfx0pcp16kpj";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/doc-toc.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
docbook = callPackage ({ elpaBuild, fetchurl, lib }:
|
docbook = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "docbook";
|
pname = "docbook";
|
||||||
|
@ -1386,10 +1401,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "eev";
|
pname = "eev";
|
||||||
ename = "eev";
|
ename = "eev";
|
||||||
version = "20220828";
|
version = "20220926";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/eev-20220828.tar";
|
url = "https://elpa.gnu.org/packages/eev-20220926.tar";
|
||||||
sha256 = "0znsimjq61p67c2q3qbia5qrimy847xy6gjpl1jgyrdlpgm9hv6r";
|
sha256 = "0kc30y44wl691jchafljp938kbwilawdfxm0bp6nsniv1bm95rpy";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1401,10 +1416,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "ef-themes";
|
pname = "ef-themes";
|
||||||
ename = "ef-themes";
|
ename = "ef-themes";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/ef-themes-0.5.0.tar";
|
url = "https://elpa.gnu.org/packages/ef-themes-0.6.0.tar";
|
||||||
sha256 = "1k73q48vg7vyjmnvizinwn9if481ajq63ps2iwb01f1brrhmbf5v";
|
sha256 = "00xq5ymsq8lq2jc541lw64i9pp0a0757wj3nasmfsa27wfpivzhb";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1563,10 +1578,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "ement";
|
pname = "ement";
|
||||||
ename = "ement";
|
ename = "ement";
|
||||||
version = "0.2";
|
version = "0.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/ement-0.2.tar";
|
url = "https://elpa.gnu.org/packages/ement-0.3.tar";
|
||||||
sha256 = "1kxbkqiy5c9pxk4f5k3d3j2q3qn7cg8f21zpgds9s8fd6ax0arcf";
|
sha256 = "08k1qfcymsnaz0mzq33l3i0fj9kjf5y0pdpn7k0skhhlsw90h078";
|
||||||
};
|
};
|
||||||
packageRequires = [
|
packageRequires = [
|
||||||
emacs
|
emacs
|
||||||
|
@ -2909,10 +2924,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "modus-themes";
|
pname = "modus-themes";
|
||||||
ename = "modus-themes";
|
ename = "modus-themes";
|
||||||
version = "2.6.0";
|
version = "2.7.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/modus-themes-2.6.0.tar";
|
url = "https://elpa.gnu.org/packages/modus-themes-2.7.1.tar";
|
||||||
sha256 = "0i4y69rrdcm64mvqs5z7dmgx1xk0x7g5978q5gjblczlfka444k4";
|
sha256 = "1ms5nig05z26342723jln50m7xq055knr2570x40lkg2m9s1ikx1";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -3162,10 +3177,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "notmuch-indicator";
|
pname = "notmuch-indicator";
|
||||||
ename = "notmuch-indicator";
|
ename = "notmuch-indicator";
|
||||||
version = "0.1.0";
|
version = "0.1.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.0.tar";
|
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.1.tar";
|
||||||
sha256 = "11kbl8y95vwww1rsgdd1q5x8i690gi4cxql4n2sg7r5dysdrbyz1";
|
sha256 = "1fdl8xm48id1a85gf3gr8d8m3sz61xrras9f598pvrksm3j162b6";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -3582,10 +3597,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "perl-doc";
|
pname = "perl-doc";
|
||||||
ename = "perl-doc";
|
ename = "perl-doc";
|
||||||
version = "0.2";
|
version = "0.6";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/perl-doc-0.2.tar";
|
url = "https://elpa.gnu.org/packages/perl-doc-0.6.tar";
|
||||||
sha256 = "1p5bbkwllh91a0vg5aisqa9kbms7l9vxk14lm09bav952xxn6gdl";
|
sha256 = "0xmk09pfvdzkrjfsa2l78bd6akcbdhcbnpvwnm6r83h65gpld79f";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -3642,10 +3657,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "plz";
|
pname = "plz";
|
||||||
ename = "plz";
|
ename = "plz";
|
||||||
version = "0.2";
|
version = "0.2.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/plz-0.2.tar";
|
url = "https://elpa.gnu.org/packages/plz-0.2.1.tar";
|
||||||
sha256 = "1b45m9b9gzx5ylpxcppkiikk5lfya7ngiqsap4a7m1b2cr8rqxcj";
|
sha256 = "01xa4vjbcdm37dya5d006k9p37kcm1g4yh4j7vh7hjfdz43j6y9s";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -3747,10 +3762,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "pyim";
|
pname = "pyim";
|
||||||
ename = "pyim";
|
ename = "pyim";
|
||||||
version = "5.2.4";
|
version = "5.2.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/pyim-5.2.4.tar";
|
url = "https://elpa.gnu.org/packages/pyim-5.2.5.tar";
|
||||||
sha256 = "1dzl4xaf31nyjb5hnwwf29i75x0i8dakpmmagbn4ks5hi3jl2ig0";
|
sha256 = "00f23pl53rdy9iwp4gj2656wik7c6vnmhsglg7z4pz3ippz3f4hq";
|
||||||
};
|
};
|
||||||
packageRequires = [ async emacs xr ];
|
packageRequires = [ async emacs xr ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -4427,10 +4442,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "sokoban";
|
pname = "sokoban";
|
||||||
ename = "sokoban";
|
ename = "sokoban";
|
||||||
version = "1.4.8";
|
version = "1.4.9";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/sokoban-1.4.8.tar";
|
url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar";
|
||||||
sha256 = "1w3vrkg239x1saqka21zbl380fxqmbz3lr7820spxd8p5w9v55pn";
|
sha256 = "1zri4czw2d5impkgn8d4hliyw31vndadg7wj31gairk8kyakjpgm";
|
||||||
};
|
};
|
||||||
packageRequires = [ cl-lib emacs ];
|
packageRequires = [ cl-lib emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -4687,10 +4702,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "taxy-magit-section";
|
pname = "taxy-magit-section";
|
||||||
ename = "taxy-magit-section";
|
ename = "taxy-magit-section";
|
||||||
version = "0.10";
|
version = "0.11";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.10.tar";
|
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.11.tar";
|
||||||
sha256 = "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw";
|
sha256 = "058z95c0z2hxplr5pfgph1cdq68zcrkmwx1wqyd5fy4a5h43yknq";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs magit-section taxy ];
|
packageRequires = [ emacs magit-section taxy ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -4826,10 +4841,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "tramp";
|
pname = "tramp";
|
||||||
ename = "tramp";
|
ename = "tramp";
|
||||||
version = "2.5.3.2";
|
version = "2.5.3.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/tramp-2.5.3.2.tar";
|
url = "https://elpa.gnu.org/packages/tramp-2.5.3.3.tar";
|
||||||
sha256 = "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw";
|
sha256 = "05w04qwk1lk50fzwl6fxyf6pb1jd2lx4as99zm1dpa858jab6w4a";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -4841,10 +4856,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "tramp-nspawn";
|
pname = "tramp-nspawn";
|
||||||
ename = "tramp-nspawn";
|
ename = "tramp-nspawn";
|
||||||
version = "1.0";
|
version = "1.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.tar";
|
url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar";
|
||||||
sha256 = "1si649vcj4md50p5nzvw431580rcl113rraj6fw636a394485hvx";
|
sha256 = "1w8h563pcdksqqy5v5vi7vrx76r6pi4bzhqywk1v67rhnr33qsvq";
|
||||||
};
|
};
|
||||||
packageRequires = [ emacs ];
|
packageRequires = [ emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -49,10 +49,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "annotate";
|
pname = "annotate";
|
||||||
ename = "annotate";
|
ename = "annotate";
|
||||||
version = "1.7.2";
|
version = "1.8.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.2.tar";
|
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.0.tar";
|
||||||
sha256 = "0vdpv8k1cvkn3cvsnxqv299gvp470ga2pgmfvdqi7k1vzypgpp57";
|
sha256 = "169cav480g2fm3z7d5dixrng2h8fv39sa9n066b79cb573p4bbcp";
|
||||||
};
|
};
|
||||||
packageRequires = [];
|
packageRequires = [];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1208,10 +1208,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "helm";
|
pname = "helm";
|
||||||
ename = "helm";
|
ename = "helm";
|
||||||
version = "3.8.7";
|
version = "3.8.8";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.7.tar";
|
url = "https://elpa.nongnu.org/nongnu/helm-3.8.8.tar";
|
||||||
sha256 = "1n0m061amrzm0xpgqy2mp9vrk2960gqhl5hi6c1smcmm7nxqwz12";
|
sha256 = "1qsiw8gswjwfp79n7g103db7xsmk36lq6ln558ipn4cw0fpnq1sc";
|
||||||
};
|
};
|
||||||
packageRequires = [ helm-core popup ];
|
packageRequires = [ helm-core popup ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1223,10 +1223,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "helm-core";
|
pname = "helm-core";
|
||||||
ename = "helm-core";
|
ename = "helm-core";
|
||||||
version = "3.8.7";
|
version = "3.8.8";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.7.tar";
|
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.8.tar";
|
||||||
sha256 = "1sak74v3gg34zzlbbgvlzvg7gw32fhcbxp5kigigmwvvbj5imgs7";
|
sha256 = "0wg21425ki8n8d954lkmlyci6awwwv53jg4gn5z495vh27qiv3qn";
|
||||||
};
|
};
|
||||||
packageRequires = [ async emacs ];
|
packageRequires = [ async emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -2358,6 +2358,21 @@
|
||||||
license = lib.licenses.free;
|
license = lib.licenses.free;
|
||||||
};
|
};
|
||||||
}) {};
|
}) {};
|
||||||
|
sweeprolog = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "sweeprolog";
|
||||||
|
ename = "sweeprolog";
|
||||||
|
version = "0.4.5";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.4.5.tar";
|
||||||
|
sha256 = "17dbrn2yvc6ib4dig410kbmvpwp4iz6q9hx6g0mk3vxqjrmgwyls";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/sweeprolog.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
|
swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "swift-mode";
|
pname = "swift-mode";
|
||||||
|
@ -2518,10 +2533,10 @@
|
||||||
elpaBuild {
|
elpaBuild {
|
||||||
pname = "tuareg";
|
pname = "tuareg";
|
||||||
ename = "tuareg";
|
ename = "tuareg";
|
||||||
version = "2.3.0";
|
version = "3.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar";
|
url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
|
||||||
sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb";
|
sha256 = "0y98gwnbrcj3csd9yilk1izgzmp1ds5dh3y1bxgb2fzrjir3i13f";
|
||||||
};
|
};
|
||||||
packageRequires = [ caml emacs ];
|
packageRequires = [ caml emacs ];
|
||||||
meta = {
|
meta = {
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -130,6 +130,15 @@ stdenv.mkDerivation rec {
|
||||||
# likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3
|
# likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3
|
||||||
# See issue #185808 for details.
|
# See issue #185808 for details.
|
||||||
sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt
|
sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt
|
||||||
|
|
||||||
|
# prusa-slicer expects the OCCTWrapper shared library in the same folder as
|
||||||
|
# the executable when loading STEP files. We force the loader to find it in
|
||||||
|
# the usual locations (i.e. LD_LIBRARY_PATH) instead. See the manpage
|
||||||
|
# dlopen(3) for context.
|
||||||
|
if [ -f "src/libslic3r/Format/STEP.cpp" ]; then
|
||||||
|
substituteInPlace src/libslic3r/Format/STEP.cpp \
|
||||||
|
--replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";'
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -147,11 +156,20 @@ stdenv.mkDerivation rec {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer"
|
ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer"
|
||||||
|
|
||||||
|
mkdir -p "$out/lib"
|
||||||
|
mv -v $out/bin/*.so $out/lib/
|
||||||
|
|
||||||
mkdir -p "$out/share/pixmaps/"
|
mkdir -p "$out/share/pixmaps/"
|
||||||
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
|
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
|
||||||
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
|
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
--prefix LD_LIBRARY_PATH : "$out/lib"
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "G-code generator for 3D printer";
|
description = "G-code generator for 3D printer";
|
||||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -3,10 +3,10 @@
|
||||||
rec {
|
rec {
|
||||||
firefox = buildMozillaMach rec {
|
firefox = buildMozillaMach rec {
|
||||||
pname = "firefox";
|
pname = "firefox";
|
||||||
version = "105.0.1";
|
version = "105.0.2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||||
sha512 = "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b";
|
sha512 = "49f4c0e7ecf2cef6fa7de8362185bd9ce6950304dadbbea0522a5782016587b9d58f32b45f0e0edf7a2cc31ea158ed10c886b287a18d1f2bff3daf50d9f0b926";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubo";
|
pname = "kubo";
|
||||||
version = "0.15.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
version = "0.16.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version
|
passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version
|
||||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||||
# Kubo makes changes to it's source tarball that don't match the git source.
|
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||||
hash = "sha256-GkOY1G2CKXbMbHXkw5v27HmfkJIl2nZOmjjZbzuaRWs=";
|
hash = "sha256-FS7lwQS7ybyoIKPkcUtPIe3srO1O/cZN+x1nzWUlF20=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# tarball contains multiple files/directories
|
# tarball contains multiple files/directories
|
||||||
|
|
|
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
||||||
ruby '>= 2.4.0', '< 2.8.0'
|
ruby '>= 2.4.0', '< 2.8.0'
|
||||||
gem 'bundler', '>= 1.12.0'
|
gem 'bundler', '>= 1.12.0'
|
||||||
|
|
||||||
gem 'rails', '5.2.8'
|
gem 'rails', '5.2.8.1'
|
||||||
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
||||||
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||||
gem 'rouge', '~> 3.26.0'
|
gem 'rouge', '~> 3.26.0'
|
||||||
|
@ -25,6 +25,7 @@ gem 'i18n', '~> 1.8.2'
|
||||||
gem "rbpdf", "~> 1.20.0"
|
gem "rbpdf", "~> 1.20.0"
|
||||||
gem 'addressable'
|
gem 'addressable'
|
||||||
gem 'rubyzip', '~> 2.3.0'
|
gem 'rubyzip', '~> 2.3.0'
|
||||||
|
gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||||
|
|
||||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||||
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.2.8)
|
actioncable (5.2.8.1)
|
||||||
actionpack (= 5.2.8)
|
actionpack (= 5.2.8.1)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailer (5.2.8)
|
actionmailer (5.2.8.1)
|
||||||
actionpack (= 5.2.8)
|
actionpack (= 5.2.8.1)
|
||||||
actionview (= 5.2.8)
|
actionview (= 5.2.8.1)
|
||||||
activejob (= 5.2.8)
|
activejob (= 5.2.8.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.2.8)
|
actionpack (5.2.8.1)
|
||||||
actionview (= 5.2.8)
|
actionview (= 5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
rack (~> 2.0, >= 2.0.8)
|
rack (~> 2.0, >= 2.0.8)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
|
@ -21,26 +21,26 @@ GEM
|
||||||
actionpack-xml_parser (2.0.1)
|
actionpack-xml_parser (2.0.1)
|
||||||
actionpack (>= 5.0)
|
actionpack (>= 5.0)
|
||||||
railties (>= 5.0)
|
railties (>= 5.0)
|
||||||
actionview (5.2.8)
|
actionview (5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
activejob (5.2.8)
|
activejob (5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.2.8)
|
activemodel (5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
activerecord (5.2.8)
|
activerecord (5.2.8.1)
|
||||||
activemodel (= 5.2.8)
|
activemodel (= 5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
arel (>= 9.0)
|
arel (>= 9.0)
|
||||||
activestorage (5.2.8)
|
activestorage (5.2.8.1)
|
||||||
actionpack (= 5.2.8)
|
actionpack (= 5.2.8.1)
|
||||||
activerecord (= 5.2.8)
|
activerecord (= 5.2.8.1)
|
||||||
marcel (~> 1.0.0)
|
marcel (~> 1.0.0)
|
||||||
activesupport (5.2.8)
|
activesupport (5.2.8.1)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -62,7 +62,7 @@ GEM
|
||||||
chunky_png (1.4.0)
|
chunky_png (1.4.0)
|
||||||
concurrent-ruby (1.1.10)
|
concurrent-ruby (1.1.10)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
css_parser (1.11.0)
|
css_parser (1.12.0)
|
||||||
addressable
|
addressable
|
||||||
csv (3.1.9)
|
csv (3.1.9)
|
||||||
docile (1.4.0)
|
docile (1.4.0)
|
||||||
|
@ -72,7 +72,7 @@ GEM
|
||||||
htmlentities (4.3.4)
|
htmlentities (4.3.4)
|
||||||
i18n (1.8.11)
|
i18n (1.8.11)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
loofah (2.18.0)
|
loofah (2.19.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.1)
|
mail (2.7.1)
|
||||||
|
@ -83,15 +83,13 @@ GEM
|
||||||
mini_mime (1.0.3)
|
mini_mime (1.0.3)
|
||||||
mini_portile2 (2.8.0)
|
mini_portile2 (2.8.0)
|
||||||
minitest (5.16.3)
|
minitest (5.16.3)
|
||||||
mocha (1.14.0)
|
mocha (1.15.0)
|
||||||
mysql2 (0.5.4)
|
mysql2 (0.5.4)
|
||||||
net-ldap (0.17.1)
|
net-ldap (0.17.1)
|
||||||
nio4r (2.5.8)
|
nio4r (2.5.8)
|
||||||
nokogiri (1.13.8)
|
nokogiri (1.13.8)
|
||||||
mini_portile2 (~> 2.8.0)
|
mini_portile2 (~> 2.8.0)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.13.8-x86_64-linux)
|
|
||||||
racc (~> 1.4)
|
|
||||||
parallel (1.22.1)
|
parallel (1.22.1)
|
||||||
parser (3.1.2.1)
|
parser (3.1.2.1)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
|
@ -106,27 +104,27 @@ GEM
|
||||||
ruby-openid (>= 2.1.8)
|
ruby-openid (>= 2.1.8)
|
||||||
rack-test (2.0.2)
|
rack-test (2.0.2)
|
||||||
rack (>= 1.3)
|
rack (>= 1.3)
|
||||||
rails (5.2.8)
|
rails (5.2.8.1)
|
||||||
actioncable (= 5.2.8)
|
actioncable (= 5.2.8.1)
|
||||||
actionmailer (= 5.2.8)
|
actionmailer (= 5.2.8.1)
|
||||||
actionpack (= 5.2.8)
|
actionpack (= 5.2.8.1)
|
||||||
actionview (= 5.2.8)
|
actionview (= 5.2.8.1)
|
||||||
activejob (= 5.2.8)
|
activejob (= 5.2.8.1)
|
||||||
activemodel (= 5.2.8)
|
activemodel (= 5.2.8.1)
|
||||||
activerecord (= 5.2.8)
|
activerecord (= 5.2.8.1)
|
||||||
activestorage (= 5.2.8)
|
activestorage (= 5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.2.8)
|
railties (= 5.2.8.1)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.4.3)
|
rails-html-sanitizer (1.4.3)
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.3)
|
||||||
railties (5.2.8)
|
railties (5.2.8.1)
|
||||||
actionpack (= 5.2.8)
|
actionpack (= 5.2.8.1)
|
||||||
activesupport (= 5.2.8)
|
activesupport (= 5.2.8.1)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.19.0, < 2.0)
|
thor (>= 0.19.0, < 2.0)
|
||||||
|
@ -174,7 +172,7 @@ GEM
|
||||||
ruby-openid (2.9.2)
|
ruby-openid (2.9.2)
|
||||||
ruby-progressbar (1.11.0)
|
ruby-progressbar (1.11.0)
|
||||||
rubyzip (2.3.2)
|
rubyzip (2.3.2)
|
||||||
selenium-webdriver (4.4.0)
|
selenium-webdriver (4.5.0)
|
||||||
childprocess (>= 0.5, < 5.0)
|
childprocess (>= 0.5, < 5.0)
|
||||||
rexml (~> 3.2, >= 3.2.5)
|
rexml (~> 3.2, >= 3.2.5)
|
||||||
rubyzip (>= 1.2.2, < 3.0)
|
rubyzip (>= 1.2.2, < 3.0)
|
||||||
|
@ -194,7 +192,7 @@ GEM
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tzinfo (1.2.10)
|
tzinfo (1.2.10)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
unicode-display_width (2.2.0)
|
unicode-display_width (2.3.0)
|
||||||
webdrivers (4.7.0)
|
webdrivers (4.7.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6)
|
||||||
rubyzip (>= 1.3.0)
|
rubyzip (>= 1.3.0)
|
||||||
|
@ -231,7 +229,7 @@ DEPENDENCIES
|
||||||
pg (~> 1.2.2)
|
pg (~> 1.2.2)
|
||||||
puma
|
puma
|
||||||
rack-openid
|
rack-openid
|
||||||
rails (= 5.2.8)
|
rails (= 5.2.8.1)
|
||||||
rails-dom-testing
|
rails-dom-testing
|
||||||
rbpdf (~> 1.20.0)
|
rbpdf (~> 1.20.0)
|
||||||
redcarpet (~> 3.5.1)
|
redcarpet (~> 3.5.1)
|
||||||
|
@ -255,4 +253,4 @@ RUBY VERSION
|
||||||
ruby 2.7.6p219
|
ruby 2.7.6p219
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.3.20
|
2.3.9
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }:
|
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "4.2.7";
|
version = "4.2.8";
|
||||||
rubyEnv = bundlerEnv {
|
rubyEnv = bundlerEnv {
|
||||||
name = "redmine-env-${version}";
|
name = "redmine-env-${version}";
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ in
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4=";
|
sha256 = "sha256-C0McBS2P02uTIB2vrzYVzbjQNGDvzyQA59MmYrKrYnI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd";
|
sha256 = "1v5bihkn3cdf7s1cv04wqpk3l5snjgyav0jz9x5vhzzdqyknvndr";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
actionmailer = {
|
actionmailer = {
|
||||||
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
||||||
|
@ -16,10 +16,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2";
|
sha256 = "1x0qjs8v5z5wzk7vlg7pdr71hsm154d8d0gwhya573xpxfjzmjpx";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
actionpack = {
|
actionpack = {
|
||||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||||
|
@ -27,10 +27,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk";
|
sha256 = "0mqvz5dsg9zis34y8m4d2ackr3zs7h27mv6zx5yx00a58fifhyv3";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
actionpack-xml_parser = {
|
actionpack-xml_parser = {
|
||||||
dependencies = ["actionpack" "railties"];
|
dependencies = ["actionpack" "railties"];
|
||||||
|
@ -49,10 +49,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx";
|
sha256 = "06bk0hyv2sq386qc7r96qbhskg91apdj3mrdpzhry6p6nby2afml";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
activejob = {
|
activejob = {
|
||||||
dependencies = ["activesupport" "globalid"];
|
dependencies = ["activesupport" "globalid"];
|
||||||
|
@ -60,10 +60,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg";
|
sha256 = "12y07kvq9y30ycl4i45g9c2c9jv5a9vlxvrjaqfl79iim6gk1klz";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
activemodel = {
|
activemodel = {
|
||||||
dependencies = ["activesupport"];
|
dependencies = ["activesupport"];
|
||||||
|
@ -71,10 +71,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6";
|
sha256 = "0vsyxbjpl47grlkzgh2rm0i9yksfwk11lsdi11jmqszc6lkj1b9g";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
activerecord = {
|
activerecord = {
|
||||||
dependencies = ["activemodel" "activesupport" "arel"];
|
dependencies = ["activemodel" "activesupport" "arel"];
|
||||||
|
@ -82,10 +82,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a";
|
sha256 = "0jk8qwdvq465nklxr7z0qzpiacxcqd72y6frimlalchhigl8ya0a";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
activestorage = {
|
activestorage = {
|
||||||
dependencies = ["actionpack" "activerecord" "marcel"];
|
dependencies = ["actionpack" "activerecord" "marcel"];
|
||||||
|
@ -93,10 +93,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w";
|
sha256 = "0qklddvw3v13dh79c7vljad8m25frlhnwcnw9xk510d676j3lr8a";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
activesupport = {
|
activesupport = {
|
||||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||||
|
@ -104,10 +104,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02";
|
sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
addressable = {
|
addressable = {
|
||||||
dependencies = ["public_suffix"];
|
dependencies = ["public_suffix"];
|
||||||
|
@ -207,10 +207,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an";
|
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.11.0";
|
version = "1.12.0";
|
||||||
};
|
};
|
||||||
csv = {
|
csv = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -280,10 +280,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1";
|
sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.18.0";
|
version = "2.19.0";
|
||||||
};
|
};
|
||||||
mail = {
|
mail = {
|
||||||
dependencies = ["mini_mime"];
|
dependencies = ["mini_mime"];
|
||||||
|
@ -361,10 +361,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr";
|
sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.14.0";
|
version = "1.15.0";
|
||||||
};
|
};
|
||||||
mysql2 = {
|
mysql2 = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -523,10 +523,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449";
|
sha256 = "1jy4jfkq0xpqp0d3ii9xhj69kacx8l4q3pincncw2g30bqd7a66g";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
rails-dom-testing = {
|
rails-dom-testing = {
|
||||||
dependencies = ["activesupport" "nokogiri"];
|
dependencies = ["activesupport" "nokogiri"];
|
||||||
|
@ -556,10 +556,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc";
|
sha256 = "0w9hm85jgbyar748z9nppsz8mgwywa2v9qqlbkzhpgirxhblifv2";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "5.2.8";
|
version = "5.2.8.1";
|
||||||
};
|
};
|
||||||
rainbow = {
|
rainbow = {
|
||||||
groups = ["default" "test"];
|
groups = ["default" "test"];
|
||||||
|
@ -786,10 +786,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv";
|
sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "4.4.0";
|
version = "4.5.0";
|
||||||
};
|
};
|
||||||
simplecov = {
|
simplecov = {
|
||||||
dependencies = ["docile" "simplecov-html"];
|
dependencies = ["docile" "simplecov-html"];
|
||||||
|
@ -870,10 +870,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn";
|
sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.2.0";
|
version = "2.3.0";
|
||||||
};
|
};
|
||||||
webdrivers = {
|
webdrivers = {
|
||||||
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
||||||
|
|
|
@ -85,7 +85,7 @@ stdenv.mkDerivation ({
|
||||||
addEmacsVars "$out"
|
addEmacsVars "$out"
|
||||||
|
|
||||||
find $out/share/emacs -type f -name '*.el' -print0 \
|
find $out/share/emacs -type f -name '*.el' -print0 \
|
||||||
| xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \
|
| xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
|
||||||
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
|
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,75 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, nix-update-script
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, vala
|
||||||
|
, wrapGAppsHook4
|
||||||
|
, elementary-gtk-theme
|
||||||
|
, elementary-icon-theme
|
||||||
|
, glib
|
||||||
|
, granite7
|
||||||
|
, gtk4
|
||||||
|
, gtksourceview5
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "elementary-iconbrowser";
|
||||||
|
version = "2.0.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "elementary";
|
||||||
|
repo = "iconbrowser";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-aXFgL5l9jnOZJJgMOYwiE7W//1sq23CbLEDmhYFJT38=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
vala
|
||||||
|
wrapGAppsHook4
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
elementary-icon-theme
|
||||||
|
glib
|
||||||
|
granite7
|
||||||
|
gtk4
|
||||||
|
gtksourceview5
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
chmod +x meson/post_install.py
|
||||||
|
patchShebangs meson/post_install.py
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
# The GTK theme is hardcoded.
|
||||||
|
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||||
|
# The icon theme is hardcoded.
|
||||||
|
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
updateScript = nix-update-script {
|
||||||
|
attrPath = "pantheon.${pname}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/elementary/iconbrowser";
|
||||||
|
description = "Browse and find system icons";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = teams.pantheon.members;
|
||||||
|
mainProgram = "io.elementary.iconbrowser";
|
||||||
|
};
|
||||||
|
}
|
|
@ -67,6 +67,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
elementary-feedback = callPackage ./apps/elementary-feedback { };
|
elementary-feedback = callPackage ./apps/elementary-feedback { };
|
||||||
|
|
||||||
|
elementary-iconbrowser = callPackage ./apps/elementary-iconbrowser { };
|
||||||
|
|
||||||
elementary-mail = callPackage ./apps/elementary-mail { };
|
elementary-mail = callPackage ./apps/elementary-mail { };
|
||||||
|
|
||||||
elementary-music = callPackage ./apps/elementary-music { };
|
elementary-music = callPackage ./apps/elementary-music { };
|
||||||
|
|
|
@ -113,13 +113,13 @@ stdenv.mkDerivation rec {
|
||||||
# NOTE: You must also bump:
|
# NOTE: You must also bump:
|
||||||
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
||||||
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||||
version = "8.7.0";
|
version = "8.8.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-5F6Ibp3k7I1mwv8DNZ7rsW0wOw5q3vHtCUc7jJUNzrs=";
|
sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "libvirt";
|
pname = "libvirt";
|
||||||
version = "8.7.0";
|
version = "8.8.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "libvirt";
|
owner = "libvirt";
|
||||||
repo = "libvirt-python";
|
repo = "libvirt-python";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-B7pJDFjamFtNAhnPWMzNUWFEBhM48y0QG4MUtX7GP4o=";
|
sha256 = "sha256-UguqUsIfrql1UZeBoHLKXvLYuWicbJWamglkvqS++FI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sphinx-jupyterbook-latex";
|
pname = "sphinx-jupyterbook-latex";
|
||||||
version = "0.5.0";
|
version = "0.5.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version;
|
inherit version;
|
||||||
pname = "sphinx_jupyterbook_latex";
|
pname = "sphinx_jupyterbook_latex";
|
||||||
sha256 = "sha256-XEYsrMcg85loIYvD3ikfgGXGeox0q03H/0wRgTaz+SI=";
|
sha256 = "sha256-QErSEpolSEkJaQLzfcF0oDlugEhN5Y9/KwVwC2IknLY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitLab, pkg-config
|
{ lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook
|
||||||
, withLibui ? true, gtk3
|
, withLibui ? true, gtk3
|
||||||
, withUdisks ? stdenv.isLinux, udisks, glib
|
, withUdisks ? stdenv.isLinux, udisks, glib
|
||||||
, libX11 }:
|
, libX11 }:
|
||||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
sourceRoot = "source/src/";
|
sourceRoot = "source/src/";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||||
buildInputs = lib.optionals withUdisks [ udisks glib ]
|
buildInputs = lib.optionals withUdisks [ udisks glib ]
|
||||||
++ lib.optional (!withLibui) libX11
|
++ lib.optional (!withLibui) libX11
|
||||||
++ lib.optional withLibui gtk3;
|
++ lib.optional withLibui gtk3;
|
||||||
|
|
Loading…
Reference in a new issue