mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-16 22:19:10 +00:00
Merge master into staging-next
This commit is contained in:
commit
09c9a2de7e
@ -1758,7 +1758,7 @@
|
||||
name = "Chris Double";
|
||||
};
|
||||
dpaetzel = {
|
||||
email = "david.a.paetzel@gmail.com";
|
||||
email = "david.paetzel@posteo.de";
|
||||
github = "dpaetzel";
|
||||
githubId = 974130;
|
||||
name = "David Pätzel";
|
||||
|
@ -109,6 +109,22 @@
|
||||
reconfiguring <literal>hostsdir</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>99-main.network</literal> file was removed. Maching all
|
||||
network interfaces caused many breakages, see
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link>
|
||||
and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>.
|
||||
</para>
|
||||
<para>
|
||||
We already don't support the global <link linkend="opt-networking.useDHCP">networking.useDHCP</link>,
|
||||
<link linkend="opt-networking.defaultGateway">networking.defaultGateway</link> and
|
||||
<link linkend="opt-networking.defaultGateway6">networking.defaultGateway6</link> options
|
||||
if <link linkend="opt-networking.useNetworkd">networking.useNetworkd</link> is enabled,
|
||||
but direct users to configure the per-device
|
||||
<link linkend="opt-networking.interfaces">networking.interfaces.<name>.…</link> options.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
@ -76,15 +76,6 @@ in
|
||||
};
|
||||
in mkMerge [ {
|
||||
enable = true;
|
||||
networks."99-main" = (genericNetwork mkDefault) // {
|
||||
# We keep the "broken" behaviour of applying this to all interfaces.
|
||||
# In general we want to get rid of this workaround but there hasn't
|
||||
# been any work on that.
|
||||
# See the following issues for details:
|
||||
# - https://github.com/NixOS/nixpkgs/issues/18962
|
||||
# - https://github.com/NixOS/nixpkgs/issues/61629
|
||||
matchConfig = mkDefault { Name = "*"; };
|
||||
};
|
||||
}
|
||||
(mkMerge (forEach interfaces (i: {
|
||||
netdevs = mkIf i.virtual ({
|
||||
|
@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw";
|
||||
sha256 = "a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.9";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hdr95cpxgdzrzhffs63gdl0g7122ma2zg8bkqwp42p5xphx0xan";
|
||||
sha256 = "0k45vfiacvwmrglpqwjq22pvdg4n0mf75x0r8nb79bmxp8sk0j0c";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.44.2";
|
||||
version = "3.45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "1dny16ybzml6py1y8vprylqq1xc08221w5xcwcmygkjrb0820kax";
|
||||
sha256 = "1hhyknmbvkyq50m7lp41n7g0818frpig8xmxliy501bz4jkhi748";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
@ -37,13 +37,13 @@ let
|
||||
optional = stdenv.lib.optional;
|
||||
in mkDerivation rec {
|
||||
pname = "obs-studio";
|
||||
version = "24.0.1";
|
||||
version = "24.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jp9000";
|
||||
repo = "obs-studio";
|
||||
rev = version;
|
||||
sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
|
||||
sha256 = "0g8nzs696f3myz4hvygav85b0jgjmn6dicy50axmapdv8miff9xa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "man-pages";
|
||||
version = "5.02";
|
||||
version = "5.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
|
||||
sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
|
||||
sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
|
||||
};
|
||||
|
||||
makeFlags = [ "MANDIR=$(out)/share/man" ];
|
||||
|
@ -5,7 +5,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, vala_0_44
|
||||
, vala
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, libcanberra
|
||||
@ -23,6 +23,7 @@
|
||||
, zeitgeist
|
||||
, glib-networking
|
||||
, elementary-icon-theme
|
||||
, fetchpatch
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
vala_0_44 # https://github.com/elementary/files/issues/1081
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
@ -76,7 +77,14 @@ stdenv.mkDerivation rec {
|
||||
zeitgeist
|
||||
];
|
||||
|
||||
patches = [ ./hardcode-gsettings.patch ];
|
||||
patches = [
|
||||
./hardcode-gsettings.patch
|
||||
# Fixes https://github.com/elementary/files/issues/1081
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
|
||||
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
|
@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
name = "openshadinglanguage-${version}";
|
||||
version = "1.10.6";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "Release-1.10.6";
|
||||
sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla";
|
||||
rev = "Release-1.10.7";
|
||||
sha256 = "15grach34grp8x65sq8xzs2s6nfzjhn4blpfnaicw46jdi4c2w59";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib
|
||||
{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
|
||||
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
|
||||
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
|
||||
, git, cacert, cmake, libyaml
|
||||
, libSM, libXt, freetype, pkgconfig, fontconfig
|
||||
, cmake, libyaml, Security
|
||||
, libjpeg, libX11, libXext, libXft, libXinerama
|
||||
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
|
||||
, extraPacks ? []
|
||||
@ -18,58 +18,35 @@ stdenv.mkDerivation {
|
||||
pname = "swi-prolog";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/SWI-Prolog/swipl-devel";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "0czbrscx2s4079nmwvipp9cnwfny16m3fpnp823llm7wyljchgvq";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ cacert git cmake gmp readline openssl
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ gmp readline openssl
|
||||
libarchive libyaml db pcre libedit libossp_uuid
|
||||
zlib pkgconfig ]
|
||||
zlib ]
|
||||
++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
|
||||
++ extraLibraries
|
||||
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
|
||||
++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-world"
|
||||
"--enable-gmp"
|
||||
"--enable-shared"
|
||||
];
|
||||
cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mkdir build
|
||||
cd build
|
||||
${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out ..
|
||||
cd ../
|
||||
make
|
||||
make install
|
||||
make clean
|
||||
mkdir -p $out/lib/swipl/pack
|
||||
''
|
||||
+ builtins.concatStringsSep "\n"
|
||||
postInstall = builtins.concatStringsSep "\n"
|
||||
( builtins.map (packInstall "$out") extraPacks
|
||||
);
|
||||
|
||||
# For macOS: still not fixed in upstream: "abort trap 6" when called
|
||||
# through symlink, so wrap binary.
|
||||
# We reinvent wrapProgram here but omit argv0 pass in order to not
|
||||
# break PAKCS package build. This is also safe for SWI-Prolog, since
|
||||
# there is no wrapping environment and hence no need to spoof $0
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
local prog="$out/bin/swipl"
|
||||
local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
|
||||
mv $prog $hidden
|
||||
makeWrapper $hidden $prog
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.swi-prolog.org/;
|
||||
homepage = "https://www.swi-prolog.org";
|
||||
description = "A Prolog compiler and interpreter";
|
||||
license = "LGPL";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin;
|
||||
maintainers = [ stdenv.lib.maintainers.meditans ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysofa";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${version}";
|
||||
sha256 = "0si0z7cfw6xcs3dkrb4zini55xpxwfp27yl8lbx39gx2pf8v2jls";
|
||||
sha256 = "1gas6fp0xy57wwdvsdfq1yq2hg4zl2c074b260y7hh92z96pj22j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.24.3"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6";
|
||||
sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
sha256 = "0rrf7i2zs2kbz6k2sj1mg30i05h2msl1q9h95dp5brq2k0w94rna";
|
||||
sha256 = "0f6r5j5d4fbzx9ihbbwrqylayw90qac8kapkhmfcvsh7f8whr623";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn";
|
||||
sha256 = "0hqf0z38gk4id8d6vcms66mh3gllh2xib5mr11069sh9ak6b3mmp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.23.1";
|
||||
version = "1.24.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c2f5306153dee33bc04212802c898cf79539917e31cf07516f31c2943bea2160";
|
||||
sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -1,18 +1,10 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
|
||||
{ stdenv, buildPythonPackage, darwin, grpc
|
||||
, six, protobuf, enum34, futures, isPy27, pkgconfig
|
||||
, cython}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (grpc) src version;
|
||||
pname = "grpcio";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython pkgconfig ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
@ -6,12 +6,12 @@ let
|
||||
allSpecs = {
|
||||
x86_64-linux = {
|
||||
system = "linux64";
|
||||
sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
|
||||
sha256 = "155yilj9w8a6jbkx1axhhkizwdc12krl4xixn10j7n94bvny4w2y";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
system = "mac64";
|
||||
sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
|
||||
sha256 = "0dzy9ihhbhx4byr2kalwfbn6jbk1hinacdqi25lvhaprdbrh2igh";
|
||||
};
|
||||
};
|
||||
|
||||
@ -28,7 +28,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromedriver";
|
||||
version = "76.0.3809.68";
|
||||
version = "78.0.3904.70";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://sites.google.com/a/chromium.org/chromedriver;
|
||||
description = "A WebDriver server for running Selenium tests on Chrome";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = [ maintainers.goibhniu maintainers.marsam ];
|
||||
platforms = attrNames allSpecs;
|
||||
};
|
||||
}
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postman";
|
||||
version = "7.6.0";
|
||||
version = "7.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "sha256:03y82ydkj46l7dn35y944gnghbrrhc75y3yxdyidbh8fl3xvmlfv";
|
||||
sha256 = "0qgw3mvds99ca1gy0zfxzi7n1yxv99xwqgzr9rkx5qm6bw9c1ppw";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
@ -1959,6 +1959,17 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
nvim-terminal-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-terminal-lua";
|
||||
version = "2019-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "norcalli";
|
||||
repo = "nvim-terminal.lua";
|
||||
rev = "095f98aaa7265628a72cd2706350c091544b5602";
|
||||
sha256 = "09hass19v3wrqgxjcr3b59w462lp2nw533zwb1nnmiz99gx1znpx";
|
||||
};
|
||||
};
|
||||
|
||||
nvim-yarp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-yarp";
|
||||
version = "2019-10-13";
|
||||
|
@ -299,6 +299,7 @@ neutaaaaan/iosvkem
|
||||
nixprime/cpsm
|
||||
NLKNguyen/papercolor-theme
|
||||
noc7c9/vim-iced-coffee-script
|
||||
norcalli/nvim-terminal.lua
|
||||
ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
nvie/vim-flake8
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtprotoproxy";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexbers";
|
||||
repo = "mtprotoproxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1i8v6w79ad3xn9dnn144q93vcs23cj0m7hj3x33i16hxz325zb9y";
|
||||
sha256 = "1j8bxwcq968h5sd58g03yc4zjqkhkjdn0f04vr826hhsdxy853r4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapPython ];
|
||||
|
@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postgis";
|
||||
version = "2.5.3";
|
||||
version = "3.0.0";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
|
||||
sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j";
|
||||
sha256 = "15557fbk0xkngihwhqsbdyz2ng49blisf5zydw81j0gabk6x4vy0";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
|
||||
|
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-10-20";
|
||||
version = "2019-10-22";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "a7c740b1d7d0033c6de118439c7935962b2a5c2a";
|
||||
rev = "40df67bc3b9b51caa24df5d220487043040d1f9a";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "1kwmjizldfsvxppf8xmgqh0644gnfvcns4l9cjpcvd0nk616yg0f";
|
||||
sha256 = "0dlkfgnhlqymgr9289j15kpcig2k184j0md7bkxn7w8v7c02xbbc";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
36
pkgs/tools/X11/x11spice/default.nix
Normal file
36
pkgs/tools/X11/x11spice/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig
|
||||
, xorg, gtk2, spice, spice-protocol
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x11spice";
|
||||
version = "2019-08-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "spice";
|
||||
repo = "x11spice";
|
||||
rev = "51d2a8ba3813469264959bb3ba2fc6fe08097be6";
|
||||
sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libxcb xorg.xcbutil xorg.utilmacros
|
||||
gtk2 spice spice-protocol
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''
|
||||
x11spice will enable a running X11 desktop to be available
|
||||
via a Spice server
|
||||
'';
|
||||
homepage = https://gitlab.freedesktop.org/spice/x11spice;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
@ -4,17 +4,17 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
version = "1.1.0";
|
||||
version = "1.3.4";
|
||||
|
||||
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
|
||||
pulumiArchPackage = {
|
||||
x86_64-linux = {
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
|
||||
sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224";
|
||||
sha256 = "1scs2msmg6ba91ri9al3299xnq8gq63clbqq1n03karf6ys2jnvi";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
|
||||
sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg";
|
||||
sha256 = "0k3hfrcwa5sgg8mgmxp2xfykrshyp4bv77d3y8758zm7xqmmjg69";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgmetrics";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidloop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zjcchgpmp2a0ir8rzrfjpn4pcjiy4kawh2pbmszmqfzw1mkh762";
|
||||
sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs";
|
||||
};
|
||||
|
||||
modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.3.3";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = version;
|
||||
sha256 = "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy";
|
||||
sha256 = "1g7rhgp405v7q9xx44k6jn3py4v73a9qjwhai6l459wdywdz1n3n";
|
||||
};
|
||||
|
||||
# test-utils coredumps so don't run those
|
||||
|
@ -2,16 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "0.13.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli";
|
||||
sha256 = "0d92wwmvyk6sn3z61y1n9w4wydafra941s0cpbnkc7c9qkxiwwnb";
|
||||
};
|
||||
|
||||
modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w";
|
||||
modSha256 = "04hcg1n8f1wxz7n1k91nfspkd1ca7v5xf4hjj3wiw55vmykzcsm5";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple deb and rpm packager written in Go";
|
||||
|
@ -8541,8 +8541,11 @@ in
|
||||
|
||||
swift = callPackage ../development/compilers/swift { };
|
||||
|
||||
swiProlog = callPackage ../development/compilers/swi-prolog { };
|
||||
swiPrologWithGui = callPackage ../development/compilers/swi-prolog { withGui = true; };
|
||||
swiProlog = callPackage ../development/compilers/swi-prolog {
|
||||
openssl = openssl_1_0_2;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
swiPrologWithGui = swiProlog.override { withGui = true; };
|
||||
|
||||
tbb = callPackage ../development/libraries/tbb { };
|
||||
|
||||
@ -21635,6 +21638,8 @@ in
|
||||
|
||||
x11vnc = callPackage ../tools/X11/x11vnc { };
|
||||
|
||||
x11spice = callPackage ../tools/X11/x11spice { };
|
||||
|
||||
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
|
||||
|
||||
x2goserver = callPackage ../applications/networking/remote/x2goserver { };
|
||||
|
Loading…
Reference in New Issue
Block a user