Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-08-18 12:53:44 +02:00
commit f65aa21bb2
125 changed files with 3217 additions and 885 deletions

View file

@ -210,8 +210,12 @@
</listitem>
<listitem>
<para>
Optionally commit the new package and open a pull request, or send a patch
to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.
Optionally commit the new package and open a pull request <link
xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or
use <link
xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477">
the Patches category</link> on Discourse for sending a patch without a
GitHub account.
</para>
</listitem>
</orderedlist>

File diff suppressed because it is too large Load diff

View file

@ -335,7 +335,7 @@
If youre using the graphical ISO image, other editors may be available
(such as <command>vim</command>). If you have network access, you can also
install other editors — for instance, you can install Emacs by running
<literal>nix-env -i emacs</literal>.
<literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
</para>
<variablelist>
<varlistentry>
@ -467,10 +467,10 @@ Retype new UNIX password: ***</screen>
<para>
You may also want to install some software. For instance,
<screen>
<prompt>$ </prompt>nix-env -qa \*</screen>
<prompt>$ </prompt>nix-env -qaP \*</screen>
shows what packages are available, and
<screen>
<prompt>$ </prompt>nix-env -i w3m</screen>
<prompt>$ </prompt>nix-env -f '&lt;nixpkgs&gt;' -iA w3m</screen>
install the <literal>w3m</literal> browser.
</para>
</listitem>

View file

@ -38,5 +38,16 @@ in {
"$HOME/.local/share/flatpak/exports"
"/var/lib/flatpak/exports"
];
# It has been possible since https://github.com/flatpak/flatpak/releases/tag/1.3.2
# to build a SELinux policy module.
users.users.flatpak = {
description = "Flatpak system helper";
group = "flatpak";
isSystemUser = true;
};
users.groups.flatpak = { };
};
}

View file

@ -552,7 +552,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
<xref linkend="opt-environment.systemPackages"/>
(<link
linkend="sec-declarative-package-mgmt">NixOS</link>), or run
<literal>nix-env -i pkgs.docbook5</literal>
<literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal>
(<link linkend="sec-ad-hoc-packages">Nix</link>).
</para>

View file

@ -103,7 +103,7 @@ in {
PrivateTmp = true;
ProtectHome = true;
ProtectSystem = "full";
DecvicePolicy = "closed";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = cfg.dataDir;
};

View file

@ -120,7 +120,8 @@ in
name = mkOption {
type = types.str;
default = "zabbix";
default = if cfg.database.type == "sqlite" then "${stateDir}/zabbix.db" else "zabbix";
defaultText = "zabbix";
description = "Database name.";
};
@ -261,17 +262,17 @@ in
preStart = optionalString pgsqlLocal ''
if ! test -e "${stateDir}/db-created"; then
cat ${cfg.package}/share/zabbix/database/postgresql/schema.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
cat ${cfg.package}/share/zabbix/database/postgresql/images.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
cat ${cfg.package}/share/zabbix/database/postgresql/data.sql | ${pgsql.package}/bin/psql ${cfg.database.name}
touch "${stateDir}/db-created"
fi
'' + optionalString mysqlLocal ''
if ! test -e "${stateDir}/db-created"; then
cat ${cfg.package}/share/zabbix/database/mysql/schema.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
cat ${cfg.package}/share/zabbix/database/mysql/images.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
cat ${cfg.package}/share/zabbix/database/mysql/data.sql | ${mysql.package}/bin/mysql ${cfg.database.name}
touch "${stateDir}/db-created"
fi
'' + optionalString (cfg.database.type == "sqlite") ''
if ! test -e "${cfg.database.name}"; then
${pkgs.sqlite}/bin/sqlite3 "${cfg.database.name}" < ${cfg.package}/share/zabbix/database/sqlite3/schema.sql
fi
'' + optionalString (cfg.database.passwordFile != null) ''
# create a copy of the supplied password file in a format zabbix can consume
touch ${passwordFile}

View file

@ -123,11 +123,9 @@ in
];
services.pantheon.contractor.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true;
services.gnome3.evince.enable = mkDefault true;
services.gnome3.evolution-data-server.enable = true;
services.gnome3.file-roller.enable = mkDefault true;
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
services.gnome3.glib-networking.enable = true;
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon;
@ -140,7 +138,6 @@ in
services.xserver.libinput.enable = mkDefault true;
services.xserver.updateDbusEnvironment = true;
services.zeitgeist.enable = mkDefault true;
services.geoclue2.enable = mkDefault true;
# pantheon has pantheon-agent-geoclue2
services.geoclue2.enableDemoAgent = false;
@ -149,6 +146,9 @@ in
isSystem = true;
};
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;

View file

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "mixxx";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg";
};
buildInputs = [

View file

@ -18,9 +18,9 @@ let
sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j";
};
latestVersion = { # canary & dev
version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"
build = "191.5618338";
sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519";
version = "3.6.0.6"; # "Android Studio 3.6 Canary 6"
build = "192.5787298";
sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df";
};
in rec {
# Attributes are named by their corresponding release channels

View file

@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi";
sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

View file

@ -4,13 +4,13 @@
mkDerivation rec {
pname = "barrier";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "debauchee";
repo = pname;
rev = "v${version}";
sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0";
sha256 = "1dakpgs4jcwg06f45xg6adc83jd2qnpywmjm1z7g0hzd2vd0qg4k";
};
buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];

View file

@ -6,11 +6,11 @@
mkDerivation rec {
pname = "calibre";
version = "3.45.2";
version = "3.46.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05";
sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
};
patches = [

View file

@ -0,0 +1,39 @@
{ stdenv, fetchFromGitHub, python3, cudatoolkit,
withCuda ? true
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "firestarter";
version = "1.7.3";
src = fetchFromGitHub {
owner = "tud-zih-energy";
repo = "FIRESTARTER";
rev = "v${version}";
sha256 = "1gc7kmzx9nw22lyfmpyz72p974jf1hvw5nvszcaq7x6h8cz9ip15";
};
nativeBuildInputs = [ python3 ];
buildInputs = optionals withCuda [ cudatoolkit ];
preBuild = ''
mkdir -p build
cd build
python ../code-generator.py ${optionalString withCuda "--enable-cuda"}
'';
makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ];
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin
cp FIRESTARTER $out/bin/firestarter
'';
meta = with stdenv.lib; {
homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter;
description = "Processor Stress Test Utility";
platforms = platforms.linux;
maintainers = with maintainers; [ astro ];
license = licenses.gpl3;
};
}

View file

@ -36,7 +36,7 @@ GEM
mime-types-data (3.2019.0331)
mini_portile2 (2.4.0)
mustache (0.99.8)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
rack (1.6.11)

View file

@ -151,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
posix-spawn = {
groups = ["default"];

View file

@ -0,0 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gsctl";
version = "0.15.4";
goPackagePath = "github.com/giantswarm/gsctl";
src = fetchFromGitHub {
owner = "giantswarm";
repo = pname;
rev = version;
sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj";
};
meta = with stdenv.lib; {
description = "The Giant Swarm command line interface";
homepage = https://github.com/giantswarm/gsctl;
license = licenses.asl20;
maintainers = with maintainers; [ joesalisbury ];
};
}

View file

@ -17,7 +17,7 @@ GEM
ffi (1.11.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.11.0)
html-pipeline (2.12.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
@ -36,8 +36,8 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
@ -49,7 +49,7 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.11.0)
jemoji (0.11.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
@ -62,7 +62,7 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.4.0)
minitest (5.11.3)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
@ -70,7 +70,7 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.5.1)
rouge (3.8.0)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
sass (3.7.4)

View file

@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779";
sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
type = "gem";
};
version = "2.11.0";
version = "2.12.0";
};
"http_parser.rb" = {
groups = ["default"];
@ -141,10 +141,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk";
type = "gem";
};
version = "0.6.0";
version = "0.7.0";
};
jekyll-mentions = {
dependencies = ["html-pipeline" "jekyll"];
@ -207,10 +207,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k";
sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6";
type = "gem";
};
version = "0.11.0";
version = "0.11.1";
};
kramdown = {
groups = ["default"];
@ -279,10 +279,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
pathutil = {
dependencies = ["forwardable-extended"];
@ -331,10 +331,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs";
type = "gem";
};
version = "3.5.1";
version = "3.8.0";
};
ruby_dep = {
groups = ["default"];

View file

@ -28,7 +28,7 @@ GEM
ffi (1.11.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.11.0)
html-pipeline (2.12.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
@ -47,8 +47,8 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (1.2.2)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
@ -70,7 +70,7 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.11.0)
jemoji (0.11.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
@ -90,7 +90,7 @@ GEM
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.1.1)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
@ -104,8 +104,8 @@ GEM
ffi (~> 1.0)
rdiscount (2.2.0.1)
rdoc (6.1.1)
redcarpet (3.4.0)
rouge (3.5.1)
redcarpet (3.5.0)
rouge (3.8.0)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
sass (3.7.4)

View file

@ -195,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779";
sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
type = "gem";
};
version = "2.11.0";
version = "2.12.0";
};
"http_parser.rb" = {
groups = ["default"];
@ -238,10 +238,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk";
type = "gem";
};
version = "0.6.0";
version = "0.7.0";
};
jekyll-coffeescript = {
dependencies = ["coffee-script" "coffee-script-source"];
@ -358,10 +358,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k";
sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6";
type = "gem";
};
version = "0.11.0";
version = "0.11.1";
};
kramdown = {
groups = ["default"];
@ -518,10 +518,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
octokit = {
dependencies = ["sawyer"];
@ -648,20 +648,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
type = "gem";
};
version = "3.4.0";
version = "3.5.0";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs";
type = "gem";
};
version = "3.5.1";
version = "3.8.0";
};
ruby_dep = {
groups = ["default"];

View file

@ -20,11 +20,11 @@
mkDerivation rec {
pname = "kdeconnect";
version = "1.3.4";
version = "1.3.5";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz";
sha256 = "12ijvp86wm6k81dggypxh3c0dmwg5mczxy43ra8rgv63aavmf42h";
sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5";
};
buildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cni-plugins";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws";
sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia";
};
buildInputs = [ removeReferencesTo go ];

View file

@ -2,7 +2,7 @@
let
stableVersion = "2.1.21";
previewVersion = "2.2.0b4";
previewVersion = "2.2.0rc3";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w";
sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99";
};
serverStable = mkServer {
@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa";
sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d";
};
}

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.91";
version = "0.0.93";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/0.0.91/discord-canary-0.0.91.tar.gz";
sha256 = "0sw5m4z5k29rzqrsxbvjqd8fxjwd9jn7nbq65nyg7f0d790rhpy8";
url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz";
sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi";
};
};
}.${branch}

View file

@ -57,11 +57,11 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.26.1";
version = "1.26.2";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1s48mgya1gvidk0fmm7pifhqj2k0dc9xdq3h5ifz9kivjp7h0z09";
sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk";
};
phases = [ "unpackPhase" "installPhase" ];

View file

@ -2,9 +2,9 @@
rec {
major = "6";
minor = "2";
patch = "4";
tweak = "2";
minor = "3";
patch = "0";
tweak = "4";
subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz";
sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
};
}

View file

@ -48,14 +48,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c";
sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s";
sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
};
};
@ -145,6 +145,8 @@ in stdenv.mkDerivation rec {
sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
# tilde expansion in path processing checks the existence of $HOME
sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
# fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071
sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx'
# rendering-dependent: on my computer the test table actually doesn't fit…
# interesting fact: test disabled on macOS by upstream
sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
@ -307,6 +309,9 @@ in stdenv.mkDerivation rec {
# Without these, configure does not finish
"--without-junit"
# Schema files for validation are not included in the source tarball
"--without-export-validation"
"--disable-libnumbertext" # system-libnumbertext"
# We do tarball prefetching ourselves

View file

@ -28,11 +28,11 @@
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
name = "boost_1_66_0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2";
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
name = "boost_1_69_0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2";
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
md5 = "";
md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2";
md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2";
}
{
name = "breakpad.zip";
@ -105,11 +105,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.64.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz";
sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5";
name = "curl-7.65.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz";
sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd";
md5 = "";
md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz";
md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -231,11 +231,11 @@
md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
}
{
name = "source-serif-font-2.007R.tar.gz";
url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz";
sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb";
name = "source-serif-pro-3.000R.tar.gz";
url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3";
md5 = "";
md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz";
md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz";
}
{
name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
@ -308,11 +308,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.8.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
name = "freetype-2.9.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2";
sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d";
md5 = "";
md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
@ -329,18 +329,18 @@
md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.10.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz";
sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9";
name = "graphite2-minimal-1.3.13.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz";
sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36";
md5 = "";
md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";
}
{
name = "harfbuzz-1.8.4.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2";
sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd";
name = "harfbuzz-2.3.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2";
sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468";
md5 = "";
md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2";
md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@ -539,11 +539,11 @@
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
name = "xmlsec1-1.2.27.tar.gz";
url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz";
sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6";
name = "xmlsec1-1.2.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz";
sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4";
md5 = "";
md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz";
md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";
}
{
name = "libxml2-2.9.9.tar.gz";
@ -602,11 +602,11 @@
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
}
{
name = "libmwaw-0.3.14.tar.xz";
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz";
sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9";
name = "libmwaw-0.3.15.tar.xz";
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz";
sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1";
md5 = "";
md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz";
md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz";
}
{
name = "mythes-1.2.4.tar.gz";
@ -623,11 +623,11 @@
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
}
{
name = "nss-3.38-with-nspr-4.19.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz";
sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9";
name = "nss-3.45-with-nspr-4.21.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz";
sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1";
md5 = "";
md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz";
md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
@ -686,11 +686,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-3550.tar.bz2";
url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2";
sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679";
name = "pdfium-3794.tar.bz2";
url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2";
sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4";
md5 = "";
md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2";
md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "symbiyosys";
version = "2019.04.18";
version = "2019.08.13";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "symbiyosys";
rev = "b1de59032ef3de35e56fa420a914c2f14d2495e4";
sha256 = "0zci1n062csswl5xxjh9fwq09p9clv95ckag3yywxq06hnqzx0r7";
rev = "9cb542ac7a310b3dfa626349db53bed6236b670c";
sha256 = "0c7nz740738ybk33zzlfl00cq86n31wvra8pqqkpl4ygxnwca1d6";
};
buildInputs = [ python3 yosys ];
@ -26,9 +26,6 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/sby \
--replace "##yosys-sys-path##" \
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
substituteInPlace $out/share/yosys/python3/sby_core.py \
--replace "/bin/bash" \
"${bash}/bin/bash"
'';
meta = {
description = "Tooling for Yosys-based verification flows";

View file

@ -1,9 +1,9 @@
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
, jre, swt, gtk, libXtst, glib
, gtk, libXtst, glib, zlib
}:
let
version = "1.5.7";
version = "1.6.0";
arch = "x86_64";
desktopItem = makeDesktopItem rec {
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
inherit version;
src = fetchzip {
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q";
sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
};
buildInputs = [ makeWrapper ];
@ -35,17 +35,20 @@ in stdenv.mkDerivation {
installPhase = ''
mkdir -p "$out/bin"
cp -r "$src" "$out/toolbox"
chmod +w "$out/toolbox" "$out/toolbox/toolbox"
chmod -R +w "$out/toolbox"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/toolbox/toolbox"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$(find "$out/toolbox" -name java)"
makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
--run "set -x; cd $out/toolbox" \
--add-flags "-data ~/.tla-toolbox" \
--prefix PATH : "${jre}/bin" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}"
echo -e "\nCreating TLA Toolbox icons..."
pushd "$src"

View file

@ -145,7 +145,7 @@ let
lab = callPackage ./lab { };
pre-commit = callPackage ./pre-commit { };
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };

View file

@ -8,7 +8,8 @@ buildPythonApplication rec {
# Mercurial should be added as a build input but because it's a Python
# application, it would mess up the Python environment. Thus, don't add it
# here, instead add it to PATH when running unit tests
buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ];
checkInputs = [ pytest pytest-flake8 pytest-cram git ];
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ ipython nbformat ];
# PyPI source is currently missing tests. Thus, use GitHub instead.

View file

@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";
stdenv.mkDerivation rec {
pname = "avidemux";
version = "2.7.3";
version = "2.7.4";
src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld";
sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x";
};
patches = [

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bspwm";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = version;
sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx";
sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];

View file

@ -1,11 +1,11 @@
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
let
defaultVersion = "88";
defaultVersion = "89";
# Map from git revs to SHA256 hashes
sha256s = {
"version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi";
"version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in

View file

@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "2019.04.19";
version = "2019.08.10";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b";
sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a";
rev = "3f26cf50767143e48d29ae691b2a0052c359eb15";
sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr";
};
nativeBuildInputs
@ -49,6 +49,10 @@ stdenv.mkDerivation rec {
"-DICEBOX_ROOT=${icestorm}/share/icebox"
"-DTRELLIS_ROOT=${trellisRoot}/trellis"
"-DUSE_OPENMP=ON"
# warning: high RAM usage
"-DSERIALIZE_CHIPDB=OFF"
# use PyPy for icestorm if enabled
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF");
# Fix the version number. This is a bit stupid (and fragile) in practice

View file

@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub
, pkgconfig, bison, flex
, tcl, readline, libffi, python3
, protobuf
, protobuf, zlib
}:
with builtins;
stdenv.mkDerivation rec {
pname = "yosys";
version = "2019.04.23";
version = "2019.08.13";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e";
sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0";
rev = "19d6b8846f55b4c7be705619f753bec86deadac8";
sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602";
name = "yosys";
})
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
(fetchFromGitHub {
owner = "berkeley-abc";
repo = "abc";
rev = "3709744c60696c5e3f4cc123939921ce8107fe04";
sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax";
rev = "5776ad07e7247993976bffed4802a5737c456782";
sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl";
name = "yosys-abc";
})
];
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ tcl readline libffi python3 bison flex protobuf ];
buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
makeFlags = [ "ENABLE_PROTOBUF=1" ];

View file

@ -115,25 +115,25 @@ in {
self = pypy27;
sourceVersion = {
major = "7";
minor = "0";
patch = "0";
minor = "1";
patch = "1";
};
sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894";
sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
pythonVersion = "2.7";
db = db.override { dbmSupport = true; };
python = python27;
inherit passthruFun;
};
pypy35 = callPackage ./pypy {
self = pypy35;
pypy36 = callPackage ./pypy {
self = pypy36;
sourceVersion = {
major = "7";
minor = "0";
patch = "0";
minor = "1";
patch = "1";
};
sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w";
pythonVersion = "3.5";
sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
pythonVersion = "3.6";
db = db.override { dbmSupport = true; };
python = python27;
inherit passthruFun;
@ -143,26 +143,26 @@ in {
# Not included at top-level
self = pythonInterpreters.pypy27_prebuilt;
sourceVersion = {
major = "6";
minor = "0";
patch = "0";
major = "7";
minor = "1";
patch = "1";
};
sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64
sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64
pythonVersion = "2.7";
inherit passthruFun;
ncurses = ncurses5;
};
pypy35_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy35_prebuilt;
pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy36_prebuilt;
sourceVersion = {
major = "6";
minor = "0";
patch = "0";
major = "7";
minor = "1";
patch = "1";
};
sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64
pythonVersion = "3.5";
sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64
pythonVersion = "3.6";
inherit passthruFun;
ncurses = ncurses5;
};

View file

@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec {
setupHook = python-setup-hook sitePackages;
doCheck = true;
# TODO: A bunch of tests are failing as of 7.1.1, please feel free to
# fix and re-enable if you have the patience and tenacity.
doCheck = false;
checkPhase = let
disabledTests = [
# disable shutils because it assumes gid 0 exists
@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec {
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
# Include a sitecustomize.py file
cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
'';
inherit passthru;
@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec {
homepage = http://pypy.org/;
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ andersk ];
broken = true; # TODO: Tests are failing!
};
}

View file

@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2";
url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
inherit sha256;
};
@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation {
platforms = [ "x86_64-linux" ];
};
}
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
version = "6.5.5";
version = "6.5.6";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39";
sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4";
};
enableParallelBuilding = true;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
--replace /usr/bin/perl "${perl}/bin/perl"'';
preConfigure = ''
export INSTALL_PREFIX=$out
export ACE_ROOT=$(pwd)

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
stdenv.mkDerivation rec {
version = "9.600.5";
pname = "armadillo";
version = "9.600.6";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x";
sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,32 +1,38 @@
{ stdenv, unzip, fetchurl }:
let
version = "24";
# Upstream changes files in-place, to update:
# 1. Check latest version at http://www.un4seen.com/
# 2. Update `version`s and `sha256` sums.
# See also http://www.un4seen.com/forum/?topic=18614.0
let
allBass = {
bass = {
h = "bass.h";
version = "2.4.14";
so = {
i686_linux = "libbass.so";
x86_64-linux = "x64/libbass.so";
};
urlpath = "bass${version}-linux.zip";
sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz";
urlpath = "bass24-linux.zip";
sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy";
};
bass_fx = {
h = "C/bass_fx.h";
version = "2.4.12.1";
so = {
i686_linux = "libbass_fx.so";
x86_64-linux = "x64/libbass_fx.so";
};
urlpath = "z/0/bass_fx${version}-linux.zip";
urlpath = "z/0/bass_fx24-linux.zip";
sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin";
};
};
dropBass = name: bass: stdenv.mkDerivation {
name = "lib${name}-${version}";
pname = "lib${name}";
inherit (bass) version;
src = fetchurl {
url = "https://www.un4seen.com/files/${bass.urlpath}";

View file

@ -1,13 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
pname = "cimg";
version = "2.6.7";
version = "2.7.0";
src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m";
sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv";
};
nativeBuildInputs = [ unzip ];

View file

@ -1,8 +1,8 @@
diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
index 6e23d9f2..8c621ec4 100644
index 9e885070..d02eeb8c 100644
--- a/icon-validator/validate-icon.c
+++ b/icon-validator/validate-icon.c
@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width,
@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width,
"--unshare-ipc",
"--unshare-net",
"--unshare-pid",

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
stdenv.mkDerivation rec {
pname = "flatpak";
version = "1.2.4";
version = "1.4.2";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v";
sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj";
};
patches = [
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau
libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
gsettings-desktop-schemas glib-networking
librsvg # for flatpak-validate-icon
];

View file

@ -1,6 +1,8 @@
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index 5dd7629e..ddc71a4c 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -624,7 +624,7 @@
@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir)
g_auto(GStrv) stdout_lines = NULL;
int i;
char *p11_argv[] = {
@ -9,7 +11,7 @@
/* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
* this flag. This is good, because those earlier versions did not properly daemonize and caused
* the spawn_sync to hang forever, waiting for the pipe to close.
@@ -770,7 +770,7 @@
@@ -836,7 +836,7 @@ main (int argc,
exit (1);
}

View file

@ -1,6 +1,8 @@
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 46bcefb3..0134425e 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -328,7 +328,7 @@
@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then
# running installed-tests: assume we know what we're doing
_flatpak_bwrap_works=true
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@ -9,7 +11,7 @@
_flatpak_bwrap_works=false
else
_flatpak_bwrap_works=true
@@ -309,12 +309,12 @@
@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
@ -24,9 +26,11 @@
gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
fusermount -u $XDG_RUNTIME_DIR/doc || :
if test -n "${TEST_SKIP_CLEANUP:-}"; then
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index 0a0a28f1..16fd51fe 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -114,13 +114,13 @@ msgid "Hello world"
@@ -129,13 +129,13 @@ msgid "Hello world"
msgstr "Hallo Welt"
EOF
mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
@ -42,9 +46,11 @@
flatpak build-finish ${DIR}
mkdir -p repos
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
index 57899b75..9236996f 100755
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -26,6 +26,7 @@
@@ -28,6 +28,7 @@ EOF
PATH="$PATH:/usr/sbin:/sbin"
# Add bash and dependencies
@ -52,7 +58,7 @@
mkdir -p ${DIR}/usr/bin
mkdir -p ${DIR}/usr/lib
ln -s ../lib ${DIR}/usr/lib64
@@ -35,48 +36,27 @@
@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then
else
cp `which ldconfig` ${DIR}/usr/bin
fi
@ -105,21 +111,20 @@
-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
-# the real en_US locale is often not available, because its in the
-# local archive.
-mkdir -p ${DIR}/usr/lib/locale/
-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
+find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
+
+# We copy the whole locale archive because we do not have C.UTF8 locale
mkdir -p ${DIR}/usr/lib/locale/
-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
if [ x$COLLECTION_ID != x ]; then
collection_args=--collection-id=${COLLECTION_ID}
diff --git a/tests/testlibrary.c b/tests/testlibrary.c
index f2773dc8..3af9026f 100644
--- a/tests/testlibrary.c
+++ b/tests/testlibrary.c
@@ -584,7 +584,7 @@
@@ -1053,7 +1053,7 @@ check_bwrap_support (void)
{
gint exit_code = 0;
char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net",
@ -128,6 +133,8 @@
g_autofree char *argv_str = g_strjoinv (" ", argv);
g_test_message ("Spawning %s", argv_str);
g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger
index 711cfab2..10c220ec 100755
--- a/triggers/gtk-icon-cache.trigger
+++ b/triggers/gtk-icon-cache.trigger
@@ -1,7 +1,7 @@

View file

@ -1,6 +1,8 @@
diff --git a/acinclude.m4 b/acinclude.m4
index 92ec3985..b3fccf1d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -40,8 +40,8 @@
@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
[
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

View file

@ -1,6 +1,8 @@
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 8d52d3a5..81700183 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = {
@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = {
{"PERLLIB", NULL},
{"PERL5LIB", NULL},
{"XCURSOR_PATH", NULL},

View file

@ -1,6 +1,8 @@
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 8f9dc66c..d3ab6e5f 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app,
@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app,
new_exec = g_string_new ("");
g_string_append_printf (new_exec,
@ -9,7 +11,7 @@
escaped_branch,
escaped_arch);
@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self,
@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self,
error))
return FALSE;
@ -21,28 +23,28 @@
G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))
return FALSE;
diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh
index 6937b041..01f8add7 100755
index dff17f33..a9857adc 100755
--- a/tests/test-bundle.sh
+++ b/tests/test-bundle.sh
@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
# Ensure Exec key is rewritten
-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 9d83d82e..234e4ec6 100755
index 233df9ad..76e0b23b 100644
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files
assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export
assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
# Ensure Exec key is rewritten
-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png
assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png

View file

@ -1,8 +1,8 @@
diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
index 6e23d9f2..f0659a78 100644
index 9e885070..44fea035 100644
--- a/icon-validator/validate-icon.c
+++ b/icon-validator/validate-icon.c
@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width,
@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width,
add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL);
if (g_getenv ("G_MESSAGES_PREFIXED"))
add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }:
{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5
, libsForQt5, makeWrapper }:
stdenv.mkDerivation rec {
pname = "g2o";
@ -11,8 +12,33 @@ stdenv.mkDerivation rec {
sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen suitesparse ];
# Removes a reference to gcc that is only used in a debug message
patches = [ ./remove-compiler-reference.patch ];
separateDebugInfo = true;
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ];
cmakeFlags = [
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
"default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
"westmere" = [ "-DDISABLE_SSE4_A=ON" ];
"sandybridge" = [ "-DDISABLE_SSE4_A=ON" ];
"ivybridge" = [ "-DDISABLE_SSE4_A=ON" ];
"haswell" = [ "-DDISABLE_SSE4_A=ON" ];
"broadwell" = [ "-DDISABLE_SSE4_A=ON" ];
"skylake" = [ "-DDISABLE_SSE4_A=ON" ];
"skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});
postInstall = ''
wrapProgram $out/bin/g2o_viewer \
--prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
'';
meta = {
description = "A General Framework for Graph Optimization";

View file

@ -0,0 +1,25 @@
From b9bfed09e4e3c481b7eb36bee1ff4202ccf69dee Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 17 May 2019 19:05:36 -0400
Subject: [PATCH] Remove reference to compiler.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3f66dd..bb05bd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,7 +371,7 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND})
set(G2O_HAVE_CSPARSE ${CSPARSE_FOUND})
set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS})
-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}")
+set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} unknown")
configure_file(config.h.in "${PROJECT_BINARY_DIR}/g2o/config.h")
install(FILES ${PROJECT_BINARY_DIR}/g2o/config.h DESTINATION ${INCLUDES_DESTINATION}/g2o)
--
2.21.0

View file

@ -0,0 +1,21 @@
{ libmodulemd, fetchurl }:
libmodulemd.overrideAttrs(old: rec {
name = "libmodulemd-${version}";
version = "1.8.15";
# Removes py output since there's no overrides here
outputs = [ "out" "devdoc" ];
patches = [
# Checks for glib docs in glib's prefix
# but they're installed to another
./dont-check-docs.patch
];
src = fetchurl {
url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz";
sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z";
};
})

View file

@ -0,0 +1,59 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, meson
, ninja
, gobject-introspection
, python3
, libyaml
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_412
, glib
}:
stdenv.mkDerivation rec {
pname = "libmodulemd";
version = "2.6.0";
outputs = [ "out" "devdoc" "py" ];
src = fetchFromGitHub {
owner = "fedora-modularity";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i";
};
patches = [
./pygobject-dir.patch
];
nativeBuildInputs = [
pkgconfig
meson
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_412
gobject-introspection
];
buildInputs = [
libyaml
glib
];
mesonFlags = [
"-Ddeveloper_build=false"
"-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
meta = with stdenv.lib; {
description = "C Library for manipulating module metadata files";
homepage = "https://github.com/fedora-modularity/libmodulemd";
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,29 @@
diff --git a/meson.build b/meson.build
index 155c9e7..9125372 100644
--- a/meson.build
+++ b/meson.build
@@ -60,15 +60,15 @@ sh = find_program('sh')
sed = find_program('sed')
test = find_program('test')
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GLib.')
-endif
-
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GObject.')
-endif
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
+# if ret.returncode() != 0
+# error('Missing documentation for GLib.')
+# endif
+
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
+# if ret.returncode() != 0
+# error('Missing documentation for GObject.')
+# endif
python_name = get_option('python_name')

View file

@ -0,0 +1,45 @@
diff --git a/bindings/python/meson.build b/bindings/python/meson.build
index 4358b79..61fd5a5 100644
--- a/bindings/python/meson.build
+++ b/bindings/python/meson.build
@@ -1,3 +1,5 @@
+pygobject_override_dir = get_option('pygobject_override_dir')
+
get_overridedir = '''
import os
import sysconfig
@@ -21,7 +23,7 @@ print(overridedir)
'''
# Python 3
-if (get_option('with_py3_overrides'))
+if (get_option('with_py3_overrides')) and pygobject_override_dir == ''
ret = run_command([python3, '-c', get_overridedir])
if ret.returncode() != 0
@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides'))
endif
# Python 2
-if (get_option('with_py2_overrides'))
+if (get_option('with_py2_overrides')) and pygobject_override_dir == ''
ret2 = run_command([python2, '-c', get_overridedir])
if ret2.returncode() != 0
@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides'))
install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir)
endif
+
+if pygobject_override_dir != ''
+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir)
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 147419f..9071a04 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false)
option('python_name', type : 'string')
option('with_py2_overrides', type : 'boolean', value : false)
option('with_py3_overrides', type : 'boolean', value : true)
+option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')

View file

@ -1,25 +1,25 @@
{ stdenv, fetchurl, qt4, qmake4Hook, AGL }:
{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
stdenv.mkDerivation rec {
name = "libqglviewer-2.6.3";
version = "2.6.3";
pname = "libqglviewer";
version = "2.7.1";
src = fetchurl {
url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz";
};
buildInputs = [ qt4 qmake4Hook ]
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase libGLU ]
++ stdenv.lib.optional stdenv.isDarwin AGL;
postPatch =
''
cd QGLViewer
'';
postPatch = ''
cd QGLViewer
'';
meta = with stdenv.lib; {
description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
homepage = http://libqglviewer.com/;
homepage = "http://libqglviewer.com";
license = licenses.gpl2;
platforms = platforms.all;
};

View file

@ -1,4 +1,5 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq")
]

View file

@ -1,18 +1,39 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }:
{ stdenv
, fetchFromGitHub
, autoreconfHook
, pkgconfig
, libxml2
, xdg-desktop-portal
, gtk3
, glib
, wrapGAppsHook
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
version = "1.2.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j";
sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
buildInputs = [ glib gtk3 gsettings-desktop-schemas ];
nativeBuildInputs = [
autoreconfHook
libxml2
pkgconfig
wrapGAppsHook
xdg-desktop-portal
];
buildInputs = [
glib
gsettings-desktop-schemas
gtk3
];
meta = with stdenv.lib; {
description = "Desktop integration portals for sandboxed apps";

View file

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }:
{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.2.0";
version = "1.4.2";
outputs = [ "out" "installedTests" ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71";
sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6";
};
patches = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ];
buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ];
doCheck = true; # XXX: investigate!

View file

@ -1,10 +1,12 @@
--- a/src/xdg-desktop-portal.c
+++ b/src/xdg-desktop-portal.c
@@ -177,38 +177,50 @@
static void
load_installed_portals (void)
diff --git a/src/portal-impl.c b/src/portal-impl.c
index 4fd48ff..346da7c 100644
--- a/src/portal-impl.c
+++ b/src/portal-impl.c
@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a,
void
load_installed_portals (gboolean opt_verbose)
{
- const char *portal_dir = PKGDATADIR "/portals";
- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals";
- g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
- g_autoptr(GFileEnumerator) enumerator = NULL;
@ -14,7 +16,7 @@
+ const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");
+
+ if (portal_dir == NULL)
+ portal_dir = PKGDATADIR "/portals";
+ portal_dir = DATADIR "/portals";
- if (enumerator == NULL)
- return;
@ -56,7 +58,7 @@
- path = g_file_get_path (child);
+ name = g_file_info_get_name (info);
- if (!register_portal (path, &error))
- if (!register_portal (path, opt_verbose, &error))
- {
- g_warning ("Error loading %s: %s", path, error->message);
- continue;
@ -66,7 +68,7 @@
+ child = g_file_enumerator_get_child (enumerator, info);
+ path = g_file_get_path (child);
+
+ if (!register_portal (path, &error))
+ if (!register_portal (path, opt_verbose, &error))
+ {
+ g_warning ("Error loading %s: %s", path, error->message);
+ continue;

View file

@ -1,24 +1,19 @@
{ stdenv
, fetchurl
# Regarding static/shared libaries, the current behaviour is:
#
# - static=true, shared=true: builds both and moves .a to the .static output;
# in this case `pkg-config` auto detection will
# not work if the .static output is given as
# buildInputs to another package (#66461)
# - static=true, shared=false: builds .a only and leaves it in the main output
# - static=false, shared=true: builds shared only
#
# To get both `.a` and shared libraries in one output,
# you currently have to use
# static=false, shared=true
# and use
# .overrideAttrs (old: { dontDisableStatic = true; })
# This is because by default, upstream zlib ./configure builds both.
, static ? true
# Note: If `{ static = false; shared = false; }`, upstream's default is used
# (which is building both static and shared as of zlib 1.2.11).
, shared ? true
, static ? true
# If true, a separate .static ouput is created and the .a is moved there.
# In this case `pkg-config` will auto detection will currently not work if the
# .static output is given as `buildInputs` to another package (#66461), because
# the `.pc` file lists only the main output's lib dir.
# If false, and if `{ static = true; }`, the .a stays in the main output.
, splitStaticOutput ? static
}:
assert splitStaticOutput -> static;
stdenv.mkDerivation (rec {
name = "zlib-${version}";
version = "1.2.11";
@ -41,14 +36,35 @@ stdenv.mkDerivation (rec {
'';
outputs = [ "out" "dev" ]
++ stdenv.lib.optional (shared && static) "static";
++ stdenv.lib.optional splitStaticOutput "static";
setOutputFlags = false;
outputDoc = "dev"; # single tiny man3 page
configureFlags = stdenv.lib.optional shared "--shared"
++ stdenv.lib.optional (static && !shared) "--static";
# For zlib's ./configure (as of verion 1.2.11), the order
# of --static/--shared flags matters!
# `--shared --static` builds only static libs, while
# `--static --shared` builds both.
# So we use the latter order to be able to build both.
# Also, giving just `--shared` builds both,
# giving just `--static` builds only static,
# and giving nothing builds both.
# So we have 3 possible ways to build both:
# `--static --shared`, `--shared` and giving nothing.
# Of these, we choose `--shared`, only because that's
# what we did in the past and we can avoid mass rebuilds this way.
# As a result, we pass `--static` only when we want just static.
configureFlags = stdenv.lib.optional (static && !shared) "--static"
++ stdenv.lib.optional shared "--shared";
postInstall = stdenv.lib.optionalString (shared && static) ''
# Note we don't need to set `dontDisableStatic`, because static-disabling
# works by grepping for `enable-static` in the `./configure` script
# (see `pkgs/stdenv/generic/setup.sh`), and zlib's handwritten one does
# not have such.
# It wouldn't hurt setting `dontDisableStatic = static && !splitStaticOutput`
# here (in case zlib ever switches to autoconf in the future),
# but we don't do it simply to avoid mass rebuilds.
postInstall = stdenv.lib.optionalString splitStaticOutput ''
moveToOutput lib/libz.a "$static"
''
# jww (2015-01-06): Sometimes this library install as a .so, even on
@ -69,6 +85,8 @@ stdenv.mkDerivation (rec {
# to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc";
# We don't strip on static cross-compilation because of reports that native
# stripping corrupted the target library; see commit 12e960f5 for the report.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static;
configurePlatforms = [];

View file

@ -1,14 +1,13 @@
{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
, js_of_ocaml-camlp4
, resource-pooling
}:
buildOcaml rec
{
name = "ocsigen-start";
version = "1.5.0";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "1.8.0";
buildInputs = [ eliom js_of_ocaml-camlp4 ];
buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
patches = [ ./templates-dir.patch ];
@ -16,12 +15,14 @@ buildOcaml rec
postPatch = ''
substituteInPlace "src/os_db.ml" --replace "citext" "text"
'';
createFindlibDestdir = true;
src = fetchFromGitHub {
owner = "ocsigen";
repo = name;
repo = "ocsigen-start";
rev = version;
sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha";
sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s";
};
meta = {
@ -31,6 +32,7 @@ buildOcaml rec
An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
'';
license = stdenv.lib.licenses.lgpl21;
inherit (ocaml.meta) platforms;
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
};

View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.0.0";
version = "2.2.0";
propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
buildInputs = [ ocaml findlib opaline ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw";
sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s";
};
createFindlibDestdir = true;

View file

@ -6,11 +6,15 @@
buildPythonPackage rec {
pname = "capstone";
version = "3.0.4";
version = "3.0.5.post1";
setupPyBuildFlags = [
"--plat-name x86_64-linux"
];
src = fetchPypi {
inherit pname version;
sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225";
sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04";
};
patches = [

View file

@ -0,0 +1,27 @@
{ stdenv, fetchPypi, buildPythonPackage,
wrapt, pytest, tox }:
buildPythonPackage rec {
pname = "Deprecated";
version = "1.2.6";
src = fetchPypi {
inherit pname version;
sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5";
};
postPatch = ''
# odd broken tests, don't appear in GitHub repo
rm tests/demo_classic_usage*.py
'';
propagatedBuildInputs = [ wrapt ];
checkInputs = [ pytest ];
meta = with stdenv.lib; {
homepage = "https://github.com/tantale/deprecated";
description = "Python @deprecated decorator to deprecate old python classes, functions or methods";
platforms = platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ tilpner ];
};
}

View file

@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
@ -12,10 +13,15 @@ buildPythonPackage rec {
sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d";
};
propagatedBuildInputs = [ requests ];
meta = with stdenv.lib; {
description = "Google Spreadsheets client library";
homepage = "https://github.com/burnash/gspread";
license = licenses.mit;
};
# No tests included
doCheck = false;
}

View file

@ -0,0 +1,31 @@
{ buildPythonPackage
, fetchFromGitHub
, lxml
, pillow
, reportlab
, stdenv
}:
buildPythonPackage rec {
pname = "hocr-tools";
version = "1.3.0";
src = fetchFromGitHub {
owner = "tmbdev";
repo = "${pname}";
rev = "v${version}";
sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p";
};
# hocr-tools uses a test framework that requires internet access
doCheck = false;
propagatedBuildInputs = [ pillow lxml reportlab ];
meta = with stdenv.lib; {
description = "
Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML";
homepage = https://github.com/tmbdev/hocr-tools;
license = licenses.asl20;
maintainers = [ maintainers.kiwi ];
};
}

View file

@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "kconfiglib";
version = "10.36.0";
src = fetchPypi {
inherit pname version;
sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b";
};
# doesnt work out of the box but might be possible
doCheck = false;
meta = with lib; {
description = "A flexible Python 2/3 Kconfig implementation and library";
homepage = https://github.com/ulfalizer/Kconfiglib;
license = licenses.isc;
maintainers = with maintainers; [ teto ];
};
}

View file

@ -0,0 +1,73 @@
{ attrs
, buildPythonPackage
, defusedxml
, fetchPypi
, hypothesis
, isPy3k
, lxml
, pillow
, pybind11
, pytest
, pytest-helpers-namespace
, pytest-timeout
, pytest_xdist
, pytestrunner
, python-xmp-toolkit
, python3
, qpdf
, setuptools-scm-git-archive
, setuptools_scm
, stdenv
}:
buildPythonPackage rec {
pname = "pikepdf";
version = "1.1.0";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my";
};
buildInputs = [
pybind11
qpdf
];
nativeBuildInputs = [
setuptools-scm-git-archive
setuptools_scm
];
checkInputs = [
attrs
hypothesis
pillow
pytest
pytest-helpers-namespace
pytest-timeout
pytest_xdist
pytestrunner
python-xmp-toolkit
];
propagatedBuildInputs = [ defusedxml lxml ];
postPatch = ''
substituteInPlace requirements/test.txt \
--replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5"
'';
preBuild = ''
HOME=$TMPDIR
'';
meta = with stdenv.lib; {
homepage = "https://github.com/pikepdf/pikepdf";
description = "Read and write PDFs with Python, powered by qpdf";
license = licenses.mpl20;
maintainers = [ maintainers.kiwi ];
};
}

View file

@ -1,5 +1,18 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
{ lib, fetchPypi, buildPythonApplication, pythonOlder
, aspy-yaml
, cached-property
, cfgv
, futures
, identify
, importlib-metadata
, importlib-resources
, nodeenv
, six
, toml
, virtualenv
}:
buildPythonApplication rec {
pname = "pre-commit";
version = "1.18.1";
@ -19,13 +32,13 @@ with python3Packages; buildPythonApplication rec {
toml
virtualenv
importlib-metadata
] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources
++ stdenv.lib.optional (pythonOlder "3.2") futures;
] ++ lib.optional (pythonOlder "3.7") importlib-resources
++ lib.optional (pythonOlder "3.2") futures;
# Tests fail due to a missing windll dependency
# slow and impure
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
description = "A framework for managing and maintaining multi-language pre-commit hooks";
homepage = https://pre-commit.com/;
license = licenses.mit;

View file

@ -1,22 +1,20 @@
{ stdenv, fetchFromGitHub
, buildPythonPackage, python-jose, pyjwt }:
, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }:
buildPythonPackage rec {
pname = "PyGithub";
version = "1.36";
version = "1.43.8";
src = fetchFromGitHub {
owner = "PyGithub";
repo = "PyGithub";
rev = "v${version}";
sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w";
sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw";
};
postPatch = ''
# requires network
echo "" > github/tests/Issue142.py
'';
propagatedBuildInputs = [ python-jose pyjwt ];
propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ];
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/PyGithub/PyGithub;
description = "A Python (2 and 3) library to access the GitHub API v3";

View file

@ -1,31 +1,33 @@
{ buildPythonPackage, lib, fetchPypi
, isPy3k
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
, requests
, pytest
, pre-commit
}:
buildPythonPackage rec {
pname = "pylibgen";
version = "2.0.1";
version = "2.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e";
src = fetchFromGitHub {
owner = "joshuarli";
repo = pname;
rev = "v${version}";
sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1";
};
disabled = !isPy3k;
propagatedBuildInputs = [ requests ];
checkInputs = [ pytest ];
checkInputs = [ pytest pre-commit ];
# no tests in PyPI tarball
# literally every tests does a network call
doCheck = false;
meta = {
meta = with lib; {
description = "Python interface to Library Genesis";
homepage = https://pypi.org/project/pylibgen/;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nico202 ];
license = licenses.mit;
maintainers = [ maintainers.nico202 ];
};
}

View file

@ -1,6 +1,6 @@
{ lib, buildPythonApplication, fetchFromGitHub }:
{ lib, buildPythonPackage, fetchFromGitHub }:
buildPythonApplication rec {
buildPythonPackage rec {
pname = "pyprof2calltree";
version = "1.4.4";

View file

@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchFromGitHub
, pytest
, stdenv
}:
buildPythonPackage rec {
pname = "pytest-helpers-namespace";
version = "2019.1.8";
src = fetchFromGitHub {
owner = "saltstack";
repo = "${pname}";
rev = "v${version}";
sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1";
};
buildInputs = [ pytest ];
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';
# The tests fail with newest pytest. They passed with pytest_3, which no longer exists
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://github.com/saltstack/pytest-helpers-namespace";
description = "PyTest Helpers Namespace";
license = licenses.asl20;
maintainers = [ maintainers.kiwi ];
};
}

View file

@ -0,0 +1,44 @@
{ buildPythonPackage
, exempi
, fetchFromGitHub
, mock
, pythonOlder
, pytz
, stdenv
}:
buildPythonPackage rec {
pname = "python-xmp-toolkit";
version = "2.0.2";
# PyPi has version 2.0.1; the tests fail
# There are commits for a 2.0.2 release that was never published
# Not to github, not to PyPi
# This is the latest commit from Jun 29, 2017 (as of Mar 13, 2019)
# It includes the commits for the unreleased version 2.0.2 and more
# Tests pass with this version
src = fetchFromGitHub {
owner = "python-xmp-toolkit";
repo = "python-xmp-toolkit";
rev = "5692bdf8dac3581a0d5fb3c5aeb29be0ab6a54fc";
sha256 = "16bylcm183ilzp7mrpdzw0pzp6csv9v5v247914qsv2abg0hgl5y";
};
buildInputs = [ exempi ];
checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ];
propagatedBuildInputs = [ pytz ];
postPatch = ''
substituteInPlace libxmp/exempi.py \
--replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
meta = with stdenv.lib; {
homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit;
description = "Python XMP Toolkit for working with metadata";
license = licenses.bsd3;
maintainers = [ maintainers.kiwi ];
};
}

View file

@ -0,0 +1,53 @@
{ gevent
, buildPythonPackage
, fetchFromGitHub
, hostname
, pytest
, python
, stdenv
}:
buildPythonPackage rec {
pname = "ruffus";
version = "2.8.1";
src = fetchFromGitHub {
owner = "cgat-developers";
repo = "${pname}";
rev = "v${version}";
sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9";
};
propagatedBuildInputs = [ gevent ];
postPatch = ''
sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile
sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile
sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile
sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd
sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd
sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py
'';
makefile = "ruffus/test/Makefile";
checkInputs = [
gevent
hostname
pytest
];
checkPhase = ''
export HOME=$TMPDIR
cd ruffus/test
make all PYTEST_OPTIONS="-q --disable-warnings"
'';
meta = with stdenv.lib; {
description = "Light-weight Python Computational Pipeline Management";
homepage = http://www.ruffus.org.uk;
license = licenses.mit;
maintainers = [ maintainers.kiwi ];
};
}

View file

@ -0,0 +1,21 @@
{ buildPythonPackage
, lib
, fetchPypi
}:
buildPythonPackage rec {
version = "1.0.1";
pname = "unittest-data-provider";
src = fetchPypi {
inherit pname version;
sha256 = "1gn2ka4vqpayx4cpbp8712agqjh3wdpk9smdxnp709ccc2v7zg46";
};
meta = with lib; {
description = "PHPUnit-like @dataprovider decorator for unittest";
homepage = https://github.com/yourlabs/unittest-data-provider;
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
}

View file

@ -1,23 +1,26 @@
{ stdenv, fetchFromGitHub
, pkgconfig, libftdi
, python3, pypy3
# PyPy yields large improvements in build time and runtime performance,
# and IceStorm isn't intended to be used as a library other than by the
# nextpnr build process (which is also sped up by using PyPy), so we
# use it by default. See 18839e1 for more details.
, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */
}:
let
pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */
pythonPkg = if pypyCompatible then pypy3 else python3;
pythonInterp = pythonPkg.interpreter;
in
stdenv.mkDerivation rec {
pythonPkg = if usePyPy then pypy3 else python3;
pythonInterp = pythonPkg.interpreter;
in stdenv.mkDerivation rec {
pname = "icestorm";
version = "2019.04.16";
version = "2019.08.08";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86";
sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky";
rev = "2ccae0d3864fd7268118287a85963c0116745cff";
sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cgdb";
version = "0.7.0";
version = "0.7.1";
src = fetchurl {
url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv";
};
buildInputs = [ ncurses readline flex texinfo ];

View file

@ -8,21 +8,21 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
version = "2019.04.22";
version = "2019.08.09";
srcs = [
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis";
rev = "5eb0ad870f30422b95d090ac9a476343809c62b9";
sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg";
rev = "a67379179985bb12a611c75d975548cdf6e7d12e";
sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35";
name = "trellis";
})
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis-db";
rev = "d0b219af41ae3da6150645fbc5cc5613b530603f";
sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq";
rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986";
sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx";
name = "database";
})
];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }:
stdenv.mkDerivation rec {
version = "4.1.3";
pname = "angband";
version = "4.2.0";
src = fetchFromGitHub {
owner = "angband";
repo = "angband";
rev = version;
sha256 = "0g9m7pq8a1hzhr83v552hfk37qc868lms2mlsq29pbi8vxdjybk7";
sha256 = "0fr59986swx9a2xkxkbfgadzpwy2lq55fgcib05k393kibyz49kg";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2019-08-02";
version = "2019-08-12";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857";
sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj";
rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4";
sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq";
};
};
@ -391,12 +391,12 @@ let
coc-lists = buildVimPluginFrom2Nix {
pname = "coc-lists";
version = "2019-08-01";
version = "2019-08-12";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-lists";
rev = "999865c6bd3745689d1eb4009b9b706cb5a68617";
sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy";
rev = "2c502ceec9816259350969970e76402c984ac4f9";
sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9";
};
};
@ -799,12 +799,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2019-08-04";
version = "2019-08-17";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "fb56c2ca2ff655c4d82e000e13e233629894caac";
sha256 = "1bwcm7smvfpllbkxb512ys9gjc5gin7v75jkys7q0xq0xb73d1hn";
rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0";
sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n";
};
};
@ -912,12 +912,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-08-11";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "153e242b07cfe5d67cd217eda3163730046de88b";
sha256 = "08slqd2kcy94xs669y8rbyz8xz72zn4rasa0yyk3i7yp8w4awgp8";
rev = "bb2b16309b94695a3344c713282368b3329a2412";
sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9";
};
};
@ -1024,12 +1024,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2019-08-01";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73";
sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn";
rev = "d642592f062c5e4d195e627ac4104d4e0355a125";
sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac";
};
};
@ -1057,12 +1057,12 @@ let
ferret = buildVimPluginFrom2Nix {
pname = "ferret";
version = "2019-06-12";
version = "2019-08-13";
src = fetchFromGitHub {
owner = "wincent";
repo = "ferret";
rev = "f6d7d01de8a92baee83218001c0bdbade8458a72";
sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr";
rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53";
sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy";
};
};
@ -1366,12 +1366,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
version = "2019-07-13";
version = "2019-08-11";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
rev = "b9f83175951654256cff41737841b4abc0c9266d";
sha256 = "0w24zqs1026khdzr7v283yx9yc3sp5rw4kzsjwalclg5xnyy55c0";
rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827";
sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86";
fetchSubmodules = true;
};
};
@ -1488,12 +1488,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
version = "2019-08-06";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
rev = "f5039419d87b76accee7000319b394ce25a0dbfb";
sha256 = "0cfjw1jpddw92jz62ly8m6waxknj19cazff01x8drk1lr9xj6wdy";
rev = "09c61dc3f650eccd2c165c36db8330496321aa50";
sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb";
};
};
@ -1708,12 +1708,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
version = "2019-08-10";
version = "2019-08-15";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
rev = "ebfb1f5a24f39561b0299ffe4d346582a6e2432d";
sha256 = "0yjd3h36zd5g4m0ldijx0p75hlf2dq69y38ilwpm2zp8rqhqgmaw";
rev = "cad94240c8284ab3502c62acc18e420ca22107de";
sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq";
};
};
@ -1906,12 +1906,12 @@ let
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
version = "2019-06-26";
version = "2019-08-17";
src = fetchFromGitHub {
owner = "sonph";
repo = "onehalf";
rev = "408104a30ae4f220096e591350a72e60cc15f9b3";
sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2";
rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e";
sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql";
};
};
@ -2148,12 +2148,12 @@ let
rust-vim = buildVimPluginFrom2Nix {
pname = "rust-vim";
version = "2019-08-01";
version = "2019-08-15";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50";
sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf";
rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff";
sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x";
};
};
@ -2225,12 +2225,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
version = "2019-06-26";
version = "2019-08-12";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8";
sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c";
rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2";
sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp";
};
};
@ -2874,12 +2874,12 @@ let
vim-bazel = buildVimPluginFrom2Nix {
pname = "vim-bazel";
version = "2019-01-30";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "vim-bazel";
rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939";
sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f";
rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8";
sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg";
};
};
@ -2962,12 +2962,12 @@ let
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2019-06-16";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8";
sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh";
rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549";
sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4";
};
};
@ -3204,12 +3204,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
version = "2019-07-22";
version = "2019-08-15";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
rev = "46a68476fc7b4f454c829d83d21997b82ac66f76";
sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs";
rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5";
sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm";
};
};
@ -3248,12 +3248,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
version = "2019-08-09";
version = "2019-08-12";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
rev = "c4f084bc36bbb7b2ab4216d87f1cce644d278dc7";
sha256 = "1c3vfpq7d3fibjz748sracfbxg6xp28c2y5780cc1jkph5z7wvvj";
rev = "8712a165da4d1de9fb6ae918322ece843ac742e0";
sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7";
};
};
@ -3314,12 +3314,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2019-08-11";
version = "2019-08-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "4daa0c558ceb14223c6c6861063ef0ae9a35233b";
sha256 = "13m30hl6syha9pkr58w23sch89m2nd9cgxbdnkkcqvbzlq202nfh";
rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5";
sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh";
};
};
@ -3358,12 +3358,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2019-08-10";
version = "2019-08-16";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "9bf988bd1d2d8001f84126d8bf74036bab33bb9b";
sha256 = "0ksz7k29nzs00apnimp2r3hqjamdhcpr9h241hcagil3dqraqi5d";
rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89";
sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw";
};
};
@ -3391,12 +3391,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2019-08-09";
version = "2019-08-12";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "ed63c87496c030d436507c4eb211a923aa5dc90b";
sha256 = "0vxqx343wgc9dr9s7jx33hai7ib8cqlfqfpwbmv7zq83x5ff0sh6";
rev = "007b69c27b63fbcbe2e0766073b09281274b0231";
sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w";
};
};
@ -3644,12 +3644,12 @@ let
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
version = "2019-07-08";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a";
sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s";
rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5";
sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f";
};
};
@ -3843,23 +3843,23 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2019-08-10";
version = "2019-08-13";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "329d894f941945287e9797c42e6125838c8a2ac0";
sha256 = "1cv1mgdc4i68kvbh1z090vj29yl2axqfnnlizikbf1z68s2ghnvr";
rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a";
sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25";
};
};
vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba";
version = "2019-01-24";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "google";
repo = "vim-maktaba";
rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c";
sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc";
rev = "ed4357d2caf1d04bd229a24191098759f94b2e25";
sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v";
};
};
@ -4107,12 +4107,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
version = "2019-07-16";
version = "2019-08-17";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962";
sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3";
rev = "307b0f244d99408decda3a98f58e864d49626818";
sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw";
};
};
@ -4327,12 +4327,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2019-08-09";
version = "2019-08-16";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "2673d732dd329b012b1f319de8ba289dbf5a281e";
sha256 = "0qmf32yi6kk8y020qgi2g7xw3c7kxh0i58r5y3mfwya9f4lqm43r";
rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad";
sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc";
};
};
@ -4448,12 +4448,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
version = "2019-08-07";
version = "2019-08-15";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
rev = "2486ab67bc5a84414ec8792f5ce7aaf04a91138c";
sha256 = "1wpk9xflhj2cklfk9ac6dpp436gizl6la8877d8ra19774zgw0k1";
rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33";
sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr";
};
};
@ -4547,12 +4547,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2019-07-12";
version = "2019-08-16";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11";
sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in";
rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b";
sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9";
};
};
@ -4855,12 +4855,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-08-09";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "d01f136c068451ef99795ceb15d285d362bec61b";
sha256 = "06hqzw63mijiqadczaf2x3sy117hlzil16la1w6ynf6d37hr1zq1";
rev = "866699bdae3696130159e7115954c64de8e7bdcd";
sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq";
};
};
@ -4899,12 +4899,12 @@ let
vundle = buildVimPluginFrom2Nix {
pname = "vundle";
version = "2018-02-03";
version = "2019-08-17";
src = fetchFromGitHub {
owner = "gmarik";
repo = "vundle";
rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
rev = "b255382d6242d7ea3877bf059d2934125e0c4d95";
sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6";
};
};
@ -5055,12 +5055,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2019-08-03";
version = "2019-08-14";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
rev = "5ef469df4f663a81e983f5ee4dce9b50b8a612af";
sha256 = "0bmcc051n9jhzggsi1mwcmlsg5qhhzycvsrziladl7xg22nv8w5m";
rev = "defc660d235152e82271a48bd89bfcc9fa58b432";
sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q";
};
};

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
let
ver = "2019.2";
ver = "2019.3";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";
src = fetchurl {
url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn";
sha256 = "0rj7vyir4m63b69fgrz06mqlw7nivjfc8mdv19l02xs9vqh7khx4";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "checksec";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "slimm609";
repo = "checksec.sh";
rev = version;
sha256 = "04lzwm24d576h425rgvgjj2wim29i3961jrj35r43wrswmrsc3r2";
sha256 = "00s4qg4h9s9vi46jyw7lz36lb5i8h3s9cmicnngp17764xgkr916";
};
patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];

