Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-11-21 08:43:10 +01:00
commit 1ffd7cf0d6
129 changed files with 5263 additions and 10739 deletions

View File

@ -126,6 +126,13 @@
to <literal>/run/pdns-recursor</literal> to match upstream. to <literal>/run/pdns-recursor</literal> to match upstream.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Paperwork was updated to version 2. The on-disk format slightly changed,
and it is not possible to downgrade from Paperwork 2 back to Paperwork
1.3. Back your documents up before upgrading. See <link xlink:href="https://forum.openpaper.work/t/paperwork-2-0/112/5">this thread</link> for more details.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
PowerDNS has been updated from <literal>4.2.x</literal> to <literal>4.3.x</literal>. Please PowerDNS has been updated from <literal>4.2.x</literal> to <literal>4.3.x</literal>. Please

View File

@ -16,8 +16,7 @@ my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {};
sub updateFile { sub updateFile {
my ($path, $contents, $perms) = @_; my ($path, $contents, $perms) = @_;
write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents); write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die;
rename("$path.tmp", $path) or die;
} }
@ -98,7 +97,7 @@ sub parseGroup {
return ($f[0], { name => $f[0], password => $f[1], gid => $gid, members => $f[3] }); return ($f[0], { name => $f[0], password => $f[1], gid => $gid, members => $f[3] });
} }
my %groupsCur = -f "/etc/group" ? map { parseGroup } read_file("/etc/group") : (); my %groupsCur = -f "/etc/group" ? map { parseGroup } read_file("/etc/group", { binmode => ":utf8" }) : ();
# Read the current /etc/passwd. # Read the current /etc/passwd.
sub parseUser { sub parseUser {
@ -109,20 +108,19 @@ sub parseUser {
return ($f[0], { name => $f[0], fakePassword => $f[1], uid => $uid, return ($f[0], { name => $f[0], fakePassword => $f[1], uid => $uid,
gid => $f[3], description => $f[4], home => $f[5], shell => $f[6] }); gid => $f[3], description => $f[4], home => $f[5], shell => $f[6] });
} }
my %usersCur = -f "/etc/passwd" ? map { parseUser } read_file("/etc/passwd", { binmode => ":utf8" }) : ();
my %usersCur = -f "/etc/passwd" ? map { parseUser } read_file("/etc/passwd") : ();
# Read the groups that were created declaratively (i.e. not by groups) # Read the groups that were created declaratively (i.e. not by groups)
# in the past. These must be removed if they are no longer in the # in the past. These must be removed if they are no longer in the
# current spec. # current spec.
my $declGroupsFile = "/var/lib/nixos/declarative-groups"; my $declGroupsFile = "/var/lib/nixos/declarative-groups";
my %declGroups; my %declGroups;
$declGroups{$_} = 1 foreach split / /, -e $declGroupsFile ? read_file($declGroupsFile) : ""; $declGroups{$_} = 1 foreach split / /, -e $declGroupsFile ? read_file($declGroupsFile, { binmode => ":utf8" }) : "";
# Idem for the users. # Idem for the users.
my $declUsersFile = "/var/lib/nixos/declarative-users"; my $declUsersFile = "/var/lib/nixos/declarative-users";
my %declUsers; my %declUsers;
$declUsers{$_} = 1 foreach split / /, -e $declUsersFile ? read_file($declUsersFile) : ""; $declUsers{$_} = 1 foreach split / /, -e $declUsersFile ? read_file($declUsersFile, { binmode => ":utf8" }) : "";
# Generate a new /etc/group containing the declared groups. # Generate a new /etc/group containing the declared groups.
@ -175,7 +173,7 @@ foreach my $name (keys %groupsCur) {
# Rewrite /etc/group. FIXME: acquire lock. # Rewrite /etc/group. FIXME: acquire lock.
my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" } my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }
(sort { $a->{gid} <=> $b->{gid} } values(%groupsOut)); (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));
updateFile($gidMapFile, encode_json($gidMap)); updateFile($gidMapFile, to_json($gidMap));
updateFile("/etc/group", \@lines); updateFile("/etc/group", \@lines);
system("nscd --invalidate group"); system("nscd --invalidate group");
@ -251,7 +249,7 @@ foreach my $name (keys %usersCur) {
# Rewrite /etc/passwd. FIXME: acquire lock. # Rewrite /etc/passwd. FIXME: acquire lock.
@lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" } @lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }
(sort { $a->{uid} <=> $b->{uid} } (values %usersOut)); (sort { $a->{uid} <=> $b->{uid} } (values %usersOut));
updateFile($uidMapFile, encode_json($uidMap)); updateFile($uidMapFile, to_json($uidMap));
updateFile("/etc/passwd", \@lines); updateFile("/etc/passwd", \@lines);
system("nscd --invalidate passwd"); system("nscd --invalidate passwd");
@ -260,7 +258,7 @@ system("nscd --invalidate passwd");
my @shadowNew; my @shadowNew;
my %shadowSeen; my %shadowSeen;
foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) { foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) {
chomp $line; chomp $line;
my ($name, $hashedPassword, @rest) = split(':', $line, -9); my ($name, $hashedPassword, @rest) = split(':', $line, -9);
my $u = $usersOut{$name};; my $u = $usersOut{$name};;

View File

@ -1,6 +1,6 @@
{ {
x86_64-linux = "/nix/store/qxayqjmlpqnmwg5yfsjjayw220ls8i2r-nix-2.3.8"; x86_64-linux = "/nix/store/fwak7l5jjl0py4wldsqjbv7p7rdzql0b-nix-2.3.9";
i686-linux = "/nix/store/5834psaay75048jp6d07liqh4j0v1swd-nix-2.3.8"; i686-linux = "/nix/store/jlqrx9zw3vkwcczndaar5ban1j8g519z-nix-2.3.9";
aarch64-linux = "/nix/store/pic90a5fxvifz05jzkd0zak21f9mjin6-nix-2.3.8"; aarch64-linux = "/nix/store/kzvpzlm12185hw27l5znrprgvcja54d0-nix-2.3.9";
x86_64-darwin = "/nix/store/cjx3f8z12wlayp5983kli2a52ipi8jz2-nix-2.3.8"; x86_64-darwin = "/nix/store/kanh3awpf370pxfnjfvkh2m343wr3hj0-nix-2.3.9";
} }

View File

@ -237,14 +237,14 @@ import ./make-test-python.nix ({ pkgs, ... }: {
with subtest("Ensure cross compiled image can be loaded and has correct arch."): with subtest("Ensure cross compiled image can be loaded and has correct arch."):
docker.succeed( docker.succeed(
"docker load --input='${pkgs.dockerTools.examples.cross-aarch64}'", "docker load --input='${pkgs.dockerTools.examples.cross}'",
) )
assert ( assert (
docker.succeed( docker.succeed(
"docker inspect ${pkgs.dockerTools.examples.cross-aarch64.imageName} " "docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
+ "| ${pkgs.jq}/bin/jq -r .[].Architecture" + "| ${pkgs.jq}/bin/jq -r .[].Architecture"
).strip() ).strip()
== "arm64v8" == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64v8"}"
) )
''; '';
}) })

View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: { mkDerivation, lib, fetchurl, pkgconfig, libjack2
, alsaLib, liblo, libsndfile, lv2, qtbase, qttools
, rubberband
}:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "samplv1"; pname = "samplv1";
version = "0.9.13"; version = "0.9.18";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
}; };
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; nativeBuildInputs = [ qttools pkgconfig ];
nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ];
meta = with stdenv.lib; { meta = with lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
homepage = "http://samplv1.sourceforge.net/"; homepage = "http://samplv1.sourceforge.net/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View File

@ -1,37 +1,24 @@
{ stdenv, fetchgit }: { stdenv, fetchFromGitHub, autoreconfHook, popt }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "svox"; pname = "svox";
version = "2017-07-18"; version = "2018-02-14";
src = fetchgit { # basically took the source code from android and borrowed autotool patches from debian
url = "https://android.googlesource.com/platform/external/svox"; src = fetchFromGitHub {
rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb"; owner = "naggety";
sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r"; repo = "picotts";
rev = "e3ba46009ee868911fa0b53db672a55f9cc13b1c";
sha256 = "0k3m7vh1ak9gmxd83x29cvhzfkybgz5hnlhd9xj19l1bjyx84s8v";
}; };
postPatch = '' postPatch = ''
cd pico cd pico
''; '';
buildPhase = '' buildInputs = [ popt ];
cd lib
for i in *.c; do
$CC -O2 -fPIC -c -o ''${i%.c}.o $i
done
$CC -shared -o libttspico.so *.o
cd ..
'';
installPhase = '' nativeBuildInputs = [ autoreconfHook ];
install -Dm755 lib/libttspico.so $out/lib/libttspico.so
mkdir -p $out/include
cp lib/*.h $out/include
mkdir -p $out/share/pico/lang
cp lang/*.bin $out/share/pico/lang
'';
NIX_CFLAGS_COMPILE = "-include stdint.h";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Text-to-speech engine"; description = "Text-to-speech engine";

View File

@ -1,6 +1,6 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk
, makeWrapper, ... }: , makeWrapper, perl, ... }:
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps mkdir -p $out/share/pixmaps
ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
# ensure eclipse.ini does not try to use a justj jvm, as those aren't compatible with nix
${perl}/bin/perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin\n||' $out/eclipse/eclipse.ini
''; # */ ''; # */
meta = { meta = {

View File

@ -10,13 +10,16 @@ assert stdenv ? glibc;
# https://download.eclipse.org/eclipse/downloads/ is the main place to # https://download.eclipse.org/eclipse/downloads/ is the main place to
# find the downloads needed for new versions # find the downloads needed for new versions
#
# to test:
# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
let let
platform_major = "4"; platform_major = "4";
platform_minor = "16"; platform_minor = "17";
year = "2020"; year = "2020";
month = "06"; month = "09";
timestamp = "${year}${month}040540"; timestamp = "${year}${month}021800";
gtk = gtk3; gtk = gtk3;
in rec { in rec {
@ -34,7 +37,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "0vfxzsvfv9zmd0ckrdpziijzskh13g8kgk8ibkwmhmqmj14a3visk6yvn5q2s0knkswl1zy9arinw0mxvqh72dfj63vwc01vhp06lyr"; sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh";
}; };
}; };
@ -46,7 +49,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "29nr1x3fgdw5ygrppfma6yi1iaqvad24jyb58sag735z1nz4ymajcwakg52mlv3s19d4w8cxpskh1r459mwz7j769qplymspqifvlkd"; sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y";
}; };
}; };
@ -58,7 +61,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
sha512 = "2pm4xam0jn9x34k1hr5rn67fpvc6snlkpcfn4bzdcf2xjv9f3dr2039mkcrhri5nv2bj6fkbai6aga6fmmrb3na33b7ir7sqlqqn61b"; sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9";
}; };
}; };
@ -83,7 +86,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
sha512 = "195c07yabmi2a42qxfmpbv6ychpj15bbpgyp40s1pcdb3p875vcqjinq9dqy2sixzwjhfdrggpvwihav87rkih9arzmk2s4cm31mjqd"; sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k";
}; };
}; };
@ -95,7 +98,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "3n8jllgxarrxgz16n7zb4bgaqxk0m9frcxrgdxvy25ar2iw8js4q4ir3cc20y4ri3ii74rf3jy6n4ndhm57miwqh4p2wqzhfjlinirb"; sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q";
}; };
}; };
@ -107,7 +110,7 @@ in rec {
src = src =
fetchurl { fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y"; sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1";
}; };
}; };

View File

@ -255,12 +255,12 @@ rec {
cdt = buildEclipseUpdateSite rec { cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}"; name = "cdt-${version}";
# find current version at https://www.eclipse.org/cdt/downloads.php # find current version at https://www.eclipse.org/cdt/downloads.php
version = "9.11.1"; version = "10.0.1";
src = fetchzip { src = fetchzip {
stripRoot = false; stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip";
sha256 = "00cpaal6jm9xb4nbkljrf381r3lf1rb1p06vrbn4l0lxnbckb9df"; sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -475,12 +475,12 @@ rec {
jdt = buildEclipseUpdateSite rec { jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}"; name = "jdt-${version}";
version = "4.16"; version = "4.17";
src = fetchzip { src = fetchzip {
stripRoot = false; stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202006040540/org.eclipse.jdt-${version}.zip"; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip";
sha256 = "0g349hg2nv1y628daxf84396wpf33z52wxv0gawlgrirbbizaznd"; sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -24,6 +24,10 @@ mkDerivation rec {
python3Packages.lxml python3Packages.lxml
]; ];
prePatch = ''
sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install
'';
dontWrapQtApps = true; dontWrapQtApps = true;
preFixup = '' preFixup = ''

View File

@ -1,19 +0,0 @@
commit e92b250968e9656084ab5984689747ca615ff6e7
Author: Volker Wichmann <wichmann@laserdata.at>
Date: Sun Mar 5 13:49:53 2017 +0100
saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly
diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp
index 76a1d8d..fa1a66f 100644
--- a/src/saga_core/saga_api/table.cpp
+++ b/src/saga_core/saga_api/table.cpp
@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord)
//---------------------------------------------------------
bool CSG_Table::Del_Records(void)
{
- if( m_Records > 0 )
+ if( m_nRecords > 0 )
{
_Index_Destroy();

View File

@ -1,4 +1,6 @@
{ stdenv { stdenv
, mkDerivation
, lib
, fetchurl , fetchurl
# native # native
, autoreconfHook , autoreconfHook
@ -28,13 +30,13 @@
, fftw , fftw
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "saga"; pname = "saga";
version = "7.7.0"; version = "7.8.1";
src = fetchurl { src = fetchurl {
url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk"; sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
] ]
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin # for why the have additional buildInputs on darwin
++ stdenv.lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
Cocoa Cocoa
unixODBC unixODBC
poppler poppler
@ -76,16 +78,11 @@ stdenv.mkDerivation rec {
sqlite sqlite
]; ];
patches = [
# See https://sourceforge.net/p/saga-gis/bugs/280/
./opencv4.patch
];
enableParallelBuilding = true; enableParallelBuilding = true;
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
meta = with stdenv.lib; { meta = with lib; {
description = "System for Automated Geoscientific Analyses"; description = "System for Automated Geoscientific Analyses";
homepage = "http://www.saga-gis.org"; homepage = "http://www.saga-gis.org";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View File

@ -1,13 +0,0 @@
diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
index c5da854..d3e9cff 100755
--- a/src/modules/imagery/imagery_maxent/me.cpp
+++ b/src/modules/imagery/imagery_maxent/me.cpp
@@ -21,7 +21,7 @@
#ifdef _SAGA_MSW
#define isinf(x) (!_finite(x))
#else
-#define isinf(x) (!finite(x))
+#define isinf(x) (!isfinite(x))
#endif
/** The input array contains a set of log probabilities lp1, lp2, lp3

View File

@ -1,14 +0,0 @@
--- a/src/tools/imagery/imagery_opencv/Makefile.am
+++ b/src/tools/imagery/imagery_opencv/Makefile.am
@@ -7,9 +7,9 @@
if HAVE_CV
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
-CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
pkglib_LTLIBRARIES = libimagery_opencv.la
libimagery_opencv_la_SOURCES =\
MLB_Interface.cpp\

View File

@ -1,4 +1,5 @@
{ stdenv { mkDerivation
, lib
, autoreconfHook , autoreconfHook
, curl , curl
, fetchFromGitHub , fetchFromGitHub
@ -7,7 +8,7 @@
, libtool , libtool
, qrencode , qrencode
, udev , udev
, libusb-compat-0_1 , libusb1
, makeWrapper , makeWrapper
, pkgconfig , pkgconfig
, qtbase , qtbase
@ -46,18 +47,18 @@
let let
copyUdevRuleToOutput = name: rule: copyUdevRuleToOutput = name: rule:
"cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
in stdenv.mkDerivation rec { in mkDerivation rec {
pname = "digitalbitbox"; pname = "digitalbitbox";
version = "2.2.2"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "digitalbitbox"; owner = "digitalbitbox";
repo = "dbb-app"; repo = "dbb-app";
rev = "v${version}"; rev = "v${version}";
sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
}; };
nativeBuildInputs = with stdenv.lib; [ nativeBuildInputs = with lib; [
autoreconfHook autoreconfHook
curl curl
git git
@ -70,7 +71,7 @@ in stdenv.mkDerivation rec {
libevent libevent
libtool libtool
udev udev
libusb-compat-0_1 libusb1
qrencode qrencode
qtbase qtbase
@ -93,6 +94,8 @@ in stdenv.mkDerivation rec {
"format" "format"
]; ];
qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ];
postInstall = '' postInstall = ''
mkdir -p "$out/lib" mkdir -p "$out/lib"
cp src/libbtc/.libs/*.so* $out/lib cp src/libbtc/.libs/*.so* $out/lib
@ -103,9 +106,6 @@ in stdenv.mkDerivation rec {
# [RPATH][patchelf] Avoid forbidden reference error # [RPATH][patchelf] Avoid forbidden reference error
rm -rf $PWD rm -rf $PWD
wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib"
wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib"
# Provide udev rules as documented in https://digitalbitbox.com/start_linux # Provide udev rules as documented in https://digitalbitbox.com/start_linux
mkdir -p "$out/etc/udev/rules.d" mkdir -p "$out/etc/udev/rules.d"
${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51}
@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "A QT based application for the Digital Bitbox hardware wallet"; description = "A QT based application for the Digital Bitbox hardware wallet";
longDescription = '' longDescription = ''
Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
@ -138,6 +138,5 @@ in stdenv.mkDerivation rec {
vidbina vidbina
]; ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }

View File

@ -1,16 +1,20 @@
{ lib, python3Packages, fetchFromGitHub, wrapQtAppsHook }: { lib
, python3Packages
, fetchFromGitHub
, wrapQtAppsHook
}:
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "inkcut"; pname = "inkcut";
version = "2.1.1"; version = "2.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1c0mfdfy9iq4l683f3aa7cm7x2w9px83dyigc7655wvaq3bxi2rp"; sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx";
}; };
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ wrapQtAppsHook ];

View File

@ -5,13 +5,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qlcplus"; pname = "qlcplus";
version = "4.12.2"; version = "4.12.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mcallegari"; owner = "mcallegari";
repo = "qlcplus"; repo = "qlcplus";
rev = "QLC+_${version}"; rev = "QLC+_${version}";
sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3"; sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs=";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];

View File

@ -82,6 +82,5 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h) timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896
}; };
}) })

View File

@ -26,15 +26,15 @@
} }
}, },
"dev": { "dev": {
"version": "88.0.4315.5", "version": "88.0.4324.11",
"sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw", "sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315",
"sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j", "sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby",
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-10-21", "version": "2020-11-05",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc", "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1" "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
} }
} }
} }

View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook { mkDerivation, lib, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "psi-plus"; pname = "psi-plus";
version = "1.4.1473"; version = "1.4.1473";
@ -19,15 +19,16 @@ stdenv.mkDerivation rec {
"-DENABLE_PLUGINS=ON" "-DENABLE_PLUGINS=ON"
]; ];
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libsecret libXScrnSaver hunspell libidn qca-qt5 libsecret libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
]; ];
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://sourceforge.net/projects/psiplus/";
description = "XMPP (Jabber) client"; description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej misuzu ]; maintainers = with maintainers; [ orivej misuzu ];
license = licenses.gpl2; license = licenses.gpl2;

View File

@ -1,30 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook { lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libXScrnSaver, hunspell , libidn, qca-qt5, libXScrnSaver, hunspell
}: }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "psi"; pname = "psi";
version = "1.4"; version = "1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-im"; owner = "psi-im";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
./fix-cmake-hunspell-1.7.patch ./fix-cmake-hunspell-1.7.patch
]; ];
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libXScrnSaver hunspell libidn qca-qt5 libXScrnSaver hunspell
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://psi-im.org";
description = "An XMPP (Jabber) client"; description = "An XMPP (Jabber) client";
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mutt"; pname = "mutt";
version = "2.0.1"; version = "2.0.2";
src = fetchurl { src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "1nr1n0lshif6lrn4c5ym473jrg0jaka5wfyy06qmbxhnavmgvx8c"; sha256 = "1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7";
}; };
patches = optional smimeSupport (fetchpatch { patches = optional smimeSupport (fetchpatch {

View File

@ -6,14 +6,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20200925"; version = "20201120";
pname = "neomutt"; pname = "neomutt";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neomutt"; owner = "neomutt";
repo = "neomutt"; repo = "neomutt";
rev = version; rev = version;
sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2"; sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna";
}; };
buildInputs = [ buildInputs = [
@ -22,18 +22,6 @@ stdenv.mkDerivation rec {
mailcap sqlite mailcap sqlite
]; ];
patches = [
# To be removed on next release. Fixes two bugs in the sidebar behavior.
(fetchpatch {
url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch";
sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s";
})
(fetchpatch {
url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch";
sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
]; ];

View File

@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem { lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk , qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
, libnl
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "ostinato"; pname = "ostinato";
version = "0.9"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pstavirs"; owner = "pstavirs";
repo = "ostinato"; repo = "ostinato";
rev = "v${version}"; rev = "v${version}";
sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg=";
}; };
ostinatoIcon = fetchurl { ostinatoIcon = fetchurl {
@ -18,14 +19,17 @@ stdenv.mkDerivation rec {
sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
}; };
buildInputs = [ qt4 protobuf libpcap ]; buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake ];
patches = [ ./drone_ini.patch ]; patches = [ ./drone_ini.patch ];
prePatch = ''
sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
'';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
type = "application"; type = "Application";
name = "ostinato"; name = "ostinato";
desktopName = "Ostinato"; desktopName = "Ostinato";
genericName = "Packet/Traffic Generator and Analyzer"; genericName = "Packet/Traffic Generator and Analyzer";
@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
# pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory
enableParallelBuilding = false; enableParallelBuilding = false;
meta = with stdenv.lib; { meta = with lib; {
description = "A packet traffic generator and analyzer"; description = "A packet traffic generator and analyzer";
homepage = "https://ostinato.org"; homepage = "https://ostinato.org";
license = licenses.gpl3; license = licenses.gpl3;

View File

@ -1,48 +0,0 @@
{ buildPythonPackage, lib, fetchFromGitLab
, isPy3k, isPyPy
, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
, python-Levenshtein, pygobject3, pyocr, natsort, libinsane
, distro
, pkgs
}:
buildPythonPackage rec {
pname = "paperwork-backend";
version = "1.3.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65";
};
sourceRoot = "source/paperwork-backend";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > paperwork_backend/_version.py
'';
preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
propagatedBuildInputs = [
pyenchant simplebayes pillow pycountry whoosh termcolor
python-Levenshtein libinsane pygobject3 pyocr natsort
pkgs.poppler_gi pkgs.gtk3 distro
];
meta = {
description = "Backend part of Paperwork (Python API, no UI)";
homepage = "https://openpaper.work/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}

View File

@ -0,0 +1,42 @@
{ buildPythonPackage, lib, fetchFromGitLab
, isPy3k, isPyPy
, distro, setuptools
, pkgs
}:
buildPythonPackage rec {
pname = "openpaperwork-core";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
sourceRoot = "source/openpaperwork-core";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > src/openpaperwork_core/_version.py
chmod a+w -R ..
patchShebangs ../tools
'';
propagatedBuildInputs = [
distro
setuptools
];
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
preBuild = ''
make l10n_compile
'';
meta = {
description = "Backend part of Paperwork (Python API, no UI)";
homepage = "https://openpaper.work/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}

View File

@ -0,0 +1,52 @@
{ buildPythonPackage
, lib
, fetchFromGitLab
, isPy3k
, isPyPy
, openpaperwork-core
, pillow
, pygobject3
, distro
, pkgs
}:
buildPythonPackage rec {
pname = "openpaperwork-gtk";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
sourceRoot = "source/openpaperwork-gtk";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py
chmod a+w -R ..
patchShebangs ../tools
'';
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
preBuild = ''
make l10n_compile
'';
propagatedBuildInputs = [
pillow
pygobject3
pkgs.poppler_gi
pkgs.gtk3
distro
pkgs.pango
openpaperwork-core
];
meta = {
description = "Reusable GTK components of Paperwork";
homepage = "https://openpaper.work/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}

View File

@ -0,0 +1,77 @@
{ buildPythonPackage
, lib
, fetchFromGitLab
, isPy3k
, isPyPy
, pyenchant
, simplebayes
, pypillowfight
, pycountry
, whoosh
, termcolor
, python-Levenshtein
, pygobject3
, pyocr
, natsort
, libinsane
, distro
, openpaperwork-core
, openpaperwork-gtk
, psutil
, pkgs
}:
buildPythonPackage rec {
pname = "paperwork-backend";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
sourceRoot = "source/paperwork-backend";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > src/paperwork_backend/_version.py
chmod a+w -R ..
patchShebangs ../tools
'';
propagatedBuildInputs = [
pyenchant
simplebayes
pypillowfight
pycountry
whoosh
termcolor
python-Levenshtein
libinsane
pygobject3
pyocr
natsort
pkgs.poppler_gi
pkgs.gtk3
distro
openpaperwork-core
];
preCheck = ''
export HOME=$(mktemp -d)
'';
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
preBuild = ''
make l10n_compile
'';
checkInputs = [ openpaperwork-gtk psutil ];
meta = {
description = "Backend part of Paperwork (Python API, no UI)";
homepage = "https://openpaper.work/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}

View File

@ -10,45 +10,36 @@
, dbus , dbus
, libnotify , libnotify
, wrapGAppsHook , wrapGAppsHook
, fetchFromGitLab
, which
, gettext
, gobject-introspection
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
inherit (python3Packages.paperwork-backend) version src; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
pname = "paperwork"; pname = "paperwork";
sourceRoot = "source/paperwork-gtk"; sourceRoot = "source/paperwork-gtk";
# Patch out a few paths that assume that we're using the FHS: # Patch out a few paths that assume that we're using the FHS:
postPatch = '' postPatch = ''
themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)" chmod a+w -R ..
sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py patchShebangs ../tools
sed -i -e 's,sys\.prefix,"",g' \ export HOME=$(mktemp -d)
src/paperwork/frontend/aboutdialog/__init__.py \
src/paperwork/frontend/mainwindow/__init__.py \
setup.py
sed -i -e '/^UI_FILES_DIRS = \[/,/^\]$/ { cat - ../AUTHORS.py > src/paperwork_gtk/_version.py <<EOF
c UI_FILES_DIRS = ["'"$out/share/paperwork"'"]
}' src/paperwork/frontend/util/__init__.py
sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ {
c LOCALE_PATHS = ["'"$out/share"'"]
}' src/paperwork/paperwork.py
sed -i -e 's/"icon"/"icon-name"/g' \
src/paperwork/frontend/mainwindow/mainwindow.glade
sed -i -e 's/"logo"/"logo-icon-name"/g' \
src/paperwork/frontend/aboutdialog/aboutdialog.glade
cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
version = "${version}" version = "${version}"
authors_code="" authors_code=""
EOF EOF
''; '';
preBuild = ''
make l10n_compile
'';
ASPELL_CONF = "dict-dir ${buildEnv { ASPELL_CONF = "dict-dir ${buildEnv {
name = "aspell-all-dicts"; name = "aspell-all-dicts";
paths = lib.collect lib.isDerivation aspellDicts; paths = lib.collect lib.isDerivation aspellDicts;
@ -56,37 +47,49 @@ python3Packages.buildPythonApplication rec {
postInstall = '' postInstall = ''
# paperwork-shell needs to be re-wrapped with access to paperwork # paperwork-shell needs to be re-wrapped with access to paperwork
cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
# install desktop files and icons # install desktop files and icons
XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user
''; '';
checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); checkInputs = [ xvfb_run dbus.daemon ];
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook wrapGAppsHook
gobject-introspection
(lib.getBin gettext)
which
]; ];
buildInputs = [ buildInputs = [
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
libnotify libnotify
librsvg librsvg
gtk3
cairo
]; ];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
# A few parts of chkdeps need to have a display and a dbus session, so we not # A few parts of chkdeps need to have a display and a dbus session, so we not
# only need to run a virtual X server + dbus but also have a large enough # only need to run a virtual X server + dbus but also have a large enough
# resolution, because the Cairo test tries to draw a 200x200 window. # resolution, because the Cairo test tries to draw a 200x200 window.
preCheck = '' preCheck = ''
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
paperwork-shell chkdeps paperwork $out/bin/paperwork-gtk chkdeps
''; '';
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
paperwork-backend paperwork-backend
paperwork-shell
openpaperwork-gtk
openpaperwork-core
pypillowfight pypillowfight
gtk3
cairo
pyxdg pyxdg
dateutil dateutil
setuptools setuptools

View File

@ -0,0 +1,59 @@
{ buildPythonPackage
, lib
, fetchFromGitLab
, isPy3k
, isPyPy
, openpaperwork-core
, openpaperwork-gtk
, paperwork-backend
, fabulous
, getkey
, pkgs
}:
buildPythonPackage rec {
pname = "paperwork-shell";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
sourceRoot = "source/paperwork-shell";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > src/paperwork_shell/_version.py
chmod a+w -R ..
patchShebangs ../tools
'';
propagatedBuildInputs = [
openpaperwork-core
paperwork-backend
fabulous
getkey
];
checkInputs = [
openpaperwork-gtk
];
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
preBuild = ''
make l10n_compile
'';
preCheck = ''
export HOME=$(mktemp -d)
"$out/bin/paperwork-cli" chkdeps
'';
meta = {
description = "CLI for Paperwork";
homepage = "https://openpaper.work/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ aszlig symphorien ];
};
}

View File

@ -0,0 +1,12 @@
{fetchFromGitLab}:
rec {
version = "2.0.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4";
};
}

View File

@ -30,6 +30,7 @@ mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DSKG_DESIGNER=OFF" "-DSKG_DESIGNER=OFF"
"-DSKG_WEBENGINE=ON" "-DSKG_WEBENGINE=ON"
"-DBUILD_TESTS=ON"
]; ];
meta = with lib; { meta = with lib; {

View File

@ -3,7 +3,7 @@
let let
description = "A note-taking application that knows programmers and Markdown better"; description = "A note-taking application that knows programmers and Markdown better";
in mkDerivation rec { in mkDerivation rec {
version = "2.8.2"; version = "2.10";
pname = "vnote"; pname = "vnote";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -11,7 +11,7 @@ in mkDerivation rec {
repo = "vnote"; repo = "vnote";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l"; sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ=";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View File

@ -13,47 +13,40 @@ libav,
libiio, libiio,
libopus, libopus,
libpulseaudio, libpulseaudio,
libusb-compat-0_1, libusb1,
limesuite, limesuite,
libbladeRF,
mkDerivation, mkDerivation,
ocl-icd, ocl-icd,
opencv3, opencv3,
pkgconfig, pkgconfig,
qtbase, qtbase,
qtmultimedia, qtmultimedia,
qtserialport,
qtwebsockets, qtwebsockets,
rtl-sdr, rtl-sdr,
serialdv serialdv,
uhd
}: }:
let mkDerivation rec {
codec2' = codec2.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "drowe67";
repo = "codec2";
rev = "567346818c0d4d697773cf66d925fdb031e15668";
sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa";
};
});
in mkDerivation rec {
pname = "sdrangel"; pname = "sdrangel";
version = "4.11.12"; version = "4.21.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "f4exb"; owner = "f4exb";
repo = "sdrangel"; repo = "sdrangel";
rev = "v${version}"; rev = "v${version}";
sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx"; sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
fftwFloat codec2' cm256cc serialdv fftwFloat codec2 cm256cc serialdv qtserialport
libbladeRF uhd
]; ];
cmakeFlags = [ cmakeFlags = [
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

View File

@ -27,7 +27,6 @@ mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [

View File

@ -1,39 +1,47 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }: { stdenv, lib, fetchFromGitHub
, qtbase, qttools, qmake, wrapQtAppsHook
}:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "librepcb"; pname = "librepcb";
version = "0.1.5"; version = "0.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LibrePCB"; owner = pname;
repo = "LibrePCB"; repo = pname;
fetchSubmodules = true; rev = version;
rev = version;
sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx"; sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";
fetchSubmodules = true;
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
qmakeFlags = ["-r"]; qmakeFlags = ["-r"];
enableParallelBuilding = true;
postInstall = '' postInstall = ''
mkdir -p $out/share/librepcb/fontobene mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
''; '';
# the build system tries to use 'git' at build time to find the HEAD hash.
# that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
# at the end of the line to remove the git call.
patchPhase = ''
substituteInPlace ./libs/librepcb/common/common.pro \
--replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
'';
preFixup = '' preFixup = ''
wrapQtApp $out/bin/librepcb wrapQtApp $out/bin/librepcb
''; '';
meta = with lib; { meta = with stdenv.lib; {
description = "A free EDA software to develop printed circuit boards"; description = "A free EDA software to develop printed circuit boards";
homepage = "https://librepcb.org/"; homepage = "https://librepcb.org/";
maintainers = with maintainers; [ luz ]; maintainers = with maintainers; [ luz thoughtpolice ];
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: { mkDerivation, lib, fetchurl, qmake }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "xflr5"; pname = "xflr5";
version = "6.47"; version = "6.47";
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ qmake wrapQtAppsHook ]; nativeBuildInputs = [ qmake ];
meta = with stdenv.lib; { meta = with lib; {
description = "An analysis tool for airfoils, wings and planes"; description = "An analysis tool for airfoils, wings and planes";
homepage = https://sourceforge.net/projects/xflr5/; homepage = https://sourceforge.net/projects/xflr5/;
license = licenses.gpl3; license = licenses.gpl3;

View File

@ -1,30 +1,30 @@
{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake { mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake
, qtdeclarative, qttools, qtx11extras, mpv , qtdeclarative, qttools, qtx11extras, mpv
# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
# account. You'll need to generate (and please share :-) a new one if it breaks. # account. You'll need to generate (and please share :-) a new one if it breaks.
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "minitube"; pname = "minitube";
version = "3.2"; version = "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU=";
rev = version; rev = version;
repo = "minitube"; repo = "minitube";
owner = "flaviotordini"; owner = "flaviotordini";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
nativeBuildInputs = [ wrapQtAppsHook qmake ]; nativeBuildInputs = [ qmake qttools ];
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "Stand-alone YouTube video player"; description = "Stand-alone YouTube video player";
longDescription = '' longDescription = ''
Watch YouTube videos in a new way: you type a keyword, Minitube gives Watch YouTube videos in a new way: you type a keyword, Minitube gives

View File

@ -0,0 +1,60 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-move-transition";
version = "2.0.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-move-transition";
rev = version;
sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
cmakeFlags = with lib; [
"-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
"-Wno-dev"
];
preConfigure = ''
cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
'';
patches = [ ./rename-obs-move-transition-cmake.patch ];
postPatch = ''
substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
'';
# obs-studio expects the shared object to be located in bin/32bit or bin/64bit
# https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48
postInstall = let
pluginPath = {
i686-linux = "bin/32bit";
x86_64-linux = "bin/64bit";
}.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}");
in ''
mkdir -p $out/share/obs/obs-plugins/move-transition/${pluginPath}
ln -s $out/lib/obs-plugins/move-transition.so $out/share/obs/obs-plugins/move-transition/${pluginPath}
'';
meta = with lib; {
description = "Plugin for OBS Studio to move source to a new position during scene transition";
homepage = "https://github.com/exeldro/obs-move-transition";
maintainers = with maintainers; [ starcraft66 ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

View File

@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d116619..a1366ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,17 @@
+if (POLICY CMP0048)
+ cmake_policy(SET CMP0048 NEW)
+endif (POLICY CMP0048)
+
project(move-transition VERSION 2.0.2)
set(PROJECT_FULL_NAME "Move Transition")
+include(FindLibobs.cmake)
+find_package(LibObs REQUIRED)
+
+include_directories(
+ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
+ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
+
set(move-transition_HEADERS
move-transition.h
easing.h)
@@ -34,4 +45,10 @@ target_link_libraries(move-transition
libobs)
set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")
-install_obs_plugin_with_data(move-transition data)
+set_target_properties(move-transition PROPERTIES PREFIX "")
+
+install(TARGETS move-transition
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
+
+install(DIRECTORY data/locale/
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale")

View File

@ -11,14 +11,14 @@ let
depSrcs = import ./deps.nix { inherit fetchurl; }; depSrcs = import ./deps.nix { inherit fetchurl; };
in mkDerivation rec { in mkDerivation rec {
pname = "plex-media-player"; pname = "plex-media-player";
version = "2.55.0.1069"; version = "2.58.0.1076";
vsnHash = "2369bed9"; vsnHash = "38e019da";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "plexinc"; owner = "plexinc";
repo = "plex-media-player"; repo = "plex-media-player";
rev = "v${version}-${vsnHash}"; rev = "v${version}-${vsnHash}";
sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw=";
}; };
nativeBuildInputs = [ pkgconfig cmake python3 ]; nativeBuildInputs = [ pkgconfig cmake python3 ];

View File

@ -1,28 +1,28 @@
{ fetchurl }: { fetchurl }:
rec { rec {
webClientBuildId = "180-afec74de50e175"; webClientBuildId = "183-045db5be50e175";
webClientDesktopBuildId = "4.29.2-e50e175"; webClientDesktopBuildId = "4.29.2-e50e175";
webClientTvBuildId = "4.29.3-afec74d"; webClientTvBuildId = "4.29.6-045db5b";
webClient = fetchurl { webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc=";
}; };
webClientDesktopHash = fetchurl { webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8=";
}; };
webClientDesktop = fetchurl { webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4=";
}; };
webClientTvHash = fetchurl { webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8=";
}; };
webClientTv = fetchurl { webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g=";
}; };
} }

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake { lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2
, v4l-utils }: , v4l-utils }:
@ -29,7 +29,7 @@ mkDerivation rec {
"INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml"
]; ];
meta = with stdenv.lib; { meta = with lib; {
description = "Webcam Capture Software"; description = "Webcam Capture Software";
longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; longDescription = "Webcamoid is a full featured and multiplatform webcam suite.";
homepage = "https://github.com/webcamoid/webcamoid/"; homepage = "https://github.com/webcamoid/webcamoid/";

View File

@ -1,18 +1,30 @@
{ stdenv, fetchFromGitHub { stdenv
, libX11, libXft, libXinerama, fontconfig, freetype }: , fetchFromGitHub
, libX11
, libXft
, libXinerama
, fontconfig
, freetype
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "berry"; pname = "berry";
version = "0.1.5"; version = "0.1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JLErvin"; owner = "JLErvin";
repo = "berry"; repo = pname;
rev = version; rev = version;
sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8=";
}; };
buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; buildInputs =[
libX11
libXft
libXinerama
fontconfig
freetype
];
preBuild = '' preBuild = ''
makeFlagsArray+=( PREFIX="${placeholder "out"}" makeFlagsArray+=( PREFIX="${placeholder "out"}"

View File

@ -0,0 +1,21 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "i3altlayout";
version = "0.3";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
};
pythonPath = with python3Packages; [ enum-compat i3ipc docopt ];
meta = with lib; {
maintainers = with maintainers; [ magnetophon ];
description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";
homepage = "https://github.com/deadc0de6/i3altlayout";
license = licenses.gpl3Only;
platforms = platforms.linux;
};
}

View File

@ -1,25 +1,32 @@
{ stdenv, fetchurl { stdenv
, pkgconfig, which, autoreconfHook , fetchurl
, rep-gtk, pango, gdk-pixbuf-xlib , pkg-config
, imlib, gettext, texinfo , which
, libXinerama, libXrandr, libXtst, libICE, libSM , autoreconfHook
, rep-gtk
, pango
, gdk-pixbuf-xlib
, imlib
, gettext
, texinfo
, libXinerama
, libXrandr
, libXtst
, libICE
, libSM
, makeWrapper , makeWrapper
}: }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sawfish"; pname = "sawfish";
version = "1.12.90"; version = "1.12.90";
sourceName = "sawfish_${version}";
src = fetchurl { src = fetchurl {
url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz";
sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ which buildInputs = [ which
rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo
libXinerama libXrandr libXtst libICE libSM libXinerama libXrandr libXtst libICE libSM
@ -31,14 +38,15 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \
$out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
wrapProgram $i \ wrapProgram $i \
--prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \
--set REP_LOAD_PATH "$out/share/sawfish/lisp" --set REP_LOAD_PATH "$out/share/sawfish/lisp"
done done
''; '';
meta = { meta = with stdenv.lib; {
description = "An extensible, Lisp-based window manager"; description = "An extensible, Lisp-based window manager";
longDescription = '' longDescription = ''
Sawfish is an extensible window manager using a Lisp-based scripting language. Sawfish is an extensible window manager using a Lisp-based scripting language.
@ -47,7 +55,7 @@ stdenv.mkDerivation rec {
All high-level WM functions are implemented in Lisp for future extensibility All high-level WM functions are implemented in Lisp for future extensibility
or redefinition. or redefinition.
''; '';
homepage = "http://sawfish.wikia.com"; homepage = "https://sawfish.fandom.com/wiki/Main_Page";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
}; };

View File

@ -408,10 +408,15 @@ rec {
}; };
# basic example, with cross compilation # basic example, with cross compilation
cross-aarch64 = pkgsCross.aarch64-multiplatform.dockerTools.buildImage { cross = let
# Cross compile for x86_64 if on aarch64
crossPkgs =
if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
else pkgsCross.aarch64-multiplatform;
in crossPkgs.dockerTools.buildImage {
name = "hello-cross"; name = "hello-cross";
tag = "latest"; tag = "latest";
contents = pkgsCross.aarch64-multiplatform.hello; contents = crossPkgs.hello;
}; };
} }

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
domain = "salsa.debian.org"; domain = "salsa.debian.org";
owner = "debian"; owner = "debian";
repo = pname; repo = pname;
rev = "debian%2F${version}"; # %2F = urlquote("/") rev = "debian/${version}";
sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5";
}; };
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps
cp -r {html,markdown} $out/share/doc/anarchism cp -r {html,markdown} $out/share/doc/anarchism
cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps
cp debian/anarchism.desktop $out/share/applications cp debian/anarchism.desktop $out/share/applications

View File

@ -5,15 +5,16 @@
mkDerivation rec { mkDerivation rec {
pname = "kde2-decoration"; pname = "kde2-decoration";
version = "1.0"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "repos-holder"; owner = "repos-holder";
repo = "kdecoration2-kde2"; repo = "kdecoration2-kde2";
rev = version; rev = version;
sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c=";
}; };
outputs = [ "out" "dev" ];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules ]; nativeBuildInputs = [ cmake extra-cmake-modules ];

View File

@ -1,43 +1,47 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation { lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation
, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies , gtk2Support ? true, gtk2
, qtbase, qtsvg, qtx11extras # Toolkit dependencies
, karchive, kconfig, kconfigwidgets, kio, frameworkintegration , karchive, kconfig, kconfigwidgets, kio, frameworkintegration
, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
, libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies
, fetchpatch , fetchpatch
}: }:
let mkDerivation rec {
version = "1.9.1";
in mkDerivation {
pname = "qtcurve"; pname = "qtcurve";
inherit version; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KDE"; owner = "KDE";
repo = "qtcurve"; repo = "qtcurve";
rev = version; rev = version;
sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw"; sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo=";
}; };
enableParallelBuilding = true;
patches = [ patches = [
# Remove unnecessary constexpr, this is not allowed in C++14
(fetchpatch { (fetchpatch {
url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch";
sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34";
}) })
# Fix build with Qt5.15
(fetchpatch {
url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch";
sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek=";
})
]; ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
buildInputs = [ buildInputs = [
gtk2
qtbase qtsvg qtx11extras qtbase qtsvg qtx11extras
karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n
kwindowsystem kdelibs4support frameworkintegration kwindowsystem kdelibs4support frameworkintegration
libpthreadstubs libpthreadstubs
pcre pcre
libXdmcp libX11 libXau libXdmcp libX11 libXau
]; ] ++ lib.optional gtk2Support gtk2;
preConfigure = '' preConfigure = ''
for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
@ -52,7 +56,12 @@ in mkDerivation {
patchShebangs tools/gen-version.sh patchShebangs tools/gen-version.sh
''; '';
meta = with stdenv.lib; { configureFlags = [
"-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}"
"-DENABLE_QT4=OFF"
];
meta = with lib; {
homepage = "https://github.com/QtCurve/qtcurve"; homepage = "https://github.com/QtCurve/qtcurve";
description = "Widget styles for Qt5/Plasma 5 and gtk2"; description = "Widget styles for Qt5/Plasma 5 and gtk2";
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "picat"; pname = "picat";
version = "3.0p2"; version = "3.0p3";
src = fetchurl { src = fetchurl {
url = "http://picat-lang.org/download/picat30_2_src.tar.gz"; url = "http://picat-lang.org/download/picat30_3_src.tar.gz";
sha256 = "0sn4fqj2ryalcndx1df5kx5rzb4pfcrza5ljlg9dkfbqv02xgxkd"; sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];
@ -18,25 +18,18 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
enableParallelBuilding = true; enableParallelBuilding = true;
buildPhase = '' buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
cd emu
make -f Makefile.$ARCH
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp picat $out/bin/picat cp picat $out/bin/picat
''; '';
meta = { meta = with stdenv.lib; {
description = "Logic-based programming langage"; description = "Logic-based programming langage";
longDescription = '' homepage = "http://picat-lang.org/";
Picat is a simple, and yet powerful, logic-based multi-paradigm license = licenses.mpl20;
programming language aimed for general-purpose applications. platforms = platforms.linux;
''; maintainers = with maintainers; [ earldouglas thoughtpolice ];
homepage = "http://picat-lang.org/";
license = stdenv.lib.licenses.mpl20;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.earldouglas ];
}; };
} }

View File

@ -109,8 +109,8 @@ in {
}; };
scala_2_13 = common { scala_2_13 = common {
version = "2.13.3"; version = "2.13.4";
sha256 = "yfNzG8zybPOaxUExcvtBZGyxn2O4ort1846JZ1ziaX8="; sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
test = { inherit (nixosTests) scala_2_13; }; test = { inherit (nixosTests) scala_2_13; };
pname = "scala_2_13"; pname = "scala_2_13";
}; };

View File

@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz"; sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -231,8 +231,6 @@ self: super: {
# ghc 8.10. # ghc 8.10.
hnix = dontCheck (super.hnix.override { hnix = dontCheck (super.hnix.override {
# 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1
data-fix = self.data-fix_0_3_0; # at least 0.3
prettyprinter = self.prettyprinter_1_7_0; # at least 1.7 prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
}); });
@ -254,7 +252,13 @@ self: super: {
angel = dontCheck super.angel; angel = dontCheck super.angel;
apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
aws = dontCheck super.aws; # needs aws credentials aws = appendPatch (dontCheck super.aws) # needs aws credentials
(pkgs.fetchpatch {
# https://github.com/aristidb/aws/pull/271
# bump a version bound
url = https://github.com/aristidb/aws/commit/3639262ccd6761dea76f052692ac3aefbd254723.patch;
sha256 = "0nxaspldgayqjnidda8w7wps5gdpr2wz6vynl7vkaw8kzxks9bci";
});
aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing
binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
binary-search = dontCheck super.binary-search; binary-search = dontCheck super.binary-search;
@ -337,12 +341,6 @@ self: super: {
else super.math-functions; else super.math-functions;
matplotlib = dontCheck super.matplotlib; matplotlib = dontCheck super.matplotlib;
# Needs the latest version of vty and brick.
matterhorn = super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_57;
vty = self.vty_5_32;
});
memcache = dontCheck super.memcache; memcache = dontCheck super.memcache;
metrics = dontCheck super.metrics; metrics = dontCheck super.metrics;
milena = dontCheck super.milena; milena = dontCheck super.milena;
@ -353,7 +351,6 @@ self: super: {
nats-queue = dontCheck super.nats-queue; nats-queue = dontCheck super.nats-queue;
netpbm = dontCheck super.netpbm; netpbm = dontCheck super.netpbm;
network = dontCheck super.network; network = dontCheck super.network;
network_2_6_3_1 = dontCheck super.network_2_6_3_1;
network-dbus = dontCheck super.network-dbus; network-dbus = dontCheck super.network-dbus;
notcpp = dontCheck super.notcpp; notcpp = dontCheck super.notcpp;
ntp-control = dontCheck super.ntp-control; ntp-control = dontCheck super.ntp-control;
@ -946,12 +943,7 @@ self: super: {
# Generate cli completions for dhall. # Generate cli completions for dhall.
dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
super.dhall-nix.overrideScope (self: super: {
dhall = super.dhall_1_36_0;
repline = self.repline_0_4_0_0;
haskeline = self.haskeline_0_8_1_0;
}));
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc; netrc = doJailbreak super.netrc;
@ -1125,21 +1117,6 @@ self: super: {
# https://github.com/kazu-yamamoto/dns/issues/150 # https://github.com/kazu-yamamoto/dns/issues/150
dns = dontCheck super.dns; dns = dontCheck super.dns;
# apply patches from https://github.com/snapframework/snap-server/pull/126
# manually until they are accepted upstream
snap-server = overrideCabal super.snap-server (drv: {
patches = [(pkgs.fetchpatch {
# allow compilation with network >= 3
url = "https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch";
sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv";
})
(pkgs.fetchpatch {
# prefer fdSocket over unsafeFdSocket
url = "https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch";
sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94";
})];
});
# https://github.com/haskell-servant/servant-blaze/issues/17 # https://github.com/haskell-servant/servant-blaze/issues/17
servant-blaze = doJailbreak super.servant-blaze; servant-blaze = doJailbreak super.servant-blaze;
@ -1253,7 +1230,22 @@ self: super: {
patch = doJailbreak super.patch; patch = doJailbreak super.patch;
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom-core = doDistribute (unmarkBroken (dontCheck super.reflex-dom-core)); reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch super.reflex-dom-core (pkgs.fetchpatch {
url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
stripLen = 2;
extraPrefix = "";
includes = ["reflex-dom-core.cabal" ];
}))));
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
sha256 = "1ndqw5r85axynmx55ld6qr8ik1i1mkh6wrnkzpxbwyil2ms8mxn0";
stripLen = 2;
extraPrefix = "";
includes = ["reflex-dom.cabal" ];
});
# add unreleased commit fixing version constraint as a patch # add unreleased commit fixing version constraint as a patch
# Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved
@ -1292,19 +1284,7 @@ self: super: {
# https://github.com/kowainik/policeman/issues/57 # https://github.com/kowainik/policeman/issues/57
policeman = doJailbreak super.policeman; policeman = doJailbreak super.policeman;
# 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs. haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ];
# That's why we need to bump a ton of dependency versions to unbreak them.
gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_4) [ pkgs.gobject-introspection ];
haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5;
gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;
gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24;
gi-atk = assert super.gi-atk.version == "2.0.21"; self.gi-atk_2_0_22;
gi-gio = assert super.gi-gio.version == "2.0.26"; self.gi-gio_2_0_27;
gi-gdk = assert super.gi-gdk.version == "3.0.22"; self.gi-gdk_3_0_23;
gi-gtk = assert super.gi-gtk.version == "3.0.33"; self.gi-gtk_3_0_35;
gi-gdkpixbuf = assert super.gi-gdkpixbuf.version == "2.0.23"; self.gi-gdkpixbuf_2_0_24;
# 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24 # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
@ -1352,7 +1332,6 @@ self: super: {
immortal = self.immortal_0_2_2_1; immortal = self.immortal_0_2_2_1;
dependent-map = self.dependent-map_0_2_4_0; dependent-map = self.dependent-map_0_2_4_0;
dependent-sum = self.dependent-sum_0_4; dependent-sum = self.dependent-sum_0_4;
witherable = self.witherable_0_3_2;
}) (drv: { }) (drv: {
# version in cabal file is invalid # version in cabal file is invalid
version = "1.3.1-beta1"; version = "1.3.1-beta1";
@ -1360,17 +1339,6 @@ self: super: {
preBuild = "export VERSION=1.3.1-beta1"; preBuild = "export VERSION=1.3.1-beta1";
})); }));
graphql-parser = super.graphql-parser.override {
protolude = self.protolude_0_3_0;
};
# Requires repline 0.4 which is the default only for ghc8101, override for the rest
zre = super.zre.override {
repline = self.repline_0_4_0_0.override {
haskeline = self.haskeline_0_8_1_0;
};
};
# https://github.com/bos/statistics/issues/170 # https://github.com/bos/statistics/issues/170
statistics = dontCheck super.statistics; statistics = dontCheck super.statistics;
@ -1395,35 +1363,15 @@ self: super: {
liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
Diff_0_3_4 = dontCheck super.Diff_0_3_4; Diff_0_3_4 = dontCheck super.Diff_0_3_4;
# We want the latest version of cryptonite. This is a first step towards
# resolving https://github.com/NixOS/nixpkgs/issues/81915.
cryptonite = doDistribute self.cryptonite_0_27;
# We want the latest version of Pandoc.
skylighting = doDistribute super.skylighting_0_10_0_3;
skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
hslua = doDistribute self.hslua_1_1_2;
jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
pandoc = doDistribute self.pandoc_2_11_1_1;
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-citeproc = doJailbreak super.pandoc-citeproc;
pandoc-types = doDistribute self.pandoc-types_1_22;
rfc5051 = doDistribute self.rfc5051_0_2;
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth; domain-auth = dontCheck super.domain-auth;
# stack-2.5.1 needs a more current version of pantry to compile
pantry = self.pantry_0_5_1_4;
# Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4
microaeson = doJailbreak super.microaeson; microaeson = doJailbreak super.microaeson;
autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
# binary-instances needs the latest version.
time-compat = self.time-compat_1_9_4;
# - Deps are required during the build for testing and also during execution, # - Deps are required during the build for testing and also during execution,
# so add them to build input and also wrap the resulting binary so they're in # so add them to build input and also wrap the resulting binary so they're in
# PATH. # PATH.
@ -1449,38 +1397,103 @@ self: super: {
# quickcheck-instances is only used in the tests of binary-instances. # quickcheck-instances is only used in the tests of binary-instances.
binary-instances = dontCheck super.binary-instances; binary-instances = dontCheck super.binary-instances;
# INSERT NEW OVERRIDES ABOVE THIS LINE # tons of overrides for bleeding edge versions for ghcide and hls
} // (let # overriding aeson on all of them to prevent double compilations
# fourmolu cant compile with an older aeson # this shouldnt break anything because nearly all their reverse deps are
localOverride = name: value: doDistribute (value.overrideScope (self: super: { # in this list or marked as broken anyways
aeson = dontCheck super.aeson_1_5_2_0; # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
});
fourmolu = dontCheck super.fourmolu;
ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
# 2020-11-13: Bumping bounds via an already upstream merged change
# https://github.com/haskell/ghcide/pull/905
url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
includes = [ "ghcide.cabal" ];
})); }));
in pkgs.lib.mapAttrs localOverride { refinery = doDistribute super.refinery_0_3_0_0;
# tons of overrides for bleeding edge versions for ghcide and hls data-tree-print = doJailbreak super.data-tree-print;
# overriding aeson on all of them to prevent double compilations # the hls brittany is objectively better, because there hasnt been a
# this shouldnt break anything because nearly all their reverse deps are # brittany release in a while and this version works with 8.10.
# in this list or marked as broken anyways # And we need to build it anyways.
haskell-language-server = dontCheck super.haskell-language-server; # 2020-11-15: jailbreaking because we have strict 0.4 which is to new
fourmolu = dontCheck super.fourmolu; brittany = self.hls-brittany;
stylish-haskell = super.stylish-haskell_0_12_2_0; hls-brittany = dontCheck (doJailbreak super.hls-brittany);
ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
# 2020-11-13: Bumping bounds via an already upstream merged change # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
# https://github.com/haskell/ghcide/pull/905 aeson = dontCheck super.aeson;
url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6"; # 2020-11-15: nettle tests are pre MonadFail change
includes = [ "ghcide.cabal" ]; # https://github.com/stbuehler/haskell-nettle/issues/10
})); nettle = dontCheck super.nettle;
refinery = super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print; # 2020-11-17: Disable tests for hackage-security because of this issue:
ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3; # https://github.com/haskell/hackage-security/issues/247
hie-bios = dontCheck super.hie-bios_0_7_1; hackage-security = dontCheck super.hackage-security;
lsp-test = dontCheck super.lsp-test_0_11_0_7;
hls-plugin-api = super.hls-plugin-api; # 2020-11-17: persistent-test is ahead of the persistent version in stack
hls-hlint-plugin = super.hls-hlint-plugin; persistent-sqlite = dontCheck super.persistent-sqlite;
implicit-hie-cradle = super.implicit-hie-cradle;
# the hls brittany is objectively better, because there hasnt been a # The tests for semver-range need to be updated for the MonadFail change in
# brittany release in a while and this version works with 8.10. # ghc-8.8:
# And we need to build it anyways. # https://github.com/adnelson/semver-range/issues/15
brittany = dontCheck super.hls-brittany; semver-range = dontCheck super.semver-range;
}
) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
# 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
# Bump version bounds for ghc 8.10
url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb";
});
# 2020-11-18: https://github.com/srid/rib/issues/169
# aeson bound out of sync
rib-core = doJailbreak super.rib-core;
# 2020-11-18: https://github.com/srid/neuron/issues/474
# base upper bound is incompatible with ghc 8.10
neuron = doJailbreak super.neuron;
reflex = appendPatches super.reflex [
# https://github.com/reflex-frp/reflex/pull/444
# Fixes for ghc 8.10
(pkgs.fetchpatch {
url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch;
sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy";
})
# https://github.com/reflex-frp/reflex/pull/444
# Bound bumps for ghc 8.10
(pkgs.fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
})
];
# 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408
# Tests disabled because of: https://github.com/kowainik/stan/issues/409
stan = doJailbreak (dontCheck super.stan);
# 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
# Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version
pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random;
# Use an already merged upstream patch fixing the build with primitive >= 0.7.2
# The version bounds were correctly specified before, so we need to jailbreak as well
streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
url = "https://github.com/composewell/streamly/commit/2c88cb631fdcb5c0d3a8bc936e1e63835800be9b.patch";
sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
});
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -57,42 +57,14 @@ self: super: {
}; };
}); });
# Deviate from Stackage LTS-15.x to fix the build.
haddock-library = self.haddock-library_1_9_0;
# Jailbreak to fix the build. # Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude; base-noprelude = doJailbreak super.base-noprelude;
system-fileio = doJailbreak super.system-fileio; system-fileio = doJailbreak super.system-fileio;
unliftio-core = doJailbreak super.unliftio-core; unliftio-core = doJailbreak super.unliftio-core;
# Use the latest version to fix the build.
dhall = self.dhall_1_36_0;
lens = self.lens_4_19_2;
optics = self.optics_0_3;
optics-core = self.optics-core_0_3_0_1;
optics-extra = self.optics-extra_0_3;
optics-th = self.optics-th_0_3_0_2;
repline = self.repline_0_4_0_0;
singletons = self.singletons_2_7;
th-desugar = self.th-desugar_1_11;
insert-ordered-containers = super.insert-ordered-containers.override {
optics-core = self.optics-core_0_3_0_1;
optics-extra = self.optics-extra_0_3.override {
optics-core = self.optics-core_0_3_0_1;
};
};
# Jailbreaking because monoidal-containers hasnt bumped it's base dependency for 8.10. # Jailbreaking because monoidal-containers hasnt bumped it's base dependency for 8.10.
monoidal-containers = doJailbreak super.monoidal-containers; monoidal-containers = doJailbreak super.monoidal-containers;
# `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need
# the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have
# multiple verions of `ghc-lib-parser(-ex)` available, and the default ones
# are older ones, those older ones will complain. Because we have a newer
# GHC, we can just set the dependency to `null` as it is not used.
ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; };
# Jailbreak to fix the build. # Jailbreak to fix the build.
brick = doJailbreak super.brick; brick = doJailbreak super.brick;
exact-pi = doJailbreak super.exact-pi; exact-pi = doJailbreak super.exact-pi;
@ -111,14 +83,6 @@ self: super: {
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
}); });
# https://github.com/commercialhaskell/pantry/issues/21
pantry = appendPatch super.pantry (pkgs.fetchpatch {
name = "add-cabal-3.2.x-support.patch";
url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch";
sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2";
excludes = ["package.yaml"];
});
# hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
hnix = generateOptparseApplicativeCompletion "hnix" hnix = generateOptparseApplicativeCompletion "hnix"
(overrideCabal super.hnix (drv: { (overrideCabal super.hnix (drv: {

View File

@ -91,4 +91,7 @@ self: super: {
# ghc versions prior to 8.8.x needs additional dependency to compile successfully. # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
# This became a core library in ghc 8.10., so we dont have an "exception" attribute anymore.
exceptions = super.exceptions_0_10_4;
} }

View File

@ -81,11 +81,25 @@ self: super: {
snap-server = doJailbreak super.snap-server; snap-server = doJailbreak super.snap-server;
exact-pi = doJailbreak super.exact-pi; exact-pi = doJailbreak super.exact-pi;
time-compat = doJailbreak super.time-compat; time-compat = doJailbreak super.time-compat;
http-media = doJailbreak super.http-media; http-media = unmarkBroken (doJailbreak super.http-media);
servant-server = doJailbreak super.servant-server; servant-server = unmarkBroken (doJailbreak super.servant-server);
foundation = dontCheck super.foundation; foundation = dontCheck super.foundation;
vault = dontHaddock super.vault; vault = dontHaddock super.vault;
servant = unmarkBroken super.servant;
servant-auth = unmarkBroken super.servant-auth;
servant-conduit = unmarkBroken super.servant-conduit;
servant-auth-client = unmarkBroken super.servant-auth-client;
servant-client = unmarkBroken super.servant-client;
servant-client-core = unmarkBroken super.servant-client-core;
servant-auth-server = unmarkBroken super.servant-auth-server;
servant-auth-swagger = unmarkBroken super.servant-auth-swagger;
servant-swagger = unmarkBroken super.servant-swagger;
servant-blaze = unmarkBroken super.servant-blaze;
servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core;
swagger2 = unmarkBroken super.swagger2;
cachix-api = unmarkBroken super.cachix-api;
# https://github.com/snapframework/snap-core/issues/288 # https://github.com/snapframework/snap-core/issues/288
snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; });
@ -95,11 +109,6 @@ self: super: {
# https://github.com/kowainik/relude/issues/241 # https://github.com/kowainik/relude/issues/241
relude = dontCheck super.relude; relude = dontCheck super.relude;
# The tests for semver-range need to be updated for the MonadFail change in
# ghc-8.8:
# https://github.com/adnelson/semver-range/issues/15
semver-range = dontCheck super.semver-range;
# The current version 2.14.2 does not compile with ghc-8.8.x or newer because # The current version 2.14.2 does not compile with ghc-8.8.x or newer because
# of issues with Cabal 3.x. # of issues with Cabal 3.x.
darcs = dontDistribute super.darcs; darcs = dontDistribute super.darcs;
@ -122,4 +131,10 @@ self: super: {
liquid-vector = markBroken super.liquid-vector; liquid-vector = markBroken super.liquid-vector;
liquidhaskell = markBroken super.liquidhaskell; liquidhaskell = markBroken super.liquidhaskell;
# This became a core library in ghc 8.10., so we dont have an "exception" attribute anymore.
exceptions = super.exceptions_0_10_4;
# ghc versions which dont match the ghc-lib-parser-ex version need the
# additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
} }

View File

@ -66,14 +66,12 @@ self: super: {
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
lukko = doJailbreak super.lukko; lukko = doJailbreak super.lukko;
parallel = doJailbreak super.parallel; parallel = doJailbreak super.parallel;
primitive = doJailbreak super.primitive_0_7_1_0;
regex-posix = doJailbreak super.regex-posix; regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv; resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool; singleton-bool = doJailbreak super.singleton-bool;
split = doJailbreak super.split; split = doJailbreak super.split;
splitmix = self.splitmix_0_1_0_3; splitmix = self.splitmix_0_1_0_3;
tar = doJailbreak super.tar; tar = doJailbreak super.tar;
th-abstraction = self.th-abstraction_0_4_0_0;
time-compat = doJailbreak super.time-compat; time-compat = doJailbreak super.time-compat;
vector = doJailbreak (dontCheck super.vector); vector = doJailbreak (dontCheck super.vector);
zlib = doJailbreak super.zlib; zlib = doJailbreak super.zlib;
@ -95,10 +93,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
}); });
QuickCheck = appendPatch super.QuickCheck_2_14_1 (pkgs.fetchpatch { QuickCheck = super.QuickCheck_2_14_2;
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/QuickCheck-2.14.1.patch";
sha256 = "0n89nx95w353h4dzala57gb0y7hx4wbkv5igs89dza50p7ybq9an";
});
regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch { regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";

File diff suppressed because it is too large Load Diff

View File

@ -654,7 +654,6 @@ self: super: builtins.intersectAttrs super {
# Tests require internet # Tests require internet
http-download = dontCheck super.http-download; http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry; pantry = dontCheck super.pantry;
pantry_0_5_1_4 = dontCheck super.pantry_0_5_1_4;
# gtk2hs-buildtools is listed in setupHaskellDepends, but we # gtk2hs-buildtools is listed in setupHaskellDepends, but we
# need it during the build itself, too. # need it during the build itself, too.
@ -665,9 +664,26 @@ self: super: builtins.intersectAttrs super {
let let
# Spago needs a small patch to work with the latest versions of rio. # Spago needs a small patch to work with the latest versions of rio.
# https://github.com/purescript/spago/pull/647 # https://github.com/purescript/spago/pull/647
spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { spagoWithPatches = overrideCabal (appendPatch super.spago (
url = "https://github.com/purescript/spago/pull/647/commits/917ee541a966db74f0f5d11f2f86df0030c35dd7.patch"; # Spago-0.17 needs a small patch to work with the latest version of dhall.
sha256 = "1nspqgcjk6z90cl9zhard0rn2q979kplcqz72x8xv5mh57zabk0w"; # This can probably be removed with Spago-0.18.
# https://github.com/purescript/spago/pull/695
pkgs.fetchpatch {
url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch";
sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k";
}
)) (old: {
# The above patch contains a completely new spago.cabal file, but our
# source tree from Hackage already contains a cabal file. Delete the
# local cabal file and just take the one from the patch.
#
# WARNING: The empty line above the `rm` needs to be kept.
prePatch = old.prePatch or "" + ''
rm spago.cabal
'';
# The above patch also adds a dependency on the stringsearch package.
libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ];
}); });
# spago requires an older version of megaparsec, but it appears to work # spago requires an older version of megaparsec, but it appears to work
@ -807,5 +823,11 @@ self: super: builtins.intersectAttrs super {
ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version}
ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version}
''; '';
testToolDepends = [ self.cabal-install pkgs.git ];
testTarget = "func-test"; # wrapper test accesses internet
preCheck = ''
export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper
export HOME=$TMPDIR
'';
}); });
} }

File diff suppressed because it is too large Load Diff

View File

@ -41,34 +41,6 @@ let
}; };
in in
{ {
fmt_6 = generic {
version = "6.2.1";
sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic";
patches = [
# Fix BC break breaking Kodi
# https://github.com/xbmc/xbmc/issues/17629
# https://github.com/fmtlib/fmt/issues/1620
(fetchpatch {
url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";
sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";
})
# Fix paths in pkg-config file
# https://github.com/fmtlib/fmt/pull/1657
(fetchpatch {
url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";
sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";
})
# Fix cmake config paths.
(fetchpatch {
url = "https://github.com/fmtlib/fmt/pull/1702.patch";
sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";
})
];
};
fmt_7 = generic { fmt_7 = generic {
version = "7.0.3"; version = "7.0.3";
sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a"; sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";

View File

@ -1,25 +1,26 @@
{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: { lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
stdenv.mkDerivation rec { mkDerivation rec {
version = "2.1.0"; version = "unstable-20-06-26";
pname = "herqq"; pname = "herqq";
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase unzip qtmultimedia ]; buildInputs = [ qtbase unzip qtmultimedia ];
preConfigure = "cd herqq";
outputs = [ "out" "dev" ];
sourceRoot = "source/herqq";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ThomArmax"; owner = "ThomArmax";
repo = "HUPnP"; repo = "HUPnP";
rev = version; rev = "c8385a8846b52def7058ae3794249d6b566a41fc";
sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; sha256 = "FxN/QlLB3sZ6Vn/9VIKNUntX/B4+crQZ7t760pwFqY8=";
}; };
meta = with stdenv.lib; { meta = with lib; {
homepage = "http://herqq.org"; homepage = "http://herqq.org";
description = "A software library for building UPnP devices and control points"; description = "A software library for building UPnP devices and control points";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ ]; maintainers = [ ];
broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
}; };
} }

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yoda"; pname = "yoda";
version = "1.8.3"; version = "1.8.4";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr"; sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x";
}; };
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

View File

@ -1,11 +1,10 @@
{ stdenv { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, csxcad , csxcad
, tinyxml , tinyxml
, vtkWithQt5 , vtkWithQt5
, wrapQtAppsHook
, qtbase , qtbase
}: }:
@ -20,13 +19,13 @@ mkDerivation {
sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
}; };
outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
wrapQtAppsHook
]; ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DCSXCAD_ROOT_DIR=${csxcad}" "-DCSXCAD_ROOT_DIR=${csxcad}"
"-DENABLE_RPATH=OFF" "-DENABLE_RPATH=OFF"
]; ];
@ -40,7 +39,7 @@ mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "Qt library for CSXCAD"; description = "Qt library for CSXCAD";
homepage = "https://github.com/thliebig/QCSXCAD"; homepage = "https://github.com/thliebig/QCSXCAD";
license = licenses.gpl3; license = licenses.gpl3;

View File

@ -79,7 +79,7 @@ in rec {
sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0";
}; };
cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2;
cudnn_cudatoolkit_11_0 = generic rec { cudnn_cudatoolkit_11_0 = generic rec {
version = "8.0.2"; version = "8.0.2";

View File

@ -4,8 +4,8 @@ with skawarePackages;
buildPackage { buildPackage {
pname = "skalibs"; pname = "skalibs";
version = "2.9.2.1"; version = "2.9.3.0";
sha256 = "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5"; sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph";
description = "A set of general-purpose C programming libraries"; description = "A set of general-purpose C programming libraries";

View File

@ -35,8 +35,8 @@ let
in in
{ {
spdlog_1 = generic { spdlog_1 = generic {
version = "1.7.0"; version = "1.8.1";
sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j"; sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k=";
}; };
spdlog_0 = generic { spdlog_0 = generic {

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "atom"; pname = "atom";
version = "0.5.2"; version = "0.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "99b4c94b833aafffc0b34ab8f98b697f575be3230bff38ebf863d065403333e0"; sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5";
}; };
buildInputs = [ cppy ]; buildInputs = [ cppy ];

View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-loganalytics"; pname = "azure-mgmt-loganalytics";
version = "1.0.0"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "7eb052a1c4bb037c06a0aff740378bd54a6ae256bf5cb71faa14b4eb61281488"; sha256 = "947cada6e52fea6ecae7011d7532cf8edbe90250753a58749c473b863331fcc6";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bip_utils"; pname = "bip_utils";
version = "1.5.0"; version = "1.6.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia"; owner = "ebellocchia";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "06ls1lara7sklqw6wrw5d3wpxwgyv6paxwjp37x7b3kfskm14cmd"; sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m";
}; };
propagatedBuildInputs = [ ecdsa pysha3 ]; propagatedBuildInputs = [ ecdsa pysha3 ];

View File

@ -1,42 +1,71 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder { stdenv, lib
, attrs, click, toml, appdirs, aiohttp, aiohttp-cors , buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook
, glibcLocales, typed-ast, pathspec, regex , aiohttp
, setuptools_scm, pytest }: , aiohttp-cors
, appdirs
, attrs
, click
, mypy-extensions
, pathspec
, regex
, toml
, typed-ast
, typing-extensions }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "black"; pname = "black";
version = "19.10b0"; version = "20.8b1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0f8mr0yzj78q1dx7v6ggbgfir2wv0n5z2shfbbvfdq7910xbgvf2"; sha256 = "1spv6sldp3mcxr740dh3ywp25lly9s8qlvs946fin44rl1x5a0hw";
}; };
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest glibcLocales ];
# Necessary for the tests to pass on Darwin with sandbox enabled. # Necessary for the tests to pass on Darwin with sandbox enabled.
# Black starts a local server and needs to bind a local address. # Black starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
# Don't know why these tests fails checkInputs = [ pytestCheckHook ];
# Disable test_expression_diff, because it fails on darwin
checkPhase = '' preCheck = ''
LC_ALL="en_US.UTF-8" pytest \ export PATH="$PATH:$out/bin"
--deselect tests/test_black.py::BlackTestCase::test_expression_diff \
--deselect tests/test_black.py::BlackTestCase::test_cache_multiple_files \
--deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached
''; '';
propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ]; disabledTests = [
# Don't know why these tests fails
"test_cache_multiple_files"
"test_failed_formatting_does_not_get_cached"
# requires network access
"test_gen_check_output"
"test_process_queue"
] ++ lib.optionals stdenv.isDarwin [
# fails on darwin
"test_expression_diff"
];
meta = with stdenv.lib; { propagatedBuildInputs = [
aiohttp
aiohttp-cors
appdirs
attrs
click
mypy-extensions
pathspec
regex
toml
typed-ast
typing-extensions
];
meta = with lib; {
description = "The uncompromising Python code formatter"; description = "The uncompromising Python code formatter";
homepage = "https://github.com/psf/black"; homepage = "https://github.com/psf/black";
changelog = "https://github.com/psf/black/blob/${version}/CHANGES.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ sveitser ]; maintainers = with maintainers; [ sveitser ];
}; };
} }

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "broadlink"; pname = "broadlink";
version = "0.14.1"; version = "0.16.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5c443d4639b737069e5e27df451b6e89c5ed50be81899e4ea02adb355bf3d724"; sha256 = "637dabc6f47b283b72bc521322554462da7a247f04614e458d65df8574d03a41";
}; };
postPatch = '' postPatch = ''

View File

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bx-python"; pname = "bx-python";
version = "0.8.6"; version = "0.8.9";
disabled = isPy27; disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bxlab"; owner = "bxlab";
repo = "bx-python"; repo = "bx-python";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i40vmn8n83vqcpqj843riv9vp16s753jc4wc90p0cmrnhmzcv13"; sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq";
}; };
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ];

View File

@ -42,5 +42,6 @@ buildPythonPackage rec {
description = "A Python client driver for Apache Cassandra"; description = "A Python client driver for Apache Cassandra";
homepage = "http://datastax.github.io/python-driver"; homepage = "http://datastax.github.io/python-driver";
license = licenses.asl20; license = licenses.asl20;
broken = true; # geomet doesn't exist
}; };
} }

View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "databricks-cli"; pname = "databricks-cli";
version = "0.11.0"; version = "0.14.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b3c7205dd8cb9935c475794ebd41b53aba79a53e028d3cf6b5871eec83c89ec0"; sha256 = "68e5cdcf4ca26d3c628bca26e44563d58e64d3b2805b9adb94b4006976d9c7e1";
}; };
checkInputs = [ checkInputs = [

View File

@ -18,13 +18,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "debugpy"; pname = "debugpy";
version = "1.1.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Microsoft"; owner = "Microsoft";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1f6a62hg82fn9ddrl6g11x2h27zng8jmrlfbnnra6q590i5v1ixr"; sha256 = "1r5w5ngipj5fgjylrmlw3jrh5y2n67n68l91sj9329549x4ww8dh";
}; };
patches = [ patches = [
@ -34,6 +34,11 @@ buildPythonPackage rec {
inherit gdb; inherit gdb;
}) })
(substituteAll {
src = ./hardcode-version.patch;
inherit version;
})
# Fix importing debugpy in: # Fix importing debugpy in:
# - test_nodebug[module-launch(externalTerminal)] # - test_nodebug[module-launch(externalTerminal)]
# - test_nodebug[module-launch(integratedTerminal)] # - test_nodebug[module-launch(integratedTerminal)]
@ -45,13 +50,6 @@ buildPythonPackage rec {
./fix-test-pythonpath.patch ./fix-test-pythonpath.patch
]; ];
postPatch = ''
# Use nixpkgs version instead of versioneer
substituteInPlace setup.py \
--replace "cmds = versioneer.get_cmdclass()" "cmds = {}" \
--replace "version=versioneer.get_version()" "version='${version}'"
'';
# Remove pre-compiled "attach" libraries and recompile for host platform # Remove pre-compiled "attach" libraries and recompile for host platform
# Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
preBuild = ''( preBuild = ''(

View File

@ -0,0 +1,51 @@
diff --git a/setup.py b/setup.py
index cfec60d..32ca206 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@ elif "--abi" in sys.argv:
from setuptools import setup # noqa
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-import versioneer # noqa
del sys.path[0]
@@ -86,7 +85,7 @@ if __name__ == "__main__":
if not os.getenv("SKIP_CYTHON_BUILD"):
cython_build()
- cmds = versioneer.get_cmdclass()
+ cmds = {}
cmds["bdist_wheel"] = bdist_wheel
extras = {}
@@ -96,7 +95,7 @@ if __name__ == "__main__":
setup(
name="debugpy",
- version=versioneer.get_version(),
+ version="@version@",
description="An implementation of the Debug Adapter Protocol for Python", # noqa
long_description=long_description,
long_description_content_type="text/markdown",
diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py
index baa5a7c..5355327 100644
--- a/src/debugpy/__init__.py
+++ b/src/debugpy/__init__.py
@@ -27,7 +27,6 @@ __all__ = [
import codecs
import os
-from debugpy import _version
from debugpy.common import compat
@@ -204,7 +203,7 @@ def trace_this_thread(should_trace):
return api.trace_this_thread(should_trace)
-__version__ = _version.get_versions()["version"]
+__version__ = "@version@"
# Force absolute path on Python 2.
__file__ = os.path.abspath(__file__)

View File

@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.0.0"; version = "1.1.0";
pname = "dockerfile-parse"; pname = "dockerfile-parse";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9ed92ede29a646094b52b8b302e477f08e63465b6ee524f5750810280143712e"; sha256 = "f37bfa327fada7fad6833aebfaac4a3aaf705e4cf813b737175feded306109e8";
}; };
postPatch = '' postPatch = ''

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pillow
, python
}:
buildPythonPackage rec {
pname = "fabulous";
version = "0.3.0";
src = fetchFromGitHub {
owner = "jart";
repo = pname;
rev = version;
sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7";
};
patches = [
./relative_import.patch
];
propagatedBuildInputs = [
pillow
];
checkPhase = ''
for i in tests/*.py; do
${python.interpreter} $i
done
'';
meta = with lib; {
description = "Make the output of terminal applications look fabulous";
homepage = "https://jart.github.io/fabulous";
license = licenses.asl20;
maintainers = [ maintainers.symphorien ];
};
}

View File

@ -0,0 +1,27 @@
diff --git a/fabulous/prompt.py b/fabulous/prompt.py
index 531176f..e395ab4 100644
--- a/fabulous/prompt.py
+++ b/fabulous/prompt.py
@@ -18,8 +18,7 @@
import sys
import os
import os.path
-import term
-from term import stdout, stderr, display
+from .term import stdout, stderr, display
__all__ = ["input_object","query","file_chooser"]
diff --git a/fabulous/widget.py b/fabulous/widget.py
index 31a2547..7ad889a 100644
--- a/fabulous/widget.py
+++ b/fabulous/widget.py
@@ -24,7 +24,7 @@ import os
import math
from datetime import datetime
# import textwrap
-from term import stdout, display
+from .term import stdout, display
class ProgressBar(object):
"""A 3-line progress bar, which looks like::

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, flake8
}:
buildPythonPackage rec {
pname = "getkey";
version = "0.6.5";
src = fetchPypi {
inherit pname version;
sha256 = "0ng0ihfagh9g8hral0bq5nhjlp3csqghyv3z8b7ylkdkqc1cgiv8";
};
# disable coverage, because we don't care and python-coveralls is not in nixpkgs
postPatch = ''
sed -e '/python-coveralls/d' -e '/pytest-cov/d' -i setup.py
rm setup.cfg
'';
checkInputs = [
flake8
pytestCheckHook
];
meta = with lib; {
description = "Read single characters and key-strokes";
homepage = "https://github.com/kcsaff/getkey";
license = licenses.mit;
maintainers = [ maintainers.symphorien ];
};
}

View File

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gevent"; pname = "gevent";
version = "20.5.2"; version = "20.9.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c"; sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz";
}; };
buildInputs = [ libev ]; buildInputs = [ libev ];

View File

@ -27,6 +27,8 @@ buildPythonPackage rec {
''; '';
homepage = "http://gehrcke.de/gipc"; homepage = "http://gehrcke.de/gipc";
license = licenses.mit; license = licenses.mit;
# gipc only has support for older versions of gevent
broken = versionOlder "1.6" gevent.version;
}; };
} }

View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "glom"; pname = "glom";
version = "20.8.0"; version = "20.11.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82"; sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12";
}; };
propagatedBuildInputs = [ boltons attrs face ]; propagatedBuildInputs = [ boltons attrs face ];

View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-storage"; pname = "google-cloud-storage";
version = "1.32.0"; version = "1.33.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f"; sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2";
}; };
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";

View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "greenlet"; pname = "greenlet";
version = "0.4.16"; version = "0.4.17";
disabled = isPyPy; # builtin for pypy disabled = isPyPy; # builtin for pypy
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"; sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ijson"; pname = "ijson";
version = "3.1.1"; version = "3.1.2.post0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "815e9ce9d2de7ddd58ba01834d8f55790b7daddbac6c844cba0fc459b7d5005a"; sha256 = "04fd8ebb8edb39db81f49b75b101d1e2a4d0728460e253fd9c98e3e17f9caa16";
}; };
doCheck = false; # something about yajl doCheck = false; # something about yajl

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jsonrpc-base"; pname = "jsonrpc-base";
version = "1.0.3"; version = "1.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7bda99589b4566f5027c2aeae122f409d8ccf4c811b278b8cfb616903871efb2"; sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7";
}; };
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];

View File

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lightgbm"; pname = "lightgbm";
version = "3.0.0"; version = "3.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "05f5b358469a679dbf27521d926750ca53ff1e61a6c0293d49af30094ebd9d4a"; sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,35 +0,0 @@
{ buildPythonPackage, fetchFromGitHub, isPy38
, flask
, gevent
, mock
, msgpack
, pyzmq
, requests
, unittest2
}:
buildPythonPackage rec {
pname = "locustio";
version = "0.14.4";
# tests hang on python38
disabled = isPy38;
src = fetchFromGitHub {
owner = "locustio";
repo = "locust";
rev = version;
sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
};
propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
checkInputs = [ mock unittest2 ];
# remove file which attempts to do GET request
preCheck = ''
rm locust/test/test_stats.py
'';
meta = {
homepage = "https://locust.io/";
description = "A load testing tool";
};
}

View File

@ -37,32 +37,25 @@
, parver , parver
, pytest-asyncio , pytest-asyncio
, hypothesis , hypothesis
, asgiref
, msgpack
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mitmproxy"; pname = "mitmproxy";
version = "5.2"; version = "5.3.0";
disabled = isPy27; disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0ja0aqnfmkvns5qmd51hmrvbw8dnccaks30gxgzgcjgy30rj4brq"; sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr";
}; };
patches = [
# Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0
(fetchpatch {
name = "urwid-lt-2.1.0.patch";
url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch";
sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg";
})
];
postPatch = '' postPatch = ''
# remove dependency constraints # remove dependency constraints
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
''; '';
doCheck = (!stdenv.isDarwin); doCheck = (!stdenv.isDarwin);
@ -75,6 +68,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
setuptools setuptools
# setup.py # setup.py
asgiref
blinker blinker
brotli brotli
certifi certifi
@ -85,6 +79,7 @@ buildPythonPackage rec {
hyperframe hyperframe
kaitaistruct kaitaistruct
ldap3 ldap3
msgpack
passlib passlib
protobuf protobuf
publicsuffix2 publicsuffix2

View File

@ -25,12 +25,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "snowflake-connector-python"; pname = "snowflake-connector-python";
version = "2.3.5"; version = "2.3.6";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7"; sha256 = "1a4ebf25989fc13d6f70dc3e2064721c54834e493a7964a1d67be61d40e75f50";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,12 +5,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.2.2"; version = "0.3.1";
pname = "sshtunnel"; pname = "sshtunnel";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4"; sha256 = "e0cac8a6a154c7a9651b42038e3f6cf35bb88c8ee4b94822b28a5b2fe7140f95";
}; };
propagatedBuildInputs = [ paramiko ]; propagatedBuildInputs = [ paramiko ];

View File

@ -72,7 +72,7 @@ let
tfFeature = x: if x then "1" else "0"; tfFeature = x: if x then "1" else "0";
version = "2.3.0"; version = "2.3.1";
variant = if cudaSupport then "-gpu" else ""; variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}"; pname = "tensorflow${variant}";
@ -103,7 +103,7 @@ let
owner = "tensorflow"; owner = "tensorflow";
repo = "tensorflow"; repo = "tensorflow";
rev = "v${version}"; rev = "v${version}";
sha256 = "1dd5fgyiazyfy7y2iv4v42qnap51fr6dzwb26inrsj7aaas06j71"; sha256 = "1lvmrqfnwzh24fl5rdkksiqfv2bn0ld5gvzq1z57rphfkf0zg996";
}; };
patches = [ patches = [
@ -117,12 +117,6 @@ let
url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
}) })
# see https://github.com/tensorflow/tensorflow/issues/40884
(fetchpatch {
url = "https://github.com/tensorflow/tensorflow/pull/41867/commits/65341f73d110bf173325768947343e1bb8f699fc.patch";
sha256 = "18ykkycaag1pcarz53bz6ydxjlah92j4178qn58gcayx1fy7hvh3";
})
]; ];
# On update, it can be useful to steal the changes from gentoo # On update, it can be useful to steal the changes from gentoo
@ -287,9 +281,9 @@ let
# cudaSupport causes fetch of ncclArchive, resulting in different hashes # cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then sha256 = if cudaSupport then
"0pf8128chkm6fxnhd4956n6gvijlj00mjmvry33gq3xx3bayhs9g" "11blnw3ghp1kdi9hh9pdqa4qni9ysc3nk9iqqk9bg4dlr9zl1yld"
else else
"0mkgss2nyk21zlj8hp24cs3dmpdnxk8qi6qq4hyc18lp82p09xwa"; "1kkghhwhl8frs68kv28r408lps7mpgq1xvq6hc3k0j35asv1g2kc";
}; };
buildAttrs = { buildAttrs = {

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "3.8.12"; version = "3.8.13";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "932670e753abdec162d1d9c661920db871236de782890ad88577b2af0d824c7f"; sha256 = "b31dfd9d8cba0271a5a447250bc07cdb5c3b1fd21b76b88a63dcd4bcdcb80769";
}; };
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];

View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sbt-extras"; pname = "sbt-extras";
rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6"; rev = "42d33338e52cee115cebc3e4ee2acc1ca766f319";
version = "2020-11-17"; version = "2020-11-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paulp"; owner = "paulp";
repo = "sbt-extras"; repo = "sbt-extras";
inherit rev; inherit rev;
sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb"; sha256 = "0k0n8q8695rdy1vas9n9m9819rpmf38d3bbkffnn7mf7qa01mxq1";
}; };
dontBuild = true; dontBuild = true;

View File

@ -1,11 +1,26 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args: { stdenv
, libXScrnSaver
, makeWrapper
, fetchurl
, wrapGAppsHook
, glib
, gtk3
, unzip
, atomEnv
, libuuid
, at-spi2-atk
, at-spi2-core
, libdrm
, mesa
, libxkbcommon
}@args:
let let
mkElectron = import ./generic.nix args; mkElectron = import ./generic.nix args;
in in
rec { rec {
electron = electron_10; electron = electron_11;
electron_3 = mkElectron "3.1.13" { electron_3 = mkElectron "3.1.13" {
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
@ -47,27 +62,35 @@ rec {
aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066";
}; };
electron_8 = mkElectron "8.5.2" { electron_8 = mkElectron "8.5.5" {
x86_64-linux = "c5b8c95b410436066b06165e9759b31336c907268339433db4f8610ccf644a51"; x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22";
x86_64-darwin = "079d951a28cfb7d1e0d3660e0fcb2dab85bd9e9f6848df5a06a7ac88ab3aa14c"; x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3";
i686-linux = "0d108ac2420a437100f7a8d06aa019cd8138da4372fb94039b6d23c6253a6aea"; i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74";
armv7l-linux = "f06ed475d1b206c3aa31e768add3517a64aabce5e2946e4d9707e615e6f398c0"; armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874";
aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7"; aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5";
}; };
electron_9 = mkElectron "9.3.3" { electron_9 = mkElectron "9.3.4" {
x86_64-linux = "17f4db5e040ea20ce89d1d492ac575ed0b9ba451ef9cb0e8cd50918505c85243"; x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf";
x86_64-darwin = "bb6188178ed1250ddaf29a2f232758c0f7878f1541ddb2ae2a0d20298599c7f4"; x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375";
i686-linux = "e413b0879247b32bfbcc114e8d49109267137b2ece97db13eaf0ce3ac6187881"; i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417";
armv7l-linux = "313abeb91efbc29d4f807a01937640580940a5fb2699c70b1c303b184ac7bec4"; armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36";
aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a"; aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3";
}; };
electron_10 = mkElectron "10.1.5" { electron_10 = mkElectron "10.1.6" {
x86_64-linux = "9db65dfe26d4fa9524b3005c6002d858ab256722cefb6a058de8e72e2d5c4083"; x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf";
x86_64-darwin = "30dc5d5a913c38c6ae7fa6913b1a907545f0230157efc066e2d5a7affd26cd1e"; x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d";
i686-linux = "bf8e1731e8b9b972c9054964b219d9b1b6baae9612afc8a5edf3503b815dd8c3"; i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e";
armv7l-linux = "e270eab1a87283d7ae25c8127d904a52f130d53cc399bd288af7f99563273f33"; armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
aarch64-linux = "03fa2418472f762377149fdd45d1e6ff0a324be3eb1b04e58c63d41df3dd0f16"; aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
};
electron_11 = mkElectron "11.0.2" {
x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636";
x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516";
i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8";
armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d";
aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0";
}; };
} }

View File

@ -1,4 +1,19 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }: { stdenv
, libXScrnSaver
, makeWrapper
, fetchurl
, wrapGAppsHook
, glib
, gtk3
, unzip
, atomEnv
, libuuid
, at-spi2-atk
, at-spi2-core
, libdrm
, mesa
, libxkbcommon
}:
version: hashes: version: hashes:
let let
@ -34,7 +49,11 @@ let
src = fetcher version (get tags platform) (get hashes platform); src = fetcher version (get tags platform) (get hashes platform);
}; };
electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); electronLibPath = with stdenv.lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core ]
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
);
linux = { linux = {
buildInputs = [ glib gtk3 ]; buildInputs = [ glib gtk3 ];

View File

@ -18,16 +18,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.5.2"; version = "1.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0dpx74zp85a3qcabfmwnsh1kl0c74ygafybqzmyvwjmax0hdgkq6"; sha256 = "0dxjcab10kqfkflq1x9np5wxlysq33swdwi2f28bi7q312sw5x2y";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "0358vbpda9x0ib0vla4crn052lk299x2hg14g8lzymg33277lk3p"; cargoSha256 = "0lhdrsvmf5b4fq2yg9vc00q1sgc1fjk0fh5axs2zffcpsp73ay2k";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }:
stdenv.mkDerivation rec {
pname = "1oom";
version = "1.0";
src = fetchFromGitLab {
owner = "KilgoreTroutMaskReplicant";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+HwSykSyAGHtITVOu4nIG87kWwVxGyFXb/NRSjhWlvs=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libsamplerate SDL2 SDL2_mixer readline ];
outputs = [ "out" "doc" ];
postInstall = ''
install -d $doc/share/doc/${pname}
install -t $doc/share/doc/${pname} \
HACKING NEWS PHILOSOPHY README doc/*.txt
'';
meta = with stdenv.lib; {
homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/";
description = "Master of Orion (1993) game engine recreation";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
};
}

Some files were not shown because too many files have changed in this diff Show More