Merge master into staging-next
Frederik Rietdijk
commit
b981eca057
|
|
@ -9254,6 +9254,12 @@
|
|||
githubId = 1322287;
|
||||
name = "William O'Hanley";
|
||||
};
|
||||
wolfangaukang = {
|
||||
email = "liquid.query960@4wrd.cc";
|
||||
github = "wolfangaukang";
|
||||
githubId = 8378365;
|
||||
name = "P. R. d. O.";
|
||||
};
|
||||
womfoo = {
|
||||
email = "kranium@gikos.net";
|
||||
github = "womfoo";
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@ in {
|
|||
matchConfig.Name = "vrf1";
|
||||
networkConfig.IPForward = "yes";
|
||||
routes = [
|
||||
{ routeConfig = { Destination = "192.168.1.2"; Metric = "100"; }; }
|
||||
{ routeConfig = { Destination = "192.168.1.2"; Metric = 100; }; }
|
||||
];
|
||||
};
|
||||
networks."10-vrf2" = {
|
||||
matchConfig.Name = "vrf2";
|
||||
networkConfig.IPForward = "yes";
|
||||
routes = [
|
||||
{ routeConfig = { Destination = "192.168.2.3"; Metric = "100"; }; }
|
||||
{ routeConfig = { Destination = "192.168.2.3"; Metric = 100; }; }
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, fluidsynth
|
||||
, libX11
|
||||
, libjack2
|
||||
, alsaLib
|
||||
, liblo
|
||||
, libsigcxx
|
||||
, libsmf
|
||||
|
|
@ -12,18 +13,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "Mamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a";
|
||||
sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ];
|
||||
buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foot";
|
||||
version = "1.4.4";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/foot.git";
|
||||
rev = "${version}";
|
||||
sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg";
|
||||
rev = version;
|
||||
sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "googler";
|
||||
version = "4.2";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c480wzc7q4pks1f6mnayr580c73jhzshliz4hgznzc7zwcdf41w";
|
||||
sha256 = "04wa0mlbfjnzwham2dpd9lch7800js4vp3ikgjl4qnwilvr1lw74";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/jarun/googler";
|
||||
description = "Google Search, Google Site Search, Google News from the terminal";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ koral filalex77 ];
|
||||
platforms = python.meta.platforms;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "1.1.4";
|
||||
version = "1.2.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -16,8 +16,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "1jgmjwjl2y3nrywnwidpk6p31sypy3gjghmzzqkrgjpf77ccbssm";
|
||||
x86_64-darwin = "1v06k4qrk3n1ncgpmnqp4axmn7gvs3mgbvf8n6ldhgjhj3hq9day";
|
||||
x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6";
|
||||
x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "17013";
|
||||
version = "17084";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "0dgfiqk5bcbs03llkffm6h96zcqa19azbanac883g26f6z6j9b8j";
|
||||
sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
|
||||
sha256 = "1mzaxcswmxah0gc9cifgaazwisr5cbanf4bspv1ra8xwzj5mdss6";
|
||||
sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,30 @@
|
|||
{ stdenv, fetchurl, ocamlPackages, ncurses, gsl }:
|
||||
{ lib, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "orpie";
|
||||
version = "1.5.2";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz";
|
||||
sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pelzlpj";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]);
|
||||
preConfigure = ''
|
||||
patchShebangs scripts
|
||||
substituteInPlace scripts/compute_prefix \
|
||||
--replace '"topfind"' \
|
||||
'"${ocamlPackages.findlib}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/topfind"'
|
||||
export PREFIX=$out
|
||||
'';
|
||||
|
||||
buildInputs = with ocamlPackages; [ curses camlp5 num gsl ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/pelzlpj/orpie";
|
||||
description = "A fullscreen RPN calculator for the console";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [ obadz ];
|
||||
inherit (src.meta) homepage;
|
||||
description = "A Curses-based RPN calculator";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ obadz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
let
|
||||
appname = "SuperSlicer";
|
||||
version = "2.2.53.1";
|
||||
version = "2.2.54.0";
|
||||
pname = "super-slicer";
|
||||
description = "PrusaSlicer fork with more features and faster development cycle";
|
||||
override = super: {
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "supermerill";
|
||||
repo = "SuperSlicer";
|
||||
sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs=";
|
||||
sha256 = "sha256-vvuUecysSdBvGBKOariQnsGJ9/Qccwp/lSq8WCED+Uk=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
|
|
@ -23,8 +23,7 @@ let
|
|||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/pixmaps/"
|
||||
# Change slic3r++ to SuperSlicer at the next release!
|
||||
ln -s "$out/share/slic3r++/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png"
|
||||
ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png"
|
||||
mkdir -p "$out/share/applications"
|
||||
cp "$desktopItem"/share/applications/* "$out/share/applications/"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upwork";
|
||||
version = "5.3.3-883";
|
||||
version = "5.4.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates-desktopapp.upwork.com/binaries/v5_3_3_883_1f817bc1fefd44e7/upwork_5.3.3.883_amd64.deb";
|
||||
sha256 = "072zns79w4h46bvbj23rvr8i12sf2l378ry0z3hchwcimkrph9wx";
|
||||
url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb";
|
||||
sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b";
|
||||
};
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
wrapGAppsHook
|
||||
autoPatchelfHook
|
||||
|
|
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Online freelancing platform desktop application for time tracking";
|
||||
homepage = "https://www.upwork.com/ab/downloads/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ zakkor ];
|
||||
maintainers = with maintainers; [ zakkor wolfangaukang ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wtf";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wtfutil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1055shnf716ga46wwcaffdpgc1glr8vrqrbs2sqbkr3wjan6n0nw";
|
||||
sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7";
|
||||
};
|
||||
|
||||
vendorSha256 = "0l1q29mdb13ir7n1x65jfnrmy1lamlsa6hm2jagf6yjbm6wf1kw4";
|
||||
vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ let
|
|||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
pname = "flashplayer-ppapi";
|
||||
version = "32.0.0.433";
|
||||
version = "32.0.0.445";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx";
|
||||
sha256 = "1r9vd210d2qp501q40pjx60mzah08rg0f8jk5rpp52ddajwggalv";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,10 +7,10 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "81.0";
|
||||
ffversion = "81.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19";
|
||||
sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,10 +36,10 @@ rec {
|
|||
|
||||
firefox-esr-78 = common rec {
|
||||
pname = "firefox-esr";
|
||||
ffversion = "78.3.0esr";
|
||||
ffversion = "78.3.1esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9";
|
||||
sha512 = "10a7xfp396n81aj17fbl1b1jr8gbn5ild2ig5cfz6r5ff3wfbjs3x0iqrlwqnjfdqq2pw19k2yrv91iwymd8jwjj4p35xsfivgn0a0n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashplayer";
|
||||
version = "32.0.0.433";
|
||||
version = "32.0.0.445";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
|
|
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 =
|
||||
if debug then
|
||||
if arch == "x86_64" then
|
||||
"18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni"
|
||||
"0jn1g8k8fkikhi0xlcsx5a43lxrj6ynwbxn55b17wacsqw20b9ii"
|
||||
else
|
||||
"1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g"
|
||||
"104af8sy0qq45agg3lpjwn1cp8lhpcjiim6gqn4cymcfp8d7ngg0"
|
||||
else
|
||||
if arch == "x86_64" then
|
||||
"0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf"
|
||||
"1dd52nhnl3f1d7r82gq28scna5qr39gpfqkgrhzd6cxd2vnhnhjn"
|
||||
else
|
||||
"1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r";
|
||||
"09ayb637cyf5x06xmhvad2znss7ak7r4n8z3wq7qmn0pmjdsa5a3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "flashplayer-standalone";
|
||||
version = "32.0.0.433";
|
||||
version = "32.0.0.445";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
|
|
@ -60,9 +60,9 @@ stdenv.mkDerivation {
|
|||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
|
||||
sha256 =
|
||||
if debug then
|
||||
"1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf"
|
||||
"0iqmdd222mjsf3rdbcm4z974i5q9y4i5agnhn039k0hpydi4zdcr"
|
||||
else
|
||||
"1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m";
|
||||
"07vz17zhwh31phccpbmwgfa3fdb2f7bnc3sf66ipsw1xcqgncpsx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ let
|
|||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
pname = "flashplayer-ppapi";
|
||||
version = "32.0.0.433";
|
||||
version = "32.0.0.445";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx";
|
||||
sha256 = "1r9vd210d2qp501q40pjx60mzah08rg0f8jk5rpp52ddajwggalv";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jvr8lf3wdg6svsfi3fdknqw543495gysznbqhl42w7d3r5krcyw";
|
||||
sha256 = "12vfxnny3giirdf1xhacy24dvy5zm7iil6h019s0l63876vingnc";
|
||||
};
|
||||
|
||||
vendorSha256 = "0p5svprhbnb7mfln1mhaq55w8xnj8v3sinwkysxjzh1g8p36mglp";
|
||||
vendorSha256 = "0hj7h58j0v98plrqfldq59d084j76aiy82mfm8zi0vcqg6gxf4pb";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
|
||||
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
|
||||
, cmocka, libmicrohttpd, expat, sqlite, libmesode
|
||||
, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch
|
||||
, autoconf-archive
|
||||
|
||||
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
|
||||
|
|
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch";
|
||||
sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k";
|
||||
})
|
||||
./patches/packages-osx.patch
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zegrapher";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdelKS";
|
||||
repo = "ZeGrapher";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://zegrapher.com/";
|
||||
description = "An open source math plotter";
|
||||
longDescription = ''
|
||||
An open source, free and easy to use math plotter. It can plot functions,
|
||||
sequences, parametric equations and data on the plane.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "seabios";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "00z7vdahpxa37irlf8ld350dp6z9qfyfb56vbfqr319hsv13srrp";
|
||||
sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b";
|
||||
};
|
||||
|
||||
buildInputs = [ iasl python ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
|
||||
, gobject-introspection, libvirt-glib, system-libvirt
|
||||
, gsettings-desktop-schemas, glib, libosinfo, gnome3
|
||||
, gtksourceview4
|
||||
, gtksourceview4, docutils
|
||||
, spiceSupport ? true, spice-gtk ? null
|
||||
, cpio, e2fsprogs, findutils, gzip
|
||||
}:
|
||||
|
|
@ -11,16 +11,17 @@ with stdenv.lib;
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "virt-manager";
|
||||
version = "2.2.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz";
|
||||
sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g";
|
||||
sha256 = "0al34lxlywqnj98hdm72a38zk8ns91wkqgrc3h1mhv1kikd8pjfc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool file
|
||||
gobject-introspection # for setup hook populating GI_TYPELIB_PATH
|
||||
docutils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, CoreFoundation, Security
|
||||
, llvmPackages
|
||||
, pkgsBuildTarget, pkgsBuildBuild
|
||||
, makeRustPlatform
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, CoreFoundation, Security
|
||||
, llvmPackages
|
||||
, pkgsBuildTarget, pkgsBuildBuild
|
||||
, makeRustPlatform
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, CoreFoundation, Security
|
||||
, llvmPackages
|
||||
, pkgsBuildTarget, pkgsBuildBuild
|
||||
, makeRustPlatform
|
||||
}: rec {
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
|
||||
toTargetArch = platform:
|
||||
|
|
@ -33,24 +34,6 @@
|
|||
in platform.rustc.config
|
||||
or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
|
||||
|
||||
makeRustPlatform = { rustc, cargo, ... }: rec {
|
||||
rust = {
|
||||
inherit rustc cargo;
|
||||
};
|
||||
|
||||
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
||||
inherit cargo;
|
||||
};
|
||||
|
||||
buildRustPackage = callPackage ../../../build-support/rust {
|
||||
inherit rustc cargo fetchCargoTarball;
|
||||
};
|
||||
|
||||
rustcSrc = callPackage ./rust-src.nix {
|
||||
inherit rustc;
|
||||
};
|
||||
};
|
||||
|
||||
# This just contains tools for now. But it would conceivably contain
|
||||
# libraries too, say if we picked some default/recommended versions from
|
||||
# `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ buildPackages, callPackage }:
|
||||
|
||||
{ rustc, cargo, ... }:
|
||||
|
||||
rec {
|
||||
rust = {
|
||||
inherit rustc cargo;
|
||||
};
|
||||
|
||||
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
||||
inherit cargo;
|
||||
};
|
||||
|
||||
buildRustPackage = callPackage ../../../build-support/rust {
|
||||
inherit rustc cargo fetchCargoTarball;
|
||||
};
|
||||
|
||||
rustcSrc = callPackage ./rust-src.nix {
|
||||
inherit rustc;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc
|
||||
,freetype, fontconfig, pixman, tllist, check }:
|
||||
,freetype, fontconfig, harfbuzz, pixman, tllist, check }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.2.6";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/fcft.git";
|
||||
rev = "${version}";
|
||||
sha256 = "06zywvvgrch9k4d07bir2sxddwsli2gzpvlvjfcwbrj3bw5x6j1b";
|
||||
rev = version;
|
||||
sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
|
||||
buildInputs = [ freetype fontconfig pixman tllist ];
|
||||
buildInputs = [ freetype fontconfig pixman tllist harfbuzz ];
|
||||
checkInputs = [ check ];
|
||||
|
||||
mesonFlags = [ "--buildtype=release" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmesode";
|
||||
|
|
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-ssl-certificate-verification.diff";
|
||||
url = "https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1.diff";
|
||||
sha256 = "140jp7xzskik0sb6aqjsw7z477a124cxl7dkm80m2nyzjng4pzg5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ openssl expat libtool check ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tllist";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/tllist.git";
|
||||
rev = "${version}";
|
||||
sha256 = "095wly66z9n2r6h318rackgl4g1w9l1vj96367ngcw7rpva9yppl";
|
||||
rev = version;
|
||||
sha256 = "sha256-+u8p/VmI61SGRhZHaJBwgcVNetNOrYzg2NVQehbfRqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/dnkl/tllist";
|
||||
description = "C header file only implementation of a typed linked list";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, fetchurl, buildDunePackage, pkg-config, gsl
|
||||
, dune-configurator
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gsl";
|
||||
version = "1.24.3";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mmottl/gsl-ocaml/releases/download/${version}/gsl-${version}.tbz";
|
||||
sha256 = "1mpzcgbrha2l8iikqbmn32668v2mnnsykxg5n5jgs0qnskn2nvrn";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator gsl pkg-config ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://mmottl.github.io/gsl-ocaml/";
|
||||
description = "OCaml bindings to the GNU Scientific Library";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-access-context-manager";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
propagatedBuildInputs = [ google_api_core ];
|
||||
|
||||
# No tests in repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "google.identity.accesscontextmanager" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protobufs for Google Access Context Manager.";
|
||||
homepage = "https://github.com/googleapis/python-access-context-manager";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ austinbutler ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-org-policy";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
propagatedBuildInputs = [ google_api_core ];
|
||||
|
||||
# No tests in repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "google.cloud.orgpolicy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protobufs for Google Cloud Organization Policy.";
|
||||
homepage = "https://github.com/googleapis/python-org-policy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ austinbutler ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,37 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, enum34
|
||||
, grpc_google_iam_v1
|
||||
, google_api_core
|
||||
, pytest
|
||||
, mock
|
||||
}:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, grpc_google_iam_v1
|
||||
, google_api_core, google-cloud-access-context-manager, google-cloud-org-policy
|
||||
, libcst, proto-plus, pytest, pytest-asyncio, pytestCheckHook, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fd4c0f7f61a8a1c5907cd6cc27a028b16236bf3d982ff412df0d2c981cef5ae5";
|
||||
sha256 = "14r77bcxy7bmqhmz2hzcf3km2y4vivf5sfzgqjwlyynaydhn4f6j";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests/unit
|
||||
checkInputs = [ mock pytest-asyncio pytestCheckHook ];
|
||||
disabledTests = [ "asset_service_transport_auth_adc" ];
|
||||
propagatedBuildInputs = [
|
||||
grpc_google_iam_v1
|
||||
google_api_core
|
||||
google-cloud-access-context-manager
|
||||
google-cloud-org-policy
|
||||
libcst
|
||||
proto-plus
|
||||
];
|
||||
|
||||
# Remove tests intended to be run in VPC
|
||||
preCheck = ''
|
||||
rm -rf tests/system
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cloud Asset API API client library";
|
||||
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
|
||||
description = "Python Client for Google Cloud Asset API";
|
||||
homepage = "https://github.com/googleapis/python-asset";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,36 +1,43 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, typing-inspect
|
||||
, pyyaml
|
||||
, isPy3k
|
||||
}:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort
|
||||
, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libcst";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zgwxdbhz2ljl0yzbrn1f4f464rjphx0j6r4qq0csax3m4wp50x1";
|
||||
# Some files for tests missing from PyPi
|
||||
# https://github.com/Instagram/LibCST/issues/331
|
||||
src = fetchFromGitHub {
|
||||
owner = "instagram";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pbddjrsqj641mr6zijk2phfn15dampbx268zcws4bhhhnrxlj65";
|
||||
};
|
||||
|
||||
# The library uses type annotation syntax.
|
||||
disabled = !isPy3k;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = [ typing-inspect pyyaml ];
|
||||
propagatedBuildInputs = [ pyyaml typing-inspect ];
|
||||
|
||||
checkInputs = [ black isort pytestCheckHook ];
|
||||
|
||||
# https://github.com/Instagram/LibCST/issues/346
|
||||
# https://github.com/Instagram/LibCST/issues/347
|
||||
preCheck = ''
|
||||
python -m libcst.codegen.generate visitors
|
||||
python -m libcst.codegen.generate return_types
|
||||
rm libcst/tests/test_fuzz.py
|
||||
rm libcst/tests/test_pyre_integration.py
|
||||
rm libcst/metadata/tests/test_full_repo_manager.py
|
||||
rm libcst/metadata/tests/test_type_inference_provider.py
|
||||
'';
|
||||
|
||||
# Test fails with ValueError: No data_provider tests were created for
|
||||
# test_type_availability! Please double check your data.
|
||||
# The tests appear to be doing some dynamic introspection, not sure what is
|
||||
# going on there.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "libcst" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A concrete syntax tree parser and serializer library for Python that preserves many aspects of Python's abstract syntax tree";
|
||||
homepage = "https://libcst.readthedocs.io/en/latest/";
|
||||
license = with licenses; [mit asl20 psfl];
|
||||
maintainers = [ maintainers.ruuda ];
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A Concrete Syntax Tree (CST) parser and serializer library for Python.";
|
||||
homepage = "https://github.com/Instagram/libcst";
|
||||
license = with licenses; [ mit asl20 psfl ];
|
||||
maintainers = with maintainers; [ maintainers.ruuda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_schema
|
||||
, zope_interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -10,10 +11,14 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3fbca4730c871d8e37b9730763c42b69ba44117cf6d0848014495bb301cae2d6";
|
||||
sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_schema ];
|
||||
propagatedBuildInputs = [ zope_interface zope_schema ];
|
||||
|
||||
checkPhase = ''
|
||||
cd src/zope/filerepresentation && python -m unittest
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://zopefilerepresentation.readthedocs.io/";
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
{
|
||||
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
|
||||
rev = "2020-10-05";
|
||||
rev = "2020-10-12";
|
||||
version = "unstable-${rev}";
|
||||
sha256 = "1vj5xwqif2ipzlb8ngpq3ymgqvv65d0700ihq7hx81k0i2m2awa6";
|
||||
cargoSha256 = "14n7nk64qq27a7ygqm0bly2bby3bmsav6nvsap3bkbkppyr5gyrg";
|
||||
sha256 = "194xax87pwdh3p8zx46igvqwznlpnl4jp8lj987616gyldfgall0";
|
||||
cargoSha256 = "1rvf3a2fpqpf4q52pi676qzq7h0xfqlcbp15sc5vqc8nbbs7c7vw";
|
||||
};
|
||||
|
||||
rust-analyzer = callPackage ./wrapper.nix {} {
|
||||
|
|
|
|||
|
|
@ -16,15 +16,16 @@ rustPlatform.buildRustPackage {
|
|||
inherit rev sha256;
|
||||
};
|
||||
|
||||
# FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0
|
||||
# FIXME: Temporary fixes for our rust 1.45.0
|
||||
cargoPatches = [
|
||||
./downgrade-smol_str.patch
|
||||
./downgrade-smol_str.patch # Requires rustc 1.46.0
|
||||
];
|
||||
|
||||
patches = [
|
||||
# FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0
|
||||
./no-loop-in-const-fn.patch
|
||||
./no-option-zip.patch
|
||||
./no-track_env_var.patch # Requires rustc 1.47.0
|
||||
./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0
|
||||
./no-loop-in-const-fn.patch # Requires rustc 1.46.0
|
||||
./no-option-zip.patch # Requires rustc 1.46.0
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs
|
||||
index ea35e833a..4df80a3c0 100644
|
||||
--- a/crates/assists/src/handlers/convert_integer_literal.rs
|
||||
+++ b/crates/assists/src/handlers/convert_integer_literal.rs
|
||||
@@ -105,7 +105,7 @@ impl IntegerLiteralBase {
|
||||
}
|
||||
}
|
||||
|
||||
- const fn base(&self) -> u32 {
|
||||
+ fn base(&self) -> u32 {
|
||||
match self {
|
||||
Self::Binary => 2,
|
||||
Self::Octal => 8,
|
||||
@@ -114,14 +114,14 @@ impl IntegerLiteralBase {
|
||||
}
|
||||
}
|
||||
|
||||
- const fn prefix_len(&self) -> usize {
|
||||
+ fn prefix_len(&self) -> usize {
|
||||
match self {
|
||||
Self::Decimal => 0,
|
||||
_ => 2,
|
||||
}
|
||||
}
|
||||
|
||||
- const fn bases() -> &'static [IntegerLiteralBase] {
|
||||
+ fn bases() -> &'static [IntegerLiteralBase] {
|
||||
&[
|
||||
IntegerLiteralBase::Binary,
|
||||
IntegerLiteralBase::Octal,
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server).
|
||||
|
||||
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
|
||||
index 55d6330cc..cb4b3bdb0 100644
|
||||
--- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
|
||||
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
|
||||
@@ -160,7 +160,6 @@ macro_rules! define_handles {
|
||||
}
|
||||
define_handles! {
|
||||
'owned:
|
||||
- FreeFunctions,
|
||||
TokenStream,
|
||||
TokenStreamBuilder,
|
||||
TokenStreamIter,
|
||||
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
|
||||
index b97886eb9..aeb05aad4 100644
|
||||
--- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
|
||||
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
|
||||
@@ -57,10 +57,6 @@ use std::thread;
|
||||
macro_rules! with_api {
|
||||
($S:ident, $self:ident, $m:ident) => {
|
||||
$m! {
|
||||
- FreeFunctions {
|
||||
- fn drop($self: $S::FreeFunctions);
|
||||
- fn track_env_var(var: &str, value: Option<&str>);
|
||||
- },
|
||||
TokenStream {
|
||||
fn drop($self: $S::TokenStream);
|
||||
fn clone($self: &$S::TokenStream) -> $S::TokenStream;
|
||||
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
|
||||
index 3acb239af..45d41ac02 100644
|
||||
--- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
|
||||
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
|
||||
@@ -11,8 +11,6 @@ use super::client::HandleStore;
|
||||
/// Declare an associated item of one of the traits below, optionally
|
||||
/// adjusting it (i.e., adding bounds to types and default bodies to methods).
|
||||
macro_rules! associated_item {
|
||||
- (type FreeFunctions) =>
|
||||
- (type FreeFunctions: 'static;);
|
||||
(type TokenStream) =>
|
||||
(type TokenStream: 'static + Clone;);
|
||||
(type TokenStreamBuilder) =>
|
||||
diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs
|
||||
index fc6e7344f..ee0dc9722 100644
|
||||
--- a/crates/proc_macro_srv/src/proc_macro/mod.rs
|
||||
+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs
|
||||
@@ -924,25 +924,3 @@ impl fmt::Debug for Literal {
|
||||
self.0.fmt(f)
|
||||
}
|
||||
}
|
||||
-
|
||||
-pub mod tracked_env {
|
||||
- use std::env::{self, VarError};
|
||||
- use std::ffi::OsStr;
|
||||
-
|
||||
- /// Retrieve an environment variable and add it to build dependency info.
|
||||
- /// Build system executing the compiler will know that the variable was accessed during
|
||||
- /// compilation, and will be able to rerun the build when the value of that variable changes.
|
||||
- /// Besides the dependency tracking this function should be equivalent to `env::var` from the
|
||||
- /// standard library, except that the argument must be UTF-8.
|
||||
- pub fn var<K: AsRef<OsStr> + AsRef<str>>(key: K) -> Result<String, VarError> {
|
||||
- use std::ops::Deref;
|
||||
-
|
||||
- let key: &str = key.as_ref();
|
||||
- let value = env::var(key);
|
||||
- super::bridge::client::FreeFunctions::track_env_var(
|
||||
- key,
|
||||
- value.as_ref().map(|t| t.deref()).ok(),
|
||||
- );
|
||||
- value
|
||||
- }
|
||||
-}
|
||||
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
|
||||
index c5fe3591e..7d1695c86 100644
|
||||
--- a/crates/proc_macro_srv/src/rustc_server.rs
|
||||
+++ b/crates/proc_macro_srv/src/rustc_server.rs
|
||||
@@ -242,8 +242,6 @@ impl TokenStreamBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
-pub struct FreeFunctions;
|
||||
-
|
||||
#[derive(Clone)]
|
||||
pub struct TokenStreamIter {
|
||||
trees: IntoIter<TokenTree>,
|
||||
@@ -256,7 +254,6 @@ pub struct Rustc {
|
||||
}
|
||||
|
||||
impl server::Types for Rustc {
|
||||
- type FreeFunctions = FreeFunctions;
|
||||
type TokenStream = TokenStream;
|
||||
type TokenStreamBuilder = TokenStreamBuilder;
|
||||
type TokenStreamIter = TokenStreamIter;
|
||||
@@ -270,13 +267,6 @@ impl server::Types for Rustc {
|
||||
type MultiSpan = Vec<Span>;
|
||||
}
|
||||
|
||||
-impl server::FreeFunctions for Rustc {
|
||||
- fn track_env_var(&mut self, _var: &str, _value: Option<&str>) {
|
||||
- // FIXME: track env var accesses
|
||||
- // https://github.com/rust-lang/rust/pull/71858
|
||||
- }
|
||||
-}
|
||||
-
|
||||
impl server::TokenStream for Rustc {
|
||||
fn new(&mut self) -> Self::TokenStream {
|
||||
Self::TokenStream::new()
|
||||
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
|
||||
index fcc4f05e4..d829790d7 100644
|
||||
--- a/xtask/src/install.rs
|
||||
+++ b/xtask/src/install.rs
|
||||
@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result};
|
||||
use crate::not_bash::{pushd, run};
|
||||
|
||||
// Latest stable, feel free to send a PR if this lags behind.
|
||||
-const REQUIRED_RUST_VERSION: u32 = 47;
|
||||
+const REQUIRED_RUST_VERSION: u32 = 46;
|
||||
|
||||
pub struct InstallCmd {
|
||||
pub client: Option<ClientOpt>,
|
||||
|
|
@ -1,20 +1,23 @@
|
|||
{ fetchurl, stdenv, runtimeShell
|
||||
, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU, libGL, glew }:
|
||||
{ fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs
|
||||
, zlib, libGLU, libGL, glew, tinyxml-2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "trigger-rally-0.6.6";
|
||||
name = "trigger-rally-0.6.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/trigger-rally/${name}.tar.gz";
|
||||
sha256 = "08qa2f2s8zyn42ff6jb1gsi64d916020ixkzvl16kbb88rabqra8";
|
||||
sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew ];
|
||||
buildInputs =
|
||||
[ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew tinyxml-2 ];
|
||||
|
||||
preConfigure = ''
|
||||
sed s,/usr/local,$out, -i bin/*defs
|
||||
|
||||
cd src
|
||||
|
||||
sed s,lSDL2main,lSDL2, -i GNUmakefile
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2"
|
||||
export makeFlags="$makeFlags prefix=$out"
|
||||
'';
|
||||
|
|
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
description = "Rally";
|
||||
description = "A fast-paced single-player racing game";
|
||||
homepage = "http://trigger-rally.sourceforge.net/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
|
||||
python3Packages, wrapGAppsHook
|
||||
procps, xset, xautolock, xscreensaver, python3Packages, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
@ -12,17 +12,25 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook glib ];
|
||||
buildInputs = [
|
||||
gdk-pixbuf gobject-introspection libnotify gtk3
|
||||
buildInputs = [
|
||||
gdk-pixbuf gobject-introspection libnotify gtk3
|
||||
python3Packages.setuptools_scm
|
||||
];
|
||||
pythonPath = with python3Packages; [
|
||||
dbus-python docopt ewmh pygobject3 pyxdg
|
||||
setproctitle
|
||||
setproctitle
|
||||
];
|
||||
|
||||
doCheck = false; # There are no tests.
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace caffeine/inhibitors.py \
|
||||
--replace 'os.system("xset' 'os.system("${xset}/bin/xset' \
|
||||
--replace 'os.system("xautolock' 'os.system("${xautolock}/bin/xautolock' \
|
||||
--replace 'os.system("pgrep' 'os.system("${procps}/bin/pgrep' \
|
||||
--replace 'os.system("xscreensaver-command' 'os.system("${xscreensaver}/bin/xscreensaver-command'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -r share $out/
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kopia";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vri2xlih7xg0vl4dndjrwf2l5g28bld6kg7adk9v974zxq1h57g";
|
||||
sha256 = "1dnk764y71c9k9nghn9q06f2zz9igsvm4z826azil2d58h5d06j6";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }:
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }:
|
||||
|
||||
let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
|
||||
let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.7.4";
|
||||
version = "2.0.0";
|
||||
pname = "imgur-screenshot";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jomo";
|
||||
repo = "imgur-screenshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr";
|
||||
sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 imgur-screenshot.sh $out/bin/imgur-screenshot
|
||||
install -Dm755 imgur-screenshot $out/bin/imgur-screenshot
|
||||
wrapProgram $out/bin/imgur-screenshot --prefix PATH ':' ${deps}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpytop";
|
||||
version = "1.0.25";
|
||||
version = "1.0.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sxwrckv2j1283h888pyyxply2g93x6jn6cghqh207igmcg4iaj3";
|
||||
sha256 = "04xbzczrd85icld7azvwzw785kmb2c2q22ly21pbi7d89wkys9kh";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ansifilter";
|
||||
version = "2.16";
|
||||
version = "2.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
|
||||
sha256 = "1wmszcykhaipxa7kxj4ml0lkmd5z7i9ryaachg9jpkhbaaijzkbz";
|
||||
sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -10,6 +10,14 @@ perlPackages.buildPerlModule {
|
|||
|
||||
src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
|
||||
|
||||
patches = [
|
||||
# Fix for https://github.com/plk/biber/issues/329
|
||||
(fetchpatch {
|
||||
url = "https://github.com/plk/biber/commit/fa312ce402fe581ba7cc0890c83a1d47c2610e26.diff";
|
||||
sha256 = "1j87mdwvx368z9b5x6b72s753hwvrldf2pb42p6hflq5hzkicy50";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
|
||||
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
|
||||
|
|
|
|||
|
|
@ -9688,7 +9688,8 @@ in
|
|||
rustPackages = rustPackages_1_46;
|
||||
|
||||
inherit (rustPackages) cargo clippy rustc rustPlatform;
|
||||
inherit (rust) makeRustPlatform;
|
||||
|
||||
makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {};
|
||||
|
||||
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
|
||||
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
|
||||
|
|
@ -22679,10 +22680,7 @@ in
|
|||
|
||||
opusTools = callPackage ../applications/audio/opus-tools { };
|
||||
|
||||
orpie = callPackage ../applications/misc/orpie {
|
||||
gsl = gsl_1;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_02;
|
||||
};
|
||||
orpie = callPackage ../applications/misc/orpie { };
|
||||
|
||||
osmo = callPackage ../applications/office/osmo { };
|
||||
|
||||
|
|
@ -26358,6 +26356,8 @@ in
|
|||
cmake = cmakeCurses;
|
||||
});
|
||||
|
||||
zegrapher = libsForQt5.callPackage ../applications/science/math/zegrapher { };
|
||||
|
||||
### SCIENCE/MEDICINE
|
||||
|
||||
aliza = callPackage ../applications/science/medicine/aliza { };
|
||||
|
|
|
|||
|
|
@ -322,6 +322,10 @@ let
|
|||
inherit (pkgs) gnuplot;
|
||||
};
|
||||
|
||||
gsl = callPackage ../development/ocaml-modules/gsl {
|
||||
inherit (pkgs) gsl;
|
||||
};
|
||||
|
||||
hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };
|
||||
|
||||
herelib = callPackage ../development/ocaml-modules/herelib { };
|
||||
|
|
|
|||
|
|
@ -2422,6 +2422,8 @@ in {
|
|||
|
||||
google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { };
|
||||
|
||||
google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { };
|
||||
|
||||
google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { };
|
||||
|
||||
google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { };
|
||||
|
|
@ -2458,6 +2460,8 @@ in {
|
|||
|
||||
google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { };
|
||||
|
||||
google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { };
|
||||
|
||||
google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { };
|
||||
|
||||
google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue