Merge branch 'master' into staging-next
This commit is contained in:
Robert Schütz
commit
d6234c2165
@ -690,6 +690,12 @@
|
||||
fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169";
|
||||
}];
|
||||
};
|
||||
anhduy = {
|
||||
email = "vo@anhduy.io";
|
||||
github = "voanhduy1512";
|
||||
githubId = 1771266;
|
||||
name = "Vo Anh Duy";
|
||||
};
|
||||
ankhers = {
|
||||
email = "me@ankhers.dev";
|
||||
github = "ankhers";
|
||||
@ -4285,6 +4291,12 @@
|
||||
githubId = 1436960;
|
||||
name = "Christoph Hrdinka";
|
||||
};
|
||||
hrhino = {
|
||||
email = "hora.rhino@gmail.com";
|
||||
github = "hrhino";
|
||||
githubId = 28076058;
|
||||
name = "Harrison Houghton";
|
||||
};
|
||||
hschaeidt = {
|
||||
email = "he.schaeidt@gmail.com";
|
||||
github = "hschaeidt";
|
||||
@ -9150,6 +9162,16 @@
|
||||
githubId = 3280280;
|
||||
name = "Ryne Everett";
|
||||
};
|
||||
rytone = {
|
||||
email = "max@ryt.one";
|
||||
github = "rytone";
|
||||
githubId = 8082305;
|
||||
name = "Maxwell Beck";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0xBB3EFA303760A0DB";
|
||||
fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB";
|
||||
}];
|
||||
};
|
||||
rzetterberg = {
|
||||
email = "richard.zetterberg@gmail.com";
|
||||
github = "rzetterberg";
|
||||
|
||||
@ -318,13 +318,19 @@
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>antlr</literal> package now defaults to the 4.x
|
||||
release instead of the old 2.7.7 version.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>libwnck</literal> package now defaults to the 3.x
|
||||
release instead of the old 2.31.0 version.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
||||
@ -80,6 +80,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
* The `antlr` package now defaults to the 4.x release instead of the
|
||||
old 2.7.7 version.
|
||||
|
||||
* The `libwnck` package now defaults to the 3.x release instead of the
|
||||
old 2.31.0 version.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
|
||||
|
||||
@ -55,6 +55,22 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
firmwarePartitionOffset = mkOption {
|
||||
type = types.int;
|
||||
default = 8;
|
||||
description = ''
|
||||
Gap in front of the /boot/firmware partition, in mebibytes (1024×1024
|
||||
bytes).
|
||||
Can be increased to make more space for boards requiring to dd u-boot
|
||||
SPL before actual partitions.
|
||||
|
||||
Unless you are building your own images pre-configured with an
|
||||
installed U-Boot, you can instead opt to delete the existing `FIRMWARE`
|
||||
partition, which is used **only** for the Raspberry Pi family of
|
||||
hardware.
|
||||
'';
|
||||
};
|
||||
|
||||
firmwarePartitionID = mkOption {
|
||||
type = types.str;
|
||||
default = "0x2178694e";
|
||||
@ -177,7 +193,7 @@ in
|
||||
zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img
|
||||
|
||||
# Gap in front of the first partition, in MiB
|
||||
gap=8
|
||||
gap=${toString config.sdImage.firmwarePartitionOffset}
|
||||
|
||||
# Create the image file sized to fit /boot/firmware and /, plus slack for the gap.
|
||||
rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }')
|
||||
|
||||
@ -118,7 +118,7 @@ in
|
||||
let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in
|
||||
{ serviceConfig.ExecStart = [
|
||||
"" # override upstream default with an empty ExecStart
|
||||
(gettyCmd "%I ${speeds} $TERM")
|
||||
(gettyCmd "%I --keep-baud ${speeds} $TERM")
|
||||
];
|
||||
restartIfChanged = false;
|
||||
};
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
||||
, kio, kcrash, breeze-icons
|
||||
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
|
||||
, openjpeg, opencolorio, vc, poppler, curl, ilmbase
|
||||
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
|
||||
, qtmultimedia, qtx11extras, quazip
|
||||
, python3Packages
|
||||
}:
|
||||
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
||||
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
||||
openjpeg opencolorio poppler curl ilmbase
|
||||
openjpeg opencolorio_1 poppler curl ilmbase
|
||||
qtmultimedia qtx11extras quazip
|
||||
python3Packages.pyqt5
|
||||
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, opencolorio
|
||||
, opencolorio_1
|
||||
, openexr
|
||||
, robin-map
|
||||
, unzip
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
opencolorio
|
||||
opencolorio_1
|
||||
openexr
|
||||
robin-map
|
||||
fmt
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||
, opencolorio, openexr, unzip
|
||||
, opencolorio_1, openexr, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake unzip ];
|
||||
buildInputs = [
|
||||
boost ilmbase libjpeg libpng
|
||||
libtiff opencolorio openexr
|
||||
libtiff opencolorio_1 openexr
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }:
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "devilspie2";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config ];
|
||||
buildInputs = [ glib gtk lua libwnck3 ];
|
||||
buildInputs = [ glib gtk lua libwnck ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, keybinder3
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libwnck3
|
||||
libwnck
|
||||
keybinder3
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier
|
||||
, appindicatorSupport ? true, libayatana-appindicator-gtk3
|
||||
}:
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3;
|
||||
buildInputs = [ gtk3 libwnck libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3;
|
||||
|
||||
configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.84.0";
|
||||
version = "0.84.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc=";
|
||||
sha256 = "sha256-ULZa0tepq00v2VHDR3+aYYvRfbxYKcjcltRgRmbVmRA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU=";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, itstool
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, keybinder3
|
||||
, desktop-file-utils
|
||||
, shared-mime-info
|
||||
@ -34,7 +34,7 @@ buildPythonApplication rec {
|
||||
desktop-file-utils # for update-desktop-database
|
||||
shared-mime-info # for update-mime-info
|
||||
];
|
||||
buildInputs = [ docutils libwnck3 keybinder3 ];
|
||||
buildInputs = [ docutils libwnck keybinder3 ];
|
||||
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
|
||||
|
||||
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.1.8";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01";
|
||||
sha256 = "uFINB8WXFbtI/WMFvqirAygzwK7I/8+8YPeyCd+xQ5w=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, gnome
|
||||
, libnotify
|
||||
, libtool
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, gsettings-desktop-schemas
|
||||
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib libwnck3 libnotify dbus-glib makeWrapper
|
||||
glib libwnck libnotify dbus-glib makeWrapper
|
||||
gsettings-desktop-schemas gnome.gnome-common
|
||||
libtool
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libwnck, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notify-osd";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib libwnck3 libnotify dbus-glib makeWrapper
|
||||
glib libwnck libnotify dbus-glib makeWrapper
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, glib
|
||||
, gnome
|
||||
, gtk3
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libX11
|
||||
, libXfixes
|
||||
, libXi
|
||||
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
libXi
|
||||
libdbusmenu-gtk3
|
||||
libgee
|
||||
libwnck3
|
||||
libwnck
|
||||
pango
|
||||
];
|
||||
|
||||
|
||||
@ -3,12 +3,13 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, stdenv
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libseat";
|
||||
pname = "seatd";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
@ -18,13 +19,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
|
||||
|
||||
mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"];
|
||||
buildInputs = [ systemd ];
|
||||
|
||||
mesonFlags = [ "-Dlogind=enabled" "-Dbuiltin=enabled" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A universal seat management library";
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli";
|
||||
sha256 = "012wyl6qvwca5r8kqf8j7r50r1lbv802c90m13xb7rqyb6jjfv0m";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq";
|
||||
cargoSha256 = "1mgi7hxsn9wajxr78kr3n4g7fa0rwp4riah8dq06cqwjlh0pkfjd";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
|
||||
, glib, libwnck3, procps }:
|
||||
, glib, libwnck, procps }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
buildInputs = [ glib libwnck3 ];
|
||||
buildInputs = [ glib libwnck ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/xsuspender \
|
||||
|
||||
@ -90,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.25.73";
|
||||
version = "1.26.67";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "mSK3hT0Rp03Bq0k+NCYo6S5w+eA9SXXxO3Lo7QWrc9U=";
|
||||
sha256 = "Kg6ExXZYdSkyBoivu9h4blytHN9hOc4bUSuFR+1YZOY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "newsboat";
|
||||
version = "2.23";
|
||||
version = "2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${version}";
|
||||
sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144";
|
||||
sha256 = "0qb10w7pn9hiczjjpc0xanmc83p22ngcqcrkjwji5rl0sh8v9ii4";
|
||||
};
|
||||
|
||||
cargoSha256 = "03g14npkisz159gibhfxj7l36vzm7cvg355hndzpxzvhf5r5yjqg";
|
||||
cargoSha256 = "0vhr8qyw4f3lc208mgl1m3z42igkbwly6wcv7g7jrq3c6dcwyhjn";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -28,7 +28,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.6.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.6.2"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "00q99r3p49fa5j54h1faxrzxfgz1pkx86b1jg3vi94hddlw3xm9c";
|
||||
sha256 = "0cdzww741l4s95n5gq5zx5l3zvxinxbqa9y6wf8wjq7rzn6bwqx3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "openhantek6022";
|
||||
version = "3.1.3";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenHantek";
|
||||
repo = "OpenHantek6022";
|
||||
rev = version;
|
||||
sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm";
|
||||
sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, glib
|
||||
, gtk3
|
||||
, bamf
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libgee
|
||||
, libgtop
|
||||
, wrapGAppsHook
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
pantheon.wingpanel
|
||||
libgee
|
||||
libgtop
|
||||
libwnck3
|
||||
libwnck
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
27
pkgs/applications/terminal-emulators/contour/default.nix
Normal file
27
pkgs/applications/terminal-emulators/contour/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "contour";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christianparpart";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ freetype libGL pcre ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern C++ Terminal Emulator";
|
||||
homepage = "https://github.com/christianparpart/contour";
|
||||
changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
, libnotify
|
||||
, libutempter
|
||||
, vte
|
||||
, libwnck3
|
||||
, libwnck
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
gtk3
|
||||
keybinder3
|
||||
libnotify
|
||||
libwnck3
|
||||
libwnck
|
||||
python3
|
||||
vte
|
||||
];
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8";
|
||||
sha256 = "sha256-YS4XuP5V7HLhz6PTwbz4mqVdzRDQvpwwL7oYeQW8Xcs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr";
|
||||
cargoSha256 = "sha256-wX7x6SbbEWFBo5HeXTjb3r4IJ2leP4T0nVqf43Bl94k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
|
||||
, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio
|
||||
, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio
|
||||
, fetchpatch }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck
|
||||
keybinder3 libappindicator-gtk3
|
||||
];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
|
||||
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
|
||||
poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio,
|
||||
poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio,
|
||||
qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
@ -58,7 +58,7 @@ let
|
||||
sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
pango librsvg librevenge libcdr opencolorio libxml2 libzip
|
||||
pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip
|
||||
poppler imagemagick
|
||||
];
|
||||
preConfigure = ''
|
||||
@ -74,7 +74,7 @@ let
|
||||
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libpng ffmpeg_3 openexr opencolorio openimageio boost libGL
|
||||
libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL
|
||||
seexpr libraw openjpeg libwebp
|
||||
];
|
||||
})
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
|
||||
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full,
|
||||
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
|
||||
CoreFoundation }:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||
buildInputs = [
|
||||
ffmpeg-full
|
||||
frei0r
|
||||
opencolorio
|
||||
opencolorio_1
|
||||
qtmultimedia
|
||||
] ++ lib.optional stdenv.isDarwin CoreFoundation;
|
||||
|
||||
|
||||
53
pkgs/applications/virtualization/lima/default.nix
Normal file
53
pkgs/applications/virtualization/lima/default.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, qemu
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AkihiroSuda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vwAxVBy2SqghxJGscSZ1o1B8EMvQh1fz5CS1YG7Rq2g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xM9LLh5c5QBrcIptdqiNNp1nU9GcdQvwrCnnyuXWYfE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make "VERSION=v${version}" binaries
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r _output/* $out
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash)
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
USER=nix $out/bin/limactl validate examples/default.yaml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/AkihiroSuda/lima";
|
||||
description = "Linux virtual machines (on macOS, in most cases)";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ anhduy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,12 +15,12 @@ rec {
|
||||
name = last (builtins.split "/" nameOrPath);
|
||||
in
|
||||
|
||||
pkgs.runCommandLocal name (if (types.str.check content) then {
|
||||
inherit content interpreter;
|
||||
passAsFile = [ "content" ];
|
||||
} else {
|
||||
pkgs.runCommandLocal name (if types.path.check content then {
|
||||
inherit interpreter;
|
||||
contentPath = content;
|
||||
} else {
|
||||
inherit content interpreter;
|
||||
passAsFile = [ "content" ];
|
||||
}) ''
|
||||
# On darwin a script cannot be used as an interpreter in a shebang but
|
||||
# there doesn't seem to be a limit to the size of shebang and multiple
|
||||
|
||||
56
pkgs/data/themes/whitesur/default.nix
Normal file
56
pkgs/data/themes/whitesur/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gnome-themes-extra
|
||||
, libxml2
|
||||
, sassc
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2021-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "075fw57mv6zadq4dryn8bg2b3vq8inmisq18s758cv53pprxh9hw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
sassc
|
||||
util-linux
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome-themes-extra # adwaita engine for Gtk2
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do patchShebangs "$file"; done
|
||||
|
||||
# Do not provide `sudo`, as it is not needed in our use case of the install script
|
||||
substituteInPlace lib-core.sh --replace '$(which sudo)' false
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
./install.sh --dest $out/share/themes --alt all --theme all
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "MacOS Big Sur like theme for Gnome desktops";
|
||||
homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }:
|
||||
{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }:
|
||||
|
||||
let
|
||||
inherit (python2.pkgs) python pygtk;
|
||||
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 librsvg libwnck libgtop python ];
|
||||
buildInputs = [ gtk2 librsvg libwnck2 libgtop python ];
|
||||
propagatedBuildInputs = [ gnome_python pygtk ];
|
||||
|
||||
# gnome-python-desktop expects that .pth file is already installed by PyGTK
|
||||
|
||||
@ -74,7 +74,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
|
||||
|
||||
# Included for backwards compatibility
|
||||
libsoup libwnck gtk-doc gnome-doc-utils rarian
|
||||
libsoup libwnck2 gtk-doc gnome-doc-utils rarian
|
||||
|
||||
gvfs # added 2019-09-03
|
||||
;
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, gettext
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, adwaita-icon-theme
|
||||
}:
|
||||
|
||||
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
adwaita-icon-theme
|
||||
at-spi2-core
|
||||
gtk3
|
||||
libwnck3
|
||||
libwnck
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
|
||||
description = "KDE Connect implementation for Gnome Shell";
|
||||
homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ etu ];
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, gnome-panel
|
||||
, gtk3
|
||||
, glib
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libgtop
|
||||
, libnotify
|
||||
, upower
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
glib
|
||||
libxml2
|
||||
libwnck3
|
||||
libwnck
|
||||
libgtop
|
||||
libnotify
|
||||
upower
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
, itstool
|
||||
, libgweather
|
||||
, libsoup
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libxml2
|
||||
, pkg-config
|
||||
, polkit
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libgweather
|
||||
libsoup
|
||||
libwnck3
|
||||
libwnck
|
||||
polkit
|
||||
systemd
|
||||
];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, gtk2
|
||||
, libX11
|
||||
, libfm
|
||||
, libwnck
|
||||
, libwnck2
|
||||
, libXmu
|
||||
, libXpm
|
||||
, cairo
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
gtk2
|
||||
libX11
|
||||
libfm
|
||||
libwnck
|
||||
libwnck2
|
||||
libXmu
|
||||
libXpm
|
||||
cairo
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck
|
||||
, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
|
||||
, mateUpdateScript }:
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gnome.gucharmap
|
||||
libwnck3
|
||||
libwnck
|
||||
libgtop
|
||||
libxml2
|
||||
libnotify
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-netbook";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libwnck3
|
||||
libwnck
|
||||
libfakekey
|
||||
libXtst
|
||||
mate.mate-panel
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
|
||||
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
|
||||
libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-notification-daemon";
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libcanberra-gtk3
|
||||
libnotify
|
||||
libwnck3
|
||||
libwnck
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-panel";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libwnck3
|
||||
libwnck
|
||||
librsvg
|
||||
libxml2
|
||||
gtk3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-system-monitor";
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
gtkmm3
|
||||
libxml2
|
||||
libgtop
|
||||
libwnck3
|
||||
libwnck
|
||||
librsvg
|
||||
polkit
|
||||
systemd
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, dconf
|
||||
, glib
|
||||
, gtk3
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libX11
|
||||
, libXfixes
|
||||
, libXi
|
||||
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
libXi
|
||||
libdbusmenu-gtk3
|
||||
libgee
|
||||
libwnck3
|
||||
libwnck
|
||||
pango
|
||||
];
|
||||
|
||||
|
||||
82
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
Normal file
82
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
Normal file
@ -0,0 +1,82 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libhandy
|
||||
, webkitgtk
|
||||
, folks
|
||||
, libgdata
|
||||
, sqlite
|
||||
, granite
|
||||
, elementary-icon-theme
|
||||
, evolution-data-server
|
||||
, appstream
|
||||
, wrapGAppsHook
|
||||
, libgee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "unstable-2021-06-21";
|
||||
|
||||
repoName = "mail";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = "c64c87fabb31dea8dc388152d5a835401993acf4";
|
||||
sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
elementary-icon-theme
|
||||
evolution-data-server
|
||||
folks
|
||||
granite
|
||||
gtk3
|
||||
libgdata
|
||||
libgee
|
||||
libhandy
|
||||
sqlite
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mail app designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/mail";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ];
|
||||
};
|
||||
}
|
||||
@ -49,6 +49,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
elementary-feedback = callPackage ./apps/elementary-feedback { };
|
||||
|
||||
elementary-mail = callPackage ./apps/elementary-mail { };
|
||||
|
||||
elementary-music = callPackage ./apps/elementary-music { };
|
||||
|
||||
elementary-photos = callPackage ./apps/elementary-photos { };
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
|
||||
{ mkXfceDerivation, exo, gtk3, libwnck, libXmu }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
@ -8,7 +8,7 @@ mkXfceDerivation {
|
||||
sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A=";
|
||||
|
||||
nativeBuildInputs = [ exo ];
|
||||
buildInputs = [ gtk3 libwnck3 libXmu ];
|
||||
buildInputs = [ gtk3 libwnck libXmu ];
|
||||
|
||||
meta = {
|
||||
description = "Easy to use task manager for Xfce";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, libXinerama
|
||||
, libXdamage
|
||||
, libX11
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, garcon
|
||||
@ -33,7 +33,7 @@ mkXfceDerivation {
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXinerama
|
||||
libwnck3
|
||||
libwnck
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfconf
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libdbusmenu-gtk3
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, tzdata
|
||||
@ -30,7 +30,7 @@ mkXfceDerivation {
|
||||
garcon
|
||||
libdbusmenu-gtk3
|
||||
libxfce4ui
|
||||
libwnck3
|
||||
libwnck
|
||||
xfconf
|
||||
tzdata
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xfce4-session }:
|
||||
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
@ -7,7 +7,7 @@ mkXfceDerivation {
|
||||
|
||||
sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0=";
|
||||
|
||||
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
|
||||
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ];
|
||||
|
||||
configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }:
|
||||
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
@ -12,7 +12,7 @@ mkXfceDerivation {
|
||||
gtk3
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
libwnck3
|
||||
libwnck
|
||||
xfconf
|
||||
libnotify
|
||||
garcon
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
|
||||
, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
|
||||
, libstartup_notification, libxfce4ui, libxfce4util, libwnck
|
||||
, libXpresent, xfconf }:
|
||||
|
||||
mkXfceDerivation {
|
||||
@ -19,7 +19,7 @@ mkXfceDerivation {
|
||||
libstartup_notification
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
libwnck3
|
||||
libwnck
|
||||
libXpresent
|
||||
xfconf
|
||||
];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46
|
||||
, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }:
|
||||
, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-namebar-plugin";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ];
|
||||
buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ];
|
||||
buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck3, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-windowck-plugin";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
python3
|
||||
imagemagick
|
||||
libwnck3
|
||||
libwnck
|
||||
libxfce4ui
|
||||
xfce4-panel
|
||||
xfconf
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, mkXfceDerivation
|
||||
, gtk3
|
||||
, librsvg
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, libxklavier
|
||||
, garcon
|
||||
, libxfce4ui
|
||||
@ -25,7 +25,7 @@ mkXfceDerivation {
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
libxklavier
|
||||
libwnck3
|
||||
libwnck
|
||||
xfce4-panel
|
||||
xfconf
|
||||
];
|
||||
|
||||
@ -1,22 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, clang, chez
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, clang
|
||||
, chez
|
||||
, gmp
|
||||
, zsh
|
||||
}:
|
||||
|
||||
# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
|
||||
|
||||
# Uses scheme to bootstrap the build of idris2
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "idris2";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-lang";
|
||||
repo = "Idris2";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh";
|
||||
sha256 = "105jybjf5s0k6003qzfxchzsfcpsxip180bh3mdmi74d464d0h8g";
|
||||
};
|
||||
|
||||
# We do not add any propagatedNativeBuildInputs because we do not want the
|
||||
# executables idris2 produces to depend on the nix-store. As such, it is left
|
||||
# to the user to guarantee chez (or any other codgen dependency) is available
|
||||
# in the path during compilation of programs with idris2.
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper clang chez ];
|
||||
buildInputs = [ chez ];
|
||||
nativeBuildInputs = [ makeWrapper clang chez ]
|
||||
++ lib.optional stdenv.isDarwin [ zsh ];
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs --build tests
|
||||
@ -26,9 +39,9 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional stdenv.isDarwin "OS=";
|
||||
|
||||
# The name of the main executable of pkgs.chez is `scheme`
|
||||
buildFlags = [ "bootstrap-build" "SCHEME=scheme" ];
|
||||
buildFlags = [ "bootstrap" "SCHEME=scheme" ];
|
||||
|
||||
checkTarget = "bootstrap-test";
|
||||
checkTarget = "test";
|
||||
|
||||
# TODO: Move this into its own derivation, such that this can be changed
|
||||
# without having to recompile idris2 every time.
|
||||
@ -72,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A purely functional programming language with first class types";
|
||||
homepage = "https://github.com/idris-lang/Idris2";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ wchresta ];
|
||||
maintainers = with lib.maintainers; [ fabianhjr wchresta ];
|
||||
inherit (chez.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,8 +21,8 @@ let
|
||||
release_version = "13.0.0";
|
||||
candidate = ""; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
rev = "643b6407faf460915679f304420cfbee87c47734"; # When using a Git commit
|
||||
rev-version = "unstable-2021-06-11"; # When using a Git commit
|
||||
rev = "1605fce6c3074f8d1dff5a917a1840ffa66abd86"; # When using a Git commit
|
||||
rev-version = "unstable-2021-06-19"; # When using a Git commit
|
||||
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
|
||||
targetConfig = stdenv.targetPlatform.config;
|
||||
|
||||
@ -30,7 +30,7 @@ let
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = if rev != "" then rev else "llvmorg-${version}";
|
||||
sha256 = "0b06qqbks20m1cy9g1k8y4w8vh9zcbh9ag2bpk9xgg2xkmbq42az";
|
||||
sha256 = "1jf0b9vn4qv5gsvhyg6xsqdkdl4vzn7j4sfcldl8bggcgjmzp0q1";
|
||||
};
|
||||
|
||||
llvm_meta = {
|
||||
|
||||
57
pkgs/development/compilers/myrddin/default.nix
Normal file
57
pkgs/development/compilers/myrddin/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, bison
|
||||
, binutils
|
||||
, binutils-unwrapped
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "myrddin";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "mc";
|
||||
owner = "oridb";
|
||||
rev = "r${version}";
|
||||
sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mk/c.mk \
|
||||
--replace "-Werror" ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make bootstrap
|
||||
make
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for b in $out/bin/*; do
|
||||
wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]}
|
||||
done
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
make check
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Systems language that is both powerful and fun to use";
|
||||
homepage = "https://myrlang.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
31
pkgs/development/compilers/scala-runners/default.nix
Normal file
31
pkgs/development/compilers/scala-runners/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, lib, fetchFromGitHub, jre, coursier }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scala-runners";
|
||||
version = "unstable-2020-02-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "dwijnand";
|
||||
rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31";
|
||||
sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner
|
||||
cp scala-runner $out/lib
|
||||
ln -s $out/lib/scala-runner $out/bin/scala
|
||||
ln -s $out/lib/scala-runner $out/bin/scalac
|
||||
ln -s $out/lib/scala-runner $out/bin/scalap
|
||||
ln -s $out/lib/scala-runner $out/bin/scaladoc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dwijnand/scala-runners";
|
||||
description = "An alternative implementation of the Scala distribution's runners";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ hrhino ];
|
||||
};
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
, which
|
||||
, fetchgit
|
||||
, libgtop
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, glib
|
||||
, vala
|
||||
, pkg-config
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
glib
|
||||
libgtop
|
||||
libstartup_notification
|
||||
libwnck3
|
||||
libwnck
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
|
||||
sha256 = "0z1r0s5s3dr1g4f3ylxfcmy3xb0ax02rw9mg7z8hzh0gxazrpndx";
|
||||
sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
|
||||
|
||||
30
pkgs/development/libraries/libwnck/2.nix
Normal file
30
pkgs/development/libraries/libwnck/2.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwnck";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ];
|
||||
# ?another optional: startup-notification
|
||||
|
||||
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
|
||||
|
||||
meta = {
|
||||
description = "A library for creating task lists and pagers";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libwnck";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
# ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found
|
||||
# #include <gdk/gdkx.h>
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
, libX11
|
||||
, glib
|
||||
, gtk3
|
||||
, pango
|
||||
, cairo
|
||||
, libXres
|
||||
, libstartup_notification
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwnck";
|
||||
version = "3.36.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_412
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libstartup_notification
|
||||
pango
|
||||
cairo
|
||||
libXres
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "${pname}${lib.versions.major version}";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@ -1,30 +1,76 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
, libX11
|
||||
, glib
|
||||
, gtk3
|
||||
, pango
|
||||
, cairo
|
||||
, libXres
|
||||
, libstartup_notification
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwnck";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
|
||||
};
|
||||
version = "3.36.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ];
|
||||
# ?another optional: startup-notification
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_412
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A library for creating task lists and pagers";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libwnck";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
# ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found
|
||||
# #include <gdk/gdkx.h>
|
||||
broken = stdenv.isDarwin;
|
||||
buildInputs = [
|
||||
libX11
|
||||
libstartup_notification
|
||||
pango
|
||||
cairo
|
||||
libXres
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "${pname}${lib.versions.major version}";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ liff ];
|
||||
};
|
||||
}
|
||||
|
||||
45
pkgs/development/libraries/opencolorio/1.x.nix
Normal file
45
pkgs/development/libraries/opencolorio/1.x.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencolorio";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "OpenColorIO";
|
||||
rev = "v${version}";
|
||||
sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
# TODO: Investigate whether git can be dropped: It's only used to apply patches
|
||||
nativeBuildInputs = [ cmake pkg-config git ];
|
||||
|
||||
buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/core/CMakeLists.txt --replace "-Werror" ""
|
||||
substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_LCMS=ON"
|
||||
"-DUSE_EXTERNAL_TINYXML=ON"
|
||||
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
||||
"-DUSE_EXTERNAL_YAML=OFF"
|
||||
] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
||||
++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin/bin; mv $out/bin $bin/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opencolorio.org";
|
||||
description = "A color management framework for visual effects and animation";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,47 +1,49 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }:
|
||||
{
|
||||
stdenv, lib, fetchFromGitHub,
|
||||
cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies
|
||||
|
||||
glew, freeglut, # Only required on Linux
|
||||
Carbon, GLUT, Cocoa, # Only required on Darwin
|
||||
|
||||
pythonBindings ? true, # Python bindings
|
||||
python3Packages,
|
||||
|
||||
buildApps ? true, # Utility applications
|
||||
lcms2, openimageio2, openexr,
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencolorio";
|
||||
version = "1.1.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenColorIO";
|
||||
rev = "v${version}";
|
||||
sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb";
|
||||
sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ expat libyamlcpp ilmbase pystring ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
|
||||
++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]
|
||||
++ lib.optionals buildApps [ lcms2 openimageio2 openexr ];
|
||||
|
||||
# TODO: Investigate whether git can be dropped: It's only used to apply patches
|
||||
nativeBuildInputs = [ cmake pkg-config git ];
|
||||
cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ]
|
||||
++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
|
||||
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
|
||||
|
||||
buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/core/CMakeLists.txt --replace "-Werror" ""
|
||||
substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_LCMS=ON"
|
||||
"-DUSE_EXTERNAL_TINYXML=ON"
|
||||
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
||||
"-DUSE_EXTERNAL_YAML=OFF"
|
||||
] ++ optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
||||
++ optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin/bin; mv $out/bin $bin/
|
||||
'';
|
||||
# TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0
|
||||
# doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opencolorio.org";
|
||||
description = "A color management framework for visual effects and animation";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = [ maintainers.rytone ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
33
pkgs/development/libraries/pystring/default.nix
Normal file
33
pkgs/development/libraries/pystring/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pystring";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "pystring";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pystring-cmake-configuration.patch";
|
||||
url = "https://github.com/imageworks/pystring/commit/4f653fc35421129eae8a2c424901ca7170059370.patch";
|
||||
sha256 = "1hynzz76ff4vvmi6kwixsmjswkpyj6s4vv05d7nw0zscj4cdp8k3";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/imageworks/pystring/";
|
||||
description = "A collection of C++ functions which match the interface and behavior of python's string class methods using std::string";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.rytone ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
|
||||
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||
, libpng, ffmpeg, xcbutilrenderutil, xwayland, libseat
|
||||
, libpng, ffmpeg, xcbutilrenderutil, xwayland, seatd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg xcbutilrenderutil xwayland libseat
|
||||
libpng ffmpeg xcbutilrenderutil xwayland seatd
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
2
pkgs/development/node-packages/node-packages.nix
generated
2
pkgs/development/node-packages/node-packages.nix
generated
@ -114043,7 +114043,7 @@ in
|
||||
"vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
|
||||
name = "vscode-lldb";
|
||||
packageName = "vscode-lldb";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
|
||||
dependencies = [
|
||||
sources."@discoveryjs/json-ext-0.5.3"
|
||||
|
||||
@ -40,8 +40,6 @@ stdenv.mkDerivation {
|
||||
preInstall = "mkdir -p $OCAMLFIND_DESTDIR";
|
||||
installFlags = "BINDIR=$(out)/bin";
|
||||
|
||||
# passthru.tests = { inherit dose3; }; # To-Do: To be enabled when Dose3 PR is accepted.
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library for CUDF format";
|
||||
homepage = "http://www.mancoosi.org/cudf/";
|
||||
|
||||
61
pkgs/development/ocaml-modules/dose3/default.nix
Normal file
61
pkgs/development/ocaml-modules/dose3/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib, buildDunePackage, fetchFromGitLab
|
||||
, camlzip, ocamlgraph, parmap, re, stdlib-shims
|
||||
, base64, bz2, ocaml_extlib, cudf
|
||||
, dpkg, git, ocaml, ounit, python39, python39Packages
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dose3";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "irill";
|
||||
repo = "dose3";
|
||||
rev = version;
|
||||
sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [
|
||||
parmap
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
base64
|
||||
bz2
|
||||
camlzip
|
||||
cudf
|
||||
ocaml_extlib
|
||||
ocamlgraph
|
||||
re
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dpkg # Replaces: conf-dpkg
|
||||
git
|
||||
ounit
|
||||
python39 # Replaces: conf-python-3
|
||||
python39Packages.pyyaml # Replaces: conf-python3-yaml
|
||||
];
|
||||
doCheck = false; # Tests are failing.
|
||||
# To enable tests use: lib.versionAtLeast ocaml.version "4.04";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dose library (part of Mancoosi tools)";
|
||||
downloadPage = "https://gitlab.com/irill/dose3/";
|
||||
homepage = "http://www.mancoosi.org/software/";
|
||||
license = licenses.lgpl3Plus;
|
||||
longDescription = ''
|
||||
The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository.
|
||||
* dose-builddebcheck checks, given a collection of source package stanzas and a collection of binary package stanzas of Debian packages, whether the build-dependencies of each source package can be satisfied by the binary packages.
|
||||
* dose-distcheck checks for every package of a distribution whether it is possible to satisfy its dependencies and conflicts within this distribution.
|
||||
* ceve, a general metadata parser supporting different input formats (Debian, rpm, and others) and different output formats.
|
||||
* dose-outdated, a Debian-specific tool for finding packages that are not installable with respect to a package repository, and that can only be made installable again by fixing the package itself.
|
||||
* dose-challenged, a Debian-specific tool for checking which packages will certainly become uninstallable when some existing package is upgraded to a newer version.
|
||||
* dose-deb-coinstall, a Debian-specific tool for checking whether a set of packages can be installed all together.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,8 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, python }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U=";
|
||||
sha256 = "sha256-WNhhQ3iqqwyYyd+iOQVpsKAAfgJwJBaUR7rmYAEYUxw=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,22 +1,33 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imaplib2";
|
||||
version = "2.45.0";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a35b6d88258696e80aabecfb784e08730b8558fcaaa3061ff2c7f8637afbd0b3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "imaplib2";
|
||||
rev = "v${version}";
|
||||
sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m";
|
||||
};
|
||||
|
||||
# No tests on PyPI and no tags on GitHub :(
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "imaplib2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A threaded Python IMAP4 client";
|
||||
homepage = "https://github.com/bcoe/imaplib2";
|
||||
# See https://github.com/bcoe/imaplib2/issues/25
|
||||
license = licenses.psfl;
|
||||
homepage = "https://github.com/jazzband/imaplib2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
30
pkgs/development/python-modules/ndms2-client/default.nix
Normal file
30
pkgs/development/python-modules/ndms2-client/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ndms2-client";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foxel";
|
||||
repo = "python_ndms2_client";
|
||||
rev = version;
|
||||
sha256 = "1sc39d10hm1y8xf3gdqzq1akrx94k590l106242j9bvfqyr8lrk9";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ndms2_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keenetic NDMS 2.x and 3.x client";
|
||||
homepage = "https://github.com/foxel/python_ndms2_client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybotvac";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM=";
|
||||
sha256 = "1hf692w44dmalv7hlcpwzbnr6xhvnmdv5nl1jcy2jhiwp89lkhzv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
41
pkgs/development/python-modules/pyscf/default.nix
Normal file
41
pkgs/development/python-modules/pyscf/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ buildPythonPackage, lib, fetchFromGitHub, libcint, libxc, xcfun, blas
|
||||
, numpy, scipy, h5py
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyscf";
|
||||
version = "1.7.6.post1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyscf";
|
||||
repo = pname;
|
||||
rev = "f6c9c6654dd9609c5e467a1edd5c2c076f793acc";
|
||||
sha256 = "0xbwkjxxysfpqz72qn6n4a0zr2h6sprbcal8j7kzymh7swjy117w";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libcint
|
||||
libxc
|
||||
xcfun
|
||||
blas
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
h5py
|
||||
];
|
||||
|
||||
PYSCF_INC_DIR="${libcint}:${libxc}:${xcfun}";
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyscf" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python-based simulations of chemistry framework";
|
||||
homepage = "https://github.com/pyscf/pyscf";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
48
pkgs/development/python-modules/rflink/default.nix
Normal file
48
pkgs/development/python-modules/rflink/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, async-timeout
|
||||
, docopt
|
||||
, pyserial
|
||||
, pyserial-asyncio
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rflink";
|
||||
version = "0.0.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aequitas";
|
||||
repo = "python-rflink";
|
||||
rev = version;
|
||||
sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version=version_from_git()" "version='${version}'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
docopt
|
||||
pyserial
|
||||
pyserial-asyncio
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rflink.protocol" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and CLI tools for interacting with RFlink 433MHz transceiver";
|
||||
homepage = "https://github.com/aequitas/python-rflink";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hobbes";
|
||||
version = "unstable-2020-05-19";
|
||||
pname = "hobbes";
|
||||
version = "unstable-2021-04-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "morgan-stanley";
|
||||
repo = "hobbes";
|
||||
rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1";
|
||||
sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1";
|
||||
rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6";
|
||||
sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj";
|
||||
};
|
||||
|
||||
# TODO: re-enable Python tests once they work on Python 3
|
||||
# currently failing with "I don't know how to decode the primitive type: b'bool'"
|
||||
postPatch = ''
|
||||
rm test/Python.C
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w.
|
||||
llvm_12
|
||||
ncurses
|
||||
readline
|
||||
zlib
|
||||
libxml2
|
||||
];
|
||||
|
||||
doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = with lib; {
|
||||
@ -32,7 +38,7 @@ stdenv.mkDerivation {
|
||||
Hobbes is a a language, embedded compiler, and runtime for efficient
|
||||
dynamic expression evaluation, data storage and analysis.
|
||||
'';
|
||||
homepage = "https://github.com/Morgan-Stanley/hobbes";
|
||||
homepage = "https://github.com/morganstanley/hobbes";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kthielen thmzlt ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gnome
|
||||
, libwnck3
|
||||
, libwnck
|
||||
, gobject-introspection
|
||||
, gettext
|
||||
, itstool
|
||||
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
glib
|
||||
gnome.adwaita-icon-theme
|
||||
gtk3
|
||||
libwnck3
|
||||
libwnck
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -120,7 +120,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# Sourcetrail attempts to copy clang headers from the LLVM store path
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}'
|
||||
--replace "\''${LLVM_BINARY_DIR}" '${lib.getLib llvmPackages.clang-unwrapped}'
|
||||
|
||||
patchShebangs script
|
||||
ln -sf ${installJavaIndexer} script/update_java_indexer.sh
|
||||
|
||||
@ -889,16 +889,9 @@ let
|
||||
|
||||
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { };
|
||||
|
||||
ms-python.python =
|
||||
let
|
||||
raw-package = callPackage ./python {
|
||||
ms-python.python = callPackage ./python {
|
||||
extractNuGet = callPackage ./python/extract-nuget.nix { };
|
||||
};
|
||||
in
|
||||
buildEnv {
|
||||
name = "vscode-extension-ms-python-python-full";
|
||||
paths = [ raw-package self.ms-toolsai.jupyter ];
|
||||
};
|
||||
|
||||
msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vscode-lldb",
|
||||
"version": "1.6.4",
|
||||
"version": "1.6.5",
|
||||
"dependencies": {
|
||||
"string-argv": "^0.3.1",
|
||||
"yaml": "^1.10.0",
|
||||
|
||||
@ -5,13 +5,15 @@ assert lib.versionAtLeast python3.version "3.5";
|
||||
let
|
||||
publisher = "vadimcn";
|
||||
pname = "vscode-lldb";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
repo = "vscode-lldb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M=";
|
||||
sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k=";
|
||||
};
|
||||
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
@ -23,7 +25,7 @@ let
|
||||
# It will pollute the build environment of `buildRustPackage`.
|
||||
cargoPatches = [ ./reset-cargo-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU=";
|
||||
cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -41,10 +43,10 @@ let
|
||||
|
||||
nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "vscode-extension-${pname}";
|
||||
inherit src;
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "vscode-extension-${publisher}-${pname}";
|
||||
inherit src version vscodeExtUniqueId;
|
||||
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
nativeBuildInputs = [ cmake nodejs unzip makeWrapper ];
|
||||
|
||||
@ -30,6 +30,9 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies)
|
||||
"$src/package.json" \
|
||||
> build-deps/package.json
|
||||
|
||||
# FIXME: vsce@1.93.0 breaks the build.
|
||||
sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json
|
||||
|
||||
# Regenerate nodePackages.
|
||||
cd "$nixpkgs/pkgs/development/node-packages"
|
||||
exec ./generate.sh
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-iscsi";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
|
||||
buildInputs = [ kmod open-isns.lib openssl systemd util-linux ];
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "open-iscsi";
|
||||
repo = "open-iscsi";
|
||||
rev = version;
|
||||
sha256 = "14rcf4xmrmz522z57sm8bb3mn79dqsdwz84rl6id84fgjbwbsp6b";
|
||||
sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI=";
|
||||
};
|
||||
|
||||
DESTDIR = "$(out)";
|
||||
|
||||
@ -421,7 +421,7 @@
|
||||
"kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client
|
||||
"kankun" = ps: with ps; [ ];
|
||||
"keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact
|
||||
"keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client
|
||||
"keenetic_ndms2" = ps: with ps; [ ndms2-client ];
|
||||
"kef" = ps: with ps; [ aiokef getmac ];
|
||||
"keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput
|
||||
"keyboard_remote" = ps: with ps; [ aionotify evdev ];
|
||||
@ -695,7 +695,7 @@
|
||||
"repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier
|
||||
"rest" = ps: with ps; [ jsonpath xmltodict ];
|
||||
"rest_command" = ps: with ps; [ ];
|
||||
"rflink" = ps: with ps; [ ]; # missing inputs: rflink
|
||||
"rflink" = ps: with ps; [ rflink ];
|
||||
"rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx
|
||||
"ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ];
|
||||
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
|
||||
|
||||
@ -506,6 +506,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"isy994"
|
||||
"izone"
|
||||
"jewish_calendar"
|
||||
"keenetic_ndms2"
|
||||
"kira"
|
||||
"kmtronic"
|
||||
"knx"
|
||||
@ -619,6 +620,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"remote"
|
||||
"rest"
|
||||
"rest_command"
|
||||
"rflink"
|
||||
"ring"
|
||||
"risco"
|
||||
"rituals_perfume_genie"
|
||||
|
||||
@ -105,4 +105,18 @@
|
||||
mkdir "$out"
|
||||
mv document*.svg "$out"/
|
||||
'';
|
||||
|
||||
texdoc = runCommandNoCC "texlive-test-texdoc" {
|
||||
nativeBuildInputs = [
|
||||
(with texlive; combine {
|
||||
inherit scheme-infraonly luatex texdoc;
|
||||
pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ];
|
||||
})
|
||||
];
|
||||
} ''
|
||||
texdoc --version
|
||||
|
||||
texdoc --debug --list texdoc | tee "$out"
|
||||
grep texdoc.pdf "$out"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.1.4";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1nk46s1s8yrlqv37sc7la05nnn7sdgqhkrcdm98qin34llwkv70x";
|
||||
sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,18 +27,6 @@ in stdenv.mkDerivation rec {
|
||||
++ pythonPath
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
patches = [
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://github.com/blueman-project/blueman/commit/ae2be5a70cdea1d1aa0e3ab1c85c1d3a0c4affc6.patch";
|
||||
sha256 = "0nb6jzlxhgjvac52cjwi0pi40b8v4h6z6pwz5vkyfmaj86spygg3";
|
||||
excludes = [
|
||||
"meson.build"
|
||||
"Dependencies.md"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString withPulseAudio ''
|
||||
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
|
||||
'';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
|
||||
eigen, libpng, python, libGLU, qt4, openexr, openimageio,
|
||||
opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper
|
||||
opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override {
|
||||
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
buildInputs = [
|
||||
boost_static guile eigen libpng python
|
||||
libGLU qt4 openexr openimageio opencolorio xercesc
|
||||
libGLU qt4 openexr openimageio opencolorio_1 xercesc
|
||||
osl seexpr
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck3,
|
||||
{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck,
|
||||
gobject-introspection, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
|
||||
|
||||
buildInputs = [ pythonEnv gtk3 libwnck3 gobject-introspection wrapGAppsHook ];
|
||||
buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ];
|
||||
|
||||
installPhase = ''
|
||||
sed -i 's/python/python3/g' clipster
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, util-linux, coreutils}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.42";
|
||||
version = "6.44";
|
||||
pname = "profile-sync-daemon";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
|
||||
sha256 = "1x47ydrwawkic5cgzp0ikd99g1hbpzc2aalq9z630vm13yw2adnp";
|
||||
sha256 = "sha256-+iQr7T99X/jYYgq0xNHLPCJG5mZU/6dN76Z1FB51Z54=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "corerad";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdlayher";
|
||||
repo = "corerad";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ky4zfmxzgxidsizfj2lwm5z3zl666khw9cgsxfgbzn3cjgr33c3";
|
||||
sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ddni8hl8fv0m9kinwfnhcj3k51fk8h61yksv7ws6agdx0bl1rwh";
|
||||
vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WUaDL1bMZ7rjlwyaqZraIKSrxj68PZiuIpgZN8l8nIo=";
|
||||
sha256 = "sha256-selmBW6GlfzKbVHz7EgmUB8n567NS08gwkRB9Y+Px8s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yk94jD8gwgmEroxg7vzfaISVakMv3+tUoq+Auas751w=";
|
||||
vendorSha256 = "sha256-q0cTFYepq7odZSACNuUoz6kjT7sE38Pv6B113w2gpIQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose HTTP toolkit";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, bison, flex}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
pname = "sshguard";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz";
|
||||
sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7";
|
||||
sha256 = "1s1prqdbxjrd1n3j4x8ggy9gl2j0ax6xhkzcvyzajw7awmvbfw17";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Felice <jason.m.felice@gmail.com>
|
||||
Date: Tue, 2 Jul 2019 13:19:23 -0400
|
||||
Subject: [PATCH] Need CoreFoundation
|
||||
|
||||
---
|
||||
src/cmd/devdraw/cocoa-screen.m | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m
|
||||
index 97128da2..0e380dd3 100644
|
||||
--- a/src/cmd/devdraw/cocoa-screen.m
|
||||
+++ b/src/cmd/devdraw/cocoa-screen.m
|
||||
@@ -56,6 +56,7 @@
|
||||
#endif
|
||||
|
||||
AUTOFRAMEWORK(Cocoa)
|
||||
+AUTOFRAMEWORK(CoreFoundation)
|
||||
|
||||
#define LOG if(0)NSLog
|
||||
#define panic sysfatal
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user