View file

@ -68,13 +68,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "conky";
version = "1.11.3";
version = "1.11.5";
src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
sha256 = "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv";
sha256 = "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp";
};
postPatch = ''

View file

@ -2,17 +2,21 @@
stdenv.mkDerivation rec {
pname = "nvme-cli";
version = "1.8.1";
version = "1.9";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0";
sha256 = "08x0x7nq8v7gr8a4lrrhclkz6n8fxlhhizxl2nz56w1xmfghcnfv";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
# To omit the hostnqn and hostid files that are impure and should be unique
# for each target host:
installTargets = "install-spec";
meta = with lib; {
inherit (src.meta) homepage;
description = "NVM-Express user space tooling for Linux";

View file

@ -1,17 +1,35 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
with python3Packages;
buildPythonApplication rec {
pname = "doh-proxy";
version = "0.0.8";
version = "0.0.9";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c";
sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp";
};
propagatedBuildInputs = with python3Packages;
[ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ];
doCheck = false; # Trouble packaging unittest-data-provider
nativeBuildInputs = [ pytestrunner flake8];
propagatedBuildInputs = [
aioh2
dnspython
aiohttp-remotes
];
checkInputs = [
asynctest
unittest-data-provider
pytest
pytestcov
pytest-aiohttp
];
# attempts to resolve address
checkPhase = ''
pytest -k 'not servers'
'';
meta = with lib; {
homepage = https://facebookexperimental.github.io/doh-proxy/;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "airsonic";
version = "10.3.1";
version = "10.4.0";
src = fetchurl {
url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
sha256 = "15y56h7zy94408605cchvf2fqg3aicylpzgd1g8fxyl42h216816";
sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8";
};
buildCommand = ''

View file

@ -63,7 +63,10 @@ in
mkdir -p $out/share/zabbix/database/
'' + optionalString sqliteSupport ''
mkdir -p $out/share/zabbix/database/sqlite3
cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/
cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/
'' + optionalString mysqlSupport ''
mkdir -p $out/share/zabbix/database/mysql
cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/
'' + optionalString postgresqlSupport ''
mkdir -p $out/share/zabbix/database/postgresql
cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/

View file

@ -8,13 +8,13 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.16.3.1402-22929c8a2";
version = "1.16.4.1469-6d5612c2f";
pname = "plexmediaserver";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5";
sha256 = "16ifgqsxgpqyd1m0xmwrrv4cic1yccklv1jlv7fhq8wc6vz9l6lx";
};
outputs = [ "out" "basedb" ];

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
, python3, makeWrapper }:
, python2, python3, makeWrapper }:
let
common = { version, sha256, extraBuildInputs ? [] }:
common = { version, sha256, python, extraNativeBuildInputs ? [] }:
stdenv.mkDerivation rec {
pname = "varnish";
inherit version;
@ -12,11 +12,12 @@ let
inherit sha256;
};
nativeBuildInputs = [ pkgconfig ];
passthru.python = python;
nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs;
buildInputs = [
pcre libxslt groff ncurses readline python3 libedit
python3.pkgs.docutils makeWrapper
] ++ extraBuildInputs;
pcre libxslt groff ncurses readline libedit makeWrapper python
];
buildFlags = "localstatedir=/var/spool";
@ -42,14 +43,17 @@ in
varnish4 = common {
version = "4.1.10";
sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n";
python = python2;
};
varnish5 = common {
version = "5.2.1";
sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
python = python2;
};
varnish6 = common {
version = "6.2.0";
sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3";
extraBuildInputs = [ python3.pkgs.sphinx ];
python = python3;
extraNativeBuildInputs = [ python3.pkgs.sphinx ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec {
version = "0.3";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
};
nativeBuildInputs = [ pkgconfig docutils autoreconfHook ];
buildInputs = [ varnish python ];
nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ];
buildInputs = [ varnish ];
postPatch = ''
substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
'';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }:
stdenv.mkDerivation rec {
version = "0.14.0";
@ -11,8 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
};
nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ];
buildInputs = [ varnish python ];
nativeBuildInputs = [
autoreconfHook
docutils
pkgconfig
removeReferencesTo
varnish.python # use same python version as varnish server
];
buildInputs = [ varnish ];
postPatch = ''
substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
{ stdenv, fetchurl, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec {
version = "1.2.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
};
nativeBuildInputs = [ pkgconfig docutils ];
buildInputs = [ varnish python ];
nativeBuildInputs = [ pkgconfig docutils varnish.python ];
buildInputs = [ varnish ];
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
meta = with stdenv.lib; {

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
version = "1.192";
version = "1.193";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x";
sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp";
};
buildInputs = [ perl ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "analog";
version = "6.0.15";
version = "6.0.16";
src = fetchFromGitHub {
owner = "c-amie";
repo = "analog-ce";
rev = version;
sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m";
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
};
configurePhase = ''

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