From 6c651604f47d9d7bcb32dd5ffa4f863d9d70df8c Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 29 Jan 2020 15:15:04 +0100 Subject: [PATCH 001/214] sane module: support overriding config files --- pkgs/applications/graphics/sane/config.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index c0a0206ddd1..e134391f58c 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -6,7 +6,7 @@ with stdenv.lib; let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do - ln -s "$backend" "$out/lib/sane/$(basename "$backend")" + symlink "$backend" "$out/lib/sane/$(basename "$backend")" done fi @@ -16,14 +16,14 @@ let installSanePath = path: '' if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then cat "$conf" >> "$out/etc/sane.d/$name" else - ln -s "$conf" "$out/etc/sane.d/$name" + symlink "$conf" "$out/etc/sane.d/$name" fi done fi if [ -e "${path}/etc/sane.d/dll.d" ]; then find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do - ln -s "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" + symlink "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" done fi ''; @@ -33,6 +33,14 @@ stdenv.mkDerivation { phases = "installPhase"; installPhase = '' + function symlink () { + local target=$1 linkname=$2 + if [ -e "$linkname" ]; then + echo "warning: conflict for $linkname. Overriding." + fi + ln -sfn "$target" "$linkname" + } + mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane '' + concatMapStrings installSanePath paths; } From ef3addb1cbeaa7ab576ed0ae5fb6c8e85cfc2994 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 1 Feb 2020 14:27:05 -0800 Subject: [PATCH 002/214] qemu: add patches for CVE-2020-7039 and CVE-2020-7211 Fixes #78762 --- .../virtualization/qemu/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 67aa36b7827..203ee1c7cc0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,6 +84,37 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "slirp/"; }) + # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7039 + (fetchpatch { + name = "CVE-2020-7039-1.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=2655fffed7a9e765bcb4701dd876e9dab975f289"; + sha256 = "1jh0k3lg3553c2x1kq1kl3967jabhba5gm584wjpmr5mjqk3lnz1"; + stripLen = 1; + extraPrefix = "slirp/"; + excludes = ["slirp/CHANGELOG.md"]; + }) + (fetchpatch { + name = "CVE-2020-7039-2.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=82ebe9c370a0e2970fb5695aa19aa5214a6a1c80"; + sha256 = "08ccxcmrhzknnzd1a1q2brszv3a7h02n26r73kpli10b0hn12r2l"; + stripLen = 1; + extraPrefix = "slirp/"; + }) + (fetchpatch { + name = "CVE-2020-7039-3.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9"; + sha256 = "18ypj9an2jmsmdn58853rbz42r10587h7cz5fdws2x4635778ibd"; + stripLen = 1; + extraPrefix = "slirp/"; + }) + # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7211 + (fetchpatch { + name = "CVE-2020-7211.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=14ec36e107a8c9af7d0a80c3571fe39b291ff1d4"; + sha256 = "1lc8zabqs580iqrsr5k7zwgkx6qjmja7apwfbc36lkvnrxwfzmrc"; + stripLen = 1; + extraPrefix = "slirp/"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { From 7a15db35d808000df2e98425e4acebb380e1c0d6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 8 Jan 2020 22:55:08 +0100 Subject: [PATCH 003/214] rxvt-unicode: cleanup --- .../misc/rxvt-unicode/default.nix | 88 +++++++++++++++++++ .../patches/256-color-resources.patch} | 0 .../patches/9.06-font-width.patch} | 0 .../patches/makefile-phony.patch} | 0 .../misc/rxvt_unicode/default.nix | 72 --------------- 5 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 pkgs/applications/misc/rxvt-unicode/default.nix rename pkgs/applications/misc/{rxvt_unicode/rxvt-unicode-256-color-resources.patch => rxvt-unicode/patches/256-color-resources.patch} (100%) rename pkgs/applications/misc/{rxvt_unicode/rxvt-unicode-9.06-font-width.patch => rxvt-unicode/patches/9.06-font-width.patch} (100%) rename pkgs/applications/misc/{rxvt_unicode/rxvt-unicode-makefile-phony.patch => rxvt-unicode/patches/makefile-phony.patch} (100%) delete mode 100644 pkgs/applications/misc/rxvt_unicode/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/misc/rxvt-unicode/default.nix new file mode 100644 index 00000000000..6512f402ffb --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchurl, makeDesktopItem +, libX11, libXt, libXft, libXrender +, ncurses, fontconfig, freetype +, pkgconfig, gdk-pixbuf, perl +, perlSupport ? true +, gdkPixbufSupport ? true +, unicode3Support ? true +}: + +let + pname = "rxvt-unicode"; + version = "9.22"; + description = "A clone of the well-known terminal emulator rxvt"; + + desktopItem = makeDesktopItem { + name = pname; + exec = "urxvt"; + icon = "utilities-terminal"; + comment = description; + desktopName = "URxvt"; + genericName = pname; + categories = "System;TerminalEmulator;"; + }; +in + +with stdenv.lib; + +stdenv.mkDerivation { + name = "${pname}-unwrapped-${version}"; + inherit pname version; + + src = fetchurl { + url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; + sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; + }; + + buildInputs = + [ libX11 libXt libXft ncurses # required to build the terminfo file + fontconfig freetype pkgconfig libXrender + ] ++ optional perlSupport perl + ++ optional gdkPixbufSupport gdk-pixbuf; + + outputs = [ "out" "terminfo" ]; + + patches = [ + ./patches/9.06-font-width.patch + ./patches/256-color-resources.patch + ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; + + + configureFlags = [ + "--with-terminfo=$terminfo/share/terminfo" + "--enable-256-color" + (enableFeature perlSupport "perl") + (enableFeature unicode3Support "unicode3") + ]; + + LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; + CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; + + preConfigure = + '' + # without this the terminfo won't be compiled by tic, see man tic + mkdir -p $terminfo/share/terminfo + export TERMINFO=$terminfo/share/terminfo + '' + + stdenv.lib.optionalString perlSupport '' + # make urxvt find its perl file lib/perl5/site_perl + # is added to PERL5LIB automatically + mkdir -p $out/$(dirname ${perl.libPrefix}) + ln -s $out/lib/urxvt $out/${perl.libPrefix} + ''; + + postInstall = '' + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + cp -r ${desktopItem}/share/applications/ $out/share/ + ''; + + meta = { + inherit description; + homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; + downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch similarity index 100% rename from pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch rename to pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch b/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch similarity index 100% rename from pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch rename to pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch b/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch similarity index 100% rename from pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch rename to pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix deleted file mode 100644 index 7c239a9b754..00000000000 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft, - ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, - gdkPixbufSupport ? true, gdk-pixbuf, unicode3Support ? true }: - -let - pname = "rxvt-unicode"; - version = "9.22"; - description = "A clone of the well-known terminal emulator rxvt"; - - desktopItem = makeDesktopItem { - name = pname; - exec = "urxvt"; - icon = "utilities-terminal"; - comment = description; - desktopName = "URxvt"; - genericName = pname; - categories = "System;TerminalEmulator;"; - }; -in - -stdenv.mkDerivation ({ - - name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; - - src = fetchurl { - url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; - }; - - buildInputs = - [ libX11 libXt libXft ncurses /* required to build the terminfo file */ - fontconfig freetype pkgconfig libXrender ] - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional gdkPixbufSupport gdk-pixbuf; - - outputs = [ "out" "terminfo" ]; - - patches = [ - ./rxvt-unicode-9.06-font-width.patch - ./rxvt-unicode-256-color-resources.patch - ] - ++ stdenv.lib.optional stdenv.isDarwin ./rxvt-unicode-makefile-phony.patch; - - preConfigure = - '' - mkdir -p $terminfo/share/terminfo - configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; - export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" - NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender -lpthread " - '' - # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically - + stdenv.lib.optionalString perlSupport '' - mkdir -p $out/$(dirname ${perl.libPrefix}) - ln -s $out/lib/urxvt $out/${perl.libPrefix} - ''; - - postInstall = '' - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - cp -r ${desktopItem}/share/applications/ $out/share/ - ''; - - meta = with stdenv.lib; { - inherit description; - homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; - downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - license = licenses.gpl3; - }; -}) From 27b3df08400daa2c98564be99abfef46d0b1663a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 8 Jan 2020 22:58:44 +0100 Subject: [PATCH 004/214] rxvt-unicode: rewrite plugin system --- .../misc/rxvt-unicode-plugins/default.nix | 20 ++++++++ .../default.nix | 0 .../urxvt-bidi/default.nix | 2 + .../urxvt-font-size/default.nix | 0 .../urxvt-perl/default.nix | 0 .../urxvt-perls/default.nix | 0 .../urxvt-tabbedex/default.nix | 0 .../urxvt-theme-switch/default.nix | 0 .../urxvt-vtwheel/default.nix} | 0 .../misc/rxvt-unicode/wrapper.nix | 46 +++++++++++++++++++ .../misc/rxvt_unicode/wrapper.nix | 23 ---------- pkgs/top-level/all-packages.nix | 30 +----------- 12 files changed, 70 insertions(+), 51 deletions(-) create mode 100644 pkgs/applications/misc/rxvt-unicode-plugins/default.nix rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-autocomplete-all-the-things/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-bidi/default.nix (95%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-font-size/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-perl/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-perls/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-tabbedex/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins => rxvt-unicode-plugins}/urxvt-theme-switch/default.nix (100%) rename pkgs/applications/misc/{rxvt_unicode-plugins/urxvt-vtwheel.nix => rxvt-unicode-plugins/urxvt-vtwheel/default.nix} (100%) create mode 100644 pkgs/applications/misc/rxvt-unicode/wrapper.nix delete mode 100644 pkgs/applications/misc/rxvt_unicode/wrapper.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix new file mode 100644 index 00000000000..b8a481fd120 --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix @@ -0,0 +1,20 @@ +{ callPackage }: + +{ + autocomplete-all-the-things = callPackage ./urxvt-autocomplete-all-the-things { }; + + bidi = callPackage ./urxvt-bidi { }; + + font-size = callPackage ./urxvt-font-size { }; + + perl = callPackage ./urxvt-perl { }; + + perls = callPackage ./urxvt-perls { }; + + tabbedex = callPackage ./urxvt-tabbedex { }; + + theme-switch = callPackage ./urxvt-theme-switch { }; + + vtwheel = callPackage ./urxvt-vtwheel { }; + +} diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix similarity index 95% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix index 3e67e4ec085..4b6b4eb8184 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix @@ -16,6 +16,8 @@ perlPackages.buildPerlPackage rec { install -Dm555 misc/bidi "$out/lib/urxvt/perl/bidi" ''; + passthru.perlPackages = [ "self" ]; + meta = with lib; { description = "Text::Bidi Perl package using fribidi, providing a urxvt plugin"; homepage = "https://github.com/mkamensky/Text-Bidi"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix rename to pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/misc/rxvt-unicode/wrapper.nix new file mode 100644 index 00000000000..8a833f23409 --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode/wrapper.nix @@ -0,0 +1,46 @@ +{ callPackage +, symlinkJoin +, makeWrapper +, lib +, rxvt-unicode-unwrapped +, perlPackages +}: + +let + availablePlugins = import ../rxvt-unicode-plugins { inherit callPackage; }; + + wrapper = + { configure ? { availablePlugins, ... }: + { plugins = builtins.attrValues availablePlugins; + extraDeps = [ ]; + perlDeps = [ ]; + } + }: + + let + config = configure { inherit availablePlugins; }; + plugins = config.plugins or (builtins.attrValues availablePlugins); + extraDeps = config.extraDeps or [ ]; + perlDeps = (config.perlDeps or [ ]) ++ lib.concatMap (p: p.perlPackages or [ ]) plugins; + in + symlinkJoin { + name = "rxvt-unicode-${rxvt-unicode-unwrapped.version}"; + + paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/urxvt \ + --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + ''; + + passthru.plugins = plugins; + }; + +in + lib.makeOverridable wrapper { } diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix deleted file mode 100644 index fd0860b3aae..00000000000 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ symlinkJoin, rxvt_unicode, makeWrapper, plugins, perlPackages, perlDeps ? []}: - -let - rxvt_name = builtins.parseDrvName rxvt_unicode.name; - -in symlinkJoin { - name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}"; - - paths = [ rxvt_unicode ] ++ plugins; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/urxvt \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - wrapProgram $out/bin/urxvtd \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - ''; - - passthru.plugins = plugins; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afad70ae602..62e3eb8d4bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21229,35 +21229,9 @@ in rxvt = callPackage ../applications/misc/rxvt { }; - # urxvt - rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { }; + rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { }; - rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { - plugins = [ - urxvt_autocomplete_all_the_things - urxvt_perl - urxvt_perls - urxvt_tabbedex - urxvt_font_size - urxvt_theme_switch - urxvt_vtwheel - urxvt_bidi - ]; - perlDeps = [ - # This needs the perl module it self provides - urxvt_bidi - ]; - }; - - # urxvt plugins - urxvt_autocomplete_all_the_things = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things { }; - urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { }; - urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; - urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; - urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; - urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; - urxvt_vtwheel = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix { }; - urxvt_bidi = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-bidi { }; + rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; uade123 = callPackage ../applications/audio/uade123 {}; From dcfff7cf0989596123060c0c586394405ff21b94 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 8 Jan 2020 23:39:55 +0100 Subject: [PATCH 005/214] rxvt-unicode: support self-depending plugins in wrapper --- .../misc/rxvt-unicode/wrapper.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/misc/rxvt-unicode/wrapper.nix index 8a833f23409..b791e8aae2e 100644 --- a/pkgs/applications/misc/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt-unicode/wrapper.nix @@ -4,24 +4,35 @@ , lib , rxvt-unicode-unwrapped , perlPackages +, configure ? { availablePlugins, ... }: + { plugins = builtins.attrValues availablePlugins; + extraDeps = [ ]; + perlDeps = [ ]; + } }: let availablePlugins = import ../rxvt-unicode-plugins { inherit callPackage; }; - wrapper = - { configure ? { availablePlugins, ... }: - { plugins = builtins.attrValues availablePlugins; - extraDeps = [ ]; - perlDeps = [ ]; - } - }: + # Transform the string "self" to the plugin itself. + # It's needed for plugins like bidi who depends on the perl + # package the provide themself. + mkPerlDeps = p: + let deps = p.perlPackages or [ ]; + in map (x: if x == "self" then p else x) deps; + # The wrapper is called with a `configure` function + # that takes the urxvt plugins as input and produce + # the configuration of the wrapper: list of plugins, + # extra dependencies and perl dependencies. + # This provides simple way to customize urxvt using + # the `.override` mechanism. + wrapper = { configure, ... }: let config = configure { inherit availablePlugins; }; plugins = config.plugins or (builtins.attrValues availablePlugins); extraDeps = config.extraDeps or [ ]; - perlDeps = (config.perlDeps or [ ]) ++ lib.concatMap (p: p.perlPackages or [ ]) plugins; + perlDeps = (config.perlDeps or [ ]) ++ lib.concatMap mkPerlDeps plugins; in symlinkJoin { name = "rxvt-unicode-${rxvt-unicode-unwrapped.version}"; @@ -43,4 +54,4 @@ let }; in - lib.makeOverridable wrapper { } + lib.makeOverridable wrapper { inherit configure; } From 1c38ce51ef3407362872a21c1b8731a19be89824 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 8 Jan 2020 23:44:37 +0100 Subject: [PATCH 006/214] rxvt-unicode: add aliases for name change --- pkgs/applications/misc/rxvt-unicode/wrapper.nix | 5 +++-- pkgs/top-level/aliases.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/misc/rxvt-unicode/wrapper.nix index b791e8aae2e..38978799b5a 100644 --- a/pkgs/applications/misc/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt-unicode/wrapper.nix @@ -3,6 +3,7 @@ , makeWrapper , lib , rxvt-unicode-unwrapped +, rxvt-unicode-plugins , perlPackages , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; @@ -12,11 +13,11 @@ }: let - availablePlugins = import ../rxvt-unicode-plugins { inherit callPackage; }; + availablePlugins = rxvt-unicode-plugins; # Transform the string "self" to the plugin itself. # It's needed for plugins like bidi who depends on the perl - # package the provide themself. + # package they provide themself. mkPerlDeps = p: let deps = p.perlPackages or [ ]; in map (x: if x == "self" then p else x) deps; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c543af2405c..40468139db7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -365,7 +365,16 @@ mapAliases ({ ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead"; ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; - rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + rxvt_unicode_with-plugins = rxvt-unicode; # added 2020-02-02 + rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 + urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 + urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 + urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 + urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02 + urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02 + urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 + urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 + urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 s6Dns = s6-dns; # added 2018-07-23 s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62e3eb8d4bc..3c0aea47342 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21233,6 +21233,8 @@ in rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; + rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; }; + uade123 = callPackage ../applications/audio/uade123 {}; udevil = callPackage ../applications/misc/udevil {}; From 4e155430ab76627f8bb29f584c4d43e499d2b1d9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Jan 2020 00:21:04 +0100 Subject: [PATCH 007/214] rxvt-unicode-plugins/urxvt-resize-font: init at 2019-10-05 --- .../misc/rxvt-unicode-plugins/default.nix | 2 ++ .../urxvt-resize-font/default.nix | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix index b8a481fd120..74bfbe83e91 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix @@ -11,6 +11,8 @@ perls = callPackage ./urxvt-perls { }; + resize-font = callPackage ./urxvt-resize-font { }; + tabbedex = callPackage ./urxvt-tabbedex { }; theme-switch = callPackage ./urxvt-theme-switch { }; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix new file mode 100644 index 00000000000..a056e603f00 --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "urxvt-resize-font"; + version = "2019-10-05"; + dontPatchShebangs = true; + + src = fetchFromGitHub { + owner = "simmel"; + repo = "urxvt-resize-font"; + rev = "e966a5d77264e9263bfc8a51e160fad24055776b"; + sha256 = "18ab3bsfdkzzh1n9fpi2al5bksvv2b7fjmvxpx6fzqcy4bc64vkh"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + cp resize-font $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "URxvt Perl extension for resizing the font"; + homepage = "https://github.com/simmel/urxvt-resize-font"; + license = licenses.mit; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} From ef9a029700babd9b26a1f452dd97c1defd31ebed Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Jan 2020 22:28:42 +0100 Subject: [PATCH 008/214] doc: document new urxvt plugin system --- doc/builders/packages/index.xml | 1 + doc/builders/packages/urxvt.xml | 101 ++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 doc/builders/packages/urxvt.xml diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index 9f3f58a8d90..4e109bd1c59 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -18,6 +18,7 @@ + diff --git a/doc/builders/packages/urxvt.xml b/doc/builders/packages/urxvt.xml new file mode 100644 index 00000000000..f85680cecc4 --- /dev/null +++ b/doc/builders/packages/urxvt.xml @@ -0,0 +1,101 @@ +
+ Urxvt + + + Urxvt, also known as rxvt-unicode, is a highly customizable terminal emulator. + + +
+ + Configuring urxvt + + + In nixpkgs, urxvt is provided by the package + rxvt-unicode. It can be configured to include your choice + of plugins, reducing its closure size from the default configuration which + includes all available plugins. To make use of this functionality, use an + overlay or directly install an expression that overrides its configuration, + such as + rxvt-unicode.override { configure = { availablePlugins, ... }: { + plugins = with availablePlugins; [ perls resize-font vtwheel ]; + } +} + If the configure function returns an attrset without the + plugins attribute, availablePlugins + will be used automatically. + + + + In order to add plugins but also keep all default plugins installed, it is + possible to use the following method: + rxvt-unicode.override { configure = { availablePlugins, ... }: { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; +} + + + + To get a list of all the plugins available, open the Nix REPL and run + $ nix repl +:l <nixpkgs> +map (p: p.name) pkgs.rxvt-unicode.plugins + + Alternatively, if your shell is bash or zsh and have completion enabled, + simply type nixpkgs.rxvt-unicode.plugins.<tab>. + + + + In addition to plugins the options + extraDeps and perlDeps can be used + to install extra packages. + extraDeps can be used, for example, to provide + xsel (a clipboard manager) to the clipboard plugin, + without installing it globally: + rxvt-unicode.override { configure = { availablePlugins, ... }: { + pluginsDeps = [ xsel ]; + } +} + + perlDeps is a handy way to provide Perl packages to + your custom plugins (in $HOME/.urxvt/ext). For example, + if you need AnyEvent you can do: + rxvt-unicode.override { configure = { availablePlugins, ... }: { + perlDeps = with perlPackages; [ AnyEvent ]; + } +} + + +
+ +
+ + Packaging urxvt plugins + + + Urxvt plugins resides in + pkgs/applications/misc/rxvt-unicode-plugins. + To add a new plugin create an expression in a subdirectory and add the + package to the set in + pkgs/applications/misc/rxvt-unicode-plugins/default.nix. + + + + A plugin can be any kind of derivation, the only requirement is that it + should always install perl scripts in $out/lib/urxvt/perl. + Look for existing plugins for examples. + + + + If the plugin is itself a perl package that needs to be imported from + other plugins or scripts, add the following passthrough: + passthru.perlPackages = [ "self" ]; + + This will make the urxvt wrapper pick up the dependency and set up the perl + path accordingly. + + +
+ +
From 8eaf02b9cd35def36217d39812b7c656de307c58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2019 12:27:17 +0100 Subject: [PATCH 009/214] Add flake.nix --- flake.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000000..9f5434330aa --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + name = "nixpkgs"; + + epoch = 2019; + + description = "A collection of packages for the Nix package manager"; + + provides = flakes: + let pkgs = import ./. {}; in + { + lib = import ./lib; + + builders = { + inherit (pkgs) stdenv fetchurl; + }; + + packages = { + inherit (pkgs) hello nix fuse nlohmann_json boost; + }; + + legacyPkgs = pkgs; + }; +} From 123dea9b0d96544f042428b556a76ce6ed6f18b2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Feb 2019 20:32:26 +0100 Subject: [PATCH 010/214] flake.nix: Set system explicitly for now Flakes now are evaluated in pure mode, so we can't rely on currentSystem anymore. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9f5434330aa..f007a060fd1 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ description = "A collection of packages for the Nix package manager"; provides = flakes: - let pkgs = import ./. {}; in + let pkgs = import ./. { system = "x86_64-linux"; }; in { lib = import ./lib; From 57ccd736bb7afb52f44ea9b6fb8357e4bf591d7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Mar 2019 14:37:43 +0100 Subject: [PATCH 011/214] Export a function for building NixOS system configurations --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index f007a060fd1..316181c2cc3 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,9 @@ provides = flakes: let pkgs = import ./. { system = "x86_64-linux"; }; in { - lib = import ./lib; + lib = (import ./lib) // { + nixosSystem = import ./nixos/lib/eval-config.nix; + }; builders = { inherit (pkgs) stdenv fetchurl; From b7cbbfff519caf46cbed563ef24439fd36c9bf84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Apr 2019 14:48:40 +0200 Subject: [PATCH 012/214] Add flake.lock --- flake.lock | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000000..b0dd7a2b6ba --- /dev/null +++ b/flake.lock @@ -0,0 +1,5 @@ +{ + "nonFlakeRequires": {}, + "requires": {}, + "version": 1 +} \ No newline at end of file From af376fdc2343dfdc748356f491c0b5315defe522 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 May 2019 21:11:22 +0200 Subject: [PATCH 013/214] legacyPkgs -> legacyPackages --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 316181c2cc3..9f4535d4c51 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,9 @@ }; packages = { - inherit (pkgs) hello nix fuse nlohmann_json boost; + inherit (pkgs) hello nix fuse nlohmann_json boost firefox; }; - legacyPkgs = pkgs; + legacyPackages = pkgs; }; } From 0f913dee486286c9846135dd857c83d28cc9c315 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 May 2019 21:21:56 +0200 Subject: [PATCH 014/214] flake.nix: Add check --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 9f4535d4c51..b4b126c9be0 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ nixosSystem = import ./nixos/lib/eval-config.nix; }; + checks.tarball = (import ./pkgs/top-level/release.nix { + nixpkgs = flakes.self; + }).tarball; + builders = { inherit (pkgs) stdenv fetchurl; }; From 55483974885b1e98fc392c73da93bb90e9204c56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 May 2019 21:28:33 +0200 Subject: [PATCH 015/214] make-tarball.nix: Derive version from lastModified instead of revCount GitHub flakes don't provide revCount. --- pkgs/top-level/make-tarball.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 288971403f1..7bb18e765f1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -17,7 +17,10 @@ releaseTools.sourceTarball { inherit officialRelease; version = pkgs.lib.fileContents ../../.version; - versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + versionSuffix = "pre${ + if nixpkgs ? lastModified + then builtins.substring 0 8 nixpkgs.lastModified + else toString nixpkgs.revCount}.${nixpkgs.shortRev}"; buildInputs = [ nix.out jq lib-tests ]; From b70a4436c617de1576c56b85c8338b5b51c18994 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 May 2019 23:03:16 +0200 Subject: [PATCH 016/214] flake.nix: provides -> outputs --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b4b126c9be0..002999fdf4c 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ description = "A collection of packages for the Nix package manager"; - provides = flakes: + outputs = inputs: let pkgs = import ./. { system = "x86_64-linux"; }; in { lib = (import ./lib) // { @@ -13,7 +13,7 @@ }; checks.tarball = (import ./pkgs/top-level/release.nix { - nixpkgs = flakes.self; + nixpkgs = inputs.self; }).tarball; builders = { From 395f044bbe282c2d9a8d5131ef1a409e702f6021 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Jun 2019 21:26:40 +0200 Subject: [PATCH 017/214] flake.nix: Update epoch --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 002999fdf4c..20145e4dadb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { name = "nixpkgs"; - epoch = 2019; + epoch = 201906; description = "A collection of packages for the Nix package manager"; From f16ca590c7dbce162f713a003fdd31bfc49df1b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Jun 2019 10:27:30 +0200 Subject: [PATCH 018/214] Remove flake.lock --- flake.lock | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index b0dd7a2b6ba..00000000000 --- a/flake.lock +++ /dev/null @@ -1,5 +0,0 @@ -{ - "nonFlakeRequires": {}, - "requires": {}, - "version": 1 -} \ No newline at end of file From 2ba1f3c1955d0687ed3ba5608b4af6f6f579f80b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Jun 2019 12:43:26 +0200 Subject: [PATCH 019/214] Add flake outputs for the manuals --- flake.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 20145e4dadb..9209a9f5e71 100644 --- a/flake.nix +++ b/flake.nix @@ -6,20 +6,30 @@ description = "A collection of packages for the Nix package manager"; outputs = inputs: - let pkgs = import ./. { system = "x86_64-linux"; }; in + let + pkgs = import ./. { system = "x86_64-linux"; }; + jobs = import ./pkgs/top-level/release.nix { + nixpkgs = inputs.self; + }; + in { lib = (import ./lib) // { nixosSystem = import ./nixos/lib/eval-config.nix; }; - checks.tarball = (import ./pkgs/top-level/release.nix { - nixpkgs = inputs.self; - }).tarball; + checks.tarball = jobs.tarball; builders = { inherit (pkgs) stdenv fetchurl; }; + htmlDocs = { + nixpkgsManual = jobs.manual; + nixosManual = (import ./nixos/release-small.nix { + nixpkgs = inputs.self; + }).nixos.manual.x86_64-linux; + }; + packages = { inherit (pkgs) hello nix fuse nlohmann_json boost firefox; }; From 63bcbc19cd4a36f439e4b7235bc2a6358cd5d278 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Aug 2019 11:48:43 +0200 Subject: [PATCH 020/214] Update flake interface --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9209a9f5e71..15dd412fdec 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,15 @@ { name = "nixpkgs"; - epoch = 201906; + epoch = 201909; description = "A collection of packages for the Nix package manager"; - outputs = inputs: + outputs = { self }: let pkgs = import ./. { system = "x86_64-linux"; }; jobs = import ./pkgs/top-level/release.nix { - nixpkgs = inputs.self; + nixpkgs = self; }; in { @@ -26,7 +26,7 @@ htmlDocs = { nixpkgsManual = jobs.manual; nixosManual = (import ./nixos/release-small.nix { - nixpkgs = inputs.self; + nixpkgs = self; }).nixos.manual.x86_64-linux; }; From 6a210fa34558f883a8200354ad0eaa9e83b04975 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Aug 2019 16:35:17 +0200 Subject: [PATCH 021/214] flake.nix: Remove obsolete name attribute --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 15dd412fdec..f3bd9c8611b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,4 @@ { - name = "nixpkgs"; - epoch = 201909; description = "A collection of packages for the Nix package manager"; From 22cc7ab78c3e45ebbb1ec66be6c5b9c7f47f780d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 18:02:44 +0200 Subject: [PATCH 022/214] nixos-rebuild: Add --flake option --- nixos/doc/manual/man-nixos-rebuild.xml | 40 +++++++++++ .../modules/installer/tools/nixos-rebuild.sh | 70 ++++++++++++++++--- nixos/modules/installer/tools/tools.nix | 1 + 3 files changed, 103 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 495dbc8859b..81e2f8bb279 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -77,7 +77,18 @@ builder-spec + + + + flake-uri + + + + name + + + @@ -508,6 +519,35 @@ + + + + flake-uri + + + + Build the NixOS system from the specified flake. The flake must + contain an output named + nixosConfigurations.name, + where name denotes the name of the + configuration and can be specified using the + option. + + + + + + + name + + + + Specifies which NixOS configuration to use from the + flake. Defaults to the current hostname. + + + + diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 7db323d38e6..949cd869146 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -3,6 +3,9 @@ if [ -x "@shell@" ]; then export SHELL="@shell@"; fi; set -e +set -o pipefail + +export PATH=@path@:$PATH showSyntax() { exec man nixos-rebuild @@ -93,6 +96,14 @@ while [ "$#" -gt 0 ]; do --use-remote-sudo) maybeSudo=(sudo --) ;; + --flake) + flake="$1" + shift 1 + ;; + --config) + flakeAttr="nixosConfigurations.$1" + shift 1 + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -226,7 +237,8 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then fi # Re-execute nixos-rebuild from the Nixpkgs tree. -if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then +# FIXME: get nixos-rebuild from $flake. +if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then if p=$(nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then export _NIXOS_REBUILD_REEXEC=1 exec $p/bin/nixos-rebuild "${origArgs[@]}" @@ -234,7 +246,23 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then fi fi +# For convenience, use the hostname as the default configuration to +# build from the flake. +if [[ -n $flake && -z $flakeAttr ]]; then + hostname=$(cat /proc/sys/kernel/hostname) + if [[ -z $hostname ]]; then + hostname=default + fi + flakeAttr="nixosConfigurations.\"$hostname\"" +fi + +# Resolve the flake. +if [[ -n $flake ]]; then + flake=$(nix flake info --json -- "$flake" | jq -r .uri) +fi + # Find configuration.nix and open editor instead of building. +# FIXME: handle flakes if [ "$action" = edit ]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} exec "${EDITOR:-nano}" "$NIXOS_CONFIG" @@ -296,7 +324,8 @@ prebuiltNix() { remotePATH= -if [ -n "$buildNix" ]; then +# FIXME: get nix from the flake. +if [[ -n $buildNix && -z $flake ]]; then echo "building Nix..." >&2 nixDrv= if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then @@ -337,7 +366,7 @@ fi # Update the version suffix if we're building from Git (so that # nixos-version shows something useful). -if [ -n "$canRun" ]; then +if [[ -n $canRun && -z $flake ]]; then if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then suffix=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true) if [ -n "$suffix" ]; then @@ -356,17 +385,42 @@ fi # or "boot"), or just build it and create a symlink "result" in the # current directory (for "build" and "test"). if [ -z "$rollback" ]; then - echo "building the system configuration..." >&2 + if [[ -z $flake ]]; then + echo "building the system configuration..." >&2 + else + echo "building the system configuration '$flake:$flakeAttr'..." >&2 + fi if [ "$action" = switch -o "$action" = boot ]; then - pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" + if [[ -z $flake ]]; then + pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" + else + outLink=$tmpDir/result + nix build "$flake:$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" --out-link $outLink + pathToConfig="$(readlink -f $outLink)" + fi copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then - pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" + if [[ -z $flake ]]; then + pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" + else + nix build "$flake:$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" + pathToConfig="$(readlink -f ./result)" + fi elif [ "$action" = build-vm ]; then - pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" + if [[ -z $flake ]]; then + pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" + else + echo "TODO: not implemented" >&2 + exit 1 + fi elif [ "$action" = build-vm-with-bootloader ]; then - pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" + if [[ -z $flake ]]; then + pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" + else + echo "TODO: not implemented" >&2 + exit 1 + fi else showSyntax fi diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 5df9c23e6b6..9c8e26ba242 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -31,6 +31,7 @@ let nix = config.nix.package.out; nix_x86_64_linux = fallback.x86_64-linux; nix_i686_linux = fallback.i686-linux; + path = makeBinPath [ pkgs.jq ]; }; nixos-generate-config = makeProg { From b91803bf135ce583a3115e5b7e4feb0333d96af1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 18:26:38 +0200 Subject: [PATCH 023/214] nixosSystem: Automatically set version suffix from flake E.g. $ nixos-version 19.03.20190913.af5eb77 (Koi) --- flake.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f3bd9c8611b..b3903f3ae3d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,19 @@ jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; + lib = import ./lib; in { - lib = (import ./lib) // { - nixosSystem = import ./nixos/lib/eval-config.nix; + lib = lib // { + nixosSystem = { modules, ... } @ args: + import ./nixos/lib/eval-config.nix (args // { + modules = modules ++ + [ { system.nixos.versionSuffix = + ".${lib.substring 0 8 self.lastModified}.${self.shortRev}"; + system.nixos.revision = self.rev; + } + ]; + }); }; checks.tarball = jobs.tarball; From 855fcc324a5e83d3abced135d4b6ecad02cc022a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 18:58:40 +0200 Subject: [PATCH 024/214] Add option system.configurationRevision to record revision of top-level flake --- nixos/modules/misc/version.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 8a85035ceb7..8dbbbe6761c 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -84,6 +84,12 @@ in description = "Default NixOS channel to which the root user is subscribed."; }; + configurationRevision = mkOption { + type = types.nullOr types.str; + default = null; + description = "The Git revision of the top-level flake from which this configuration was built."; + }; + }; config = { From 7e9b745174092b5eee25890d5d377db58236d3dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Sep 2019 18:58:55 +0200 Subject: [PATCH 025/214] nixos-version: Add --json flag and show system.configurationRevision --- nixos/doc/manual/man-nixos-version.xml | 29 +++++++++++++++++-- .../modules/installer/tools/nixos-version.sh | 5 ++++ nixos/modules/installer/tools/tools.nix | 1 + 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index e9ad8bddcac..aada08c5b4a 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -12,16 +12,22 @@ - nixos-version + nixos-version - + + + + + + + Description @@ -84,12 +90,16 @@ + Options + This command accepts the following options: + + @@ -107,6 +117,21 @@ + + + + + + + + Print a JSON representation of the versions of NixOS and the + top-level configuration flake. + + + + + + diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 190c49a33ec..0117aa1549c 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -8,6 +8,11 @@ case "$1" in --hash|--revision) echo "@revision@" ;; + --json) + cat < Date: Fri, 13 Sep 2019 19:01:23 +0200 Subject: [PATCH 026/214] Export nixosModules.notDetected --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index b3903f3ae3d..3c0f6c31cd5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,5 +42,9 @@ }; legacyPackages = pkgs; + + nixosModules = { + notDetected = ./nixos/modules/installer/scan/not-detected.nix; + }; }; } From cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Sep 2019 14:40:24 +0200 Subject: [PATCH 027/214] nixos-rebuild: Use /etc/nixos/flake.nix if it exists --- nixos/doc/manual/man-nixos-rebuild.xml | 40 ++++++++++++++----- .../modules/installer/tools/nixos-rebuild.sh | 6 +++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 81e2f8bb279..4341b8918df 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -140,14 +140,17 @@ Description - This command updates the system so that it corresponds to the configuration - specified in /etc/nixos/configuration.nix. Thus, every - time you modify /etc/nixos/configuration.nix or any - NixOS module, you must run nixos-rebuild to make the - changes take effect. It builds the new system in - /nix/store, runs its activation script, and stop and - (re)starts any system services if needed. Please note that user services need - to be started manually as they aren't detected by the activation script at the moment. + This command updates the system so that it corresponds to the + configuration specified in + /etc/nixos/configuration.nix or + /etc/nixos/flake.nix. Thus, every time you + modify the configuration or any other NixOS module, you must run + nixos-rebuild to make the changes take + effect. It builds the new system in + /nix/store, runs its activation script, and + stop and (re)starts any system services if needed. Please note that + user services need to be started manually as they aren't detected + by the activation script at the moment. @@ -526,8 +529,10 @@ - Build the NixOS system from the specified flake. The flake must - contain an output named + Build the NixOS system from the specified flake. It defaults to + the directory containing the target of the symlink + /etc/nixos/flake.nix, if it exists. The + flake must contain an output named nixosConfigurations.name, where name denotes the name of the configuration and can be specified using the @@ -594,6 +599,21 @@ + + + /etc/nixos/flake.nix + + + + If this file exists, then nixos-rebuild will + use it as if the option was given. This + file may be a symlink to a flake.nix in an + actual flake; thus /etc/nixos need not be a + flake. + + + + /run/current-system diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 949cd869146..18088e4f9ea 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -236,6 +236,12 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then export PATH=@nix@/bin:$PATH fi +# Use /etc/nixos/flake.nix if it exists. It can be a symlink to the +# actual flake. +if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then + flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")" +fi + # Re-execute nixos-rebuild from the Nixpkgs tree. # FIXME: get nixos-rebuild from $flake. if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then From 20087bd5534e115a1c7ddd5279610bc437c39046 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Sep 2019 18:55:21 +0200 Subject: [PATCH 028/214] nixos-container: Add flake support E.g. to create a container that runs the NixOS homepage: $ nixos-container create homepage --flake nixos-homepage And to upgrade it: $ nixos-container update homepage --- .../nixos-container/nixos-container.pl | 71 +++++++++++++++---- 1 file changed, 57 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 2a9625501b6..392d59486c1 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -22,13 +22,27 @@ $ENV{"NIXOS_CONFIG"} = ""; sub showHelp { print < [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] [--bridge ] [--port ] [--host-address ] [--local-address ] + nixos-container create + [--nixos-path ] + [--system-path ] + [--config ] + [--config-file ] + [--flake ] + [--ensure-unique-name] + [--auto-start] + [--bridge ] + [--port ] + [--host-address ] + [--local-address ] nixos-container destroy nixos-container start nixos-container stop nixos-container terminate nixos-container status - nixos-container update [--config ] [--config-file ] + nixos-container update + [--config ] + [--config-file ] + [--flake ] nixos-container login nixos-container root-login nixos-container run -- args... @@ -49,6 +63,7 @@ my $signal; my $configFile; my $hostAddress; my $localAddress; +my $flake; GetOptions( "help" => sub { showHelp() }, @@ -63,6 +78,7 @@ GetOptions( "config-file=s" => \$configFile, "host-address=s" => \$hostAddress, "local-address=s" => \$localAddress, + "flake=s" => \$flake, ) or exit 1; if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { @@ -97,8 +113,6 @@ sub writeNixOSConfig { my $localExtraConfig = ""; - - if ($extraConfig) { $localExtraConfig = $extraConfig } elsif ($configFile) { @@ -121,6 +135,14 @@ EOF write_file($nixosConfigFile, $nixosConfig); } +sub buildFlake { + system("nix", "build", "-o", "$systemPath.tmp", "--", + "$flake:nixosConfigurations.container.config.system.build.toplevel") == 0 + or die "$0: failed to build container from flake '$flake'\n"; + $systemPath = readlink("$systemPath.tmp") or die; + unlink("$systemPath.tmp"); +} + if ($action eq "create") { # Acquire an exclusive lock to prevent races with other # invocations of ‘nixos-container create’. @@ -176,6 +198,7 @@ if ($action eq "create") { push @conf, "HOST_BRIDGE=$bridge\n"; push @conf, "HOST_PORT=$port\n"; push @conf, "AUTO_START=$autoStart\n"; + push @conf, "FLAKE=$flake\n" if defined $flake; write_file($confFile, \@conf); close($lock); @@ -191,6 +214,10 @@ if ($action eq "create") { mkpath($profileDir, 0, 0755); # Build/set the initial configuration. + if (defined $flake) { + buildFlake(); + } + if (defined $systemPath) { system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0 or die "$0: failed to set initial container configuration\n"; @@ -326,19 +353,35 @@ elsif ($action eq "status") { } elsif ($action eq "update") { - my $nixosConfigFile = "$root/etc/nixos/configuration.nix"; - # FIXME: may want to be more careful about clobbering the existing - # configuration.nix. - if ((defined $extraConfig && $extraConfig ne "") || - (defined $configFile && $configFile ne "")) { - writeNixOSConfig $nixosConfigFile; + # Unless overriden on the command line, rebuild the flake recorded + # in the container config file. FIXME: read the container config + # in a more sensible way. + if (!defined $flake && !defined $configFile && !defined $extraConfig) { + my $s = read_file($confFile); + $s =~ /^FLAKE=(.*)$/m; + $flake = $1; } - system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "", - "--set", "-A", "system") == 0 - or die "$0: failed to build container configuration\n"; + if (defined $flake) { + buildFlake(); + system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0 + or die "$0: failed to set container configuration\n"; + } else { + my $nixosConfigFile = "$root/etc/nixos/configuration.nix"; + + # FIXME: may want to be more careful about clobbering the existing + # configuration.nix. + if ((defined $extraConfig && $extraConfig ne "") || + (defined $configFile && $configFile ne "")) { + writeNixOSConfig $nixosConfigFile; + } + + system("nix-env", "-p", "$profileDir/system", + "-I", "nixos-config=$nixosConfigFile", "-f", "", + "--set", "-A", "system") == 0 + or die "$0: failed to build container configuration\n"; + } if (isContainerRunning) { print STDERR "reloading container...\n"; From fb051f0dece79d2ac28ad368d6e26289d780bc0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Sep 2019 18:37:17 +0200 Subject: [PATCH 029/214] nixos-{rebuild,container}: Use flakeref#attrpath syntax This makes them consistent with the 'nix' command line. --- nixos/doc/manual/man-nixos-rebuild.xml | 25 +++------------ .../modules/installer/tools/nixos-rebuild.sh | 32 +++++++++---------- .../nixos-container/nixos-container.pl | 8 ++++- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 4341b8918df..f4f663b84f0 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -83,10 +83,6 @@ flake-uri - - name - - @@ -525,7 +521,7 @@ - flake-uri + flake-uri[name] @@ -533,22 +529,9 @@ the directory containing the target of the symlink /etc/nixos/flake.nix, if it exists. The flake must contain an output named - nixosConfigurations.name, - where name denotes the name of the - configuration and can be specified using the - option. - - - - - - - name - - - - Specifies which NixOS configuration to use from the - flake. Defaults to the current hostname. + nixosConfigurations.name. If + name is omitted, it default to the + current host name. diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 18088e4f9ea..b681a170b6b 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -100,10 +100,6 @@ while [ "$#" -gt 0 ]; do flake="$1" shift 1 ;; - --config) - flakeAttr="nixosConfigurations.$1" - shift 1 - ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -254,12 +250,20 @@ fi # For convenience, use the hostname as the default configuration to # build from the flake. -if [[ -n $flake && -z $flakeAttr ]]; then - hostname=$(cat /proc/sys/kernel/hostname) - if [[ -z $hostname ]]; then - hostname=default +if [[ -n $flake ]]; then + if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then + flake="${BASH_REMATCH[1]}" + flakeAttr="${BASH_REMATCH[2]}" + fi + if [[ -z $flakeAttr ]]; then + hostname=$(cat /proc/sys/kernel/hostname) + if [[ -z $hostname ]]; then + hostname=default + fi + flakeAttr="nixosConfigurations.\"$hostname\"" + else + flakeAttr="nixosConfigurations.\"$flakeAttr\"" fi - flakeAttr="nixosConfigurations.\"$hostname\"" fi # Resolve the flake. @@ -391,17 +395,13 @@ fi # or "boot"), or just build it and create a symlink "result" in the # current directory (for "build" and "test"). if [ -z "$rollback" ]; then - if [[ -z $flake ]]; then - echo "building the system configuration..." >&2 - else - echo "building the system configuration '$flake:$flakeAttr'..." >&2 - fi + echo "building the system configuration..." >&2 if [ "$action" = switch -o "$action" = boot ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else outLink=$tmpDir/result - nix build "$flake:$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" --out-link $outLink + nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi copyToTarget "$pathToConfig" @@ -410,7 +410,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix build "$flake:$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" + nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm ]; then diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 392d59486c1..727c0333b27 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -64,6 +64,7 @@ my $configFile; my $hostAddress; my $localAddress; my $flake; +my $flakeAttr = "container"; GetOptions( "help" => sub { showHelp() }, @@ -92,6 +93,11 @@ if (defined $configFile and defined $extraConfig) { "Please define on or the other, but not both"; } +if (defined $flake && $flake =~ /^(.*)#([^#"]+)$/) { + $flake = $1; + $flakeAttr = $2; +} + # Execute the selected action. mkpath("/etc/containers", 0, 0755); @@ -137,7 +143,7 @@ EOF sub buildFlake { system("nix", "build", "-o", "$systemPath.tmp", "--", - "$flake:nixosConfigurations.container.config.system.build.toplevel") == 0 + "$flake#nixosConfigurations.\"$flakeAttr\".config.system.build.toplevel") == 0 or die "$0: failed to build container from flake '$flake'\n"; $systemPath = readlink("$systemPath.tmp") or die; unlink("$systemPath.tmp"); From bda94ae808b8864a0e58b60830c505084c752462 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Oct 2019 14:56:51 +0200 Subject: [PATCH 030/214] epoch -> edition --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3c0f6c31cd5..c3defdeceab 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - epoch = 201909; + edition = 201909; description = "A collection of packages for the Nix package manager"; From 98e322b929bdc141c630d5c615d18ed487d4abd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Oct 2019 20:46:10 +0200 Subject: [PATCH 031/214] nixos-rebuild: uri -> url --- nixos/modules/installer/tools/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index b681a170b6b..ec9dd9b71d4 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -268,7 +268,7 @@ fi # Resolve the flake. if [[ -n $flake ]]; then - flake=$(nix flake info --json -- "$flake" | jq -r .uri) + flake=$(nix flake info --json -- "$flake" | jq -r .url) fi # Find configuration.nix and open editor instead of building. From 2452042c47859666c2ad89fdfd47e5c0a55c0af2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Oct 2019 20:48:43 +0200 Subject: [PATCH 032/214] nixos-rebuild: Support -L flag --- nixos/modules/installer/tools/nixos-rebuild.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index ec9dd9b71d4..8d69bbfd14c 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -61,7 +61,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L) extraBuildFlags+=("$i") ;; --option) @@ -268,7 +268,7 @@ fi # Resolve the flake. if [[ -n $flake ]]; then - flake=$(nix flake info --json -- "$flake" | jq -r .url) + flake=$(nix flake info --json "${extraBuildFlags[@]}" -- "$flake" | jq -r .url) fi # Find configuration.nix and open editor instead of building. @@ -401,7 +401,8 @@ if [ -z "$rollback" ]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else outLink=$tmpDir/result - nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" --out-link $outLink + nix build "$flake#$flakeAttr.config.system.build.toplevel" \ + --keep-going "${extraBuildFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi copyToTarget "$pathToConfig" From 0bf1ab421bb166cba1e4aa4f28ea17f2184f9215 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Oct 2019 13:50:44 +0200 Subject: [PATCH 033/214] flake.nix: Remove packages, builders outputs --- flake.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index c3defdeceab..599aa0352b7 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ outputs = { self }: let - pkgs = import ./. { system = "x86_64-linux"; }; jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; @@ -26,10 +25,6 @@ checks.tarball = jobs.tarball; - builders = { - inherit (pkgs) stdenv fetchurl; - }; - htmlDocs = { nixpkgsManual = jobs.manual; nixosManual = (import ./nixos/release-small.nix { @@ -37,11 +32,7 @@ }).nixos.manual.x86_64-linux; }; - packages = { - inherit (pkgs) hello nix fuse nlohmann_json boost firefox; - }; - - legacyPackages = pkgs; + legacyPackages = import ./. { system = "x86_64-linux"; }; nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; From 7ff2e743e81214665e80dba3462292019999a45a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Oct 2019 18:17:21 +0200 Subject: [PATCH 034/214] flake.nix: Support more systems --- flake.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 599aa0352b7..3f9e22bdae0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,17 @@ outputs = { self }: let + jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; + lib = import ./lib; + + systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + + forAllSystems = f: lib.genAttrs systems (system: f system); + in { lib = lib // { @@ -32,7 +39,7 @@ }).nixos.manual.x86_64-linux; }; - legacyPackages = import ./. { system = "x86_64-linux"; }; + legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; From 2a0cf385d26544d80a29ebf7e34f63e86f397283 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2020 12:11:22 +0100 Subject: [PATCH 035/214] nixos-rebuild: Avoid subshell reading hostname MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jörg Thalheim --- nixos/modules/installer/tools/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8d69bbfd14c..4bbed9e6971 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -256,7 +256,7 @@ if [[ -n $flake ]]; then flakeAttr="${BASH_REMATCH[2]}" fi if [[ -z $flakeAttr ]]; then - hostname=$(cat /proc/sys/kernel/hostname) + read -r hostname < /proc/sys/kernel/hostname if [[ -z $hostname ]]; then hostname=default fi From 60330b60655b3fa3a18624bdd7069855bb37af99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Feb 2020 16:00:27 +0100 Subject: [PATCH 036/214] flake.nix: Handle missing rev attribute Dirty trees no longer set 'rev', so we need to handle this. --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 3f9e22bdae0..e2346f99c7a 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ import ./nixos/lib/eval-config.nix (args // { modules = modules ++ [ { system.nixos.versionSuffix = - ".${lib.substring 0 8 self.lastModified}.${self.shortRev}"; - system.nixos.revision = self.rev; + ".${lib.substring 0 8 self.lastModified}.${self.shortRev or "dirty"}"; + system.nixos.revision = lib.mkIf (self ? rev) self.rev; } ]; }); From c08930874a37d5dea5985498d4ff6dec7e9069cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Feb 2020 16:00:58 +0100 Subject: [PATCH 037/214] nixos-rebuild: Propagate various flake lock file flags And also --refresh and --no-net. --- .../modules/installer/tools/nixos-rebuild.sh | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4bbed9e6971..88c5cb4a443 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -16,6 +16,7 @@ showSyntax() { # Parse the command line. origArgs=("$@") extraBuildFlags=() +lockFlags=() action= buildNix=1 fast= @@ -61,7 +62,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net) extraBuildFlags+=("$i") ;; --option) @@ -100,6 +101,18 @@ while [ "$#" -gt 0 ]; do flake="$1" shift 1 ;; + --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) + lockFlags+=("$i") + ;; + --update-input) + j="$1"; shift 1 + lockFlags+=("$i" "$j") + ;; + --override-input) + j="$1"; shift 1 + k="$1"; shift 1 + lockFlags+=("$i" "$j" "$k") + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -268,7 +281,7 @@ fi # Resolve the flake. if [[ -n $flake ]]; then - flake=$(nix flake info --json "${extraBuildFlags[@]}" -- "$flake" | jq -r .url) + flake=$(nix flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) fi # Find configuration.nix and open editor instead of building. @@ -402,7 +415,7 @@ if [ -z "$rollback" ]; then else outLink=$tmpDir/result nix build "$flake#$flakeAttr.config.system.build.toplevel" \ - --keep-going "${extraBuildFlags[@]}" --out-link $outLink + --keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi copyToTarget "$pathToConfig" @@ -411,7 +424,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" + nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm ]; then From 5f1f7e2a75f0fe81874246d76feb9a86feb3e522 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 07:41:17 +0000 Subject: [PATCH 038/214] cpp-utilities: 5.1.0 -> 5.2.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index e4335061294..c3cc9d84aa4 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0g7mn84xx7yfbvpj9wm5sn08w8bzlfizh4yd1m75fnh8hg829jnl"; + sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb"; }; nativeBuildInputs = [ cmake ]; From 56dcbc391accfcc5375304df08b745cd2764001d Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 2 Feb 2020 10:51:21 -0800 Subject: [PATCH 039/214] bs-platform: fix build on aarch64 Co-Authored-By: Jon --- pkgs/development/compilers/bs-platform/build-bs-platform.nix | 5 ++--- pkgs/development/compilers/bs-platform/default.nix | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index 830a0b647c4..528fa5e4f42 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -30,9 +30,8 @@ stdenv.mkDerivation { cp ${custom-ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux ''; - configurePhase = '' - node scripts/ninja.js config - ''; + # avoid building the development version, will break aarch64 build + dontConfigure = true; buildPhase = '' # This is an unfortunate name, but it's actually how to build a release diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 7abf7b306a5..763a4e3ba67 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -21,8 +21,5 @@ in license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; platforms = platforms.all; - # Currently there is an issue with aarch build in hydra - # https://github.com/BuckleScript/bucklescript/issues/4091 - badPlatforms = platforms.aarch64; }; }) From e978d20fd2ccbc98d1df46016eac1b2803ae21a6 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 8 Feb 2020 11:57:19 +0800 Subject: [PATCH 040/214] opencorsairlink: init at 2019-12-23 --- pkgs/tools/misc/opencorsairlink/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/opencorsairlink/default.nix diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix new file mode 100644 index 00000000000..11df20b3b82 --- /dev/null +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libusb1, pkgconfig }: + +stdenv.mkDerivation rec { + name = "OpenCorsairLink-${version}"; + version = "2019-12-23"; + + buildInputs = [ libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + src = fetchFromGitHub { + owner = "audiohacked"; + repo = "OpenCorsairLink"; + rev = "46dbf206e19a40d6de6bd73142ed93bdb26c5c1a"; + sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld"; + }; + + meta = with stdenv.lib; { + description = "Linux and Mac OS support for the CorsairLink Devices "; + homepage = "https://github.com/audiohacked/OpenCorsairLink"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c9b909a9d0..9e5a10d7e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5418,6 +5418,8 @@ in ocserv = callPackage ../tools/networking/ocserv { }; + opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; From 4e6bc8972a9f383a3670b68ef215c41ff7d68c80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 05:22:08 +0000 Subject: [PATCH 041/214] flat-remix-icon-theme: 20191018 -> 20191122 --- pkgs/data/icons/flat-remix-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index f0e13b21dfd..53732c61106 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20191018"; + version = "20191122"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "13ibxvrvri04lb5phm49b6d553jh0aigm57z5i0nsins405gixn9"; + sha256 = "1rv35r52l7xxjpajwli0md07k3xl7xplbw919vjmsb1hhrzavzzg"; }; nativeBuildInputs = [ gtk3 ]; From 658224c2c09cea8bd0c661666e1648e44ff676ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 07:38:27 +0000 Subject: [PATCH 042/214] gede: 2.15.1 -> 2.15.4 --- pkgs/development/tools/misc/gede/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 40e64ced4dc..00cc411dc40 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.15.1"; + version = "2.15.4"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "0n67fiks7lbylgda8n06wfwcvl5qnb70rabk2b39g05byz7jcdcn"; + sha256 = "0bg7vyvznn1gn6w5yn14j59xph9psf2fyxr434pk62wmbzdpmkfg"; }; nativeBuildInputs = [ qmake makeWrapper python ]; From dae266aa6627151e51a4f7e2cfca4d6ace7a3030 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 13:04:53 +0000 Subject: [PATCH 043/214] last: 1045 -> 1047 --- pkgs/applications/science/biology/last/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index c9e546dc2ce..b47ce6ac3a9 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1045"; + version = "1047"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0x2wrm52ca935n3yc486m8yy59ap34w1x9h3csjca3jab5agnjkc"; + sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8"; }; nativeBuildInputs = [ unzip ]; From d5757a8880108ca267bdfe32e42a069fe0a8cf15 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 8 Feb 2020 09:25:14 -0600 Subject: [PATCH 044/214] nixos/plasma5: Port initial configurations from Plasma 5.16 --- .../services/x11/desktop-managers/plasma5.nix | 165 +++++++++++++----- 1 file changed, 121 insertions(+), 44 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bd0a2f3481f..f3bf9268b29 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -8,6 +8,125 @@ let cfg = xcfg.desktopManager.plasma5; inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; + inherit (pkgs) writeText; + + pulseaudio = config.hardware.pulseaudio; + pactl = "${getBin pulseaudio.package}/bin/pactl"; + startplasma-x11 = "${getBin plasma5.plasma-workspace}/bin/startplasma-x11"; + sed = "${getBin pkgs.gnused}/bin/sed"; + + gtkrc2 = writeText "gtkrc-2.0" '' + # Default GTK+ 2 config for NixOS Plasma 5 + include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" + style "user-font" + { + font_name="Sans Serif Regular" + } + widget_class "*" style "user-font" + gtk-font-name="Sans Serif Regular 10" + gtk-theme-name="Breeze" + gtk-icon-theme-name="breeze" + gtk-fallback-icon-theme="hicolor" + gtk-cursor-theme-name="breeze_cursors" + gtk-toolbar-style=GTK_TOOLBAR_ICONS + gtk-menu-images=1 + gtk-button-images=1 + ''; + + gtk3_settings = writeText "settings.ini" '' + [Settings] + gtk-font-name=Sans Serif Regular 10 + gtk-theme-name=Breeze + gtk-icon-theme-name=breeze + gtk-fallback-icon-theme=hicolor + gtk-cursor-theme-name=breeze_cursors + gtk-toolbar-style=GTK_TOOLBAR_ICONS + gtk-menu-images=1 + gtk-button-images=1 + ''; + + kcminputrc = writeText "kcminputrc" '' + [Mouse] + cursorTheme=breeze_cursors + cursorSize=0 + ''; + + activationScript = '' + # The KDE icon cache is supposed to update itself automatically, but it uses + # the timestamp on the icon theme directory as a trigger. This doesn't work + # on NixOS because the timestamp never changes. As a workaround, delete the + # icon cache at login and session activation. + # See also: http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html + rm -fv $HOME/.cache/icon-cache.kcache + + # xdg-desktop-settings generates this empty file but + # it makes kbuildsyscoca5 fail silently. To fix this + # remove that menu if it exists. + rm -fv ''${XDG_CONFIG_HOME:?}/menus/applications-merged/xdg-desktop-menu-dummy.menu + + # Qt writes a weird ‘libraryPath’ line to + # ~/.config/Trolltech.conf that causes the KDE plugin + # paths of previous KDE invocations to be searched. + # Obviously using mismatching KDE libraries is potentially + # disastrous, so here we nuke references to the Nix store + # in Trolltech.conf. A better solution would be to stop + # Qt from doing this wackiness in the first place. + trolltech_conf="''${XDG_CONFIG_HOME:?}/Trolltech.conf" + if [ -e "$trolltech_conf" ]; then + ${sed} -i "$trolltech_conf" -e '/nix\\store\|nix\/store/ d' + fi + + # Remove the kbuildsyscoca5 cache. It will be regenerated + # immediately after. This is necessary for kbuildsyscoca5 to + # recognize that software that has been removed. + rm -fv $HOME/.cache/ksycoca* + + ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 + ''; + + startplasma = + '' + export XDG_CONFIG_HOME="''${XDG_CONFIG_HOME:-$HOME/.config}" + mkdir -p "''${XDG_CONFIG_HOME:?}" + + '' + + optionalString pulseaudio.enable '' + # Load PulseAudio module for routing support. + # See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ + ${pactl} load-module module-device-manager "do_routing=1" + + '' + + '' + ${activationScript} + + # Create default configurations if Plasma has never been started. + kdeglobals="''${XDG_CONFIG_HOME:?}/kdeglobals" + if ! [ -f "$kdeglobals" ] + then + kcminputrc="''${XDG_CONFIG_HOME:?}/kcminputrc" + if ! [ -f "$kcminputrc" ] + then + cat ${kcminputrc} >"$kcminputrc" + fi + + gtkrc2="$HOME/.gtkrc-2.0" + if ! [ -f "$gtkrc2" ] + then + cat ${gtkrc2} >"$gtkrc2" + fi + + gtk3_settings="''${XDG_CONFIG_HOME:?}/gtk-3.0/settings.ini" + if ! [ -f "$gtk3_settings" ] + then + mkdir -p "$(dirname "$gtk3_settings")" + cat ${gtk3_settings} >"$gtk3_settings" + fi + fi + + '' + + '' + exec "${startplasma-x11}" + ''; in @@ -41,27 +160,7 @@ in services.xserver.desktopManager.session = singleton { name = "plasma5"; bgSupport = true; - start = '' - # Load PulseAudio module for routing support. - # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${optionalString config.hardware.pulseaudio.enable '' - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - ''} - - if [ -f "$HOME/.config/kdeglobals" ] - then - # Remove extraneous font style names. - # See also: https://phabricator.kde.org/D9070 - ${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \ - -e '/^fixed=/ s/,Regular$//' \ - -e '/^font=/ s/,Regular$//' \ - -e '/^menuFont=/ s/,Regular$//' \ - -e '/^smallestReadableFont=/ s/,Regular$//' \ - -e '/^toolBarFont=/ s/,Regular$//' - fi - - exec "${getBin plasma5.plasma-workspace}/bin/startplasma-x11" - ''; + start = startplasma; }; security.wrappers = { @@ -227,29 +326,7 @@ in xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; # Update the start menu for each user that is currently logged in - system.userActivationScripts.plasmaSetup = '' - # The KDE icon cache is supposed to update itself - # automatically, but it uses the timestamp on the icon - # theme directory as a trigger. Since in Nix the - # timestamp is always the same, this doesn't work. So as - # a workaround, nuke the icon cache on login. This isn't - # perfect, since it may require logging out after - # installing new applications to update the cache. - # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html - rm -fv $HOME/.cache/icon-cache.kcache - - # xdg-desktop-settings generates this empty file but - # it makes kbuildsyscoca5 fail silently. To fix this - # remove that menu if it exists. - rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu - - # Remove the kbuildsyscoca5 cache. It will be regenerated - # immediately after. This is necessary for kbuildsyscoca5 to - # recognize that software that has been removed. - rm -fv $HOME/.cache/ksycoca* - - ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 - ''; + system.userActivationScripts.plasmaSetup = activationScript; }) ]; From 0b9f20d6bea9d34e926193e3a22ffd79b31d2e47 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 20:44:59 +0000 Subject: [PATCH 045/214] libsForQt5.qtutilities: 6.0.3 -> 6.0.4 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 94e83c883c4..3f0dc18f157 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "184lcw56r0hq3d6msy5ccscs01zhvml7m4w56wbvy9lzcc4sk200"; + sha256 = "0cp7sbj20z0vl99qhs3hi5bd6akjd9l7lqdky0p6la4c9y9w5n1w"; }; buildInputs = [ qtbase cpp-utilities ]; From b153b7152398d737b1b5e5c2fab896faf7e1cd29 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 16:20:00 -0500 Subject: [PATCH 046/214] rage: 0.2.0 -> 0.3.0 Changelog: https://github.com/str4d/rage/releases/tag/v0.3.0 --- pkgs/tools/security/rage/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 63cc2972a58..f9d648f04b1 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -2,22 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "0ri4rfhy1wl0cppi2cp97kkiz08x2f072yfahn2kv9r4v1i9f4a7"; + sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb"; }; - cargoSha256 = "02adwvcvha83zcvc5n7p88l7wmkg52j2xhznmhabc0zn328as2yd"; + cargoSha256 = "09dg43vba8hwivng2h70qmpxnijad171mf02vwjw0gqxk83ql28v"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; + changelog = "https://github.com/str4d/rage/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; From a1857a0dabf59e02071d04140c6c176d4810f6d6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 16:20:00 -0500 Subject: [PATCH 047/214] dive: 0.9.1 -> 0.9.2 Changelog: https://github.com/wagoodman/dive/releases/tag/v0.9.2 --- pkgs/development/tools/dive/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 6c4d91bac78..5d4de99ffdb 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dive"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wagoodman"; repo = pname; rev = "v${version}"; - sha256 = "1dqaqzmb74kf6q70wxfbsrbbfmxl82rj7r5kpsg5znm99filk3ny"; + sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22"; }; modSha256 = "1y8mqxlzbizra2m9aayp6w07s39gddvm5igdaw9kwxwjwvd1dbfc"; @@ -17,6 +17,8 @@ buildGoModule rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with stdenv.lib; { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; From f298263d78aeff63c6b16d35602ebebcb1395667 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 9 Feb 2020 22:54:12 -0500 Subject: [PATCH 048/214] nodePackages: update set --- .../node-packages/node-packages-v10.nix | 476 +++++++++--------- 1 file changed, 230 insertions(+), 246 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index e17bf7f009b..c97f9d7ab49 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1345,13 +1345,13 @@ let sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/hoek-8.5.0" = { + "@hapi/hoek-8.5.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz"; - sha512 = "7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw=="; + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; }; }; "@hapi/joi-15.1.1" = { @@ -2830,13 +2830,13 @@ let sha512 = "i+UrSKZXs561g8LXsCBkgpNYkgBS3T3Pif2/+DraZmSKpQ2r2D1yCOdH82IGPWWpQ/GMSg6Z0qpLJpjnYz+bpg=="; }; }; - "@textlint/ast-traverse-2.1.6" = { + "@textlint/ast-traverse-2.1.7" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.6.tgz"; - sha512 = "qSPTUptR/C4YwoeVXRLUij6TpxbXT7U0P9S0No+p9Q+EYJeNvl1NUTrcpQmzrRydo6vCR0RzVkHmj+gEckH2Ug=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.7.tgz"; + sha512 = "73Nw0R4TaskPmF36Hop1DZ8AbH339WrGiLQjzbOLaXHaBHQ4hdNw28UMlw4glfPZb7/zvxPcJRtg9AB8F3ZW0g=="; }; }; "@textlint/feature-flag-3.1.6" = { @@ -2848,40 +2848,40 @@ let sha512 = "R2s027/WG3zhCMHZG79OhRFmkSL2ghwvFYg/W+2VUva5aYC8i9yeuwRyWt7m83tP1qlI+bq7j3S04fyn6yNheg=="; }; }; - "@textlint/fixer-formatter-3.1.12" = { + "@textlint/fixer-formatter-3.1.13" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.12.tgz"; - sha512 = "MQcVkr6WT4m31gG32IYoOJ+vMw+YI/hpO1S2gwfuQo7z+qBWoqByydbEn4H6dtJzWCX9RBgi8D1lAL2HPvASYw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.13.tgz"; + sha512 = "FXqAJZ+5fLsOZjvFmn1JhCer8gQI4ZQk3R45bXizRJm6DASByPAGGh/MAQxxHSGeR5wR8miO/koxA2BrS8OhAw=="; }; }; - "@textlint/kernel-3.2.0" = { + "@textlint/kernel-3.2.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.2.0.tgz"; - sha512 = "1uir4V/fFSLl7vkbQUt4BYkXmwAwrT8En7RAv3o6t7EugCwyLlzCluFwCHrTLgVMTTZuS5NIqUQZREUMP7U/vg=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.2.1.tgz"; + sha512 = "gMCgP/tAjCX8dGqgu7nhUwaDC/TzDKeRZb9qa50nqbnILRasKplj3lOWn2osZdkScVZPLQp+al1pDh9pU4D+Dw=="; }; }; - "@textlint/linter-formatter-3.1.11" = { + "@textlint/linter-formatter-3.1.12" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.11.tgz"; - sha512 = "tPFz8sGXWuDrhDRiHrLceasAN8AGM2ctt5uLvCxGVJ4Lmx6O7o+kDnHNGfIuF8rTRRQKWJ9jR/SCCH1SZulXmw=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.12.tgz"; + sha512 = "OEP4pklu01MEgBJrftD9vwe3HFx+jhiEe1JFIgf7GZ4a0fSer5vQWXBo5wHW6WtZtSa+iLBsLC3mI5VMeshzdA=="; }; }; - "@textlint/markdown-to-ast-6.1.6" = { + "@textlint/markdown-to-ast-6.1.7" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.6.tgz"; - sha512 = "xIaMn6gW1Ig+M+2Xcdbxt4cgOqWJSuB0pIO98KppQyqPzQ5k5deea7SBABqLZiKeNIxLl+2C1vfIfnBFFjxlmg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz"; + sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; "@textlint/module-interop-1.0.2" = { @@ -2902,31 +2902,31 @@ let sha512 = "CBAEQmiEa2G/wonlLr1HgUtXfTSas6OGGvYGRIRMJweNh5Ilhbz2nM2/9XQMfLQbdn5pGYrAAAQRB2+/9fZ31A=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.11" = { + "@textlint/textlint-plugin-markdown-5.1.12" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.11"; + version = "5.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.11.tgz"; - sha512 = "DnCtNI10kejLPdEFu5pBHCDoBLJQTLnxwu76Mr/5iSEcYcytK2X72qiuvtg3c3s/8+at53TPQ6+5/AmpQKdvfg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.12.tgz"; + sha512 = "CJWWTaomR22hQD3ogrZujMH1pNN7DqZadmx9CJXxgKwpI/cuD5d2kClwXO3MeLFckJr5HRso7SFN5ebqKu1ycw=="; }; }; - "@textlint/textlint-plugin-text-4.1.12" = { + "@textlint/textlint-plugin-text-4.1.13" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.12"; + version = "4.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.12.tgz"; - sha512 = "WhCzAURZBokAzZ+ismEiS857F4YCRXROtwSiqk3gbgiZWVq47xX6g5xhVDPet3RvCMFzCUkrHVRJ+udORE6sFw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.13.tgz"; + sha512 = "KQfSYNDt8HSX8ZL/r86N8OrAuQ9LEuevAtGomtfkw0h7Ed/pUfmuYXjht8wYRdysYBa4JyjrXcmqzRAUdkWrag=="; }; }; - "@textlint/types-1.3.0" = { + "@textlint/types-1.3.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.3.0.tgz"; - sha512 = "PJM3u0dnKyFCQJfhS+ft4OPse10P2PXz7bM2YJMyEs6kKOc2hDvZE7CH8F85GuSL9H5gToTqJ9/c3Yy4I3S+iA=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.3.1.tgz"; + sha512 = "9MJ6PRPYWiFs2lfvp/Qhq72WrkZLL5ncBUXAVoj1Ug17ug8d7psmr/KJstMMocW3EWHSOuIDj7unh413c3jPqQ=="; }; }; "@textlint/utils-1.0.3" = { @@ -2974,15 +2974,6 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/bluebird-3.5.29" = { - name = "_at_types_slash_bluebird"; - packageName = "@types/bluebird"; - version = "3.5.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.29.tgz"; - sha512 = "kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw=="; - }; - }; "@types/body-parser-1.17.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -3397,40 +3388,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-4.1.2" = { + "@vue/cli-shared-utils-4.2.2" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.1.2.tgz"; - sha512 = "uQAVqxCWdL5ipZ0TPu6SVsdokQp4yHt8SzzpUGhq8TkW4vwalGddJAAJrqZHMl91ZTIJ4p4ixofmCaaJo5rSRA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz"; + sha512 = "EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ=="; }; }; - "@vue/cli-ui-4.1.2" = { + "@vue/cli-ui-4.2.2" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.1.2.tgz"; - sha512 = "fA9z8yDQqhD8QcHlWt6wX0t+7EVKFVRRzxPnZ8dEoYaoo+Y5wLAE0fJyyxjpzlwEStqBSDs6A7X+1wQq/FBICQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.2.2.tgz"; + sha512 = "JWbAWIxjMIL8Svgveqd7cxIpLGxX2vXizVtjoWNsxcnEGrWFOzbb2uKQwlf/3v4m4ERNP+eKGFagqWEn7SUFiw=="; }; }; - "@vue/cli-ui-addon-webpack-4.1.2" = { + "@vue/cli-ui-addon-webpack-4.2.2" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.1.2.tgz"; - sha512 = "zmb8cYHCxqEzrpQvlV5R8zMcDWJMo6KRTIn13i5FxBdezZkkni1tJunaoiDRjEFyuu01Lg8jcb8TNxuIaH5TKg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.2.2.tgz"; + sha512 = "d5LpntzWGJGLD9EXEZPosCrgMosds9Mik/tSbs0tOrCkiBRgC2feUOeL87JnPWS2wEQA34Vujz7+2WeTM40GUw=="; }; }; - "@vue/cli-ui-addon-widgets-4.1.2" = { + "@vue/cli-ui-addon-widgets-4.2.2" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.1.2.tgz"; - sha512 = "Y6/MLtfaiEfoEToSoSSbFi/EshpLmsBMfK7m98NbCTZgpnhJ7iSaHYkYsF4gg0D52C6Oa2cy0iLoJtaFA8zQbQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.2.2.tgz"; + sha512 = "c3NNO3eXU2H1ISk12UVXbRg0cKes2IxPiaT4URDTxUVTXzQJpCg2bQ3V8w11IcvC6rykonzrFsXRrhUPD+tD8A=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -6142,15 +6133,6 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.11.7" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz"; - sha512 = "2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw=="; - }; - }; "ast-types-0.13.2" = { name = "ast-types"; packageName = "ast-types"; @@ -6484,13 +6466,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.613.0" = { + "aws-sdk-2.614.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.613.0"; + version = "2.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.613.0.tgz"; - sha512 = "FYLaVtC/AlrcnjsPw1JhAsKd6yapr918Mk0jAcw3yFZp1sI2V0Um+2pmijLFsV+nNRxFlCVJRhhFWB5GK6yALA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.614.0.tgz"; + sha512 = "o7utaxDMo9ri1VyPKw8Kcmpy5uZOqMeok2cgur70iZ94zsLIRnHKrBv1wMBbyRGuUbfJRq76HGAS9QxdiSqQHw=="; }; }; "aws-sign2-0.6.0" = { @@ -14206,13 +14188,13 @@ let sha512 = "1N+eCCrepIeK1+qtWrMEO1CV68Hn+TLbiR9c70VB3xnut3DmUxT+3T7sRHhb0mpK2F/74IfP+loQDriU2W9lkA=="; }; }; - "e-prime-0.10.2" = { + "e-prime-0.10.3" = { name = "e-prime"; packageName = "e-prime"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/e-prime/-/e-prime-0.10.2.tgz"; - sha1 = "ea9375eb985636de88013c7a9fb129ad9e15eff8"; + url = "https://registry.npmjs.org/e-prime/-/e-prime-0.10.3.tgz"; + sha512 = "QGKWEWRVUfjUXSoio9AW43RzzMQzI23No8uyKQD9yZJm4Hbc+8ZRZhyEtWdnpAkY7dXFmTxtcFR4cM0T0U1jGw=="; }; }; "each-props-1.3.2" = { @@ -14359,13 +14341,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.345" = { + "electron-to-chromium-1.3.346" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.345"; + version = "1.3.346"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.345.tgz"; - sha512 = "f8nx53+Z9Y+SPWGg3YdHrbYYfIJAtbUjpFfW4X1RwTZ94iUG7geg9tV8HqzAXX7XTNgyWgAFvce4yce8ZKxKmg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.346.tgz"; + sha512 = "Yy4jF5hJd57BWmGPt0KjaXc25AmWZeQK75kdr4zIzksWVtiT6DwaNtvTb9dt+LkQKwUpvBfCyyPsXXtbY/5GYw=="; }; }; "elegant-spinner-1.0.1" = { @@ -21643,13 +21625,13 @@ let sha1 = "28a44cfbd9d3db193045f22b65fce8edf9620596"; }; }; - "is-finite-1.0.2" = { + "is-finite-1.1.0" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; + sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -22642,13 +22624,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.17.1" = { + "jaeger-client-3.17.2" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.1.tgz"; - sha512 = "S3fS3vk7dcWTWUWGqMWD9fGa/diLhPIP9h0S8L+OQdz24+7hR7cdALk+AOZD1VzbvqUIQbj6uUELp31J4Frgcw=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.2.tgz"; + sha512 = "19YloSidmKbrXHgecLWod8eXo7rm2ieUnsfg0ripTFGRCW5v2OWE96Gte4/tOQG/8N+T39VoLU2nMBdjbdMUJg=="; }; }; "java-properties-1.0.2" = { @@ -22723,15 +22705,6 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-renderer-1.0.8" = { - name = "joplin-renderer"; - packageName = "joplin-renderer"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/joplin-renderer/-/joplin-renderer-1.0.8.tgz"; - sha512 = "Q4SSYXl9ErcnUDTz7N4FjWcOOgfPEf5yyNRjU2J1fuxZ/1VbYt6MnfBB7OeiRW+XF+4Arhihk+/XVK++of4hEA=="; - }; - }; "joplin-turndown-4.0.19" = { name = "joplin-turndown"; packageName = "joplin-turndown"; @@ -22912,13 +22885,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.6.4" = { + "jscodeshift-0.7.0" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.6.4"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.6.4.tgz"; - sha512 = "+NF/tlNbc2WEhXUuc4WEJLsJumF84tnaMUZW2hyJw3jThKKRvsPX4sPJVgO1lPE28z0gNL+gwniLG9d8mYvQCQ=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz"; + sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig=="; }; }; "jsdom-11.12.0" = { @@ -25370,6 +25343,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "lodash.repeat-4.1.0" = { + name = "lodash.repeat"; + packageName = "lodash.repeat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz"; + sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; + }; + }; "lodash.rest-4.0.5" = { name = "lodash.rest"; packageName = "lodash.rest"; @@ -26315,6 +26297,15 @@ let sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; }; }; + "markdown-it-expand-tabs-1.0.13" = { + name = "markdown-it-expand-tabs"; + packageName = "markdown-it-expand-tabs"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-expand-tabs/-/markdown-it-expand-tabs-1.0.13.tgz"; + sha512 = "ODpk98FWkGIq2vkwm2NOLt4G6TRgy3M9eTa9SFm06pUyOd0zjjYAwkhsjiCDU42pzKuz0ChiwBO0utuOj3LNOA=="; + }; + }; "markdown-it-footnote-3.0.2" = { name = "markdown-it-footnote"; packageName = "markdown-it-footnote"; @@ -29002,15 +28993,6 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-5.4.3" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "5.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz"; - sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q=="; - }; - }; "node-notifier-6.0.0" = { name = "node-notifier"; packageName = "node-notifier"; @@ -30956,13 +30938,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-10.3.1" = { + "pacote-10.3.2" = { name = "pacote"; packageName = "pacote"; - version = "10.3.1"; + version = "10.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-10.3.1.tgz"; - sha512 = "rCChFkLK9aqmk34ewjVmoUL3MD0yxzj3xkknS7MtDO5rx5z4d4bB+GxsAu4zoYc9r3ynQyEfc2GNtpL94yZaEw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-10.3.2.tgz"; + sha512 = "Hem2RkLAHhNaJSbhjouhbCAXlinNsv9W75s6JNxv9GypIjFkHtxCBoV6+GYBPttVOpZqnTAHmYRLs8yc2X2Dnw=="; }; }; "pacote-9.5.8" = { @@ -34881,15 +34863,6 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.16.2" = { - name = "recast"; - packageName = "recast"; - version = "0.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.16.2.tgz"; - sha512 = "O/7qXi51DPjRVdbrpNzoBQH5dnAPQNbfoOFyRiUwreTMJfIHYOEBzwuH+c0+/BTSJ3CQyKs6ILSWXhESH6Op3A=="; - }; - }; "recast-0.18.5" = { name = "recast"; packageName = "recast"; @@ -36087,13 +36060,13 @@ let sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg=="; }; }; - "rimraf-3.0.1" = { + "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz"; - sha512 = "IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; "ripemd160-2.0.2" = { @@ -38796,13 +38769,13 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.2.1" = { + "ssb-keys-7.2.2" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.1.tgz"; - sha512 = "Xoer1wCyRh7LmzS5nWOK/WBvIXjuPxW4rBnvGgmNPYG5/EDizuK4lneacxk5eaxeU0GjZvRdhmauiwCBalcyRw=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.2.tgz"; + sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; "ssb-links-3.0.8" = { @@ -47247,10 +47220,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.1.2.tgz"; - sha512 = "CGBcPFvnWnZMV+7Q4FI8yBWkQKECXYQ2Sf8YWoqn5ZG3ZRODG8dXSejg1O0VktKtPl7IVYYXOOqvyerV11fYmw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.2.2.tgz"; + sha512 = "9HNfmFG3WYcQVE5+bBOf+zDlMLk6cBwpXZYjqLZXBWWRxOcpRdCzXcJMoLQqJrMbpLnrD2QMkgncPNCZELqT5Q=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -47393,7 +47366,7 @@ in sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" - sources."@hapi/hoek-8.5.0" + sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -47418,6 +47391,7 @@ in dependencies = [ sources."debug-3.2.6" sources."fs-extra-6.0.1" + sources."ms-2.1.2" ]; }) (sources."@oclif/plugin-help-2.2.3" // { @@ -47475,18 +47449,19 @@ in sources."@types/minimatch-3.0.3" sources."@types/node-13.7.0" sources."@types/node-fetch-2.5.4" + sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" sources."@types/ws-6.0.4" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.1.2" - (sources."@vue/cli-ui-4.1.2" // { + sources."@vue/cli-shared-utils-4.2.2" + (sources."@vue/cli-ui-4.2.2" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.1.2" - sources."@vue/cli-ui-addon-widgets-4.1.2" + sources."@vue/cli-ui-addon-webpack-4.2.2" + sources."@vue/cli-ui-addon-widgets-4.2.2" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" @@ -47519,12 +47494,16 @@ in sources."apollo-codegen-scala-0.35.0" sources."apollo-codegen-swift-0.36.0" sources."apollo-codegen-typescript-0.36.0" - sources."apollo-datasource-0.6.4" + sources."apollo-datasource-0.7.0" sources."apollo-engine-reporting-1.5.0" sources."apollo-engine-reporting-protobuf-0.4.4" sources."apollo-env-0.6.1" sources."apollo-graphql-0.4.0" - sources."apollo-language-server-1.19.0" + (sources."apollo-language-server-1.19.0" // { + dependencies = [ + sources."apollo-datasource-0.6.4" + ]; + }) sources."apollo-link-1.2.13" sources."apollo-link-context-1.0.19" sources."apollo-link-error-1.1.12" @@ -47534,11 +47513,7 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.1" - (sources."apollo-server-core-2.10.0" // { - dependencies = [ - sources."apollo-datasource-0.7.0" - ]; - }) + sources."apollo-server-core-2.10.0" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.3.4" sources."apollo-server-express-2.10.0" @@ -47601,7 +47576,6 @@ in sources."debug-2.6.9" sources."http-errors-1.7.2" sources."inherits-2.0.3" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) @@ -47743,7 +47717,11 @@ in }) sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cosmiconfig-5.2.1" + (sources."cosmiconfig-5.2.1" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -47757,7 +47735,11 @@ in sources."dashdash-1.14.1" sources."date-fns-1.30.1" sources."de-indent-1.0.2" - sources."debug-4.1.1" + (sources."debug-4.1.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."decode-uri-component-0.2.0" (sources."decompress-4.2.0" // { dependencies = [ @@ -47779,7 +47761,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deepmerge-3.3.0" + sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -47812,7 +47794,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -47849,14 +47831,12 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" sources."safe-buffer-5.1.2" ]; @@ -47887,7 +47867,6 @@ in (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" ]; }) (sources."find-cache-dir-2.1.0" // { @@ -47994,6 +47973,7 @@ in sources."he-1.2.0" sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.5" (sources."htmlparser2-3.10.1" // { dependencies = [ sources."readable-stream-3.5.0" @@ -48002,6 +47982,7 @@ in (sources."http-call-5.3.0" // { dependencies = [ sources."is-stream-2.0.0" + sources."parse-json-4.0.0" ]; }) sources."http-errors-1.7.3" @@ -48084,13 +48065,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" - (sources."jscodeshift-0.6.4" // { - dependencies = [ - sources."ast-types-0.11.7" - sources."recast-0.16.2" - sources."source-map-0.6.1" - ]; - }) + sources."jscodeshift-0.7.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -48104,6 +48079,7 @@ in sources."launch-editor-2.2.1" sources."leven-3.1.0" sources."levenary-1.1.1" + sources."lines-and-columns-1.1.6" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" (sources."listr-update-renderer-0.5.0" // { @@ -48124,7 +48100,9 @@ in }) (sources."load-json-file-5.3.0" // { dependencies = [ + sources."parse-json-4.0.0" sources."pify-4.0.1" + sources."type-fest-0.3.1" ]; }) sources."locate-path-3.0.0" @@ -48193,7 +48171,7 @@ in ]; }) sources."moment-2.24.0" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.14.0" sources."nanoid-2.1.11" @@ -48218,19 +48196,25 @@ in sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-5.4.3" // { + (sources."node-notifier-6.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."is-wsl-2.1.1" ]; }) sources."node-releases-1.1.48" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" + sources."ms-2.1.2" sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" @@ -48281,7 +48265,7 @@ in }) sources."param-case-2.1.1" sources."parse-git-config-2.0.3" - sources."parse-json-4.0.0" + sources."parse-json-5.0.0" sources."parse-passwd-1.0.0" sources."parse5-3.0.3" sources."parseurl-1.3.3" @@ -48315,6 +48299,7 @@ in (sources."portfinder-1.0.25" // { dependencies = [ sources."debug-3.2.6" + sources."ms-2.1.2" ]; }) sources."posix-character-classes-0.1.1" @@ -48340,6 +48325,7 @@ in ]; }) sources."rc-1.2.8" + sources."read-pkg-5.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -48446,7 +48432,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -48467,6 +48452,10 @@ in ]; }) sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -48611,14 +48600,13 @@ in sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.3.1" + sources."type-fest-0.6.0" sources."type-is-1.6.18" sources."typescript-3.7.5" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -48657,6 +48645,7 @@ in sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -48668,7 +48657,6 @@ in (sources."vue-cli-plugin-apollo-0.21.3" // { dependencies = [ sources."cross-spawn-7.0.1" - sources."deepmerge-4.2.2" sources."execa-3.4.0" sources."fs-extra-8.1.0" sources."get-stream-5.1.0" @@ -49293,7 +49281,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { @@ -49326,7 +49314,6 @@ in sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-tmpdir-1.0.2" @@ -49726,7 +49713,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-0.0.1" @@ -49776,7 +49763,6 @@ in sources."mute-stream-0.0.4" sources."network-address-0.0.5" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."numeral-1.5.6" sources."oauth-sign-0.9.0" sources."object-assign-1.0.0" @@ -52373,7 +52359,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.613.0" + sources."aws-sdk-2.614.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -52612,7 +52598,7 @@ in sources."ink-text-input-1.1.1" sources."invariant-2.2.4" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.1" @@ -52656,7 +52642,6 @@ in sources."ms-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."onetime-2.0.1" sources."os-homedir-1.0.2" @@ -53160,7 +53145,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -53200,7 +53185,6 @@ in sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."onetime-1.1.0" @@ -54076,7 +54060,7 @@ in sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.2.1" + sources."ssb-keys-7.2.2" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -56896,7 +56880,7 @@ in sources."raw-body-2.4.1" sources."readable-stream-3.5.0" sources."restore-cursor-2.0.0" - sources."rimraf-3.0.1" + sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" sources."rxjs-6.5.4" @@ -57491,7 +57475,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.17.1" // { + (sources."jaeger-client-3.17.2" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -57547,10 +57531,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.153"; + version = "1.0.155"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.153.tgz"; - sha512 = "3uY8WevVQaMtbRp07LgLEk3BcRakQiPPE55EjDu2+UYhrMOCO6InA+Q5/lS5bsZMz4L6OjZinfMPwq0DGnWw+Q=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.155.tgz"; + sha512 = "KgaE+pkLK8ku98UmQ+mxt8Y/xXwby+FgUPRNsDu00NO2+4vLyZK9RCBej+OeGFSYj3Zia28ICojfZ+bU4unxsA=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -57780,13 +57764,6 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - (sources."joplin-renderer-1.0.8" // { - dependencies = [ - sources."entities-2.0.0" - sources."fs-extra-8.1.0" - sources."markdown-it-10.0.0" - ]; - }) sources."joplin-turndown-4.0.19" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.1.2" @@ -57814,6 +57791,7 @@ in sources."lodash-4.17.15" sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" + sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" sources."lodash.toarray-4.4.0" sources."loose-envify-1.4.0" @@ -57824,15 +57802,24 @@ in ]; }) sources."magicli-0.0.8" - sources."markdown-it-8.4.2" + (sources."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.0" + ]; + }) sources."markdown-it-abbr-1.0.4" sources."markdown-it-anchor-5.2.5" sources."markdown-it-deflist-2.0.3" sources."markdown-it-emoji-1.4.0" + sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.2" sources."markdown-it-ins-3.0.0" sources."markdown-it-mark-3.0.0" - sources."markdown-it-multimd-table-4.0.1" + (sources."markdown-it-multimd-table-4.0.1" // { + dependencies = [ + sources."markdown-it-8.4.2" + ]; + }) sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.1.0" @@ -59730,7 +59717,7 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { @@ -60198,10 +60185,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.10.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.10.3.tgz"; - sha512 = "vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow=="; + url = "https://registry.npmjs.org/less/-/less-3.11.0.tgz"; + sha512 = "dAui5qzfxuWY7BIEt9/gy5EbDhwDb44rqaIUFYeu8wEE8huMZ/PzB+gNFONEG5DUPrOrOGcAjGeYVg6AFiA9KQ=="; }; dependencies = [ sources."ajv-6.11.0" @@ -61616,7 +61603,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -61877,7 +61864,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" sources."is-module-1.0.0" @@ -62011,7 +61998,6 @@ in ]; }) sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -62512,14 +62498,14 @@ in madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/madoko/-/madoko-1.1.7.tgz"; - sha512 = "6kR0neT2fvgpn7uhyo/tfcIZsXF78vG5WNXU9rV33EnARZ2iqIF0alWsagwLkDhBysvF5wf2gy7js2/S2DRl1Q=="; + url = "https://registry.npmjs.org/madoko/-/madoko-1.1.8.tgz"; + sha512 = "SYChn9LZ7X8hXFHe/y11cebSC4N1+F7LncYCunRX2IW4u5w2y0J2wWw+RicYm6+JZORI61EdzgJFWqQDjgsAEQ=="; }; dependencies = [ sources."amdefine-1.0.1" - sources."mkdirp-1.0.3" + sources."mkdirp-0.3.5" sources."requirejs-2.3.6" ]; buildInputs = globalBuildInputs; @@ -62623,14 +62609,14 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "2.7.7"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz"; - sha512 = "OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.1.tgz"; + sha512 = "hrwOeKm3b1X4zpvLRSX89y3MZLRJTq0bSGIbo5M6BANOeGlL2z8Y8mZaKRFJ/WY4qcIrHp3f+Q9RWIaldOCUVg=="; }; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; @@ -63933,7 +63919,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -65282,7 +65268,7 @@ in sources."p-map-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - (sources."pacote-10.3.1" // { + (sources."pacote-10.3.2" // { dependencies = [ sources."semver-7.1.2" ]; @@ -65963,7 +65949,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66727,7 +66713,7 @@ in sources."is-arrayish-0.2.1" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.5" @@ -68122,7 +68108,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.613.0" // { + (sources."aws-sdk-2.614.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -70741,7 +70727,7 @@ in sources."ssb-friends-4.1.4" sources."ssb-gossip-1.1.1" sources."ssb-invite-2.1.4" - sources."ssb-keys-7.2.1" + sources."ssb-keys-7.2.2" sources."ssb-links-3.0.8" sources."ssb-local-1.0.0" sources."ssb-logging-1.0.0" @@ -70962,7 +70948,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.613.0" // { + (sources."aws-sdk-2.614.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72622,29 +72608,28 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.6.2"; + version = "11.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.6.2.tgz"; - sha512 = "jNW+e4pJ4MJAVciuK1UdG96tl8sAgLPJty+dRdOzDlNA5725xSohn4SQ0Iewv13EgnpXIRxy1SGaBNbv8nYT5Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.6.3.tgz"; + sha512 = "tTLLgB49zkJgq6GYDJOT6F31kHLulFjzovCHpN6ycv8d/aPcYl9vv7f/luR33YBQZdnGLtn+j8+G4GJAZ6Uz6w=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.2.5" sources."@textlint/ast-tester-2.1.6" - sources."@textlint/ast-traverse-2.1.6" + sources."@textlint/ast-traverse-2.1.7" sources."@textlint/feature-flag-3.1.6" - sources."@textlint/fixer-formatter-3.1.12" - sources."@textlint/kernel-3.2.0" - sources."@textlint/linter-formatter-3.1.11" - sources."@textlint/markdown-to-ast-6.1.6" + sources."@textlint/fixer-formatter-3.1.13" + sources."@textlint/kernel-3.2.1" + sources."@textlint/linter-formatter-3.1.12" + sources."@textlint/markdown-to-ast-6.1.7" sources."@textlint/module-interop-1.0.2" sources."@textlint/text-to-ast-3.1.7" - sources."@textlint/textlint-plugin-markdown-5.1.11" - sources."@textlint/textlint-plugin-text-4.1.12" - sources."@textlint/types-1.3.0" + sources."@textlint/textlint-plugin-markdown-5.1.12" + sources."@textlint/textlint-plugin-text-4.1.13" + sources."@textlint/types-1.3.1" sources."@textlint/utils-1.0.3" - sources."@types/bluebird-3.5.29" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -72652,7 +72637,6 @@ in sources."argparse-1.0.10" sources."bail-1.0.5" sources."balanced-match-1.0.0" - sources."bluebird-3.7.2" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -72926,7 +72910,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."alex-5.1.0" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -73017,7 +73001,7 @@ in sources."is-ci-1.2.1" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.4" sources."is-hidden-1.1.3" @@ -73361,7 +73345,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" @@ -73447,14 +73431,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.0.tgz"; - sha512 = "JG06DCJv7i7UjEdFC39eS8uGdY4295wf3SzVvSVhKplQPsLu1LZdMCSON3uziDrLv4B1EEN7lRI9QHMXYTv/6Q=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.1.tgz"; + sha512 = "TUnOIMXl850Px9bl3H522UeeStmh92EYwXXnkMZOBIerHwFLG2KaaH+qGN+FaL0EugKj6WY8QKG6jOufGAiJsQ=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."lodash-4.17.15" sources."split-lines-2.0.0" @@ -73477,14 +73461,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.0.3.tgz"; - sha512 = "ehBBoW8E3pCv2TnNTIcQtBiyBDH/9T1om+qEuPq5vhUHpkf5+eRsfPIa9mbf8IhEnecuej5EJbDLX1LxhpA4hA=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.1.tgz"; + sha512 = "955Q289wCubt67iar/U3jnsPvwHkRhWnOM0gqE3fQDBMJkFsoDnYNummU8CmAPXK7usnbwa2r48q0s4FtATWbw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."lodash-4.17.15" sources."strip-json-comments-3.0.1" @@ -73552,11 +73536,11 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."define-properties-1.1.3" - sources."e-prime-0.10.2" + sources."e-prime-0.10.3" sources."function-bind-1.1.1" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -78380,7 +78364,7 @@ in sources."ms-2.1.2" ]; }) - sources."rimraf-3.0.1" + sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."run-parallel-limit-1.0.5" sources."run-series-1.1.8" @@ -78495,7 +78479,7 @@ in dependencies = [ sources."adverb-where-0.2.1" sources."commander-2.20.3" - sources."e-prime-0.10.2" + sources."e-prime-0.10.3" sources."no-cliches-0.2.2" sources."passive-voice-0.1.0" sources."too-wordy-0.2.2" @@ -78813,7 +78797,7 @@ in sources."is-docker-1.1.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" From a68edf4106908ca1acf5490f163dc2da59e7c089 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Mon, 11 Nov 2019 09:48:06 -0500 Subject: [PATCH 049/214] nodePackages_10_x."@angular/cli": disable analytics @angular/cli fails to build due to the prompt for NG_CLI_ANALYTICS Set NG_CLI_ANALYTICS to false to skip this prompt and allow the build to continue --- pkgs/development/node-packages/default-v10.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index f79696207d3..65b537ad50f 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -7,6 +7,11 @@ let }; in nodePackages // { + "@angular/cli" = nodePackages."@angular/cli".override { + prePatch = '' + export NG_CLI_ANALYTICS=false + ''; + }; bower2nix = nodePackages.bower2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' From b771cc73d4f25c88e9e2c91c2af0acb713935de2 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 10 Feb 2020 09:10:11 +0100 Subject: [PATCH 050/214] cri-o: v1.16.1 -> v1.17.0 Signed-off-by: Sascha Grunert --- .../virtualization/cri-o/default.nix | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index f6e78f364c2..f39e22cc64a 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -4,6 +4,7 @@ , btrfs-progs , buildGoPackage , fetchFromGitHub +, git , glibc , gpgme , libapparmor @@ -13,13 +14,14 @@ , libselinux , lvm2 , pkgconfig +, which }: let buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; in buildGoPackage rec { project = "cri-o"; - version = "1.16.1"; + version = "1.17.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -28,11 +30,11 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p"; + sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j"; }; outputs = [ "bin" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ git pkgconfig which ]; buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; @@ -40,27 +42,15 @@ in buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} - # Build pause - make -C pause - - # Build the crio binaries - function build() { - go build \ - -tags "${buildTags}" \ - -o bin/"$1" \ - -buildmode=pie \ - -ldflags '-s -w ${ldflags}' \ - ${goPackagePath}/cmd/"$1" - } - build crio - build crio-status + make BUILDTAGS='${buildTags}' \ + bin/crio \ + bin/crio-status \ + bin/pinns ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} - - mkdir -p $bin/libexec/crio - install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} + install -Dm755 bin/pinns $bin/bin/pinns${flavor} ''; meta = with stdenv.lib; { From 221274e1552fdb84e8caf0831dbd9140b111131e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2020 13:08:24 +0100 Subject: [PATCH 051/214] rtptools: fix a typo /cc PR #79028. Whitespace change: seems more common this way. Normal eval didn't notice but it came out in the metrics job: https://hydra.nixos.org/build/112189807 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71436dc0cd..94be4b1745d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6094,7 +6094,7 @@ in rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; - rtptools = callPackages ../tools/networking/rtptools {}; + rtptools = callPackage ../tools/networking/rtptools { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; From f21e292e019d3d4b806f7c3eaaeaabe5505c2d0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 22:33:43 +0000 Subject: [PATCH 052/214] oil: 0.7.pre11 -> 0.7.0 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 81c86284394..9e2aa3454d2 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.7.pre11"; + version = "0.7.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0885cw07gkaggd5cvl58v6kw1z6la2xgdh1s88y0dynx95qv4i4c"; + sha256 = "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3"; }; postPatch = '' From 0f71a3d22c3231feded8b385ba1ccfc78905c62d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 20:39:31 +0000 Subject: [PATCH 053/214] memcached: 1.5.21 -> 1.5.22 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 681439bb941..98bd92c7531 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.21"; + version = "1.5.22"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1x4jzrz09aq4nllkarn7d5x77gsys5l3nvfj8c7j4nvmvc30rlg3"; + sha256 = "14qzbxgz40j4yhi3lzrsdjd6kyy3zwv9c8kw11kj6njp42fpxd62"; }; patches = [ From c717844ff722b65f8c4aae2f226ea8bb0b9a5610 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 10:10:56 +0000 Subject: [PATCH 054/214] jgmenu: 4.0 -> 4.0.2 --- pkgs/applications/misc/jgmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index cbe26b817e2..df690727b27 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "1s9291y38k4adc2wqj7plfhj431nf36zs262jm6mmb2fs910ncgv"; + sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br"; }; nativeBuildInputs = [ From 854eb8f3ef7fab408a8e487c95d34ca7447f3ab1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2020 07:15:51 -0500 Subject: [PATCH 055/214] linux: 4.14.169 -> 4.14.170 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d7c6c6b5e60..99a74f14d7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.169"; + version = "4.14.170"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jc24zvqz3vsv65xxcivzkj6nv27vsy62l50n2h1ysy5jdwsk3nq"; + sha256 = "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll"; }; } // (args.argsOverride or {})) From 54c0c2ee70c67bbedca6e3e1a20586960ed799b8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2020 07:16:13 -0500 Subject: [PATCH 056/214] linux: 4.19.101 -> 4.19.102 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 11751ca880b..f4c3ac52c9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.101"; + version = "4.19.102"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i4bkwankl5q95kgqmmyzdkwmf3b8ppkb8ild9bw12mkpmm1a9my"; + sha256 = "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih"; }; } // (args.argsOverride or {})) From 4d8f7a7905c993dd6605f9750cf22dbb5db2c796 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2020 07:16:21 -0500 Subject: [PATCH 057/214] linux: 5.4.17 -> 5.4.18 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 26bc92a7ef4..883def31b7f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.17"; + version = "5.4.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fbl5knf6pini9lsx8mqkdmf3qbsydqvaxggh6nd1vk9mzv2npwl"; + sha256 = "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj"; }; } // (args.argsOverride or {})) From 657582e43aa4749e3d2e68d476e87f5f7a25b739 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2020 07:16:32 -0500 Subject: [PATCH 058/214] linux_latest-libre: 17262 -> 17318 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index fab4fd6aaed..19e226cc344 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17262"; - sha256 = "0g1jwhzmbyf11jnbd6svb48b8ga4gd43lx1hx1jkqaa5ijvw1smr"; + rev = "17318"; + sha256 = "1advlajxkcwjp6ffhg31wpxmp9xqj04mg0g4rbmff4vkrz68kraf"; } , ... }: From 9a101749c7aa0a10377da43c49a990e05ea514cb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 10 Feb 2020 07:21:22 -0500 Subject: [PATCH 059/214] oh-my-zsh: 2020-02-04 -> 2020-02-07 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 3cd8d2d4942..23df4fc8a81 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-02-04"; + version = "2020-02-07"; pname = "oh-my-zsh"; - rev = "77aa1795d2f05583d4fc63a63abb0144beb5ecff"; + rev = "e81782ac3faf24cac2384a99366f748040b3f20a"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0n36wpdlr1w4gr0cja48mcywi8av71p3diigkiv3n45a9hh94fxx"; + sha256 = "0mry8a43kfmb1wap85ss4dvmy5x3sil14z98fd15l9cgkqxpjnlb"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From ec3f3601bddf4573fbd48cd5e20432a4960a41d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 05:46:35 +0000 Subject: [PATCH 060/214] elisa: 19.12.0 -> 19.12.2 --- pkgs/applications/audio/elisa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index fdfca08c0b0..a159ca7f685 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "elisa"; - version = "19.12.0"; + version = "19.12.2"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac"; + sha256 = "0g6zj4ix97aa529w43v1z3n73b8l5di6gscs40hyx4sl1sb7fdh6"; }; buildInputs = [ vlc ]; From e988c072be4cfc684ba7480d1420be288a7bdb76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 01:55:18 +0000 Subject: [PATCH 061/214] clp: 1.17.3 -> 1.17.5 --- pkgs/applications/science/math/clp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index f91b091439f..5e770cec13b 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.3"; + version = "1.17.5"; pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0ws515f73vq2p4nzyq0fbnm4zp9a7mjg54szdzvkql5dj51gafx1"; + sha256 = "0y5wg4lfffy5vh8gc20v68pmmv241ndi2jgm9pgvk39b00bzkaa9"; }; propagatedBuildInputs = [ zlib ]; From 879d609e6006313f81e392363bc620eabb7a52d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 14:54:26 +0000 Subject: [PATCH 062/214] micronaut: 1.2.8 -> 1.3.0 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7b9223ddec0..19e825a32f9 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.2.8"; + version = "1.3.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1znrgmwi11pnanvlaqlrffp5y3pz2ql6vrglbzqx8m9ydvdn1cp1"; + sha256 = "1dpg1j0004k6ykj9i2nhkxlyq7vq2c96bwggppq2k7ckma0i4x6z"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From dc428ae8631540c3059a2604c68f5e32f1b6e2c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 12:43:22 +0000 Subject: [PATCH 063/214] libdigidocpp: 3.14.1 -> 3.14.2 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index c4a351739b6..a2280bb4b3e 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.1"; + version = "3.14.2"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "0yrcfw5i1jddz7x3j9zzlcwjlzdbi10wns7kbblbp03nx7vk2vqy"; + sha256 = "0d3p72gvnj00bxl6lzh6n5x1r37wj54mzzv700gngcvr3m62lkbv"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; From d7e67bf0886e8151cdb90c42327aff9fd89d3087 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Feb 2020 09:55:12 +0000 Subject: [PATCH 064/214] libsmbios: 2.4.2 -> 2.4.3 --- pkgs/os-specific/linux/libsmbios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index d0ae1852853..81f5fe49d55 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libsmbios"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "dell"; repo = "libsmbios"; rev = "v${version}"; - sha256 = "0bck3byk62a69ngyj0zjpzf4wxwjmkhwhvsqb8z24dww9wz41l9k"; + sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; From b1d0806b373c4505e36dadf51c6d527516bd0e2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Jan 2020 06:12:42 +0000 Subject: [PATCH 065/214] libosip: 5.1.0 -> 5.1.1 --- pkgs/development/libraries/osip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index a243b5c0b51..a4a2a51402b 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0"; + sha256 = "0kgnxgzf968kbl6rx3hjsfb3jsg4ydgrsf35gzj319i1f8qjifv1"; }; pname = "libosip2"; From 40c98652e235a47bc465a6c1059c4b08d7d23007 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 07:47:16 +0000 Subject: [PATCH 066/214] mage: 1.8.0 -> 1.9.0 --- pkgs/development/tools/build-managers/mage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 40ddf742ed5..37cea6adb1a 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "0vkzm2k2v3np30kdgz9kpwkhnshbjcn8j1y321djz2h3w23k5h7r"; + sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; }; modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; From 87549860767a5d96fba474c444ea7bd150bc1c46 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Feb 2020 13:28:18 +0100 Subject: [PATCH 067/214] nixos: Fix build of manual XML error introduced with merge commit 4e0fea3fe294d112ac6eef5adbed2357. This was probably because of wrong conflict resolution, because the actual change (d8e697b4fcfd929d05221ac3e67b9c04ac69df86) had the close tag of the element, but the merge commit didn't. Signed-off-by: aszlig --- nixos/doc/manual/release-notes/rl-2003.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index eac50b705a8..3ee6e708ff0 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -675,8 +675,9 @@ auth required pam_succeed_if.so uid >= 1000 quiet Certificates will be regenerated anew on the next renewal date. The credentials for simp-le are preserved and thus it is possible to roll back to previous versions without breaking certificate generation. + - + It is now possible to unlock LUKS-Encrypted file systems using a FIDO2 token via . From f003810989c58746db9ea52f6231b4e05d1ecf8c Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 23 Jan 2020 17:19:53 +0100 Subject: [PATCH 068/214] nixos/buildkite-agents: support multiple buildkite agents --- nixos/modules/module-list.nix | 2 +- ...ildkite-agent.nix => buildkite-agents.nix} | 79 +++++++++++-------- nixos/tests/all-tests.nix | 2 +- ...ildkite-agent.nix => buildkite-agents.nix} | 19 ++--- 4 files changed, 54 insertions(+), 48 deletions(-) rename nixos/modules/services/continuous-integration/{buildkite-agent.nix => buildkite-agents.nix} (78%) rename nixos/tests/{buildkite-agent.nix => buildkite-agents.nix} (55%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 541a17af6e9..6b032f64bdb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -253,7 +253,7 @@ ./services/computing/slurm/slurm.nix ./services/continuous-integration/buildbot/master.nix ./services/continuous-integration/buildbot/worker.nix - ./services/continuous-integration/buildkite-agent.nix + ./services/continuous-integration/buildkite-agents.nix ./services/continuous-integration/hail.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix similarity index 78% rename from nixos/modules/services/continuous-integration/buildkite-agent.nix rename to nixos/modules/services/continuous-integration/buildkite-agents.nix index 58bce654941..e6a637e9c02 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.services.buildkite-agent; + cfg = config.services.buildkite-agents; mkHookOption = { name, description, example ? null }: { inherit name; @@ -15,7 +15,7 @@ let }; mkHookOptions = hooks: listToAttrs (map mkHookOption hooks); - hooksDir = let + hooksDir = cfg: let mkHookEntry = name: value: '' cat > $out/${name} <<'EOF' #! ${pkgs.runtimeShell} @@ -29,12 +29,13 @@ let ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))} ''; -in - -{ - options = { - services.buildkite-agent = { - enable = mkEnableOption "buildkite-agent"; + buildkiteOptions = { name ? "", config, ... }: { + options = { + enable = mkOption { + default = true; + type = types.bool; + description = "Whether to enable this buildkite agent"; + }; package = mkOption { default = pkgs.buildkite-agent; @@ -44,7 +45,7 @@ in }; dataDir = mkOption { - default = "/var/lib/buildkite-agent"; + default = "/var/lib/buildkite-agent-${name}"; description = "The workdir for the agent"; type = types.str; }; @@ -68,9 +69,9 @@ in name = mkOption { type = types.str; - default = "%hostname-%n"; + default = "%hostname-${name}-%n"; description = '' - The name of the agent. + The name of the agent as seen in the buildkite dashboard. ''; }; @@ -166,11 +167,11 @@ in hooksPath = mkOption { type = types.path; - default = hooksDir; - defaultText = "generated from services.buildkite-agent.hooks"; + default = hooksDir config; + defaultText = "generated from services.buildkite-agents..hooks"; description = '' Path to the directory storing the hooks. - Consider using + Consider using instead. ''; }; @@ -184,24 +185,38 @@ in }; }; }; + enabledAgents = lib.filterAttrs (n: v: v.enable) cfg; + mapAgents = function: lib.mkMerge (lib.mapAttrsToList function enabledAgents); +in +{ + options.services.buildkite-agents = mkOption { + type = types.attrsOf (types.submodule buildkiteOptions); + default = {}; + description = '' + Attribute set of buildkite agents. + The attribute key is combined with the hostname and a unique integer to + create the final agent name. This can be overridden by setting the `name` + attribute. + ''; + }; - config = mkIf config.services.buildkite-agent.enable { - users.users.buildkite-agent = { - name = "buildkite-agent"; + config.users.users = mapAgents (name: cfg: { + "buildkite-agent-${name}" = { + name = "buildkite-agent-${name}"; home = cfg.dataDir; createHome = true; description = "Buildkite agent user"; extraGroups = [ "keys" ]; isSystemUser = true; }; + }); - environment.systemPackages = [ cfg.package ]; - - systemd.services.buildkite-agent = + config.systemd.services = mapAgents (name: cfg: { + "buildkite-agent-${name}" = { description = "Buildkite Agent"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = cfg.runtimePackages ++ [ pkgs.coreutils ]; + path = cfg.runtimePackages ++ [ cfg.package pkgs.coreutils ]; environment = config.networking.proxy.envVars // { HOME = cfg.dataDir; NIX_REMOTE = "daemon"; @@ -230,8 +245,8 @@ in ''; serviceConfig = - { ExecStart = "${cfg.package}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg"; - User = "buildkite-agent"; + { ExecStart = "${cfg.package}/bin/buildkite-agent start --config ${cfg.dataDir}/buildkite-agent.cfg"; + User = "buildkite-agent-${name}"; RestartSec = 5; Restart = "on-failure"; TimeoutSec = 10; @@ -240,22 +255,18 @@ in KillMode = "mixed"; }; }; + }); - assertions = [ + config.assertions = mapAgents (name: cfg: [ { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); message = '' - Options `services.buildkite-agent.hooksPath' and - `services.buildkite-agent.hooks.' are mutually exclusive. + Options `services.buildkite-agents.${name}.hooksPath' and + `services.buildkite-agents.${name}.hooks.' are mutually exclusive. ''; } - ]; - }; + ]); + imports = [ - (mkRenamedOptionModule [ "services" "buildkite-agent" "token" ] [ "services" "buildkite-agent" "tokenPath" ]) - (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKey" ] [ "services" "buildkite-agent" "privateSshKeyPath" ]) - (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKeyPath" ] [ "services" "buildkite-agent" "privateSshKeyPath" ]) - (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ] "SSH public keys aren't necessary to clone private repos.") - (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKeyPath" ] "SSH public keys aren't necessary to clone private repos.") - (mkRenamedOptionModule [ "services" "buildkite-agent" "meta-data"] [ "services" "buildkite-agent" "tags" ]) + (mkRemovedOptionModule [ "services" "buildkite-agent"] "services.buildkite-agent has been moved to an attribute set at services.buildkite-agents") ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b773cf3364f..33c6441dbc8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -32,7 +32,7 @@ in bees = handleTest ./bees.nix {}; bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; - buildkite-agent = handleTest ./buildkite-agent.nix {}; + buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; diff --git a/nixos/tests/buildkite-agent.nix b/nixos/tests/buildkite-agents.nix similarity index 55% rename from nixos/tests/buildkite-agent.nix rename to nixos/tests/buildkite-agents.nix index 3c824c9aedf..a6f33e0143c 100644 --- a/nixos/tests/buildkite-agent.nix +++ b/nixos/tests/buildkite-agents.nix @@ -6,18 +6,13 @@ import ./make-test-python.nix ({ pkgs, ... }: maintainers = [ flokli ]; }; - nodes = { - node1 = { pkgs, ... }: { - services.buildkite-agent = { - enable = true; + machine = { pkgs, ... }: { + services.buildkite-agents = { + one = { privateSshKeyPath = (import ./ssh-keys.nix pkgs).snakeOilPrivateKey; tokenPath = (pkgs.writeText "my-token" "5678"); }; - }; - # don't configure ssh key, run as a separate user - node2 = { pkgs, ...}: { - services.buildkite-agent = { - enable = true; + two = { tokenPath = (pkgs.writeText "my-token" "1234"); }; }; @@ -28,9 +23,9 @@ import ./make-test-python.nix ({ pkgs, ... }: # we can't wait on the unit to start up, as we obviously can't connect to buildkite, # but we can look whether files are set up correctly - node1.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg") - node1.wait_for_file("/var/lib/buildkite-agent/.ssh/id_rsa") + machine.wait_for_file("/var/lib/buildkite-agent-one/buildkite-agent.cfg") + machine.wait_for_file("/var/lib/buildkite-agent-one/.ssh/id_rsa") - node2.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg") + machine.wait_for_file("/var/lib/buildkite-agent-two/buildkite-agent.cfg") ''; }) From e242eccb0b79c26af6a6e8bcefc0468e0450c8ab Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 24 Jan 2020 19:31:33 +0100 Subject: [PATCH 069/214] nixos/buildkite-agents: update release notes --- nixos/doc/manual/release-notes/rl-2003.xml | 16 ++++++++++------ .../continuous-integration/buildkite-agents.nix | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index eac50b705a8..403109f6628 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -440,15 +440,19 @@ users.users.me = - The Buildkite Agent - module and corresponding packages have been updated to 3.x. - While doing so, the following options have been changed: + The Buildkite + Agent module and corresponding packages have been updated to + 3.x, and to support multiple instances of the agent running at the + same time. This means you will have to rename + services.buildkite-agent to + services.buildkite-agents.<name>. Furthermore, + the following options have been changed: services.buildkite-agent.meta-data has been renamed to - services.buildkite-agent.tags, + services.buildkite-agents.<name>.tags, to match upstreams naming for 3.x. Its type has also changed - it now accepts an attrset of strings. @@ -464,13 +468,13 @@ users.users.me = services.buildkite-agent.openssh.privateKeyPath has been renamed to - buildkite-agent.privateSshKeyPath, + buildkite-agents.<name>.privateSshKeyPath, as the whole openssh now only contained that single option. - services.buildkite-agent.shell + services.buildkite-agents.<name>.shell has been introduced, allowing to specify a custom shell to be used. diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index e6a637e9c02..fbda2731bbf 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -267,6 +267,6 @@ in ]); imports = [ - (mkRemovedOptionModule [ "services" "buildkite-agent"] "services.buildkite-agent has been moved to an attribute set at services.buildkite-agents") + (mkRemovedOptionModule [ "services" "buildkite-agent"] "services.buildkite-agent has been upgraded from version 2 to version 3 and moved to an attribute set at services.buildkite-agents. Please consult the 20.03 release notes for more information.") ]; } From b94c1c89f69563a9fc2ceee487b9bc19e5234d6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2020 08:32:31 +0000 Subject: [PATCH 070/214] manuskript: 0.10.0 -> 0.11.0 --- pkgs/applications/editors/manuskript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 811284491dd..dc8eb200fff 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "manuskript"; - version = "0.10.0"; + version = "0.11.0"; format = "other"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { repo = pname; owner = "olivierkes"; rev = version; - sha256 = "0q413vym7hzjpyg3krj5y63hwpncdifjkyswqmr76zg5yqnklnh3"; + sha256 = "1l6l9k6k69yv8xqpll0zv9cwdqqg4zvxy90l6sx5nv2yywh5crla"; }; nativeBuildInputs = [ wrapQtAppsHook ]; From c36fca9701f697c6c6ada46c847686804ff59084 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 10 Feb 2020 14:42:40 +0100 Subject: [PATCH 071/214] cri-o: remove unused ldflags variable Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index f39e22cc64a..274468334ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,5 +1,4 @@ { flavor ? "" -, ldflags ? "" , stdenv , btrfs-progs , buildGoPackage From 15418a017ee771ef673b09d09570ae1d0fa58e9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 12:14:16 +0000 Subject: [PATCH 072/214] sdcc: 3.9.0 -> 4.0.0 --- pkgs/development/compilers/sdcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index cdac400b1af..e87f758bcde 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "sdcc"; - version = "3.9.0"; + version = "4.0.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "0dn0cy6whcrvbfh9x467jdi8dmzjrvixz2bz63pgxwzpz9rsxv4l"; + sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8"; }; buildInputs = [ autoconf bison boost flex gputils texinfo zlib ]; From 611019c6197d7f927097f682caef8aa8bbc6b5cf Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 16:05:03 +0200 Subject: [PATCH 073/214] elixir_1_10: 1.10.0 -> 1.10.1 --- pkgs/development/interpreters/elixir/1.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix index f9e1451354d..7f4162cade8 100644 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ b/pkgs/development/interpreters/elixir/1.10.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.10.0"; - sha256 = "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv"; + version = "1.10.1"; + sha256 = "07iccn90yp11ms58mwkwd9ixd9vma0025l9zm6l7y0jjzrj3vycy"; minimumOTPVersion = "21"; } From 60631eab82ca427caae0b6bb5faad237a40e0335 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 16:07:07 +0200 Subject: [PATCH 074/214] elixir: add filalex77 to maintainers --- pkgs/development/interpreters/elixir/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index a1186557101..571f39203f8 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -73,6 +73,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ]; + maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ]; }; }) From 4089dbf090eb3cd2a2286e496c3f7491ae27f6f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 Feb 2020 15:26:12 +0100 Subject: [PATCH 075/214] nixos-rebuild: Make 'edit' work with with flakes --- nixos/modules/installer/tools/nixos-rebuild.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 88c5cb4a443..cc86fa25b60 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -285,10 +285,13 @@ if [[ -n $flake ]]; then fi # Find configuration.nix and open editor instead of building. -# FIXME: handle flakes if [ "$action" = edit ]; then - NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} - exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + if [[ -z $flake ]]; then + NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} + exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + else + exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" + fi exit 1 fi From f9392f04aef1d534e5baa6f136264270f050be5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 Feb 2020 19:49:01 +0100 Subject: [PATCH 076/214] nixos-rebuild: Remove --keep-going flag --- nixos/modules/installer/tools/nixos-rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index cc86fa25b60..0ba3930ab99 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -418,7 +418,7 @@ if [ -z "$rollback" ]; then else outLink=$tmpDir/result nix build "$flake#$flakeAttr.config.system.build.toplevel" \ - --keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink + "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi copyToTarget "$pathToConfig" @@ -427,7 +427,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" + nix build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm ]; then From b98ea4560899470536506426a74704a907fcfc8f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 15:25:24 +0100 Subject: [PATCH 077/214] nixos-version --json: Use builtins.toJSON --- nixos/modules/installer/tools/nixos-version.sh | 2 +- nixos/modules/installer/tools/tools.nix | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 0117aa1549c..2711bc1e131 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -10,7 +10,7 @@ case "$1" in ;; --json) cat < Date: Mon, 10 Feb 2020 15:25:44 +0100 Subject: [PATCH 078/214] nixos.revision: Use null instead of "master" "master" is not a valid SHA-1 commit hash, and it's not even necessarily the branch used. 'nixos-version --revision' now returns an error if the commit hash is not known. --- nixos/modules/installer/tools/nixos-version.sh | 4 ++++ nixos/modules/misc/version.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 2711bc1e131..bde6c9c3003 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -6,6 +6,10 @@ case "$1" in exit 1 ;; --hash|--revision) + if ! [[ @revision@ =~ /[0-9a-f]+/ ]]; then + echo "$0: Nixpkgs commit hash is unknown" + exit 1 + fi echo "@revision@" ;; --json) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 8dbbbe6761c..c394ff592f4 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -42,8 +42,8 @@ in nixos.revision = mkOption { internal = true; - type = types.str; - default = trivial.revisionWithDefault "master"; + type = types.nullOr types.str; + default = trivial.revisionWithDefault null; description = "The Git revision from which this NixOS configuration was built."; }; From 8f86624ac95de33f3bdd08b9f0d3a9096f7755c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 15:31:23 +0100 Subject: [PATCH 079/214] nixos-rebuild: Remove TODOs --- nixos/modules/installer/tools/nixos-rebuild.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 0ba3930ab99..354274478a3 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -222,7 +222,7 @@ fi # If ‘--upgrade’ is given, run ‘nix-channel --update nixos’. -if [ -n "$upgrade" -a -z "$_NIXOS_REBUILD_REEXEC" ]; then +if [[ -n $upgrade && -z $_NIXOS_REBUILD_REEXEC && -z $flake ]]; then nix-channel --update nixos # If there are other channels that contain a file called @@ -350,7 +350,6 @@ prebuiltNix() { remotePATH= -# FIXME: get nix from the flake. if [[ -n $buildNix && -z $flake ]]; then echo "building Nix..." >&2 nixDrv= @@ -434,14 +433,14 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else - echo "TODO: not implemented" >&2 + echo "$0: 'build-vm' is not supported with '--flake'" >&2 exit 1 fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - echo "TODO: not implemented" >&2 + echo "$0: 'build-vm-with-bootloader' is not supported with '--flake'" >&2 exit 1 fi else From 3815de80c0e1b4d97d46bf181ffdd02aa68f1843 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 14:47:35 +0000 Subject: [PATCH 080/214] unit: 1.14.0 -> 1.15.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index c3af0d55543..9077bc21654 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -18,14 +18,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.15.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w"; + sha256 = "1dj21fcssrvbspppbhg8684vfcbn0m1abiy1r60h5fzb470k21jb"; }; patches = [ From c2038483fda492591c2c08d07cdc1d8f59aaffd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2020 15:52:20 +0100 Subject: [PATCH 081/214] glibc, openssl: unbreak cross eval (with minor caveats) It's certainly better to have those two caveats than not evaluate. Both seem rather niche. Unfortunately I failed to find a better way. I started testing builds of several cross variants; all seem OK. --- pkgs/development/libraries/glibc/common.nix | 4 ++++ pkgs/development/libraries/openssl/default.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9ea94381659..7ccba0072e2 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -111,6 +111,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + '' + # FIXME: find a solution for infinite recursion in cross builds. + # For now it's hopefully acceptable that IDN from libc doesn't reliably work. + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Ensure that libidn2 is found. patch -p 1 < Date: Mon, 10 Feb 2020 16:20:41 +0100 Subject: [PATCH 082/214] lib/tests/misc.nix: Fix dependency on currentSystem This doesn't work in pure mode. --- lib/tests/misc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 59ed1e507e2..01ff5ecf148 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -148,7 +148,7 @@ runTests { "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"; in { storePath = isStorePath goodPath; - storePathDerivation = isStorePath (import ../.. {}).hello; + storePathDerivation = isStorePath (import ../.. { system = "x86_64-linux"; }).hello; storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); From 5c389f84d42538f41e3e9a73b5e6bee645d45ebf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 16:21:04 +0100 Subject: [PATCH 083/214] lib/tests/misc.nix: Don't make a copy on Nixpkgs --- lib/tests/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 737d142d253..069c015d783 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -2,7 +2,7 @@ pkgs.runCommandNoCC "nixpkgs-lib-tests" { buildInputs = [ pkgs.nix (import ./check-eval.nix) ]; - NIX_PATH="nixpkgs=${pkgs.path}"; + NIX_PATH = "nixpkgs=${toString pkgs.path}"; } '' datadir="${pkgs.nix}/share" export TEST_ROOT=$(pwd)/test-tmp From d6474081d0fcd09d9901e2c664a6c14c1e1482cc Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 10 Feb 2020 16:24:59 +0100 Subject: [PATCH 084/214] exodus: reformating --- .../blockchains/exodus/default.nix | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index bc354a5213e..792d960e990 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { sourceRoot = "."; unpackCmd = '' - ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" + ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" ''; installPhase = '' - mkdir -p $out/bin $out/share/applications - cd Exodus-linux-x64 - cp -r . $out - ln -s $out/Exodus $out/bin/Exodus - ln -s $out/exodus.desktop $out/share/applications - substituteInPlace $out/share/applications/exodus.desktop \ - --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" + mkdir -p $out/bin $out/share/applications + cd Exodus-linux-x64 + cp -r . $out + ln -s $out/Exodus $out/bin/Exodus + ln -s $out/exodus.desktop $out/share/applications + substituteInPlace $out/share/applications/exodus.desktop \ + --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" ''; dontPatchELF = true; @@ -31,35 +31,35 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ - glib - nss - nspr - gtk3-x11 - gnome2.pango - atk - cairo - gdk-pixbuf - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg_sys_opengl - utillinux - xorg.libXrandr - xorg.libXScrnSaver - alsaLib - dbus.lib - at-spi2-atk - cups.lib - libpulseaudio - systemd - vivaldi-ffmpeg-codecs + glib + nss + nspr + gtk3-x11 + gnome2.pango + atk + cairo + gdk-pixbuf + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg_sys_opengl + utillinux + xorg.libXrandr + xorg.libXScrnSaver + alsaLib + dbus.lib + at-spi2-atk + cups.lib + libpulseaudio + systemd + vivaldi-ffmpeg-codecs ]; in '' patchelf \ From ff06678927923f8c70170796533cd15bfde5bc1f Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 10 Feb 2020 16:25:30 +0100 Subject: [PATCH 085/214] exodus: adding exodus alias --- pkgs/applications/blockchains/exodus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 792d960e990..4a8aa0b56af 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { cd Exodus-linux-x64 cp -r . $out ln -s $out/Exodus $out/bin/Exodus + ln -s $out/bin/Exodus $out/bin/exodus ln -s $out/exodus.desktop $out/share/applications substituteInPlace $out/share/applications/exodus.desktop \ --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" From 0dfcfe13d443d6c8ad1f1e0a4afc2a282cfa78ef Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 10 Feb 2020 16:26:02 +0100 Subject: [PATCH 086/214] exodus: adding at-spi2-core dependency --- pkgs/applications/blockchains/exodus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 4a8aa0b56af..f6eda020337 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, -cups, vivaldi-ffmpeg-codecs, libpulseaudio }: +cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { alsaLib dbus.lib at-spi2-atk + at-spi2-core cups.lib libpulseaudio systemd From 64e5f4d53b2740bffb16641f703b9cf0df58b84e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 16:25:33 +0100 Subject: [PATCH 087/214] Fix 'nix flake check' --- flake.nix | 4 ++-- pkgs/top-level/make-tarball.nix | 4 ++-- pkgs/top-level/release.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index e2346f99c7a..197b6e2056e 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ }); }; - checks.tarball = jobs.tarball; + checks.x86_64-linux.tarball = jobs.tarball; htmlDocs = { nixpkgsManual = jobs.manual; @@ -42,7 +42,7 @@ legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { - notDetected = ./nixos/modules/installer/scan/not-detected.nix; + notDetected = import ./nixos/modules/installer/scan/not-detected.nix; }; }; } diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 7bb18e765f1..ff0b0568819 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -20,7 +20,7 @@ releaseTools.sourceTarball { versionSuffix = "pre${ if nixpkgs ? lastModified then builtins.substring 0 8 nixpkgs.lastModified - else toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; buildInputs = [ nix.out jq lib-tests ]; @@ -28,7 +28,7 @@ releaseTools.sourceTarball { eval "$preConfigure" releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo -n $VERSION_SUFFIX > .version-suffix - echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision + echo -n ${nixpkgs.rev or nixpkgs.shortRev or "dirty"} > .git-revision echo "release name is $releaseName" echo "git-revision is $(cat .git-revision)" ''; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b8ce1fcbce5..78d70c0239a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -14,9 +14,9 @@ , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage -, scrubJobs ? true +, scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; From 14e842ec021ea18618f893fea8e7ce332f858a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 10 Feb 2020 16:25:58 +0100 Subject: [PATCH 088/214] openocd: fix build with new glibc Fixes this build error: In file included from src/helper/options.c:38: /nix/store/dl4h1p847f2rsrsfvlmm6cxxx7q21kxj-glibc-2.30-dev/include/sys/sysctl.h:21:2: error: #warning "The header is deprecated and will be removed." [-Werror=cpp] 21 | #warning "The header is deprecated and will be removed." | ^~~~~~~ cc1: all warnings being treated as errors Fixes: 48a997cd ("Merge #66528: glibc: 2.27 -> 2.30 (into staging)") --- pkgs/development/tools/misc/openocd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 7e141270904..7ebf4a1e065 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "-Wno-format-overflow" "-Wno-error=tautological-compare" "-Wno-error=array-bounds" + "-Wno-error=cpp" ]); postInstall = lib.optionalString stdenv.isLinux '' From 38d84665d85174ba9aae2b7538471348d750abc8 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 10 Feb 2020 16:27:20 +0100 Subject: [PATCH 089/214] exodus: 19.5.24 -> 20.1.30 --- pkgs/applications/blockchains/exodus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index f6eda020337..758673229af 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "19.5.24"; + version = "20.1.30"; src = fetchurl { - url = "https://exodusbin.azureedge.net/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1yx296i525qmpqh8f2vax7igffg826nr8cyq1l0if35374bdsqdw"; + url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; + sha256 = "0jns5zqjm0gqn18ypghbgk6gb713mh7p44ax1r8y4vcwijlp5nql"; }; sourceRoot = "."; From fb05afd78dc63fa93626ee51330c69559754b44d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 16:32:59 +0100 Subject: [PATCH 090/214] Doh --- nixos/modules/installer/tools/nixos-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index bde6c9c3003..fb0fe26116a 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -6,7 +6,7 @@ case "$1" in exit 1 ;; --hash|--revision) - if ! [[ @revision@ =~ /[0-9a-f]+/ ]]; then + if ! [[ @revision@ =~ ^[0-9a-f]+$ ]]; then echo "$0: Nixpkgs commit hash is unknown" exit 1 fi From a1fa9e65cab889c4f45e5966d25e45639fc3381b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2020 16:36:53 +0100 Subject: [PATCH 091/214] flake.nix: Add note --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 197b6e2056e..a6828c98fb5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,3 +1,5 @@ +# Experimental flake interface to Nixpkgs. +# See https://github.com/NixOS/rfcs/pull/49 for details. { edition = 201909; From 79210713e6112ceb7c276c0028ec696c43a52c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2020 16:56:58 +0100 Subject: [PATCH 092/214] nixpkgs manual: fix a typo in cross-compilation I can't say I really understand that much about our cross stuff, but this seems very clear. --- doc/stdenv/cross-compilation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml index bea56a0c2fc..690578b78c6 100644 --- a/doc/stdenv/cross-compilation.xml +++ b/doc/stdenv/cross-compilation.xml @@ -256,7 +256,7 @@ -doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; +doCheck = stdenv.hostPlatform == stdenv.buildPlatfrom; Add it to your mkDerivation invocation. From 78e0d72c88f234b68d7093b81ea97c14053ceac7 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 10 Feb 2020 16:59:52 +0100 Subject: [PATCH 093/214] cloudflared: 2019.12.0 -> 2020.2.0 --- pkgs/applications/networking/cloudflared/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index b7e0ba75115..c5d6e45ac88 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2019.12.0"; + version = "2020.2.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0cc78bysp7z76h4ddiwbsrygz4m4r71f8xylg99pc5qyg8p3my4p"; + sha256 = "1fzndqkmfpx15fllxqxbh7n4m13ydlp50dvkdh8n384j09ndmx4r"; }; modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p"; @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; - homepage = https://www.cloudflare.com/products/argo-tunnel; + homepage = "https://www.cloudflare.com/products/argo-tunnel"; license = licenses.unfree; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice maintainers.enorris ]; From c213993880c28bb822dd3833368946e1bf513c07 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 10 Feb 2020 16:57:48 +0100 Subject: [PATCH 094/214] gitRepo: 1.13.9.4 -> 2.0 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 642afa350c6..dc4ee00b003 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.9.4"; + version = "2.0"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0kkb3s472zvmz5xign25rgv7amdzhjb1wvchqxaf80g4913rw583"; + sha256 = "077fsg2mh47c7qvqwpivkw474rpnw5xs36j23rxj2k5m700bz3hq"; }; patches = [ ./import-ssl-module.patch ]; From 223af4a592096cc54413eaa2b5eab7aeeb6af4fc Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 16:09:59 +0200 Subject: [PATCH 095/214] run: 0.7.0 -> 0.7.1 --- pkgs/development/tools/run/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 18c08a0f3f5..b5786960331 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,13 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "0365nvsqrlagrp08sifbdk3rgy7r4hmp3sx5zhizamadfcj2fsv6"; + sha256 = "0q9f8lzrzybdablqph5wihqhfbfzb3bbnnxvhy7g5ccg1kzy7mgp"; }; modSha256 = "0s2lw9q5jskj41jqr8bv5w45pkrp2s0yfd2hgjgsd0q4ifm07k7s"; From 2de244e729285a0232e13ebdca010dd1c63f5c0b Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 16:10:15 +0200 Subject: [PATCH 096/214] run: add filalex77 to maintainers --- pkgs/development/tools/run/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index b5786960331..4dcfed96056 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { description = "Easily manage and invoke small scripts and wrappers"; homepage = https://github.com/TekWizely/run; license = licenses.mit; - maintainers = with maintainers; [ rawkode ]; + maintainers = with maintainers; [ rawkode filalex77 ]; platforms = platforms.unix; }; } From 4979541cadc8977c5e98b28ce245be5720422eb5 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Feb 2020 17:28:37 +0100 Subject: [PATCH 097/214] sane module: make warning more explicit --- pkgs/applications/graphics/sane/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index e134391f58c..2ef1e26f5ac 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { function symlink () { local target=$1 linkname=$2 if [ -e "$linkname" ]; then - echo "warning: conflict for $linkname. Overriding." + echo "warning: conflict for $linkname. Overriding $(readlink $linkname) with $target." fi ln -sfn "$target" "$linkname" } From 8b302e41d47bbba217c4faf994c79541b299732b Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 16:02:33 +0200 Subject: [PATCH 098/214] lazygit: 0.13 -> 0.14.2 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index bb6d7dc0871..7a4276b4c9a 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.13"; + version = "0.14.2"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1illn4aqg4gyjnrh505f1s7blk826nqx6mc9i06i0fc1lw5jsxx1"; + sha256 = "001j663l851lg59rjjkpf915rsr9c9lm1vynzw05rfwszicgkdaa"; }; meta = with stdenv.lib; { From 170eefbbb0e2b53912c36fd7dbb4b8cf80ee73b3 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Wed, 9 Oct 2019 13:17:01 +0200 Subject: [PATCH 099/214] ispc: use cmake for building. The Makefile approach is gone in newer versions of ispc. --- pkgs/development/compilers/ispc/default.nix | 28 ++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0c44595b24b..c6431363ae6 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, cmake, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -17,11 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; }; - # there are missing dependencies in the Makefile, causing sporadic build failures - enableParallelBuilding = false; - doCheck = stdenv.isLinux; + nativeBuildInputs = [ cmake ]; buildInputs = with llvmPackages; [ which m4 @@ -32,7 +30,7 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; - postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile"; + postPatch = "sed -i -e 's/curses/ncurses/g' CMakeLists.txt"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real # errors @@ -40,27 +38,23 @@ stdenv.mkDerivation rec { # makeFlagsArray=( SHELL="${bash}/bin/bash -o pipefail" ) #''; - installPhase = '' - mkdir -p $out/bin - cp ispc $out/bin - ''; - checkPhase = '' - export ISPC_HOME=$PWD + export ISPC_HOME=$PWD/bin for target in $testedTargets do echo "Testing target $target" echo "================================" echo - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log - fgrep -q "No new fails" test_output.log || exit 1 + (cd ../ + PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log + fgrep -q "No new fails" test_output.log || exit 1) done ''; - makeFlags = [ - "CXX=${stdenv.cc}/bin/clang++" - "CLANG=${stdenv.cc}/bin/clang" - "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" + cmakeFlags = [ + "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" + "-DISPC_INCLUDE_EXAMPLES=OFF" + "-DISPC_INCLUDE_UTILS=OFF" ]; meta = with stdenv.lib; { From cc1ae9f21b9e0ce998e706a3de1bad0b5259f22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2020 17:29:48 +0100 Subject: [PATCH 100/214] make-bootstrap-tools: fixup after glibc update There's a generated header that got comment about the source header from glibc.dev, which added unwanted runtime dependency. Tested: nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.{aarch64,i686,x86_64}-linux.test --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 0c285f9661e..90a679756d7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -175,6 +175,7 @@ in with pkgs; rec { nuke-refs $out/lib/* nuke-refs $out/libexec/gcc/*/*/* nuke-refs $out/lib/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/include-fixed/*/* mkdir $out/.pack mv $out/* $out/.pack From 17c72ef75f64628f57667a7fd032e42510d2beea Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 10 Feb 2020 17:55:46 +0100 Subject: [PATCH 101/214] nixos/heapster: fix username Broken in 1d61efb7f177f7b70c467ab4940fde0a3481d4dc. --- nixos/modules/services/monitoring/heapster.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index 585632943fd..0a9dfa12eaa 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -49,7 +49,7 @@ in { }; }; - users.users.heapsterrs = { + users.users.heapster = { uid = config.ids.uids.heapster; description = "Heapster user"; }; From 5d3d3eac8b0753ca77255bfdaee4173da578e469 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 10 Feb 2020 17:56:35 +0100 Subject: [PATCH 102/214] nixos/statsd: fix username Broken in 1d61efb7f177f7b70c467ab4940fde0a3481d4dc. --- nixos/modules/services/monitoring/statsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 17836e95a6f..30b2916a992 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -125,7 +125,7 @@ in message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; }) cfg.backends; - users.use.statsdrs = { + users.users.statsd = { uid = config.ids.uids.statsd; description = "Statsd daemon user"; }; From d99808c7201b7cc89d8615e813d2c056df482b3a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 10 Feb 2020 17:56:51 +0100 Subject: [PATCH 103/214] nixos/supybot: fix username Broken in 1d61efb7f177f7b70c467ab4940fde0a3481d4dc. --- nixos/modules/services/networking/supybot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 92c84bd0e1e..d5b9a97a1c1 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -45,7 +45,7 @@ in environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; - users.users.supybotrs = { + users.users.supybot = { uid = config.ids.uids.supybot; group = "supybot"; description = "Supybot IRC bot user"; From 6884a530899e7ccb02ed64920493685f5b795415 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 05:53:29 +0000 Subject: [PATCH 104/214] postfix: 3.4.8 -> 3.4.9 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index d797a9ec9a3..f0153382b54 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0hw9kbr05qdzvfqhxi4dp4n3s9xvdh0gr0la08a4bip06ybl4pcd"; + sha256 = "19rdb92q77japw6gy7niiyj1h3nqfdakkcsq2avn9l160vxrqw54"; }; nativeBuildInputs = [ makeWrapper m4 ]; From 98f45d965143a96d0ecdb5687434d0bd34d01532 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 08:47:02 +0000 Subject: [PATCH 105/214] faudio: 20.01 -> 20.02 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 2be8caaa1b1..d515d0c07eb 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.01"; + version = "20.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0gqwma3r216xgymjnagm6ndxfvdigzl46nlny4z085sgvydx3n8m"; + sha256 = "07f3n8qxjbrn7dhyi90l1zx5klsr3qiw14n0jdk589jgynhjgv5r"; }; nativeBuildInputs = [cmake]; From a387f3d13aa966e991e7c054bd5d1be69ed9408f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 12:39:59 +0000 Subject: [PATCH 106/214] libdigidoc: 3.10.4 -> 3.10.5 --- pkgs/development/libraries/libdigidoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 06ba10904a7..36f6f023a8e 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "3.10.4"; + version = "3.10.5"; pname = "libdigidoc"; src = fetchurl { url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; - sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1"; + sha256 = "0nw36a4i6rcq7z6jqz5h2ln9hmmsfhw65jga3rymlswk2k7bndgn"; }; nativeBuildInputs = [ cmake ]; From 186f71dcf9011be7d222f2f4e328326949744e39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 10:48:35 +0000 Subject: [PATCH 107/214] nx-libs: 3.5.99.22 -> 3.5.99.23 --- pkgs/tools/X11/nx-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 77aada9f83f..07b58bcfad6 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -2,12 +2,12 @@ libpng, libtool, libxml2, pkgconfig, which, xorg }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.22"; + version = "3.5.99.23"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "0ipq93s2knv2xbb919d777mrc7v4k9l5bk0d4x6ji1bgispfa7jl"; + sha256 = "0hcsic9bf8w4ja3xy2nka8hcjvidqzjafn1bwr34l5l47h0kbyqz"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig which From 8790ca3a0cb28a69e30f1850c8f5258232928192 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 09:01:52 +0000 Subject: [PATCH 108/214] snd: 19.9 -> 20.0 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 2ba9d4f50c3..54f8fe4c9ad 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.9"; + name = "snd-20.0"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys"; + sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc"; }; nativeBuildInputs = [ pkgconfig ]; From 1543fd14be37ac1709ed8aac2a43a6db6be38bb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 06:58:33 +0000 Subject: [PATCH 109/214] saga: 7.3.0 -> 7.5.0 --- pkgs/applications/gis/saga/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 90e7af9944d..747777c75af 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "saga"; - version = "7.3.0"; + version = "7.5.0"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -18,8 +18,8 @@ stdenv.mkDerivation { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.3.0/saga-7.3.0.tar.gz"; - sha256 = "1g7v6vx7b8mfhbbg03pdk4kyks20maqbcdbasnxazhs8pl2zih7k"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.5.0/saga-7.5.0.tar.gz"; + sha256 = "0s5195802xwlkb2w4i4vd9ys95d7fnzn5cnnixh1csaqc2x1qp6r"; }; meta = with stdenv.lib; { From 3052f4660828362002ce2016266033c3e5259c1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2020 13:39:30 +0000 Subject: [PATCH 110/214] pcl: 1.9.1 -> 1.10.0 --- pkgs/development/libraries/pcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 33158129469..ba903d27ab7 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.9.1"; + name = "pcl-1.10.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "0g0am3bf14sadfw231l5nmf5d2g1p9i7yq12c6q8rl7nw501ny9j"; + sha256 = "1dbfkdk9mgwzadkw9jx3f5vzrcj88qcyv745kjxld7gcv8by9g6g"; }; enableParallelBuilding = true; From 9caa28975309df981f88a301f9a4409b806952d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Dec 2019 00:17:09 -0800 Subject: [PATCH 111/214] fmt: 6.0.0 -> 6.1.1 --- pkgs/development/libraries/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 3e79ebe15cf..0c50b069d39 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "6.0.0"; + version = "6.1.1"; pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba"; + sha256 = "0arii4hs33lqlbfwilnxiq8mqcvdwz66b24qa7fdjiga02j8kl2n"; }; outputs = [ "out" "dev" ]; From e5f681e592c0ebde9ac75aff89a058fbd276b14a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 12:55:47 +0000 Subject: [PATCH 112/214] tautulli: 2.1.42 -> 2.1.44 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index b6e5fa7deee..e088c319d40 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.1.42"; + version = "2.1.44"; pname = "Tautulli"; pythonPath = [ python.pkgs.setuptools ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0qrxxsrmqkc7v3irxi2226zvl16zid6q2wxvznci7dbg8f4rm7nw"; + sha256 = "07nbxz30v8rkvd3xyzc124gv3dpz6bllw6xl6kql0q5gqn05w96s"; }; buildPhase = ":"; From 1c438a0cd04cf8987562d529e39c5347dceed1b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 03:13:29 +0000 Subject: [PATCH 113/214] catt: 0.10.2 -> 0.10.3 --- pkgs/applications/video/catt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 1f2b2535931..027c156be35 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "catt"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "0n6aa2vvbq0z3vcg4cylhpqxch783cxvxk234647knklgg9vdf1r"; + sha256 = "08rjimcy9n7nvh4dz9693gjmkq6kaq5pq1nmjjsdrb7vb89yl53i"; }; propagatedBuildInputs = [ From acb0317520fb30efe9e84be441ce9ca4a0935900 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Mon, 3 Feb 2020 12:58:38 -0500 Subject: [PATCH 114/214] arviz: 0.5.1 -> 0.6.1 --- pkgs/development/python-modules/arviz/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index ba941503548..2bc3ed76093 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, bokeh , emcee , matplotlib , netcdf4 @@ -21,13 +22,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = version; - sha256 = "0p600cakix24wz2ridnzy6sp3l1p2kr5s60qc7s82wpv7fw0i9ry"; + sha256 = "1qc4piz18hfik32gj4v65ckwv516mppq2ac0jyqs21lhqfwbgv9w"; }; propagatedBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bokeh emcee numba pytest From eaeb87add1ec31b3b088b65aa601b3c4f6d78e51 Mon Sep 17 00:00:00 2001 From: Christoph Stich Date: Tue, 14 Jan 2020 12:26:09 +0000 Subject: [PATCH 115/214] This allows cupy to find the thrust library which is needed among other things for cupy.argsort Removed unnecessary dependencies Remove extra whitespace --- pkgs/development/python-modules/cupy/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 5426a609449..443d96b097a 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages -, fastrlock, numpy, six, wheel, pytest, mock +, fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl }: @@ -18,6 +18,10 @@ buildPythonPackage rec { mock ]; + preConfigure = '' + export CUDA_PATH=${cudatoolkit} + ''; + propagatedBuildInputs = [ cudatoolkit cudnn @@ -26,12 +30,15 @@ buildPythonPackage rec { fastrlock numpy six + setuptools wheel ]; # In python3, test was failed... doCheck = !isPy3k; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = https://cupy.chainer.org/; From d4f09b65906c1077397da825671f8b35e0175fdd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 10 Feb 2020 19:45:36 +0200 Subject: [PATCH 116/214] luarocks: 3.2.1 -> 3.3.1 --- pkgs/development/tools/misc/luarocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index fa19b249407..565b6a5ca04 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; - sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; + sha256 = "0859k2b9pihmcw45fdsbwx936npcj3vbp3hxi1v3j7n61dkw7r0s"; }; patches = [ ./darwin-3.1.3.patch ]; From a07e870d85096608427c2926273bb3682ae1387f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 06:51:27 +0100 Subject: [PATCH 117/214] libportal: init at 0.3 --- .../libraries/libportal/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/libraries/libportal/default.nix diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix new file mode 100644 index 00000000000..0f31115f50f --- /dev/null +++ b/pkgs/development/libraries/libportal/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_45 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libportal"; + version = "0.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "flatpak"; + repo = pname; + rev = version; + sha256 = "1s3g17zbbmq3m5jfs62fl94p4irln9hfhpybj7jb05z0p1939rk3"; + }; + + patches = [ + # Fix build and .pc file + # https://github.com/flatpak/libportal/pull/20 + (fetchpatch { + url = "https://github.com/flatpak/libportal/commit/7828be4ec8f05f8de7b129a1e35b5039d8baaee3.patch"; + sha256 = "04nadcxx69mbnzljwjrzm88cgapn14x3mghpkhr8b9yrjn7yj86h"; + }) + (fetchpatch { + url = "https://github.com/flatpak/libportal/commit/bf5de2f6fefec65f701b4ec8712b48b29a33fb71.patch"; + sha256 = "1v0b09diq49c01j5gg2bpvn5f5gfw1a5nm1l8grc4qg4z9jck1z8"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_45 + ]; + + propagatedBuildInputs = [ + glib + ]; + + meta = with stdenv.lib; { + description = "Flatpak portal library"; + homepage = "https://github.com/flatpak/libportal"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bfeaf0acf2..0ab42ce4ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4811,6 +4811,8 @@ in libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; + libportal = callPackage ../development/libraries/libportal { }; + libmicrodns = callPackage ../development/libraries/libmicrodns { }; libnids = callPackage ../tools/networking/libnids { }; From 9ecb58bfcba668b9d5da141ac5ca6346511882df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 22:55:16 +0100 Subject: [PATCH 118/214] flatpak: clean up and add comments --- .../development/libraries/flatpak/default.nix | 125 +++++++++++++++--- 1 file changed, 110 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c0a3d3718f3..a6295bed5cd 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,52 @@ -{ 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, fuse, nixosTests -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }: +{ 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 +, fuse +, nixosTests +, libsoup +, lzma +, ostree +, polkit +, python3 +, systemd +, xorg +, valgrind +, glib-networking +, wrapGAppsHook +, dconf +, gsettings-desktop-schemas +, librsvg +}: stdenv.mkDerivation rec { pname = "flatpak"; @@ -16,41 +61,91 @@ stdenv.mkDerivation rec { }; patches = [ + # Hardcode paths used by tests and change test runtime generation to use files from Nix store. + # https://github.com/flatpak/flatpak/issues/1460 (substituteAll { src = ./fix-test-paths.patch; inherit coreutils gettext glibcLocales; hicolorIconTheme = hicolor-icon-theme; }) + + # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; p11 = p11-kit; }) + + # Adapt paths exposed to sandbox for NixOS. (substituteAll { src = ./bubblewrap-paths.patch; inherit (builtins) storeDir; }) - # patch taken from gtk_doc + + # Allow gtk-doc to find schemas using XML_CATALOG_FILES environment variable. + # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch + + # Don’t hardcode flatpak binary path in launchers stored under user’s profile otherwise they will break after Flatpak update. + # https://github.com/NixOS/nixpkgs/issues/43581 ./use-flatpak-from-path.patch + + # Nix environment hacks should not leak into the apps. + # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + + # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch ]; nativeBuildInputs = [ - autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection - gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook + autoreconfHook + libxml2 + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xsl + which + gobject-introspection + gtk-doc + intltool + libxslt + pkgconfig + xmlto + appstream-glib + yacc + wrapGAppsHook ]; buildInputs = [ - bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau fuse - gsettings-desktop-schemas glib-networking + bubblewrap + bzip2 + dbus + dconf + glib + gpgme + json-glib + libarchive + libcap + libseccomp + libsoup + lzma + ostree + polkit + python3 + systemd + xorg.libXau + fuse + gsettings-desktop-schemas + glib-networking librsvg # for flatpak-validate-icon ]; - checkInputs = [ valgrind ]; + checkInputs = [ + valgrind + ]; - doCheck = false; # TODO: some issues with temporary files + # TODO: some issues with temporary files + doCheck = false; NIX_LDFLAGS = "-lpthread"; @@ -65,8 +160,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/flatpak" - "installed_test_metadir=$(installedTests)/share/installed-tests/flatpak" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/flatpak" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/flatpak" ]; postPatch = '' @@ -82,7 +177,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux application sandboxing and distribution framework"; - homepage = https://flatpak.org/; + homepage = "https://flatpak.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; From a10d38d901742364e2a2ddc3226a1218a14b8c53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 23:03:28 +0100 Subject: [PATCH 119/214] xdg-desktop-portal: Clean up --- .../libraries/xdg-desktop-portal/default.nix | 49 +++++++++++++++++-- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index d16c5d670e5..22bbfb5358a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,22 @@ -{ stdenv, fetchFromGitHub, nixosTests, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, nixosTests +, 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"; @@ -14,15 +32,36 @@ stdenv.mkDerivation rec { }; patches = [ + # Allow loading portals from different path than prefix (since that is immutable). + # We pass XDG_DESKTOP_PORTAL_PATH environment variable to the systemd service to achieve that. ./respect-path-env-var.patch + + # Hardcode paths used by x-d-p itself. (substituteAll { src = ./fix-paths.patch; inherit flatpak; }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + libxml2 + wrapGAppsHook + ]; + + buildInputs = [ + glib + pipewire + fontconfig + flatpak + acl + dbus + geoclue2 + fuse + gsettings-desktop-schemas + json-glib + ]; doCheck = true; # XXX: investigate! @@ -31,8 +70,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal" - "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/xdg-desktop-portal" ]; passthru = { From 0f76b3c61dacf7500a445c360cb9a5f6ddd03353 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 23:04:43 +0100 Subject: [PATCH 120/214] xdg-dbus-proxy: clean up --- .../libraries/xdg-dbus-proxy/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index d00b5398a19..38d7d447e28 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_43, dbus, glib }: +{ stdenv +, fetchurl +, pkgconfig +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, dbus +, glib +}: stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; @@ -9,9 +17,20 @@ stdenv.mkDerivation rec { sha256 = "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p"; }; - nativeBuildInputs = [ pkgconfig libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - checkInputs = [ dbus ]; + nativeBuildInputs = [ + pkgconfig + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + ]; + + checkInputs = [ + dbus + ]; configureFlags = [ "--enable-man" @@ -22,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DBus proxy for Flatpak and others"; - homepage = https://flatpak.org/; + homepage = "https://github.com/flatpak/xdg-dbus-proxy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; From b108a07e3802284fe0f896b0a615711f7cc5aece Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 23:09:48 +0100 Subject: [PATCH 121/214] ostree: clean up --- pkgs/tools/misc/ostree/default.nix | 67 ++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 8ec9fc1d488..76c47820892 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,6 +1,32 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gjs, nixosTests -, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux -, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, gtk-doc +, gobject-introspection +, gjs +, nixosTests +, glib +, systemd +, xz +, e2fsprogs +, libsoup +, gpgme +, which +, autoconf +, automake +, libtool +, fuse +, utillinuxMinimal +, libselinux +, libarchive +, libcap +, bzip2 +, yacc +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, python3 }: stdenv.mkDerivation rec { @@ -17,24 +43,47 @@ stdenv.mkDerivation rec { patches = [ # Workarounds for https://github.com/ostreedev/ostree/issues/1592 ./fix-1592.patch + # Disable test-gpg-verify-result.test, # https://github.com/ostreedev/ostree/issues/1634 ./disable-test-gpg-verify-result.patch + # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ]; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk-doc gobject-introspection which yacc - libxslt docbook_xsl docbook_xml_dtd_42 + autoconf + automake + libtool + pkgconfig + gtk-doc + gobject-introspection + which + yacc + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap - libarchive bzip2 xz + glib + systemd + e2fsprogs + libsoup + gpgme + fuse + libselinux + libcap + libarchive + bzip2 + xz utillinuxMinimal # for libmount - (python3.withPackages (p: with p; [ pyyaml ])) gjs # for tests + + # for installed tests + (python3.withPackages (p: with p; [ pyyaml ])) + gjs ]; preConfigure = '' @@ -62,7 +111,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = https://ostree.readthedocs.io/en/latest/; + homepage = "https://ostree.readthedocs.io/en/latest/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; From c55c3b9c3ca3588b7af0f436f66394b70bb01b73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Feb 2020 23:11:34 +0100 Subject: [PATCH 122/214] rpm-ostree: clean up --- pkgs/tools/misc/rpm-ostree/default.nix | 92 ++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 09f2150cdce..5cbe7c09eeb 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,12 +1,49 @@ -{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, - gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, - libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, - bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit, fetchpatch }: +{ stdenv +, fetchurl +, ostree +, rpm +, which +, autoconf +, automake +, libtool +, pkgconfig +, cargo +, rustc +, gobject-introspection +, gtk-doc +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, gperf +, cmake +, libcap +, glib +, systemd +, json-glib +, libarchive +, libsolv +, librepo +, polkit +, bubblewrap +, pcre +, check +, python +, json_c +, libmodulemd_1 +, utillinux +, sqlite +, cppunit +, fetchpatch +}: stdenv.mkDerivation rec { pname = "rpm-ostree"; version = "2019.5"; + outputs = [ "out" "dev" "man" "devdoc" ]; + src = fetchurl { url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; @@ -25,17 +62,46 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "dev" "man" "devdoc" ]; nativeBuildInputs = [ - pkgconfig which autoconf automake libtool cmake gperf cargo rustc - gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_43 + pkgconfig + which + autoconf + automake + libtool + cmake + gperf + cargo + rustc + gobject-introspection + gtk-doc + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_42 + docbook_xml_dtd_43 ]; + buildInputs = [ - libcap ostree rpm glib systemd polkit bubblewrap - json-glib libarchive libsolv librepo - pcre check python - # libdnf - json_c libmodulemd_1 utillinux sqlite cppunit + libcap + ostree + rpm + glib + systemd + polkit + bubblewrap + json-glib + libarchive + libsolv + librepo + pcre + check + python + # libdnf + json_c + libmodulemd_1 + utillinux + sqlite + cppunit ]; configureFlags = [ @@ -60,7 +126,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = https://rpm-ostree.readthedocs.io/en/latest/; + homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux; From 26a06b7917aa0ac63af91b3d26c6e0c99283760e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 01:49:06 +0100 Subject: [PATCH 123/214] =?UTF-8?q?ostree:=202019.2=20=E2=86=92=202019.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * https://github.com/ostreedev/ostree/releases/tag/v2019.3 * https://github.com/ostreedev/ostree/releases/tag/v2019.4 * https://github.com/ostreedev/ostree/releases/tag/v2019.5 * https://github.com/ostreedev/ostree/releases/tag/v2019.6 --- ...ial-httpd-CLI-move-to-tests-director.patch | 41 +++++++++-------- pkgs/tools/misc/ostree/default.nix | 44 ++++++++++++++----- .../disable-test-gpg-verify-result.patch | 12 ----- pkgs/tools/misc/ostree/fix-test-paths.patch | 26 +++++++++++ 4 files changed, 79 insertions(+), 44 deletions(-) delete mode 100644 pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch create mode 100644 pkgs/tools/misc/ostree/fix-test-paths.patch diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch index 9c334436162..a6b7af5f1c7 100644 --- a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -1,4 +1,4 @@ -From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001 +From 977fdfad2ceba7232b4f78144b20640d7fd0aedb Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Jun 2018 09:34:18 -0400 Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory @@ -13,22 +13,22 @@ Also at this point nothing should depend on `ostree trivial-httpd`. Makefile-man.am | 6 -- Makefile-ostree.am | 7 --- Makefile-tests.am | 7 +++ - configure.ac | 10 --- + configure.ac | 9 --- man/ostree-trivial-httpd.xml | 118 ----------------------------------- src/ostree/main.c | 5 -- tests/libtest.sh | 13 ++-- - 7 files changed, 12 insertions(+), 154 deletions(-) + 7 files changed, 12 insertions(+), 153 deletions(-) delete mode 100644 man/ostree-trivial-httpd.xml diff --git a/Makefile-man.am b/Makefile-man.am -index 8ccbba8c..d204aa3e 100644 +index bc58103b..bcfde285 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ ostree-static-delta.1 --if BUILDOPT_TRIVIAL_HTTPD +-if USE_LIBSOUP -man1_files += ostree-trivial-httpd.1 -else -# We still want to distribute the source, even if we are not building it @@ -38,10 +38,10 @@ index 8ccbba8c..d204aa3e 100644 if BUILDOPT_FUSE man1_files += rofiles-fuse.1 diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 8d352e38..1471b3e5 100644 +index f861afe4..497d99b0 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am -@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c +@@ -144,13 +144,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c endif if USE_LIBSOUP @@ -56,12 +56,12 @@ index 8d352e38..1471b3e5 100644 # This is necessary for the cookie jar bits ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) diff --git a/Makefile-tests.am b/Makefile-tests.am -index 2c0916f6..b11fde89 100644 +index fc2f2d91..7343b63f 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am -@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u - tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ - tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h +@@ -263,6 +263,13 @@ _installed_or_uninstalled_test_programs += \ + $(NULL) + endif +if USE_LIBSOUP +test_extra_programs += ostree-trivial-httpd @@ -74,10 +74,10 @@ index 2c0916f6..b11fde89 100644 test_programs += tests/test-repo-finder-avahi endif diff --git a/configure.ac b/configure.ac -index e6e145db..1e36e6a0 100644 +index 46a900f5..2f91cdec 100644 --- a/configure.ac +++ b/configure.ac -@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi +@@ -190,14 +190,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) @@ -85,15 +85,14 @@ index e6e145db..1e36e6a0 100644 - [AS_HELP_STRING([--enable-trivial-httpd-cmdline], - [Continue to support "ostree trivial-httpd" [default=no]])],, - enable_trivial_httpd_cmdline=no) --AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) --AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +-AS_IF([test x$enable_trivial_httpd_cmdline = xyes], - [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] -) - AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) ]) -@@ -602,7 +593,6 @@ echo " +@@ -617,7 +609,6 @@ echo " Rust (internal oxidation): $rust_debug_release rofiles-fuse: $enable_rofiles_fuse HTTP backend: $fetcher_backend @@ -226,10 +225,10 @@ index d03c12be..00000000 - - diff --git a/src/ostree/main.c b/src/ostree/main.c -index c5b45012..6478a62b 100644 +index a523ff9a..61ea742d 100644 --- a/src/ostree/main.c +++ b/src/ostree/main.c -@@ -116,11 +116,6 @@ static OstreeCommand commands[] = { +@@ -118,11 +118,6 @@ static OstreeCommand commands[] = { { "summary", OSTREE_BUILTIN_FLAG_NONE, ostree_builtin_summary, "Manage summary metadata" }, @@ -242,10 +241,10 @@ index c5b45012..6478a62b 100644 }; diff --git a/tests/libtest.sh b/tests/libtest.sh -index e0022512..b07dc962 100755 +index 3f5fd931..eacd96de 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -149,15 +149,12 @@ fi +@@ -160,15 +160,12 @@ fi if test -n "${OSTREE_UNINSTALLED:-}"; then OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd else @@ -267,5 +266,5 @@ index e0022512..b07dc962 100755 files_are_hardlinked() { -- -2.22.0 +2.25.0 diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 76c47820892..4bc690bc45f 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , fetchpatch +, substituteAll , pkgconfig , gtk-doc , gobject-introspection @@ -13,6 +14,7 @@ , libsoup , gpgme , which +, makeWrapper , autoconf , automake , libtool @@ -29,28 +31,41 @@ , python3 }: -stdenv.mkDerivation rec { +let + testPython = (python3.withPackages (p: with p; [ + pyyaml + ])); +in stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.2"; + version = "2019.6"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y"; + sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl"; }; patches = [ + # Tests access the helper using relative path + # https://github.com/ostreedev/ostree/issues/1593 + # Patch from https://github.com/ostreedev/ostree/pull/1633 + ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch + + # Fix tests running in Catalan instead of C locale. + (fetchpatch { + url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch"; + sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8"; + }) + # Workarounds for https://github.com/ostreedev/ostree/issues/1592 ./fix-1592.patch - # Disable test-gpg-verify-result.test, - # https://github.com/ostreedev/ostree/issues/1634 - ./disable-test-gpg-verify-result.patch - - # Tests access the helper using relative path - # https://github.com/ostreedev/ostree/issues/1593 - ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch + # Hard-code paths in tests + (substituteAll { + src = ./fix-test-paths.patch; + python3 = testPython.interpreter; + }) ]; nativeBuildInputs = [ @@ -61,6 +76,7 @@ stdenv.mkDerivation rec { gtk-doc gobject-introspection which + makeWrapper yacc libxslt docbook_xsl @@ -82,7 +98,7 @@ stdenv.mkDerivation rec { utillinuxMinimal # for libmount # for installed tests - (python3.withPackages (p: with p; [ pyyaml ])) + testPython gjs ]; @@ -103,6 +119,12 @@ stdenv.mkDerivation rec { "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" ]; + postFixup = '' + for test in $installedTests/libexec/installed-tests/libostree/*.js; do + wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" + done + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.ostree; diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch deleted file mode 100644 index 8da2fb82dd0..00000000000 --- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile-tests.am b/Makefile-tests.am -index b11fde89..82937a67 100644 ---- a/Makefile-tests.am -+++ b/Makefile-tests.am -@@ -245,7 +245,6 @@ endif - - _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ - tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ -- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ - tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h - - if USE_LIBSOUP diff --git a/pkgs/tools/misc/ostree/fix-test-paths.patch b/pkgs/tools/misc/ostree/fix-test-paths.patch new file mode 100644 index 00000000000..cf94b33f31c --- /dev/null +++ b/pkgs/tools/misc/ostree/fix-test-paths.patch @@ -0,0 +1,26 @@ +diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh +index f65094fd..105be893 100755 +--- a/tests/test-basic-user-only.sh ++++ b/tests/test-basic-user-only.sh +@@ -29,7 +29,7 @@ extra_basic_tests=5 + . $(dirname $0)/basic-test.sh + + $CMD_PREFIX ostree --version > version.yaml +-python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))' ++@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))' + echo "ok yaml version" + + # Reset things so we don't inherit a lot of state from earlier tests +diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh +index a41d087a..77b34c90 100755 +--- a/tests/test-remote-headers.sh ++++ b/tests/test-remote-headers.sh +@@ -26,7 +26,7 @@ echo '1..2' + . $(dirname $0)/libtest.sh + + V=$($CMD_PREFIX ostree --version | \ +- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') ++ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') + + setup_fake_remote_repo1 "archive" "" \ + --expected-header foo=bar \ From 67225411d475d7e5b83c09dd506fa5e25ebabae4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 02:22:42 +0100 Subject: [PATCH 124/214] zchunk: init at 1.1.5 required by rpm-ostree --- pkgs/development/libraries/zchunk/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/zchunk/default.nix diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix new file mode 100644 index 00000000000..ee07133b7aa --- /dev/null +++ b/pkgs/development/libraries/zchunk/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, zstd +, curl +}: + +stdenv.mkDerivation rec { + pname = "zchunk"; + version = "1.1.5"; + + outputs = [ "out" "lib" "dev" ]; + + src = fetchFromGitHub { + owner = "zchunk"; + repo = pname; + rev = version; + sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + zstd + curl + ]; + + meta = with stdenv.lib; { + description = "File format designed for highly efficient deltas while maintaining good compression"; + homepage = "https://github.com/zchunk/zchunk"; + license = licenses.bsd2; + maintainers = with maintainers; []; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ab42ce4ce0..fd06de5dbaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14765,6 +14765,8 @@ in yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; + zchunk = callPackage ../development/libraries/zchunk { }; + zeitgeist = callPackage ../development/libraries/zeitgeist { }; zlib = callPackage ../development/libraries/zlib { }; From 0e651ce7fa02d8a8cffdf7a73a8bbf2e0f0f1414 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 02:33:05 +0100 Subject: [PATCH 125/214] librepo: Clean up --- .../package-management/librepo/default.nix | 52 ++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 61435cee284..83af8307c75 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,30 +1,58 @@ -{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, libxml2, glib, openssl, curl, check, gpgme }: +{ stdenv +, fetchFromGitHub +, cmake +, python +, pkgconfig +, libxml2 +, glib +, openssl +, curl +, check +, gpgme +}: stdenv.mkDerivation rec { version = "1.9.2"; pname = "librepo"; src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "librepo"; - rev = version; + owner = "rpm-software-management"; + repo = "librepo"; + rev = version; sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; - cmakeFlags = ["-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; - - buildInputs = [ python libxml2 glib openssl curl check gpgme ]; + buildInputs = [ + python + libxml2 + glib + openssl + curl + check + gpgme + ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here - propagatedBuildInputs = [ curl gpgme libxml2 ]; + propagatedBuildInputs = [ + curl + gpgme + libxml2 + ]; + + cmakeFlags = [ + "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" + ]; meta = with stdenv.lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; - homepage = https://rpm-software-management.github.io/librepo/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = "https://rpm-software-management.github.io/librepo/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } From 3c65622fc5b87b24975f649ce4c2d474fdcb392c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 03:07:04 +0100 Subject: [PATCH 126/214] =?UTF-8?q?librepo:=201.9.2=20=E2=86=92=201.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Changes: https://github.com/rpm-software-management/librepo/compare/1.9.2...1.11.2 * Split into multiple outputs * Default to Python 3 like upstream does --- .../package-management/librepo/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/python-packages.nix | 18 +++++++++++++++--- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 83af8307c75..69821ca5136 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -6,20 +6,23 @@ , libxml2 , glib , openssl +, zchunk , curl , check , gpgme }: stdenv.mkDerivation rec { - version = "1.9.2"; + version = "1.11.2"; pname = "librepo"; + outputs = [ "out" "dev" "py" ]; + src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx"; + sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw"; }; nativeBuildInputs = [ @@ -32,6 +35,7 @@ stdenv.mkDerivation rec { libxml2 glib openssl + zchunk curl check gpgme @@ -48,6 +52,10 @@ stdenv.mkDerivation rec { "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + meta = with stdenv.lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd06de5dbaf..e54e0102e44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12667,7 +12667,9 @@ in librelp = callPackage ../development/libraries/librelp { }; - librepo = callPackage ../tools/package-management/librepo { }; + librepo = callPackage ../tools/package-management/librepo { + python = python3; + }; libresample = callPackage ../development/libraries/libresample {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 955cd768c4e..74182d10c48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4006,9 +4006,21 @@ in { libkeepass = callPackage ../development/python-modules/libkeepass { }; - librepo = toPythonModule (pkgs.librepo.override { - inherit python; - }); + librepo = pipe pkgs.librepo [ + toPythonModule + + (p: p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + }; + })) + + (p: p.override { + inherit python; + }) + + (p: p.py) + ]; libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; From f9bc083256e425707bdac986ad2b7f609b300b42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 03:36:58 +0100 Subject: [PATCH 127/214] =?UTF-8?q?rpm-ostree:=202019.5=20=E2=86=92=202020?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/coreos/rpm-ostree/compare/v2019.5...v2020.1 --- pkgs/tools/misc/rpm-ostree/default.nix | 22 +++++-------------- .../rpm-ostree/fix-introspection-build.patch | 11 ---------- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 5cbe7c09eeb..79003ff1ecf 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -31,37 +31,24 @@ , check , python , json_c +, zchunk , libmodulemd_1 , utillinux , sqlite , cppunit -, fetchpatch }: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.5"; + version = "2020.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { - url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; + url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1xgfppq4fqqvg3cs327bckjpiz6rrn3bbbhg3q5p4j2bzsq89xiz"; }; - patches = [ - # gobject-introspection requires curl in cflags - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169 - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080 - ./fix-introspection-build.patch - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/coreos/rpm-ostree/commit/60053d0d3d2279d120ae7007c6048e499d2c4d14.patch"; - sha256 = "0ig21zip09iy2da7ksg87jykaj3q8jyzh8r7yrpzyql85qxiwm0m"; - }) - ]; - nativeBuildInputs = [ pkgconfig which @@ -98,6 +85,7 @@ stdenv.mkDerivation rec { python # libdnf json_c + zchunk libmodulemd_1 utillinux sqlite diff --git a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch b/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch deleted file mode 100644 index b82ad5b24b5..00000000000 --- a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -103,7 +103,7 @@ - ostree-1 >= 2018.9 - libsystemd - polkit-gobject-1 -- rpm librepo libsolv -+ rpm librepo libsolv libcurl - libarchive]) - - dnl -ldl: https://github.com/ostreedev/ostree/commit/1f832597fc83fda6cb8daf48c4495a9e1590774c From ea06e0055e942038569cedc218e1e1e0706dac78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 04:36:49 +0100 Subject: [PATCH 128/214] glib-testing: init at 0.1.0 --- nixos/tests/installed-tests/default.nix | 1 + nixos/tests/installed-tests/glib-testing.nix | 5 ++ .../libraries/glib-testing/default.nix | 63 +++++++++++++++++++ .../glib-testing/installed-tests-path.patch | 32 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 103 insertions(+) create mode 100644 nixos/tests/installed-tests/glib-testing.nix create mode 100644 pkgs/development/libraries/glib-testing/default.nix create mode 100644 pkgs/development/libraries/glib-testing/installed-tests-path.patch diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 8e997ee4aeb..0551b235ba9 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -90,6 +90,7 @@ in graphene = callInstalledTest ./graphene.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; + glib-testing = callInstalledTest ./glib-testing.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; ostree = callInstalledTest ./ostree.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; diff --git a/nixos/tests/installed-tests/glib-testing.nix b/nixos/tests/installed-tests/glib-testing.nix new file mode 100644 index 00000000000..7a06cf792bd --- /dev/null +++ b/nixos/tests/installed-tests/glib-testing.nix @@ -0,0 +1,5 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.glib-testing; +} diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix new file mode 100644 index 00000000000..085dfc7344f --- /dev/null +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "glib-testing"; + version = "0.1.0"; + + outputs = [ "out" "dev" "devdoc" "installedTests" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "pwithnall"; + repo = "libglib-testing"; + rev = version; + sha256 = "0xmycsrlqyji6sc2i4wvp2gxf3897z65a57ygihfnpjpyl7zlwkr"; + }; + + patches = [ + # allow installing installed tests to a separate output + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.glib-testing; + }; + }; + + meta = with stdenv.lib; { + description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib"; + homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/development/libraries/glib-testing/installed-tests-path.patch new file mode 100644 index 00000000000..37ee2a98889 --- /dev/null +++ b/pkgs/development/libraries/glib-testing/installed-tests-path.patch @@ -0,0 +1,32 @@ +diff --git a/libglib-testing/tests/meson.build b/libglib-testing/tests/meson.build +index 4789c63..2b8525d 100644 +--- a/libglib-testing/tests/meson.build ++++ b/libglib-testing/tests/meson.build +@@ -15,9 +15,9 @@ test_programs = [ + ['signal-logger', [], deps], + ] + +-installed_tests_metadir = join_paths(datadir, 'installed-tests', ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', + 'libglib-testing-' + libglib_testing_api_version) +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', + 'libglib-testing-' + libglib_testing_api_version) + + foreach program: test_programs +@@ -48,4 +48,4 @@ foreach program: test_programs + exe, + env: envs, + ) +-endforeach +\ No newline at end of file ++endforeach +diff --git a/meson_options.txt b/meson_options.txt +index e69263e..7cb1ee8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,3 +4,4 @@ option( + value: false, + description: 'enable installed tests' + ) ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e54e0102e44..d36b0a9d03f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11738,6 +11738,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + glib-testing = callPackage ../development/libraries/glib-testing { }; + glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; gom = callPackage ../development/libraries/gom { }; From 102fa4aaec93aed5d79d4949d8976d3b4cd63a2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 06:16:13 +0100 Subject: [PATCH 129/214] malcontent: init at 0.4.0 --- nixos/tests/installed-tests/default.nix | 1 + nixos/tests/installed-tests/malcontent.nix | 5 ++ .../libraries/malcontent/default.nix | 87 +++++++++++++++++++ .../malcontent/installed-tests-path.patch | 35 ++++++++ .../malcontent/use-system-dependencies.patch | 22 +++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 152 insertions(+) create mode 100644 nixos/tests/installed-tests/malcontent.nix create mode 100644 pkgs/development/libraries/malcontent/default.nix create mode 100644 pkgs/development/libraries/malcontent/installed-tests-path.patch create mode 100644 pkgs/development/libraries/malcontent/use-system-dependencies.patch diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 0551b235ba9..a189ef63f22 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -92,6 +92,7 @@ in libgdata = callInstalledTest ./libgdata.nix {}; glib-testing = callInstalledTest ./glib-testing.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; + malcontent = callInstalledTest ./malcontent.nix {}; ostree = callInstalledTest ./ostree.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; } diff --git a/nixos/tests/installed-tests/malcontent.nix b/nixos/tests/installed-tests/malcontent.nix new file mode 100644 index 00000000000..d4e214c4198 --- /dev/null +++ b/nixos/tests/installed-tests/malcontent.nix @@ -0,0 +1,5 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.malcontent; +} diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix new file mode 100644 index 00000000000..3a40be3c4ed --- /dev/null +++ b/pkgs/development/libraries/malcontent/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, gobject-introspection +, wrapGAppsHook +, glib +, coreutils +, dbus +, polkit +, glib-testing +, python3 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "malcontent"; + version = "0.4.0"; + + outputs = [ "bin" "out" "dev" "man" "installedTests" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pwithnall"; + repo = pname; + rev = version; + sha256 = "0d703r20djvrgy711jvn90i8dwbb0p7qj4j43z101afpkiizq810"; + }; + + patches = [ + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # This is unnecessary and breaks when submodules are not available. + # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3 + ./use-system-dependencies.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + dbus + polkit + glib-testing + (python3.withPackages (pp: with pp; [ + pygobject3 + ])) + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + substituteInPlace libmalcontent/tests/app-filter.c \ + --replace "/usr/bin/true" "${coreutils}/bin/true" \ + --replace "/bin/true" "${coreutils}/bin/true" \ + --replace "/usr/bin/false" "${coreutils}/bin/false" \ + --replace "/bin/false" "${coreutils}/bin/false" + ''; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.malcontent; + }; + }; + + meta = with stdenv.lib; { + description = "Parental controls library"; + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch new file mode 100644 index 00000000000..f2e75c2a854 --- /dev/null +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build +index a8a815a..0b1d242 100644 +--- a/libmalcontent/tests/meson.build ++++ b/libmalcontent/tests/meson.build +@@ -61,9 +61,9 @@ test_programs = [ + ], deps], + ] + +-installed_tests_metadir = join_paths(datadir, 'installed-tests', ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) + + foreach program: test_programs +@@ -94,4 +94,4 @@ foreach program: test_programs + env: envs, + args: ['--tap'], + ) +-endforeach +\ No newline at end of file ++endforeach +diff --git a/meson_options.txt b/meson_options.txt +index 96a517d..7cb1ee8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,4 +3,5 @@ option( + type: 'boolean', + value: false, + description: 'enable installed tests' +-) +\ No newline at end of file ++) ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch new file mode 100644 index 00000000000..315bfe5ec10 --- /dev/null +++ b/pkgs/development/libraries/malcontent/use-system-dependencies.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index f4a05ba..dd31537 100644 +--- a/meson.build ++++ b/meson.build +@@ -33,9 +33,8 @@ polkit_gobject = dependency('polkit-gobject-1') + polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', + define_variable: ['prefix', prefix]) + +-libglib_testing = subproject('libglib-testing') + libglib_testing_dep = dependency( +- 'libglib-testing', ++ 'glib-testing-0', + fallback: ['libglib-testing', 'libglib_testing_dep'], + ) + +@@ -120,4 +119,4 @@ test_env = [ + + subdir('accounts-service') + subdir('malcontent-client') +-subdir('libmalcontent') +\ No newline at end of file ++subdir('libmalcontent') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d36b0a9d03f..c0fcbad1d0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12774,6 +12774,8 @@ in libmad = callPackage ../development/libraries/libmad { }; + malcontent = callPackage ../development/libraries/malcontent { }; + libmanette = callPackage ../development/libraries/libmanette { }; libmatchbox = callPackage ../development/libraries/libmatchbox { }; From fefc7d8c9c9014e4667d0b6b695068cce65e8bd4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 06:28:43 +0100 Subject: [PATCH 130/214] =?UTF-8?q?flatpak:=201.4.2=20=E2=86=92=201.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * https://github.com/flatpak/flatpak/releases/tag/1.4.3 * https://github.com/flatpak/flatpak/releases/tag/1.5.0 * https://github.com/flatpak/flatpak/releases/tag/1.5.1 * https://github.com/flatpak/flatpak/releases/tag/1.5.2 * https://github.com/flatpak/flatpak/releases/tag/1.6.0 * https://github.com/flatpak/flatpak/releases/tag/1.6.1 --- .../development/libraries/flatpak/default.nix | 14 ++- .../libraries/flatpak/fix-test-paths.patch | 98 ++++++++++++++----- .../flatpak/use-flatpak-from-path.patch | 16 +-- 3 files changed, 93 insertions(+), 35 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index a6295bed5cd..2c44b045a2f 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -29,9 +29,14 @@ , libcap , libseccomp , coreutils +, socat , gettext , hicolor-icon-theme +, shared-mime-info +, desktop-file-utils +, gtk3 , fuse +, malcontent , nixosTests , libsoup , lzma @@ -50,14 +55,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.4.2"; + version = "1.6.1"; # 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 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; + sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w"; }; patches = [ @@ -65,7 +70,9 @@ stdenv.mkDerivation rec { # https://github.com/flatpak/flatpak/issues/1460 (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils gettext glibcLocales; + inherit coreutils gettext glibcLocales socat gtk3; + smi = shared-mime-info; + dfu = desktop-file-utils; hicolorIconTheme = hicolor-icon-theme; }) @@ -135,6 +142,7 @@ stdenv.mkDerivation rec { systemd xorg.libXau fuse + malcontent gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 85b222152d0..8ea2f0159a3 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,8 +1,21 @@ +diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c +index 5de89d62..bf6bdb52 100644 +--- a/app/flatpak-builtins-build-export.c ++++ b/app/flatpak-builtins-build-export.c +@@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file, + subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE | + G_SUBPROCESS_FLAGS_STDERR_PIPE | + G_SUBPROCESS_FLAGS_STDERR_MERGE, +- &local_error, "desktop-file-validate", path, NULL); ++ &local_error, "@dfu@/bin/desktop-file-validate", path, NULL); + if (!subprocess) + { + if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT)) diff --git a/tests/libtest.sh b/tests/libtest.sh -index 46bcefb3..0134425e 100644 +index e64be49f..a9a53e12 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then +@@ -367,7 +367,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 \ @@ -11,7 +24,7 @@ index 46bcefb3..0134425e 100644 _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ +@@ -440,7 +440,7 @@ 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)" @@ -20,17 +33,20 @@ index 46bcefb3..0134425e 100644 assert_not_reached "Failed to start dbus-daemon" fi +@@ -449,7 +449,7 @@ gdb_bt () { + } + cleanup () { -- /bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} -+ @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} +- /bin/kill -9 $DBUS_SESSION_BUS_PID ++ @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : - if test -n "${TEST_SKIP_CLEANUP:-}"; then + kill $(jobs -p) &> /dev/null || true diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh -index 0a0a28f1..16fd51fe 100755 +index e51e21a6..7d39efb5 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -129,13 +129,13 @@ msgid "Hello world" +@@ -149,13 +149,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -47,18 +63,22 @@ index 0a0a28f1..16fd51fe 100755 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 +index 5d2c309b..cf61a3cf 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -28,6 +28,7 @@ EOF - PATH="$PATH:/usr/sbin:/sbin" +@@ -25,9 +25,10 @@ EOF + + # On Debian derivatives, /usr/sbin and /sbin aren't in ordinary users' + # PATHs, but ldconfig is kept in /sbin +-PATH="$PATH:/usr/sbin:/sbin" ++PATH="$PATH:@socat@/bin:/usr/sbin:/sbin" # Add bash and dependencies +mkdir -p ${DIR}/nix/store mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then +@@ -37,48 +38,24 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -85,18 +105,19 @@ index 57899b75..9236996f 100755 - fi -} - - for i in $@ bash ls cat echo readlink; do + for i in $@ bash ls cat echo readlink socat; do - I=`which $i` - add_bin $I -done -for i in `cat $BINS`; do -- echo Adding binary $i 1>&2 +- #echo Adding binary $i 1>&2 - cp "$i" ${DIR}/usr/bin/ -done -for i in `cat $LIBS`; do -- echo Adding library $i 1>&2 +- #echo Adding library $i 1>&2 - cp "$i" ${DIR}/usr/lib/ + I=$(readlink -f $(which $i)) ++ [ -e ${DIR}/usr/bin/$i ] && continue + requisites=$(nix-store --query --requisites "$I") + for r in $requisites; do + # a single store item can be needed by multiple paths, no need to copy it again @@ -121,10 +142,10 @@ index 57899b75..9236996f 100755 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 +index 44ae28e3..76bf619f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -1053,7 +1053,7 @@ check_bwrap_support (void) +@@ -1343,7 +1343,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -133,16 +154,45 @@ index f2773dc8..3af9026f 100644 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 @@ +diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger +index 2188f535..d8283061 100755 +--- a/triggers/desktop-database.trigger ++++ b/triggers/desktop-database.trigger +@@ -1,5 +1,5 @@ #!/bin/sh - if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then +-if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -d $1/exports/share/applications \); then +- exec update-desktop-database -q $1/exports/share/applications ++if test \( -d $1/exports/share/applications \); then ++ exec @dfu@/bin/update-desktop-database -q $1/exports/share/applications + fi +diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger +index 711cfab2..07baa2ac 100755 +--- a/triggers/gtk-icon-cache.trigger ++++ b/triggers/gtk-icon-cache.trigger +@@ -1,10 +1,10 @@ + #!/bin/sh + +-if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then - cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ ++if test \( -d $1/exports/share/icons/hicolor \); then + cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ for dir in $1/exports/share/icons/*; do if test -f $dir/index.theme; then - if ! gtk-update-icon-cache --quiet $dir; then +- if ! gtk-update-icon-cache --quiet $dir; then ++ if ! @gtk3@/bin/gtk-update-icon-cache --quiet $dir; then + echo "Failed to run gtk-update-icon-cache for $dir" + exit 1 + fi +diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger +index 2067d8ec..a49a8777 100755 +--- a/triggers/mime-database.trigger ++++ b/triggers/mime-database.trigger +@@ -1,5 +1,5 @@ + #!/bin/sh + +-if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d $1/exports/share/mime/packages \); then +- exec update-mime-database $1/exports/share/mime ++if test \( -d $1/exports/share/mime/packages \); then ++ exec @smi@/bin/update-mime-database $1/exports/share/mime + fi diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 01363ffb7b3..84534b7bc53 100644 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,8 +1,8 @@ diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c -index 8f9dc66c..d3ab6e5f 100644 +index 52b222ea..9489441f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, +@@ -6956,7 +6956,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -11,7 +11,7 @@ index 8f9dc66c..d3ab6e5f 100644 escaped_branch, escaped_arch); -@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -8290,8 +8290,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -23,10 +23,10 @@ index 8f9dc66c..d3ab6e5f 100644 G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index dff17f33..a9857adc 100755 +index d1682344..5e2b9a97 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 +@@ -67,7 +67,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 @@ -36,7 +36,7 @@ index dff17f33..a9857adc 100755 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 233df9ad..76e0b23b 100644 +index fecb756e..64043281 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files @@ -45,6 +45,6 @@ index 233df9ad..76e0b23b 100644 # Ensure Exec key is rewritten -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/gnome-shell/search-providers/org.test.Hello.search-provider.ini + assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$" 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 From f1aa8416d72ba509b2e1b2d30c8aa470a34bc34f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 06:57:47 +0100 Subject: [PATCH 131/214] =?UTF-8?q?xdg-desktop-portal:=201.4.2=20=E2=86=92?= =?UTF-8?q?=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.6.0 * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.5.4 * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.5.3 * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.5.2 * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.5.1 * https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.5.0 --- nixos/modules/config/xdg/portal.nix | 6 +- .../installed-tests/xdg-desktop-portal.nix | 4 + .../libraries/xdg-desktop-portal/default.nix | 14 ++-- .../xdg-desktop-portal/fix-paths.patch | 6 +- .../respect-path-env-var.patch | 78 ------------------- 5 files changed, 19 insertions(+), 89 deletions(-) delete mode 100644 pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 95fa8e05fa3..1330a08070c 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -42,6 +42,10 @@ with lib; let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; + joinedPortals = pkgs.symlinkJoin { + name = "xdg-portals"; + paths = cfg.extraPortals; + }; in mkIf cfg.enable { @@ -56,7 +60,7 @@ with lib; environment.variables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; - XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals; + XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; }; }; } diff --git a/nixos/tests/installed-tests/xdg-desktop-portal.nix b/nixos/tests/installed-tests/xdg-desktop-portal.nix index b16008ff4ad..90529d37ee0 100644 --- a/nixos/tests/installed-tests/xdg-desktop-portal.nix +++ b/nixos/tests/installed-tests/xdg-desktop-portal.nix @@ -2,4 +2,8 @@ makeInstalledTest { tested = pkgs.xdg-desktop-portal; + + # Ton of breakage. + # https://github.com/flatpak/xdg-desktop-portal/pull/428 + meta.broken = true; } diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 22bbfb5358a..1049ce3201a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -13,6 +13,7 @@ , acl , dbus , fuse +, libportal , geoclue2 , json-glib , wrapGAppsHook @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.4.2"; + version = "1.6.0"; outputs = [ "out" "installedTests" ]; @@ -28,14 +29,10 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; + sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a"; }; patches = [ - # Allow loading portals from different path than prefix (since that is immutable). - # We pass XDG_DESKTOP_PORTAL_PATH environment variable to the systemd service to achieve that. - ./respect-path-env-var.patch - # Hardcode paths used by x-d-p itself. (substituteAll { src = ./fix-paths.patch; @@ -59,11 +56,14 @@ stdenv.mkDerivation rec { dbus geoclue2 fuse + libportal gsettings-desktop-schemas json-glib ]; - doCheck = true; # XXX: investigate! + # Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor" + # TODO: investigate! + doCheck = false; configureFlags = [ "--enable-installed-tests" diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch index f4b103eb38b..98e26e88b5c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -1,13 +1,13 @@ diff --git a/src/notification.c b/src/notification.c -index 1367114..72ba033 100644 +index 5412609..4243e98 100644 --- a/src/notification.c +++ b/src/notification.c -@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) +@@ -366,7 +366,7 @@ int status; g_autofree char *err = NULL; g_autoptr(GError) error = NULL; - const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; + const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; const char *args[6]; - + if (G_IS_THEMED_ICON (icon)) diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch deleted file mode 100644 index d970f5636ae..00000000000 --- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 = DATADIR "/xdg-desktop-portal/portals"; -- g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); -- g_autoptr(GFileEnumerator) enumerator = NULL; - -- enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL); -+ g_auto(GStrv) portal_dir_list; -+ int i; -+ const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); -+ -+ if (portal_dir == NULL) -+ portal_dir = DATADIR "/portals"; - -- if (enumerator == NULL) -- return; -+ portal_dir_list = g_strsplit (portal_dir, G_SEARCHPATH_SEPARATOR_S, 0); - -- while (TRUE) -+ for (i = 0; portal_dir_list[i] != NULL; i++) - { -- g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL); -- g_autoptr(GFile) child = NULL; -- g_autofree char *path = NULL; -- const char *name; -- g_autoptr(GError) error = NULL; -+ portal_dir = portal_dir_list[i]; -+ g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); -+ g_autoptr(GFileEnumerator) enumerator = NULL; -+ enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL); - -- if (info == NULL) -- break; -+ if (enumerator == NULL) -+ continue; - -- name = g_file_info_get_name (info); -+ while (TRUE) -+ { -+ g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL); -+ g_autoptr(GFile) child = NULL; -+ g_autofree char *path = NULL; -+ const char *name; -+ g_autoptr(GError) error = NULL; - -- if (!g_str_has_suffix (name, ".portal")) -- continue; -+ if (info == NULL) -+ break; - -- child = g_file_enumerator_get_child (enumerator, info); -- path = g_file_get_path (child); -+ name = g_file_info_get_name (info); - -- if (!register_portal (path, opt_verbose, &error)) -- { -- g_warning ("Error loading %s: %s", path, error->message); -- continue; -+ if (!g_str_has_suffix (name, ".portal")) -+ continue; -+ -+ child = g_file_enumerator_get_child (enumerator, info); -+ path = g_file_get_path (child); -+ -+ if (!register_portal (path, opt_verbose, &error)) -+ { -+ g_warning ("Error loading %s: %s", path, error->message); -+ continue; -+ } - } - } - From 328f639f621243ac6e755cd1bb929779444d6fd4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Feb 2020 07:02:23 +0100 Subject: [PATCH 132/214] =?UTF-8?q?xdg-desktop-portal-gtk:=201.4.0=20?= =?UTF-8?q?=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.5.0 * https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.5.1 * https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.5.2 * https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.6.0 --- .../libraries/xdg-desktop-portal-gtk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 9b031602371..994c2864e7f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,6 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 +, gnome3 , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; + sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h"; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gtk3 + gnome3.gnome-desktop ]; meta = with stdenv.lib; { From e3cbebfc7c656c50e4506bcc5d21d909fad8c22f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Feb 2020 21:37:12 +0100 Subject: [PATCH 133/214] =?UTF-8?q?gnome-desktop-testing:=202018.1=20?= =?UTF-8?q?=E2=86=92=20unstable-2019-12-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to master since the stable version prints to journal even when running in terminal, which is annoying. Also clean up the expression. --- .../tools/gnome-desktop-testing/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 8f9b9ddf0b5..e0dc9ecda80 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,25 +1,39 @@ -{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }: +{ stdenv +, glib +, autoreconfHook +, pkgconfig +, systemd +, fetchFromGitLab +}: stdenv.mkDerivation rec { - version = "2018.1"; pname = "gnome-desktop-testing"; + version = "unstable-2019-12-11"; - src = fetchgit { - url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; - rev = "v${version}"; - sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-desktop-testing"; + rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a"; + sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - buildInputs = [ glib systemd ]; + buildInputs = [ + glib + systemd + ]; enableParallelBuilding = true; meta = with stdenv.lib; { - description = "GNOME OSTree testing code"; - homepage = https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests; - license = licenses.lgpl21; + description = "GNOME test runner for installed tests"; + homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jtojnar ]; }; From b5126937b4031cfb30733559935c3e2f4afcb5e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Jan 2020 17:01:50 +0100 Subject: [PATCH 134/214] duplicity: 0.7.19 -> 0.8.10 Update, port to Python 3 and clean up. Co-Authored-By: Jan Tojnar Co-Authored-By: Frederik Rietdijk --- pkgs/tools/backup/duplicity/default.nix | 106 +++++++++++------- .../backup/duplicity/gnutar-in-test.patch | 16 +-- .../use-installed-scripts-in-test.patch | 40 ++++++- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 113 insertions(+), 51 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index a33067e8897..0d4e098129a 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,64 +1,90 @@ -{ stdenv, fetchpatch, fetchurl, python2Packages, librsync, ncftp, gnupg +{ stdenv +, fetchpatch +, fetchurl +, pythonPackages +, librsync +, ncftp +, gnupg , gnutar , par2cmdline , utillinux , rsync -, backblaze-b2, makeWrapper }: +, backblaze-b2 +, makeWrapper +}: -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.7.19"; + version = "0.8.10"; src = fetchurl { - url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; + url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}fin1558.tar.gz"; + sha256 = "13apmavdc2cx3wxv2ymy97c575hc37xjhpa6b4sds8fkx2vrb0mh"; }; - patches = [ - ./gnutar-in-test.patch - ./use-installed-scripts-in-test.patch - # The following patches improve the performance of installCheckPhase: - # Ensure all duplicity output is captured in tests - (fetchpatch { - extraPrefix = ""; - sha256 = "07ay3mmnw8p2j3v8yvcpjsx0rf2jqly9ablwjpmry23dz9f0mxsd"; - url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.1"; - }) - # Minimize time spent sleeping between backups - (fetchpatch { - extraPrefix = ""; - sha256 = "0v99q6mvikb8sf68gh3s0zg12pq8fijs87fv1qrvdnc8zvs4pmfs"; - url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.2"; - }) - # Remove unnecessary sleeping after running backups in tests - (fetchpatch { - extraPrefix = ""; - sha256 = "1bmgp4ilq2gwz2k73fxrqplf866hj57lbyabaqpkvwxhr0ch1jiq"; - url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.3"; + patches = [ + # We use the tar binary on all platforms. + ./gnutar-in-test.patch + + # Make test respect TMPDIR env var. + # https://bugs.launchpad.net/duplicity/+bug/1862672 + (fetchurl { + url = "https://launchpadlibrarian.net/464404371/0001-Make-LogTest-respect-TMPDIR-env-variable.patch"; + hash = "sha256-wdy8mMurLhBS0ZTXmlIGGrIkS2gGBDwTp7TRxTSXBGo="; }) + + # Our Python infrastructure runs test in installCheckPhase so we need + # to make the testing code stop assuming it is run from the source directory. + ./use-installed-scripts-in-test.patch ] ++ stdenv.lib.optionals stdenv.isLinux [ ./linux-disable-timezone-test.patch ]; - buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; - propagatedBuildInputs = [ backblaze-b2 ] ++ (with python2Packages; [ - boto cffi cryptography ecdsa enum idna pygobject3 fasteners - ipaddress lockfile paramiko pyasn1 pycrypto six pydrive + buildInputs = [ + librsync + makeWrapper + pythonPackages.wrapPython + ]; + + propagatedBuildInputs = [ + backblaze-b2 + ] ++ (with pythonPackages; [ + boto + cffi + cryptography + ecdsa + idna + pygobject3 + fasteners + ipaddress + lockfile + paramiko + pyasn1 + pycrypto + pydrive + future + ] ++ stdenv.lib.optionals (!isPy3k) [ + enum ]); + checkInputs = [ - gnupg # Add 'gpg' to PATH. - gnutar # Add 'tar' to PATH. - librsync # Add 'rdiff' to PATH. - par2cmdline # Add 'par2' to PATH. + gnupg # Add 'gpg' to PATH. + gnutar # Add 'tar' to PATH. + librsync # Add 'rdiff' to PATH. + par2cmdline # Add 'par2' to PATH. ] ++ stdenv.lib.optionals stdenv.isLinux [ - utillinux # Add 'setsid' to PATH. - ] ++ (with python2Packages; [ lockfile mock pexpect ]); + utillinux # Add 'setsid' to PATH. + ] ++ (with pythonPackages; [ + lockfile + mock + pexpect + pytest + pytestrunner + ]); postInstall = '' wrapProgram $out/bin/duplicity \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" - - wrapPythonPrograms ''; preCheck = '' @@ -88,7 +114,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; - homepage = https://www.nongnu.org/duplicity; + homepage = "https://www.nongnu.org/duplicity"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti ]; platforms = platforms.unix; diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch index b2820feb019..694fc881950 100644 --- a/pkgs/tools/backup/duplicity/gnutar-in-test.patch +++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -4,15 +4,15 @@ https://launchpad.net/bugs/929067 """ -- if platform.system().startswith('Linux'): -- tarcmd = "tar" -- elif platform.system().startswith('Darwin'): -- tarcmd = "gtar" -- elif platform.system().endswith('BSD'): -- tarcmd = "gtar" +- if platform.system().startswith(u'Linux'): +- tarcmd = u"tar" +- elif platform.system().startswith(u'Darwin'): +- tarcmd = u"gtar" +- elif platform.system().endswith(u'BSD'): +- tarcmd = u"gtar" - else: -- raise Exception("Platform %s not supported by tar/gtar." % platform.platform()) -+ tarcmd = "tar" +- raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform()) ++ tarcmd = u"tar" # Intial normal backup self.backup("full", "testfiles/blocktartest") diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index 191808abc63..a3ba1422915 100644 --- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -4,10 +4,46 @@ except Exception: pass -- os.environ['PATH'] = "%s:%s" % ( +- os.environ[u'PATH'] = u"%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), -- os.environ.get('PATH')) +- os.environ.get(u'PATH')) - test.run(self) def run_tests(self): +--- a/testing/functional/__init__.py ++++ b/testing/functional/__init__.py +@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase): + if basepython is not None: + cmd_list.extend([basepython]) + cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"]) +- cmd_list.extend([u"../bin/duplicity"]) ++ cmd_list.extend([u"duplicity"]) + cmd_list.extend(options) + cmd_list.extend([u"-v0"]) + cmd_list.extend([u"--no-print-statistics"]) +--- a/testing/functional/test_log.py ++++ b/testing/functional/test_log.py +@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase): + # Run actual duplicity command (will fail, because no arguments passed) + basepython = os.environ.get(u'TOXPYTHON', None) + if basepython is not None: +- os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) ++ os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) + else: +- os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) ++ os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) + + # The format of the file should be: + # """ERROR 2 +--- a/testing/functional/test_rdiffdir.py ++++ b/testing/functional/test_rdiffdir.py +@@ -38,7 +38,7 @@ class RdiffdirTest(FunctionalTestCase): + + def run_rdiffdir(self, argstring): + u"""Run rdiffdir with given arguments""" +- self.run_cmd(u"../bin/rdiffdir " + argstring) ++ self.run_cmd(u"rdiffdir " + argstring) + + def run_cycle(self, dirname_list): + u"""Run diff/patch cycle on directories in dirname_list""" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bfeaf0acf2..da80856205d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2906,7 +2906,7 @@ in duplicati = callPackage ../tools/backup/duplicati { }; duplicity = callPackage ../tools/backup/duplicity { - gnupg = gnupg1; + pythonPackages = python3Packages; }; duply = callPackage ../tools/backup/duply { }; From 2cd32ebf4f156110af26fd41eb85805c194e9f22 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Feb 2020 00:20:47 +0100 Subject: [PATCH 135/214] gitfs: Switch to Python 3 Supported since 0.5 at least --- pkgs/tools/filesystems/gitfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 5b379414666..7c36e37b33f 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gitfs"; version = "0.5.2"; @@ -16,8 +16,8 @@ python2Packages.buildPythonApplication rec { echo > requirements.txt ''; - buildInputs = with python2Packages; [ pytest pytestcov mock ]; - propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ]; + checkInputs = with python3Packages; [ pytest pytestcov mock ]; + propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; doCheck = false; From 6a64f267a0cb24e6f206415251c61fe28b7e4093 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 17:31:35 +0000 Subject: [PATCH 136/214] tor: 0.4.2.5 -> 0.4.2.6 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 819b9688924..698693be95e 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.2.5"; + version = "0.4.2.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1hnqg6psf7shcmlvfk44mkpaz7v66mify3cnx7mzl23q5s37anad"; + sha256 = "1i766s211nrbjvwvkd2375mjsbbc28yrg46564rbx6w46cj10005"; }; outputs = [ "out" "geoip" ]; From c1a16501c40894bc82b35443f248db9b82eac873 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 16:19:20 +0000 Subject: [PATCH 137/214] vms-empire: 1.14 -> 1.15 --- pkgs/games/vms-empire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index 1d4545f17b1..33e342de3b4 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ pname = "vms-empire"; - version = "1.14"; + version = "1.15"; src = fetchurl{ url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz"; - sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890"; + sha256 = "1vcpglkimcljb8s1dp6lzr5a0vbfxmh6xf37cmb8rf9wc3pghgn3"; }; buildInputs = From 79d0c76b75b88a1a31ca397d17d91265850033ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 02:56:00 +0000 Subject: [PATCH 138/214] cinnamon.cinnamon-desktop: 4.4.0 -> 4.4.1 --- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index a622e6abfd1..c5beff134b3 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "17hb8gkb9pfj56ckva5g4x83yvmdv7hvpidxjsdf79dw6pabr5rg"; + sha256 = "10db5rai8cbbzphvcwarr3hm1bd9rxchlc0hcghg7qnmvv52fq03"; }; outputs = [ "out" "dev" ]; From ebb3d1a9a49b1b5b3eac8911b7eb3bd48870098a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 6 Feb 2020 13:02:09 +0100 Subject: [PATCH 139/214] glfw: 3.3.1 -> 3.3.2 --- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 16368ae2127..0dfe3cbea2e 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "0c7nlrhq84gdq10diyv6nshjbv8410bmn0vging815pfvis208xc"; + sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw"; }; enableParallelBuilding = true; From 8a24d3f89214d1f9d1f85de834b887fd2afec572 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 9 Feb 2020 13:48:38 +0100 Subject: [PATCH 140/214] chipsec: 1.4.1 -> 1.4.7 --- pkgs/tools/security/chipsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 7b4c8cf68eb..7d745630989 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -2,13 +2,13 @@ , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { name = "chipsec-${version}"; - version = "1.4.1"; + version = "1.4.7"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77"; + sha256 = "11qi4m4hqkylf1wd7f921r0p7xg5prpmfkmb7l9nn7sb95zz0sjr"; }; nativeBuildInputs = [ From 70e3b2b4429e0ab39fb64701be2c9ec790fed22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 9 Feb 2020 02:22:47 +0100 Subject: [PATCH 141/214] twinkle: patch manual link since old domain got re-used --- .../networking/instant-messengers/twinkle/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 0378f50a9c0..b6f0b87dc84 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -47,10 +47,16 @@ mkDerivation rec { ]; patches = [ - (fetchurl { # https://github.com/LubosD/twinkle/pull/152 patch for bcg729 1.0.2+ + # patch for bcg729 1.0.2+ + (fetchurl { # https://github.com/LubosD/twinkle/pull/152 url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch"; sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2"; }) + # patch manual link to not link to old url, which now points to NSFW page + (fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07 + url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff"; + sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0"; + }) ]; nativeBuildInputs = [ From e77291b64e0bfb00efce0e66fe1295637e186386 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 9 Feb 2020 13:05:40 +0100 Subject: [PATCH 142/214] hpmyroom: 11.1.0.0508 -> 12.0.0.0220 --- pkgs/applications/networking/hpmyroom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index b0f21f6f7e0..59274f4105b 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { pname = "hpmyroom"; - version = "11.1.0.0508"; + version = "12.0.0.0220"; src = fetchurl { url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm"; - sha256 = "1j7mzvf349yxb42m8syh73gpvil01hy1a2wrr0rdzb2ijfnkxyaa"; + sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr"; }; nativeBuildInputs = [ From 6ca7b62a3670d6ebdd6e8ac7f3d531471f1263f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sat, 8 Feb 2020 15:55:30 +0700 Subject: [PATCH 143/214] alure2: unstable-2020-01-09 -> unstable-2020-02-06 --- pkgs/development/libraries/alure2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index 91919873fa6..6da95a77264 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "alure2"; - version = "unstable-2020-01-09"; + version = "unstable-2020-02-06"; src = fetchFromGitHub { owner = "kcat"; repo = "alure"; - rev = "4b7b58d3f0de444d6f26aa705704deb59145f586"; - sha256 = "0ds18hhy2wpvx498z5hcpzfqz9i60ixsi0cjihyvk20rf4qy12vg"; + rev = "50f92fe528e77da82197fd947d1cf9b0a82a0c7d"; + sha256 = "1gmc1yfhwaj6lik0vn7zv8y23i05f4rw25v2jg34n856jcs02svx"; }; nativeBuildInputs = [ cmake ]; From bcad453bcfdc85048632054b2b1dfa3077b1953f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 20 Dec 2019 12:11:24 -0500 Subject: [PATCH 144/214] minc_tools: 2017-09-11 -> unstable-2019-12-04 --- .../science/biology/minc-tools/default.nix | 10 ++++++---- .../biology/minc-tools/fix-netcdf-header.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 033f78609e9..87d5ceaa125 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }: stdenv.mkDerivation rec { - pname = "minc-tools"; - name = "${pname}-2017-09-11"; + pname = "minc-tools"; + version = "unstable-2019-12-04"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056"; - sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7"; + rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94"; + sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng"; }; + patches = [ ./fix-netcdf-header.patch ]; + nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg zlib ]; propagatedBuildInputs = with perlPackages; [ perl TextFormat ]; diff --git a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch new file mode 100644 index 00000000000..89c7564f8b6 --- /dev/null +++ b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch @@ -0,0 +1,12 @@ +diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h +index 14c95cd..117ab26 100644 +--- a/progs/mincdump/mincdump.h ++++ b/progs/mincdump/mincdump.h +@@ -3,6 +3,7 @@ + * See netcdf/COPYRIGHT file for copying and redistribution conditions. + * $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $ + *********************************************************************/ ++#include + + + /* error checking macro */ From 39f0e3b32b5b4aa5ec463c21fa3488f677fac18e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 7 Feb 2020 11:57:12 -0500 Subject: [PATCH 145/214] minc_tools: enable building conversion tools --- .../science/biology/minc-tools/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 87d5ceaa125..4c8b768a56a 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, + libminc, libjpeg, nifticlib, zlib }: stdenv.mkDerivation rec { pname = "minc-tools"; @@ -15,9 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg zlib ]; - propagatedBuildInputs = with perlPackages; [ perl TextFormat ]; + propagatedBuildInputs = [ perl TextFormat ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + "-DZNZ_INCLUDE_DIR=${nifticlib}/include/" + "-DZNZ_LIBRARY=${nifticlib}/lib/libznz.a" + "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti/" + "-DNIFTI_LIBRARY=${nifticlib}/lib/libniftiio.a" ]; postFixup = '' for prog in minccomplete minchistory mincpik; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b325f77a87a..85891e27c51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23884,7 +23884,9 @@ in messer-slim = callPackage ../applications/science/biology/messer-slim { }; - minc_tools = callPackage ../applications/science/biology/minc-tools { }; + minc_tools = callPackage ../applications/science/biology/minc-tools { + inherit (perlPackages) perl TextFormat; + }; minc_widgets = callPackage ../applications/science/biology/minc-widgets { }; From ec85f51603073e9912aedf1f74e75c76cd592305 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 7 Feb 2020 10:44:52 +0300 Subject: [PATCH 146/214] tippecanoe: 1.34.3 -> 1.35.0 --- pkgs/applications/misc/tippecanoe/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 8d84ab59d47..c85192603cb 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tippecanoe"; - version = "1.34.3"; + version = "1.35.0"; src = fetchFromGitHub { owner = "mapbox"; repo = pname; rev = version; - sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i"; + sha256 = "0v5ycc3gsqnl9pps3m45yrnb1gvw5pk6jdyr0q6516b4ac6x67m5"; }; buildInputs = [ sqlite zlib ]; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build vector tilesets from large collections of GeoJSON features"; - homepage = https://github.com/mapbox/tippecanoe; + homepage = "https://github.com/mapbox/tippecanoe"; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } From a9942b0226f8bd08a007001f6f2daf90ae73c2f4 Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 12 Jan 2020 16:45:35 +0100 Subject: [PATCH 147/214] kicad: simplify component names --- .../science/electronics/kicad/default.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0b627dbb23a..a60f8db388a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -35,8 +35,8 @@ let python = python3; wxPython = python3Packages.wxPython_4_0; - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; - kicad-base = callPackage ./base.nix { + libraries = callPackages ./libraries.nix versionConfig.libVersion; + base = callPackage ./base.nix { pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { inherit pname; version = versions.${baseName}.kicadVersion.version; - src = kicad-base; + src = base; dontUnpack = true; dontConfigure = true; dontBuild = true; @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = optionals (scriptingSupport) [ pythonPackages.wrapPython ]; - # wrapGAppsHook added the equivalent to ${kicad-base}/share + # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it makeWrapperArgs = [ - "--prefix XDG_DATA_DIRS : ${kicad-base}/share" + "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" @@ -73,13 +73,13 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${kicad-libraries.footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${kicad-libraries.symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${kicad-libraries.templates}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.symbols}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.footprints}/share/kicad/template" + "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${kicad-libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 @@ -88,30 +88,30 @@ stdenv.mkDerivation rec { # dunno why i have to add $makeWrapperArgs manually... # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # not sure if anything has to be done with the other stuff in kicad-base/bin + # not sure if anything has to be done with the other stuff in base/bin # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${kicad-base} $pythonPath" + optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" '' + - '' makeWrapper ${kicad-base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' + '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' + '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' + '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' + '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' + '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' + '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' + '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' ; From d3a9e634bf463b0cfbad2dc02cad58e7f3b102e3 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 11 Jan 2020 11:29:55 +0100 Subject: [PATCH 148/214] kicad-unstable: update update.sh && update use /tmp instead of XDG_RUNTIME_DIR which is /run/user/1000, which defaults to 10% of RAM and kicad-packages3d needs ~6gb --- .../science/electronics/kicad/update.sh | 16 ++++++------- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index b4f744c47ef..7dc0b008b6c 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -5,13 +5,12 @@ # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping -# if you get something like "tar: no space left on device" -# you may need a bigger tmpfs, this can be set as such -# services.logind.extraConfig = "RuntimeDirectorySize=8G"; -# this is most likely only needed for the packages3d -# this can be checked without that config by manual TOFU -# copy the generated items from ,versions.nix to versions.nix -# then nix-build and see what it actually gets +# by default nix-prefetch-url uses XDG_RUNTIME_DIR as tmp +# which is /run/user/1000, which defaults to 10% of your RAM +# unless you have over 64GB of ram that'll be insufficient +# resulting in "tar: no space left on device" for packages3d +# hence: +export TMPDIR=/tmp # if something goes unrepairably wrong, run 'update.sh all clean' @@ -19,7 +18,8 @@ # support parallel instances for each pname # currently risks reusing old data # no getting around manually checking if the build product works... -# if there is, default to commiting +# if there is, default to commiting? +# won't work when running in parallel? # remove items left in /nix/store? # get the latest tag that isn't an RC or *.99 diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index ac273a1265c..6b9a981a87c 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-01-08"; + version = "2020-02-10"; src = { - rev = "ca34ade00c554157f106fde97af5f08a202808ef"; - sha256 = "0xx5qkc5pi3qdrdikgq3902ws8zilv2476fb4bbgh95d9wpgr35v"; + rev = "1190e60dd426d246661e478db3287f266ec6cda2"; + sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; }; }; libVersion = { - version = "2020-01-08"; + version = "2020-02-10"; libSources = { - i18n.rev = "e7439fd76f27cfc26e269c4e6c4d56245345c28b"; - i18n.sha256 = "1nqm1kx5b4f7s0f9q8bg4rdhqnp0128yp6bgnrkia1kwmfnf5gmy"; - symbols.rev = "ad58768b88d564fd188c6667841adec436da53f2"; - symbols.sha256 = "1rdplf04bff0hmgjwr81fbcr9nkqi21n0n88nzs5fdp73mqiywcy"; + i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; + i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; + symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; + symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "973867de7f33f202e9fd1b3455bd1f7e7fe4a074"; - footprints.sha256 = "0yvidpnqbfxjdwaiscl5bdchsg0l4d769vp456dc8h0f3802mibi"; - packages3d.rev = "c2b92a411adc93ddeeed74b36b542e1057f81a2a"; - packages3d.sha256 = "05znc6y2lc31iafspg308cxdda94zg6c7mwslmys76npih1pb8qc"; + footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; + footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; + packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; + packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; }; }; }; From 567be487077dc56508c7d3a290b56959e74d691f Mon Sep 17 00:00:00 2001 From: Brenton Horne Date: Mon, 10 Feb 2020 19:26:58 +1000 Subject: [PATCH 149/214] marvin: 20.3.0 -> 20.4.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index ba20695ec44..b27af67c974 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.3.0"; + version = "20.4.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1y2vh1n80mrrbxqbhxfag8h4lisarbw8h3labmh3ajrfan7bmhql"; + sha256 = "12kygxq24in7hbp7shkx1baqig8rwmzvv0d3kc3ld9sj9hb0a2n1"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.linux; }; -} \ No newline at end of file +} From 63abe0af44f02a46a1e1a4602a95c7b1a7418cad Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 15:59:50 +0200 Subject: [PATCH 150/214] lazydocker: 0.7.6 -> 0.8 --- pkgs/tools/misc/lazydocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 96c13010fac..b63892178d9 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.7.6"; + version = "0.8"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "1sp5f9lkysqkyhd6gvrlpszrih78bj67yidkkd6azv9ianrndx0b"; + sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7"; }; goPackagePath = "github.com/jesseduffield/lazydocker"; From 46db47e5f76a8045e4bdbce22b97e7c83a579712 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 10 Feb 2020 15:53:45 +0200 Subject: [PATCH 151/214] findomain: 0.9.3 -> 1.4.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index abc34abd77f..3eb037d50a1 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "0.9.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1p7bj8q3zwn92nn6d71bk7cczclcsjvan6m8znlzr4lrwircp1y1"; + sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka"; }; - cargoSha256 = "1grb0frc1kp3z6vs2906h9v1yx9qxn6x0gf9jy1msqgnqjw0bgn9"; + cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From ab0b90ec5036c2bcb0133d69d2f8c5c9e9c30541 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 10 Feb 2020 00:26:32 +0000 Subject: [PATCH 152/214] python3Packages.matrix-nio: 0.6 -> 0.7.1 --- .../python-modules/matrix-nio/default.nix | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 9f5a086f2ee..c7631f0c5b2 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -1,23 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, git, - attrs, future, peewee, h11, h2, atomicwrites, pycryptodome, sphinx, Logbook, jsonschema, - python-olm, unpaddedbase64, aiohttp, cachetools }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, git +, attrs +, future +, aiohttp +, aiofiles +, h11 +, h2 +, Logbook +, jsonschema +, unpaddedbase64 +, pycryptodome +, python-olm +, peewee +, cachetools +, atomicwrites +}: buildPythonPackage rec { pname = "nio"; - version = "0.6"; + version = "0.7.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0pq5i6ks3pck2kq9m4p3pw9hbvkzs27xkyv68mjnfc6chp2g2mg9"; + sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'python-olm>=3.1.0' "" - ''; - nativeBuildInputs = [ git ]; @@ -25,18 +36,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs future - peewee + aiohttp + aiofiles h11 h2 - atomicwrites - pycryptodome - sphinx Logbook jsonschema - python-olm unpaddedbase64 - aiohttp + pycryptodome + python-olm + peewee cachetools + atomicwrites ]; doCheck = false; @@ -45,6 +56,6 @@ buildPythonPackage rec { description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; license = licenses.isc; - maintainers = [ maintainers.tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; }; } From 6957e476f422a58951a5869e4b5a34367ceb6d8c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 10 Feb 2020 00:26:59 +0000 Subject: [PATCH 153/214] weechatScripts.weechat-matrix: unstable-2019-11-10 -> unstable-2020-01-21 --- .../scripts/weechat-matrix/default.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index ff6a7d94741..845dd928766 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,20 +1,34 @@ -{ buildPythonPackage, stdenv, python, fetchFromGitHub, - pyopenssl, webcolors, future, atomicwrites, - attrs, Logbook, pygments, cachetools, matrix-nio }: +{ buildPythonPackage +, stdenv +, python +, fetchFromGitHub +, pyopenssl +, webcolors +, future +, atomicwrites +, attrs +, Logbook +, pygments +, matrix-nio +, aiohttp +, requests +}: let - matrixUploadPython = python.withPackages (ps: with ps; [ - magic + scriptPython = python.withPackages (ps: with ps; [ + aiohttp + requests + python_magic ]); in buildPythonPackage { pname = "weechat-matrix"; - version = "unstable-2019-11-10"; + version = "unstable-2020-01-21"; src = fetchFromGitHub { owner = "poljar"; repo = "weechat-matrix"; - rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365"; - sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c"; + rev = "46640df3e0bfb058e97d8abe723bb88fdf4e5177"; + sha256 = "1j3l43j741csfxsp1nsc74y6wj2wm86c45iraf167g6p0sdzcq8z"; }; propagatedBuildInputs = [ @@ -25,8 +39,9 @@ in buildPythonPackage { attrs Logbook pygments - cachetools matrix-nio + aiohttp + requests ]; passthru.scripts = [ "matrix.py" ]; @@ -38,10 +53,18 @@ in buildPythonPackage { mkdir -p $out/share $out/bin cp $src/main.py $out/share/matrix.py - cp $src/contrib/matrix_upload $out/bin/ + cp \ + $src/contrib/matrix_upload \ + $src/contrib/matrix_decrypt \ + $src/contrib/matrix_sso_helper \ + $out/bin/ substituteInPlace $out/bin/matrix_upload \ - --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u' - + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_sso_helper \ + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_decrypt \ + --replace '/usr/bin/env python3' '${scriptPython}/bin/python' + mkdir -p $out/${python.sitePackages} cp -r $src/matrix $out/${python.sitePackages}/matrix ''; @@ -53,6 +76,6 @@ in buildPythonPackage { homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; platforms = platforms.linux; - maintainers = [ maintainers.tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; }; } From 603109c1718d0c0d6fbf3855a2a050fbf829560f Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 7 Feb 2020 12:40:18 +0100 Subject: [PATCH 154/214] vscodium: 1.41.1 -> 1.42.0 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index e7bdacc1390..d4676d421d0 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0n4wcg072a0b76jjv08cig2kygkmakvwav5vvl0h6ww9sbdcwl1x"; - x86_64-darwin = "0xvyh9qypsyzw02vpmnfa0hdszj8ylvf78yjbmg86m4xml0sbj9r"; + x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; + x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.41.1"; + version = "1.42.0"; pname = "vscodium"; executableName = "codium"; From b19c857985dbfd034f4535a805560880a8ea0459 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 5 Feb 2020 21:23:44 +0800 Subject: [PATCH 155/214] redoflacs: 0.30.20150202 -> 0.30.20190903 --- pkgs/applications/audio/redoflacs/default.nix | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index e32fd42af32..140b163e25c 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -1,39 +1,49 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, flac, sox }: +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, installShellFiles +, flac +, sox +, withAucdtect ? false +, aucdtect ? null +}: stdenv.mkDerivation rec { pname = "redoflacs"; - version = "0.30.20150202"; + version = "0.30.20190903"; src = fetchFromGitHub { - owner = "sirjaren"; - repo = "redoflacs"; - rev = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735"; - sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j"; + owner = "sirjaren"; + repo = "redoflacs"; + rev = "4ca544cbc075d0865884906208cb2b8bc318cf9e"; + sha256 = "19lcl09d4ngz2zzwd8dnnxx41ddvznhar6ggrlf1xvkr5gd7lafp"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; installPhase = '' runHook preInstall install -Dm755 -t $out/bin redoflacs install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md + installManPage redoflacs.1 runHook postInstall ''; postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]} + --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger"; - homepage = src.meta.homepage; - license = licenses.gpl2; - platforms = platforms.all; + homepage = src.meta.homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } From fd162292cfe5d50dc1e49d2cf021877164b91056 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 3 Feb 2020 22:23:53 +0800 Subject: [PATCH 156/214] dxx-rebirth: 0.59.100 -> 0.59.20200202 --- pkgs/games/dxx-rebirth/default.nix | 54 ++++++++++++++++-------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index b7eb2f02568..aa2563d4e4b 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,5 +1,15 @@ -{ gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig -, SDL, SDL_mixer, libGLU, libGL, physfs +{ stdenv +, fetchFromGitHub +, fetchurl +, fetchpatch +, scons +, pkgconfig +, SDL +, SDL_mixer +, libGLU +, libGL +, libpng +, physfs }: let @@ -8,46 +18,38 @@ let sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc"; }; -in gcc6Stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "dxx-rebirth"; - version = "0.59.100"; + version = "0.59.20200202"; - src = fetchurl { - url = "https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz"; - sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka"; + src = fetchFromGitHub { + owner = "dxx-rebirth"; + repo = "dxx-rebirth"; + rev = "8ebb66c5c9c74ebb93d49741cc9545f2bb7fa05d"; + sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk"; }; - # TODO: drop these when upgrading to version > 0.59.100 - patches = [ - (fetchpatch { - name = "dxx-gcc7-fix1.patch"; - url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch"; - sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0"; - }) - (fetchpatch { - name = "dxx-gcc7-fix2.patch"; - url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch"; - sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy"; - }) - ]; - nativeBuildInputs = [ pkgconfig scons ]; - buildInputs = [ libGLU libGL physfs SDL SDL_mixer ]; + buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + NIX_CFLAGS_COMPILE = [ + "-Wno-format-nonliteral" + "-Wno-format-truncation" + ]; postInstall = '' - install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa + install -Dm644 ${music} $out/share/games/dxx-rebirth/${music.name} install -Dm644 -t $out/share/doc/dxx-rebirth *.txt ''; - meta = with gcc6Stdenv.lib; { + meta = with stdenv.lib; { description = "Source Port of the Descent 1 and 2 engines"; homepage = "https://www.dxx-rebirth.com/"; - license = licenses.free; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; From 07655cd7244cb1219a626b43eda18e8562ae38ba Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 2 Feb 2020 22:34:36 +0300 Subject: [PATCH 157/214] lsd2dsl: 0.4.1 -> 0.5.1 --- pkgs/applications/misc/lsd2dsl/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 5dd5fa0f512..335279c7084 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -1,26 +1,29 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, boost, libvorbis, libsndfile, minizip, gtest }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake +, boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: mkDerivation rec { pname = "lsd2dsl"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "15xjp5xxvl0qc4zp553n7djrbvdp63sfjw406idgxqinfmkqkqdr"; + sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libvorbis libsndfile minizip gtest ]; + buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; installPhase = '' - install -Dm755 lsd2dsl $out/bin/lsd2dsl - install -m755 qtgui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + install -Dm755 console/lsd2dsl $out/bin/lsd2dsl + install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + '' + lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/bin/lsd2dsl + wrapQtApp $out/bin/lsd2dsl-qtgui ''; meta = with lib; { @@ -31,6 +34,6 @@ mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } From c856d7ff128b4d6ed87bae0a5b10692763a0e63b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jan 2020 19:37:29 +0000 Subject: [PATCH 158/214] dino: remove unnecessary private transitive deps As explained by Orivej (reformatted from Markdown): > These (except libsignal-protocol-c) are private dependencies of the > actual dependencies that should neither be propagated nor added > manually to dino. For example, libpsl and brotli come from > libsoup-2.4.pc: > > Requires: glib-2.0 >= 2.38, gobject-2.0 >= 2.38, gio-2.0 >= 2.38 > Requires.private: libxml-2.0, sqlite3, libpsl >= 0.20, libbrotlidec, zlib > > (To be precise, glib uses utillinuxMinimal rather than utillinux.) > > The warnings we see, such as Package 'mount', required by 'gio-2.0', > not found, come from CMake running both pkg-config --libs and > pkg-config --static --libs to populate both _LIBRARIES and > _STATIC_LIBRARIES[1], but dino has no use for the latter. > Currently these warnings can not be disabled: > https://gitlab.kitware.com/cmake/cmake/issues/18158 > > (They could be prevented by pruning Requires.private from shared-only > libraries akin to , > although it can not be detected if a library is shared-only from the > .pc file alone, and this is just a warning.) > > [1]: docs: https://cmake.org/cmake/help/v3.16/module/FindPkgConfig.html --- .../networking/instant-messengers/dino/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8928814e967..9cf0032cf49 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup, libgee, utillinux, libselinux, libsepol, libpsl, brotli +, libnotify, libsoup, libgee , librsvg, libsignal-protocol-c , libgcrypt , epoxy @@ -52,18 +52,12 @@ stdenv.mkDerivation rec { pcre xorg.libxcb xorg.libpthreadstubs - xorg.libXtst libXdmcp libxkbcommon epoxy at-spi2-core dbus icu - utillinux - libselinux - libsepol - libpsl - brotli libsignal-protocol-c librsvg ]; From 49fe4299905e5066bf76bc1b53f3f7c153689334 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 30 Jan 2020 11:58:17 -0600 Subject: [PATCH 159/214] lfe: add message to OTP version assertion --- pkgs/development/interpreters/lfe/generic-builder.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 6e74229e1e8..5df491e72d3 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv.lib) getVersion versionAtLeast versions; + inherit (stdenv.lib) assertMsg getVersion versionAtLeast versions; mainVersion = versions.major (getVersion erlang); @@ -25,7 +25,9 @@ let }; in -assert versionAtLeast maximumOTPVersion mainVersion; +assert (assertMsg (versionAtLeast maximumOTPVersion mainVersion)) '' + LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}. +''; buildRebar3 { name = baseName; From 82e007f80fd14216f2104798acf3d53645383da2 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 30 Jan 2020 12:00:24 -0600 Subject: [PATCH 160/214] lfe: pin 1.2.1 to R19 --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index badee379ad3..6da96b967b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9050,15 +9050,14 @@ in inherit (beam.interpreters) erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 - lfe lfe_1_2; + elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; inherit (beam.packages.erlang) rebar rebar3 fetchHex beamPackages relxExe; - inherit (beam.packages.erlangR19) cuter; + inherit (beam.packages.erlangR19) cuter lfe lfe_1_2; groovy = callPackage ../development/interpreters/groovy { }; From d723b9122345b0198ad5349ebdd21651561a6e64 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 30 Jan 2020 12:00:09 -0600 Subject: [PATCH 161/214] lfe: 1.2.1 -> 1.3 Add patches to the builder expression, and add those necessary for 1.3. --- pkgs/development/beam-modules/default.nix | 3 +- pkgs/development/interpreters/lfe/1.3.nix | 43 +++++++++++++++++++ .../interpreters/lfe/dedup-ebins.patch | 13 ++++++ .../interpreters/lfe/generic-builder.nix | 13 ++++-- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/beam-packages.nix | 2 +- 6 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/interpreters/lfe/1.3.nix create mode 100644 pkgs/development/interpreters/lfe/dedup-ebins.patch diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 96062a57300..efd68988c9b 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -66,8 +66,9 @@ let # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html - lfe = lfe_1_2; + lfe = lfe_1_3; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. diff --git a/pkgs/development/interpreters/lfe/1.3.nix b/pkgs/development/interpreters/lfe/1.3.nix new file mode 100644 index 00000000000..52df5c02544 --- /dev/null +++ b/pkgs/development/interpreters/lfe/1.3.nix @@ -0,0 +1,43 @@ +{ fetchpatch, mkDerivation }: + +let + _fetchpatch = + { rev, sha256 }: + fetchpatch { + url = "https://github.com/rvirding/lfe/commit/${rev}.patch"; + inherit sha256; + }; + fetchPatches = map _fetchpatch; +in + +mkDerivation { + version = "1.3"; + sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; + maximumOTPVersion = "21"; + patches = fetchPatches [ + { + rev = "b457e5d521bb35008e6049fab31b4073cc10d583"; + sha256 = "1zrq1b3291xhb0jsirgb5s8hacq5xvz7xidsp29aqcnpazdvivdc"; + } + { + rev = "5fe9f37741b7d53bd43109fd3435e1437f124a0d"; + sha256 = "1anqlcbih52lc0wynf58r67w1jhn264lz49rczwgh19pqg92dvqf"; + } + { + rev = "b8f3e06511cb6805cf3a904c1589b27f33f3958d"; + sha256 = "1zqafc0asm9m6cq7r0brvfawv69fqggy1phif3zknjmpicf25pqf"; + } + { + rev = "40c239a608460e55563edb68c1b6faca57518b54"; + sha256 = "03av5115jwyammw337xzy50l6api5h0wbwwda5vzw0w10zwb2z8y"; + } + { + rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; + sha256 = "0ml5yh5b3rn4ympks4bpx409hkra0i79zvq80azk0kmbjd869fxp"; + } + { + rev = "9ff978693babcfd043d741b5c6940920b8315892"; + sha256 = "04968dmp527wbkdv7dqpaj3nsyjls93whc1b5hx73b39dvl3n3y1"; + } + ]; +} diff --git a/pkgs/development/interpreters/lfe/dedup-ebins.patch b/pkgs/development/interpreters/lfe/dedup-ebins.patch new file mode 100644 index 00000000000..44e3733c416 --- /dev/null +++ b/pkgs/development/interpreters/lfe/dedup-ebins.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 59f2c06..5ee8f6e 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ ESRCS = $(notdir $(wildcard $(SRCDIR)/*.erl)) + XSRCS = $(notdir $(wildcard $(SRCDIR)/*.xrl)) + YSRCS = $(notdir $(wildcard $(SRCDIR)/*.yrl)) + LSRCS = $(notdir $(wildcard $(LSRCDIR)/*.lfe)) +-EBINS = $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam) ++EBINS = $(sort $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam)) + LBINS = $(LSRCS:.lfe=.beam) + + CSRCS = $(notdir $(wildcard $(CSRCDIR)/*.c)) diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 5df491e72d3..ba42c2d59d5 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -6,10 +6,13 @@ , sha256 ? null , rev ? version , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; } +, patches ? [] }: let - inherit (stdenv.lib) assertMsg getVersion versionAtLeast versions; + inherit (stdenv.lib) + assertMsg makeBinPath optionalString + getVersion versionAtLeast versionOlder versions; mainVersion = versions.major (getVersion erlang); @@ -36,13 +39,15 @@ buildRebar3 { buildInputs = [ erlang makeWrapper ]; beamDeps = [ proper ]; - patches = [ ./no-test-deps.patch ]; + patches = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches; doCheck = true; checkTarget = "travis"; + makeFlags = [ "-e" "MANDB=''" "PREFIX=$$out"]; + # These installPhase tricks are based on Elixir's Makefile. # TODO: Make, upload, and apply a patch. - installPhase = '' + installPhase = optionalString (versionOlder version "1.3") '' local libdir=$out/lib/lfe local ebindir=$libdir/ebin local bindir=$libdir/bin @@ -65,7 +70,7 @@ buildRebar3 { # Add some stuff to PATH so the scripts can run without problems. for f in $out/bin/*; do wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin" + --prefix PATH ":" "${makeBinPath [ erlang coreutils bash ]}:$out/bin" substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6da96b967b5..0090a06e3df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9057,7 +9057,9 @@ in fetchHex beamPackages relxExe; - inherit (beam.packages.erlangR19) cuter lfe lfe_1_2; + inherit (beam.packages.erlangR19) cuter lfe_1_2; + + inherit (beam.packages.erlangR21) lfe lfe_1_3; groovy = callPackage ../development/interpreters/groovy { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index a2405107563..f6fe58a83d0 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -74,7 +74,7 @@ rec { # `beam.packages.erlangR22.elixir`. inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; - inherit (packages.erlang) lfe lfe_1_2; + inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; # Helper function to generate package set with a specific Erlang version. From 60446543dc31a152e0128e907643d21f654b7b3c Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 18 Jan 2020 13:48:40 +0000 Subject: [PATCH 162/214] zopfli: split outputs --- pkgs/tools/compression/zopfli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 586c47de582..f3f82a4067a 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -3,6 +3,7 @@ stdenv.mkDerivation rec { pname = "zopfli"; version = "1.0.3"; + outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "google"; From 08e96d2fb99af8dbe0d80e4c52634c8feec01488 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 18 Jan 2020 14:10:11 +0000 Subject: [PATCH 163/214] zopfli: add edef as maintainer --- pkgs/tools/compression/zopfli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index f3f82a4067a..81fdc95d88d 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; license = licenses.asl20; - maintainers = with maintainers; [ bobvanderlinden ]; + maintainers = with maintainers; [ bobvanderlinden edef ]; }; } From 434c507864cf6ae7e4940ea275735f4d2a115680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= Date: Tue, 4 Feb 2020 11:20:40 +0100 Subject: [PATCH 164/214] insomnia: 7.0.5 -> 7.0.6 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 00ffa9d1d62..ae4302b7429 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1zcxldfi4rxg7rr6r588blhihyh7ggcdy32vwzjklgq7ihsvx5bs"; + sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8"; }; nativeBuildInputs = From 4562d76dde955b74b8ffe3524cf434bcc06500ce Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 28 Jan 2020 23:58:37 +0300 Subject: [PATCH 165/214] qtpbfimageplugin: 2.0 -> 2.1 --- pkgs/development/libraries/qtpbfimageplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 5f3f8c4a66a..cc4a3ae84d9 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "16qsax1p09gldbg83df77ixaz7bkxl8wm806lc55y19pwnid9m7p"; + sha256 = "05l28xf7pf9mxm6crrdx5i7d2ri3hlg5iva0fqc8wxnj8pf2m38r"; }; nativeBuildInputs = [ qmake ]; From bd90b5a5cff0158925ed26d78bb65734acee33d1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 27 Jan 2020 12:48:57 +0100 Subject: [PATCH 166/214] faust: 2.5.23 -> 2.20.2 --- pkgs/applications/audio/faust/faust2.nix | 58 ++++++------------- pkgs/applications/audio/faust/faust2jack.nix | 2 + .../audio/faust/faust2jackrust.nix | 18 ++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 40 insertions(+), 42 deletions(-) create mode 100644 pkgs/applications/audio/faust/faust2jackrust.nix diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 21cd3fbdb25..74a5f4d383d 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -3,25 +3,30 @@ , fetchFromGitHub , makeWrapper , pkgconfig +, cmake , llvm , emscripten , openssl , libsndfile , libmicrohttpd +, gnutls +, libtasn1 +, p11-kit , vim +, which }: with stdenv.lib.strings; let - version = "2.5.23"; + version = "2.20.2"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; + sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy"; fetchSubmodules = true; }; @@ -40,8 +45,8 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig vim ]; - buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { @@ -50,39 +55,13 @@ let preConfigure = '' - makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix - - # The makefile sets LLVM_ depending on the current llvm - # version, but the detection code is quite brittle. - # - # Failing to properly detect the llvm version means that the macro - # LLVM_VERSION ends up being the raw output of `llvm-config --version`, while - # the code assumes that it's set to a symbol like `LLVM_35`. Two problems result: - # * :0:1: error: macro names must be identifiers.; and - # * a bunch of undefined reference errors due to conditional definitions relying on - # LLVM_XY being defined. - # - # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION - # to something the makefile will recognize. - sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix + cd build ''; - postPatch = '' - # fix build with llvm 5.0.2 by adding it to the list of known versions - # TODO: check if still needed on next update - substituteInPlace compiler/Makefile.unix \ - --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2" + cmakeFlags = '' + -C ../backends/all.cmake -C ../targets/all.cmake .. ''; - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" @@ -90,10 +69,6 @@ let ''; postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - # The 'faustoptflags' is 'source'd into other faust scripts and # not used as an executable, so patch 'uname' usage directly # rather than use makeWrapper. @@ -160,8 +135,6 @@ let # 'faustoptflags' to absolute paths. for script in "$out"/bin/*; do substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \ --replace " error " "echo" done ''; @@ -200,19 +173,22 @@ let propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs; postFixup = '' # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ + --set FAUSTLDDIR "${faust}/lib" \ --set FAUSTLIB "${faust}/share/faust" \ - --set FAUST_LIB_PATH "${faust}/share/faust" \ --set FAUSTINC "${faust}/include/faust" \ + --set FAUSTARCH "${faust}/share/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" + --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ + --prefix LIBRARY_PATH $libPath done ''; }); diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 7762ca39369..f032f435a35 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,6 +1,7 @@ { faust , gtk2 , jack2Full +, alsaLib , opencv , libsndfile }: @@ -18,6 +19,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 jack2Full + alsaLib opencv libsndfile ]; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix new file mode 100644 index 00000000000..2562237424e --- /dev/null +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -0,0 +1,18 @@ +{ stdenv +, faust +, libjack2 +, cargo +, binutils +, gcc +, gnumake +, openssl +, pkgconfig + +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2jackrust"; + + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0090a06e3df..4494a96ab94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24759,7 +24759,7 @@ in faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_5; + llvm = llvm_9; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -24772,6 +24772,8 @@ in faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; + faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { }; + faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; From 2ba2b0cf23e4d0f7fdcf97ac7900c349da0d3fbc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 10 Feb 2020 14:14:05 -0500 Subject: [PATCH 167/214] 20.09 is Nightingale --- .version | 2 +- lib/trivial.nix | 2 +- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-2009.xml | 80 +++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-2009.xml diff --git a/.version b/.version index 88b8320330d..3eea3c4c0e9 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -20.03 \ No newline at end of file +20.09 diff --git a/lib/trivial.nix b/lib/trivial.nix index a281cd70fb0..5788dd435e5 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -171,7 +171,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Markhor"; + codeName = "Nightingale"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 444862c5739..e2913b8a535 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml new file mode 100644 index 00000000000..240fa281d79 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -0,0 +1,80 @@ +
+ Release 20.09 (“Markhor”, 2020.09/??) + +
+ Highlights + + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + + + Support is planned until the end of October 2020, handing over to 20.09. + + + +
+ +
+ New Services + + + The following new services were added since the last release: + + + + + + + + +
+ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + + +
+ +
+ Other Notable Changes + + + + + + +
+
From 1f54afb299f693fe2c9a42b97890e65e8cb89d8a Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 20 Jan 2020 21:09:11 -0800 Subject: [PATCH 168/214] gotools: fix the path in the setup-hook --- pkgs/development/tools/gotools/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 59416f03134..430f17bfb5b 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -40,9 +40,8 @@ buildGoModule rec { # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' mkdir -p $out/nix-support - substituteAll ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook.tmp - cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook - rm $out/nix-support/setup-hook.tmp + substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \ + --subst-var-by bin $out ''; # Do not copy this without a good reason for enabling From 3b4c71721a95222f3634eb3064e0401fb0b190ab Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Tue, 21 Jan 2020 13:15:28 -0500 Subject: [PATCH 169/214] jdiskreport: cleanup and add desktop item --- pkgs/tools/misc/jdiskreport/builder.sh | 15 --------- pkgs/tools/misc/jdiskreport/default.nix | 41 +++++++++++++++++++++---- 2 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/misc/jdiskreport/builder.sh diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh deleted file mode 100644 index f95dafedd32..00000000000 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -unzip $src - -jar=$(ls */*.jar) - -mkdir -p $out/share/java -mv $jar $out/share/java - -mkdir -p $out/bin -cat > $out/bin/jdiskreport < $out/bin/jdiskreport < Date: Fri, 31 Jan 2020 11:39:26 -0500 Subject: [PATCH 170/214] jdiskreport: remove builder.sh link from docs --- doc/contributing/quick-start.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/contributing/quick-start.xml b/doc/contributing/quick-start.xml index 80514cba490..8e4e914d451 100644 --- a/doc/contributing/quick-start.xml +++ b/doc/contributing/quick-start.xml @@ -69,8 +69,7 @@ JDiskReport, a Java utility: pkgs/tools/misc/jdiskreport/default.nix (and the builder). Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix">pkgs/tools/misc/jdiskreport/default.nix. Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc. From 168b3076a73ac5f3949c57b182c454aeb7b922ed Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 15 Jan 2020 15:49:32 -0500 Subject: [PATCH 171/214] pythonPackages.cfn-flip: 1.1.0.post1 -> 1.2.2 --- .../python-modules/cfn-flip/default.nix | 54 ++++++++++++++----- .../python-modules/fluidasserts/default.nix | 1 - 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index ab6abc4cd6f..da04ecf6889 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }: +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, click +, pytest +, pytestcov +, pytestrunner +, pyyaml +, six +}: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.1.0.post1"; + version = "1.2.2"; - src = fetchPypi { - pname = "cfn_flip"; - inherit version; - sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck"; + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-cfn-template-flip"; + rev = version; + sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; }; - propagatedBuildInputs = [ six pyyaml click ]; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + click + pyyaml + six + ]; - # No tests in Pypi - doCheck = false; + checkInputs = [ + pytest + pytestcov + pytestrunner + ]; + + checkPhase = '' + py.test \ + --cov=cfn_clean \ + --cov=cfn_flip \ + --cov=cfn_tools \ + --cov-report term-missing \ + --cov-report html + ''; meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; - homepage = https://github.com/awslabs/aws-cfn-template-flip; + homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ psyanticy ]; + maintainers = with maintainers; [ + kamadorueda + psyanticy + ]; }; } diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index 78405ed8a66..f1f5397c0a8 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -75,7 +75,6 @@ buildPythonPackage rec { substituteInPlace ./setup.py \ --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ --replace 'boto3==1.11.7' 'boto3==1.10.1' \ - --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \ --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ --replace 'pillow==7.0.0' 'pillow==6.2.1' \ From 48d502cd66ea604d5f9baf68e423aa7a1df54004 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 14 Jan 2020 16:06:54 +0100 Subject: [PATCH 172/214] libspiro: 0.5.20150702 -> 20190731 also build from Git --- pkgs/development/libraries/libspiro/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 5f547a97370..67251f9430a 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,18 +1,22 @@ -{stdenv, pkgconfig, fetchurl}: +{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; - version = "0.5.20150702"; - src = fetchurl { - url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; + version = "20190731"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = pname; + rev = version; + sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; homepage = https://github.com/fontforge/libspiro; license = licenses.gpl3Plus; + maintainers = [ maintainers.erictapen ]; }; } From 35bfcc98c93ce66f386731a3e8156a5b6cd79b2d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Jan 2020 17:17:24 -0500 Subject: [PATCH 173/214] python3Packages.sparse: mark unbroken (package has been previously updated) --- pkgs/development/python-modules/sparse/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index ec126e963b0..a1b9eae398d 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = https://github.com/pydata/sparse/; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; - broken = true; }; } From 7059f44440c264cb534336dcd4c84dc5687c7b44 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Jan 2020 17:18:02 -0500 Subject: [PATCH 174/214] python3Packages.tensorly: init at 0.4.5 --- .../python-modules/tensorly/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/tensorly/default.nix diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix new file mode 100644 index 00000000000..33aca636f45 --- /dev/null +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, nose +, isPy27 +, numpy +, scipy +, sparse +, pytorch +}: + +buildPythonPackage rec { + pname = "tensorly"; + version = "0.4.5"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x"; + }; + + propagatedBuildInputs = [ numpy scipy sparse ]; + checkInputs = [ pytest nose pytorch ]; + # also has a cupy backend, but the tests are currently broken + # (e.g. attempts to access cupy.qr instead of cupy.linalg.qr) + # and this backend also adds a non-optional CUDA dependence, + # as well as tensorflow and mxnet backends, but the tests don't + # seem to exercise these backend by default + + checkPhase = '' + runHook preCheck + nosetests -e "test_cupy" + runHook postCheck + ''; + + meta = with lib; { + description = "Tensor learning in Python"; + homepage = https://tensorly.org/; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 610a8d0852f..f510f29facc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6581,6 +6581,8 @@ in { cudaSupport = true; }; + tensorly = callPackage ../development/python-modules/tensorly { }; + tflearn = callPackage ../development/python-modules/tflearn { }; simpleai = callPackage ../development/python-modules/simpleai { }; From 8f30b3e83e561dee8f18d3be618a07a8c2eba644 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 13 Jan 2020 19:25:47 +0100 Subject: [PATCH 175/214] kanboard: 1.2.12 -> 1.2.13 Add self to maintainers --- pkgs/applications/misc/kanboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index d3cef00bbe8..b790fb9e6c4 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "1m1drgbyk1m6mf69xqlz9gqcj650n9m4y2fdj7d2yv20q8r31489"; + sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk"; }; dontBuild = true; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Kanban project management software"; homepage = https://kanboard.net; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz lheckemann ]; }; } From be01f27adcaf56c56357cfce60acdae5fd4d22e3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 10 Feb 2020 14:21:59 -0500 Subject: [PATCH 176/214] rl-2009: typo --- nixos/doc/manual/release-notes/rl-2009.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 240fa281d79..d07b7cf49c3 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-20.09"> - Release 20.09 (“Markhor”, 2020.09/??) + Release 20.09 (“Nightingale”, 2020.09/??)
Date: Tue, 7 Jan 2020 21:13:49 +0000 Subject: [PATCH 177/214] google-play-music-desktop-player: 4.6.1 -> 4.7.1 --- .../audio/google-play-music-desktop-player/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index b51b72f1c8a..332f2ca2342 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,14 +1,15 @@ -{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: let - version = "4.6.1"; + version = "4.7.1"; deps = [ alsaLib atk + at-spi2-atk cairo cups dbus @@ -48,7 +49,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g"; + sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; }; dontBuild = true; From 9205b2d6334289b8acb340c4d1b84252247464a6 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 5 Jan 2020 13:18:12 +0100 Subject: [PATCH 178/214] trilium: 0.38.2 -> 0.39.4 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 28548091f6e..ee494092884 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.38.2"; + version = "0.39.4"; in { @@ -30,7 +30,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa"; + sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9"; }; # Fetch from source repo, no longer included in release. @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61"; + sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3"; }; nativeBuildInputs = [ From 51950d7a29a42d0d4e0e3b2953401bc17480b0c3 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 4 Jan 2020 22:48:37 -0500 Subject: [PATCH 179/214] rtl8812au: fix cross compiling Built and tested on: Raspberry Pi 3, natively compiled on aarch64 Raspberry Pi 1, cross compiled from x86_64 to armv6l --- pkgs/os-specific/linux/rtl8812au/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 68364580346..edec5932e7f 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -23,6 +23,15 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + preInstall = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; @@ -35,7 +44,7 @@ stdenv.mkDerivation rec { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; }; } From a8c0c21f7851e201bf113854f0f80519afa551fe Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 3 Jan 2020 23:31:31 +0000 Subject: [PATCH 180/214] capstone: enable for darwin, enable tests & fix pkg-config output turns out capstone.pc is generated during the buildPhase, so needs PREFIX set here too for it to be correct --- .../libraries/capstone/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 956fd74da58..b8d00984cd6 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -9,9 +9,23 @@ stdenv.mkDerivation rec { sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; }; + # replace faulty macos detection + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile + ''; + configurePhase = '' patchShebangs make.sh ''; - buildPhase = '' ./make.sh ''; - installPhase = '' env PREFIX=$out ./make.sh install ''; + buildPhase = "PREFIX=$out ./make.sh"; + + doCheck = true; + checkPhase = '' + # first remove fuzzing steps from check target + substituteInPlace Makefile --replace "fuzztest fuzzallcorp" "" + make check + ''; + + installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + + "PREFIX=$out ./make.sh install"; nativeBuildInputs = [ pkgconfig @@ -23,7 +37,7 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; }; } From 8817036a3140dc8496dd627ed6c7e8994b086b9a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 2 Jan 2020 20:06:50 +0000 Subject: [PATCH 181/214] pythonPackages.capstone: 3.0.5.post1 -> 4.0.1, redesign as wrapper package around main capstone package this allows us to keep the two packages in sync and handle overrides more flexibly --- .../python-modules/capstone/default.nix | 38 +++++++------------ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 035632f9cf2..7fc0b16522e 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -3,43 +3,33 @@ , fetchPypi , fetchpatch , setuptools +, capstone }: buildPythonPackage rec { pname = "capstone"; - version = "3.0.5.post1"; + version = stdenv.lib.getVersion capstone; - setupPyBuildFlags = [ - "--plat-name x86_64-linux" - ]; + src = capstone.src; + sourceRoot = "${capstone.name}/bindings/python"; - src = fetchPypi { - inherit pname version; - sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; - }; + postPatch = '' + ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ + ln -s ${capstone}/lib/libcapstone.a prebuilt/ + ''; propagatedBuildInputs = [ setuptools ]; - patches = [ - (fetchpatch { - stripLen = 2; - url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch"; - sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r"; - }) - ]; - - postPatch = '' - patchShebangs src/make.sh - ''; - - preCheck = '' - mv src/libcapstone.so capstone + checkPhase = '' + mv capstone capstone.hidden + patchShebangs test_* + make check ''; meta = with stdenv.lib; { homepage = "http://www.capstone-engine.org/"; license = licenses.bsdOriginal; - description = "Capstone disassembly engine"; - maintainers = with maintainers; [ bennofs ]; + description = "Python bindings for Capstone disassembly engine"; + maintainers = with maintainers; [ bennofs ris ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f510f29facc..603b2cf5dfe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1816,7 +1816,7 @@ in { inherit (self) python numpy boost; }); - capstone = callPackage ../development/python-modules/capstone { }; + capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; capturer = callPackage ../development/python-modules/capturer { }; From 8d6d53b173692ab2160383d78ab5f8f8fb333496 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Jan 2020 10:54:00 -0800 Subject: [PATCH 182/214] pythonPackages.elementpath: 1.3.3 -> 1.4.0 --- .../python-modules/elementpath/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 093a30d29da..7d293edba35 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,19 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.3.3"; + version = "1.4.0"; pname = "elementpath"; + disabled = isPy27; # uses incompatible class syntax src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "05wplh836ffwhncf5rpdnz4g1b3mqw7jiy83352nw4x3aak4ifbr"; + sha256 = "1fmwy7plcgxam09cx3z11068k0c98wcsgclmxdq8chsd6id3632y"; }; # avoid circular dependency with xmlschema which directly depends on this doCheck = false; + pythonImportsCheck = [ + "elementpath.xpath1_parser" + "elementpath.xpath2_parser" + "elementpath.xpath2_functions" + "elementpath.xpath_context" + "elementpath.xpath_selectors" + ]; + meta = with lib; { description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; homepage = "https://github.com/sissaschool/elementpath"; From 2214be1fe1b6da7860d2e7c7d6f2f90b0697e7b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Jan 2020 15:17:33 -0800 Subject: [PATCH 183/214] pythonPackages.xmlschema: 1.0.17 -> 1.0.18 --- pkgs/development/python-modules/xmlschema/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 788ccc0ed81..ade478bf82c 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "elementpath~=1.3.0" "elementpath~=1.3" + ''; + # Ignore broken fixtures, and tests for files which don't exist. # For darwin, we need to explicity say we can't reach network checkPhase = '' From d108ba9ded169e857a2807df4a97ceb611da085f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 29 Dec 2019 20:04:35 -0500 Subject: [PATCH 184/214] recursive: 1.022 -> 1.030 --- pkgs/data/fonts/recursive/default.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index d3d65f8e515..3b1e8931b89 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -2,25 +2,13 @@ stdenv.mkDerivation rec { pname = "recursive"; - version = "1.022"; + version = "1.030"; - srcs = [ - (fetchzip { - name = "${pname}"; - url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-beta_1_022.zip"; - sha256 = "09nr1fli7ksv8z4yb25c4xidwsqq50av18qrybsy4kqy5c22957v"; - stripRoot = false; - }) - - (fetchzip { - name = "${pname}-static"; - url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-static_fonts-b020.zip"; - sha256 = "1wlj113gjm26ra9y2r2b3syis2wx0mjq2m8i8xpwscp1kflma1r6"; - stripRoot = false; - }) - ]; - - sourceRoot = "."; + src = fetchzip { + url = "https://github.com/arrowtype/recursive/releases/download/${version}/recursive-beta_1_030--statics.zip"; + sha256 = "1clds4ljiqdf0zc3b7nlna1w7kc23pc9gxdd5vwbgmz9xfvkam0f"; + stripRoot = false; + }; installPhase = '' mkdir -p $out/share/fonts/{opentype,truetype,woff2} From e66cbc5f6544c8475626b27a74a859e39790d1c2 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 29 Dec 2019 04:10:33 +0100 Subject: [PATCH 185/214] rakudo: 2017.01 -> 2020.01 dependencies: - moarvm: init at 2020.01.1 - nqp: init at 2020.01 - zef: init 0.8.2 Replaced the rakudo-star distribution with packages for raku, moarvm, nqp and zef. --- .../interpreters/rakudo/default.nix | 30 ++++++++-------- .../interpreters/rakudo/moarvm.nix | 25 ++++++++++++++ pkgs/development/interpreters/rakudo/nqp.nix | 29 ++++++++++++++++ pkgs/development/interpreters/rakudo/zef.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++- 5 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/interpreters/rakudo/moarvm.nix create mode 100644 pkgs/development/interpreters/rakudo/nqp.nix create mode 100644 pkgs/development/interpreters/rakudo/zef.nix diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ab5493e8a9d..1f832efee89 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, readline -, CoreServices, ApplicationServices }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: stdenv.mkDerivation rec { - pname = "rakudo-star"; - version = "2017.01"; + pname = "rakudo"; + version = "2020.01"; src = fetchurl { - url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz"; - sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; + url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz"; + sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if"; }; - buildInputs = [ icu zlib gmp readline perl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ icu zlib gmp perl ]; configureScript = "perl ./Configure.pl"; - configureFlags = - [ "--backends=moar" - "--gen-moar" - "--gen-nqp" - ]; + configureFlags = [ + "--backends=moar" + "--with-nqp=${nqp}/bin/nqp" + ]; + + # Some tests fail on Darwin + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - description = "A Perl 6 implementation"; + description = "Raku implementation on top of Moar virtual machine"; homepage = https://www.rakudo.org; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra ]; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; }; } diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix new file mode 100644 index 00000000000..48430ef548b --- /dev/null +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, perl +, CoreServices, ApplicationServices }: + +stdenv.mkDerivation rec { + pname = "moarvm"; + version = "2020.01.1"; + + src = fetchurl { + url = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz"; + sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw"; + }; + + buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + doCheck = false; # MoarVM does not come with its own test suite + + configureScript = "${perl}/bin/perl ./Configure.pl"; + + meta = with stdenv.lib; { + description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; + homepage = "https://github.com/MoarVM/MoarVM"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + }; +} diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix new file mode 100644 index 00000000000..5a93a7f9dad --- /dev/null +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, lib, moarvm }: + +stdenv.mkDerivation rec { + pname = "nqp"; + version = "2020.01"; + + src = fetchurl { + url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c"; + }; + + buildInputs = [ perl ]; + + configureScript = "${perl}/bin/perl ./Configure.pl"; + configureFlags = [ + "--backends=moar" + "--with-moar=${moarvm}/bin/moar" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; + homepage = "https://github.com/perl6/nqp"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + }; +} diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix new file mode 100644 index 00000000000..5c3597cf289 --- /dev/null +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rakudo, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "zef"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "ugexe"; + repo = "zef"; + rev = "v${version}"; + sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70"; + }; + + buildInputs = [ rakudo makeWrapper ]; + + installPhase = '' + mkdir -p "$out" + # TODO: Find better solution. zef stores cache stuff in $HOME with the + # default config. + env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install . + ''; + + postFixup ='' + wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" + ''; + + meta = with stdenv.lib; { + description = "Raku / Perl6 Module Management"; + homepage = "https://github.com/ugexe/zef"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4494a96ab94..073f5f42f60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9394,9 +9394,12 @@ in }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; - rakudo = callPackage ../development/interpreters/rakudo { + rakudo = callPackage ../development/interpreters/rakudo {}; + moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + nqp = callPackage ../development/interpreters/rakudo/nqp.nix { }; + zef = callPackage ../development/interpreters/rakudo/zef.nix { }; rascal = callPackage ../development/interpreters/rascal { }; From 8d0f535606ffba2c270997097d1de8b5f82e0c46 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Sun, 2 Feb 2020 10:19:25 +0100 Subject: [PATCH 186/214] nsis: 3.04 -> 3.05 --- pkgs/development/tools/nsis/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index f8beae4d527..683d07ed496 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -2,23 +2,24 @@ stdenv.mkDerivation rec { pname = "nsis"; - version = "3.04"; + version = "3.05"; src = fetchurl { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"; + sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"; }; srcWinDistributable = fetchzip { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "1g31vz73x4d3cmsw2wfk43qa06bpqp5815fb5qq9vmwms6hym6y2"; + sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q"; }; postUnpack = '' mkdir -p $out/share/nsis cp -avr ${srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \ $out/share/nsis + chmod -R u+w $out/share/nsis ''; nativeBuildInputs = [ scons ]; From 4e0f25d443c85f6cac415ba1602d53ca4593252a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 9 Feb 2020 19:07:55 -0800 Subject: [PATCH 187/214] abseil-cpp: 20190322 -> 20191119 Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/abseil-cpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index b46963f4673..bd896fb9c65 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - date = "20190322"; - rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a"; + date = "20191119"; + rev = "8ba96a8244bbe334d09542e92d566673a65c1f78"; version = "${date}-${rev}"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = rev; - sha256 = "1bpz44hxq5fpkv6jlgphzk7mxjiiah526jgb63ih5pd1hd2cfw1r"; + sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; }; nativeBuildInputs = [ cmake ]; From 1a32e383e6139834f1b86c1edc877fcd28f24dea Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 9 Feb 2020 19:08:45 -0800 Subject: [PATCH 188/214] or-tools: 7.3 -> 7.5 Signed-off-by: Anders Kaseorg --- .../science/math/or-tools/build.patch | 5 ----- .../science/math/or-tools/default.nix | 22 +++++++++---------- .../science/math/or-tools/protobuf.patch | 10 --------- pkgs/top-level/all-packages.nix | 4 +--- pkgs/top-level/python-packages.nix | 1 - 5 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/or-tools/build.patch delete mode 100644 pkgs/development/libraries/science/math/or-tools/protobuf.patch diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/pkgs/development/libraries/science/math/or-tools/build.patch deleted file mode 100644 index a67e137ff4a..00000000000 --- a/pkgs/development/libraries/science/math/or-tools/build.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/makefiles/Makefile.python.mk -+++ b/makefiles/Makefile.python.mk -@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T --$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools -+$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 15aea5803bf..688d1425681 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf, cbc, zlib -, ensureNewerSourcesForZipFilesHook, python, swig -, pythonProtobuf }: +, lsb-release, glog, protobuf3_11, cbc, zlib +, ensureNewerSourcesForZipFilesHook, python, swig }: -stdenv.mkDerivation rec { +let + protobuf = protobuf3_11; + pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; }; + +in stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.3"; + version = "7.5"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc"; + sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; }; - patches = [ - ./build.patch # https://github.com/google/or-tools/pull/1619 - ./protobuf.patch # Otherwise it tries to install protobuf from pypi. - ]; - # The original build system uses cmake which does things like pull # in dependencies through git and Makefile creation time. We # obviously don't want to do this so instead we provide the @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { description = '' Google's software suite for combinatorial optimization. ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ andersk ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/pkgs/development/libraries/science/math/or-tools/protobuf.patch deleted file mode 100644 index b0cce40434c..00000000000 --- a/pkgs/development/libraries/science/math/or-tools/protobuf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/makefiles/Makefile.third_party.unix.mk -+++ b/makefiles/Makefile.third_party.unix.mk -@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0 --PROTOBUF_TAG = 3.9.0 -+PROTOBUF_TAG = 3.7.0 ---- a/makefiles/Makefile.third_party.win.mk -+++ b/makefiles/Makefile.third_party.win.mk -@@ -40 +40 @@ GLOG_TAG = 0.4.0 --PROTOBUF_TAG = 3.9.0 -+PROTOBUF_TAG = 3.7.0 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073f5f42f60..e12acb12327 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24065,9 +24065,7 @@ in osi = callPackage ../development/libraries/science/math/osi { }; - or-tools = callPackage ../development/libraries/science/math/or-tools { - pythonProtobuf = pythonPackages.protobuf; - }; + or-tools = callPackage ../development/libraries/science/math/or-tools { }; rubiks = callPackage ../development/libraries/science/math/rubiks { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 603b2cf5dfe..2f307c0da05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -929,7 +929,6 @@ in { ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; - pythonProtobuf = self.protobuf; })).python; osmnx = callPackage ../development/python-modules/osmnx { }; From 047095f89f741dd934ebfd64e816672279ba51d6 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 16 Dec 2019 16:53:46 +0000 Subject: [PATCH 189/214] far2l: 2018-07-19 -> 2019-12-14 --- pkgs/applications/misc/far2l/default.nix | 34 +++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 51e9c4371b5..3823c70cf11 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,10 +1,17 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: -with stdenv.lib; +let + newer-colorer-schemes = fetchFromGitHub { + owner = "colorer"; + repo = "Colorer-schemes"; + rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes) + sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c"; + }; +in stdenv.mkDerivation rec { - build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; - name = "far2l-2.1.${build}"; + pname = "far2l"; + version = "2019-12-14.git${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "elfmz"; @@ -16,16 +23,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] - ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - postPatch = optionalString stdenv.isLinux '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' - '' + optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ --replace "-framework System" -lSystem '' + '' - echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh + echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ @@ -42,14 +49,9 @@ stdenv.mkDerivation rec { --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' - ( cd colorer/configs/base - patch -p2 < ${ fetchpatch { - name = "nix-language-highlighting.patch"; - url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; - sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; - } - } - ) + cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc colorer/configs/base/hrc/base/ + cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc colorer/configs/base/hrc/base/ + cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/ ''; installPhase = '' @@ -75,7 +77,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "An orthodox file manager"; homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; From f1541d185d02a0584b31f944ac2d0f5bb9bc1074 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 18 Jan 2020 17:50:37 +0000 Subject: [PATCH 190/214] far2l: fix .desktop file --- pkgs/applications/misc/far2l/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 3823c70cf11..7c6573630a1 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp - sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop + cp ../far2l/DE/far2l.desktop $out/share/applications/far2l.desktop + substituteInPlace $out/share/applications/far2l.desktop --replace \''${CMAKE_INSTALL_PREFIX} "$out" cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/ convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png From 0aa6230b58253a0f02a763e394f2c522e26ead1f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 11 Dec 2019 23:52:21 +0200 Subject: [PATCH 191/214] keybase,keybase-gui: 5.0.0 -> 5.1.0 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 1edf86675c3..fe9d702cbaf 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.0.0"; + version = "5.1.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0cxxqmgp82qi2b1fljyfa38is94y8ghb2pd31nbyh8y4wnmi0x1s"; + sha256 = "1phf90q30la50bdqhm9cqcw039wh4dwrxwa5l3zvsr5j72aak5ij"; }; patches = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 2ec97f88236..4a50a749322 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20191114203213.f73f97dac6"; + versionSuffix = "20191211211104.cd9333f9fc"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "e175e52a6355d8359d66ef4b445981b572c513754329d5c7f75ad7bb14ec348f"; + sha256 = "0wqcb56wg6f4d49ln88krj7fhgy3zyb3f62yd5c17nym05anchwy"; }; nativeBuildInputs = [ From 85b93ef20e7530c4cd4815d815e862486cad99ec Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 11 Dec 2019 23:54:17 +0200 Subject: [PATCH 192/214] keybase,keybase-gui: add filalex77 to maintainers --- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index fe9d702cbaf..f3ee5a0e7ed 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { homepage = https://www.keybase.io/; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ carlsverre np rvolosatovs ]; + maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 4a50a749322..973d6ee2f41 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { homepage = https://www.keybase.io/; description = "The Keybase official GUI"; platforms = platforms.linux; - maintainers = with maintainers; [ rvolosatovs puffnfresh np ]; + maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; license = licenses.bsd3; }; } From 0ea4e9940bfd6f8169c50aa8379a79bf802ec12e Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 12 Dec 2019 13:46:47 +0200 Subject: [PATCH 193/214] keybase,keybase-gui: 5.1.0 -> 5.1.1 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index f3ee5a0e7ed..284ee2cab21 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.1.0"; + version = "5.1.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1phf90q30la50bdqhm9cqcw039wh4dwrxwa5l3zvsr5j72aak5ij"; + sha256 = "06rhnmk59was7dd5pd4czlrwqvmh02l9gka9561dkpl6w3j6814a"; }; patches = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 973d6ee2f41..3095142d362 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20191211211104.cd9333f9fc"; + versionSuffix = "20191211223501.15bbb94c23"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.1.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "0wqcb56wg6f4d49ln88krj7fhgy3zyb3f62yd5c17nym05anchwy"; + sha256 = "1frmk4ldmcz9rkl5bpsinzzwh39vavww67lsklln76xmkm3nacvq"; }; nativeBuildInputs = [ From 2835f1b8eb2ff65dc54939c252d63c07cf456e09 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 5 Dec 2019 13:12:59 +0100 Subject: [PATCH 194/214] pandoc-imagine: unstable-2018-11-19 -> 0.1.6 --- pkgs/tools/misc/pandoc-imagine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix index 811e44a6ce8..67e27da960f 100644 --- a/pkgs/tools/misc/pandoc-imagine/default.nix +++ b/pkgs/tools/misc/pandoc-imagine/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pandoc-imagine"; - version = "unstable-2018-11-19"; + version = "0.1.6"; src = fetchFromGitHub { repo = "imagine"; owner = "hertogp"; - rev = "cc9be85155666c2d12d47a71690ba618cea1fac2"; - sha256 = "0iksh9081g488yfjzd24bz4lm1nrrjamph1vynx3imrcfgyq7nsb"; + rev = version; + sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw"; }; propagatedBuildInputs = [ pandocfilters six ]; From a80f4726c4321582af96618c7da2665f58da5c67 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 15 Nov 2019 00:38:40 +0100 Subject: [PATCH 195/214] gofumpt: 2019-07-29 -> 2019-11-11 --- pkgs/development/tools/gofumpt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 221058a461e..5ca0d6cb1e0 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2019-07-29"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b"; - sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf"; + rev = "eb442649d62000da5d11671f3beb1afa1b746fd7"; + sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; }; - modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g"; + modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2"; meta = with lib; { description = "A stricter gofmt"; From c79d6d0430777e97e34aab1777ff74998f7e870e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 26 Oct 2019 16:08:37 -0400 Subject: [PATCH 196/214] c3d: 2018-10-04 -> unstable-2019-10-22; mark unbroken --- pkgs/applications/graphics/c3d/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index ad86e66204b..4997bb03d6a 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, cmake, itk, Cocoa }: +{ stdenv, fetchgit, cmake, itk4, Cocoa }: stdenv.mkDerivation { pname = "c3d"; - version = "2018-10-04"; + version = "unstable-2019-10-22"; src = fetchgit { - url = "https://git.code.sf.net/p/c3d/git"; - rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0"; - sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w"; + url = "https://github.com/pyushkevich/c3d"; + rev = "c04e2b84568654665c64d8843378c8bbd58ba9b0"; + sha256 = "0lzldxvshl9q362mg76byc7s5zc9qx7mxf2wgyij5vysx8mihx3q"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] + buildInputs = [ itk4 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { @@ -20,6 +20,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl2; - broken = true; }; } From 3a6751d22d927ea41169360b65aa444a3fee1c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Sun, 18 Aug 2019 11:34:07 -0300 Subject: [PATCH 197/214] maintainers: add AluisioASG --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index de6adbf69d5..c4634caa7e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -357,6 +357,16 @@ githubId = 5892756; name = "Alec Snyder"; }; + AluisioASG = { + name = "Aluísio Augusto Silva Gonçalves"; + email = "aluisio@aasg.name"; + github = "AluisioASG"; + githubId = 1904165; + keys = [{ + longkeyid = "rsa4096/0x9FAA63E097506D9D"; + fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; + }]; + }; alunduil = { email = "alunduil@gmail.com"; github = "alunduil"; From 9a0e92512c8aa27828447bad1d8c13f4979dff0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Sun, 18 Aug 2019 16:31:15 -0300 Subject: [PATCH 198/214] r128gain: init at 0.9.3 --- pkgs/applications/audio/r128gain/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/audio/r128gain/default.nix diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix new file mode 100644 index 00000000000..c4d8a1c2016 --- /dev/null +++ b/pkgs/applications/audio/r128gain/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "r128gain"; + version = "0.9.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0dx2grryp0lj58bawx1zcq9a6b4ijz9r5qrg8h6nvm92kqlya26i"; + }; + + propagatedBuildInputs = [ ffmpeg ] + ++ (with python3Packages; [ crcmod mutagen tqdm ]) + ; + + doCheck = false; # downloads media files for testing + + meta = with lib; { + description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; + homepage = "https://github.com/desbma/r128gain"; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.AluisioASG ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e12acb12327..dbacd6bab9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25186,6 +25186,8 @@ in pcre = pcre-cpp; }); + r128gain = callPackage ../applications/audio/r128gain { }; + redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; robin-map = callPackage ../development/libraries/robin-map { }; From 84506b6c18bb8db47de21577c5a6299f0a1c3ba4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Feb 2020 16:40:19 +0000 Subject: [PATCH 199/214] unoconv: 0.8.2 -> 0.9.0 --- pkgs/tools/text/unoconv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index aed7554e170..2eaabc4f53d 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "unoconv"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "unoconv"; repo = "unoconv"; rev = version; - sha256 = "0mxrzzg9bl42lsiw8hcq624qbq8jrhcgmnal7ys68dj0l901snk3"; + sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr"; }; buildInputs = [ asciidoc makeWrapper ]; From 7d927677f494c07a81613547105b95b534840513 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 10 Feb 2020 23:28:06 +0100 Subject: [PATCH 200/214] signal-desktop: 1.30.1 -> 1.31.0 Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v1.31.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index be1fe96526c..d7e70b584c2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.30.1"; # Please backport all updates to the stable channel. + version = "1.31.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6"; + sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9"; }; nativeBuildInputs = [ From 6932a75d9c48c4587a340ceb384d83e87709d189 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 10 Feb 2020 23:16:23 +0000 Subject: [PATCH 201/214] drawpile,drawpile-server-headless: 2.1.15 -> 2.1.16 (#79760) --- pkgs/applications/graphics/drawpile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index e64e384a9a7..abe3bd19f74 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -60,11 +60,11 @@ let in mkDerivation rec { pname = "drawpile"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0w6bdg1rnnjzjg8xzqv3a9qhw41q41sjvp6f8m0sqxjfax05lqin"; + sha256 = "1mz64c1a5x906j2jqq7i16l1q1d97wgm2y0ybmmcyqzg09x9wyaw"; }; nativeBuildInputs = [ From 157f392f57ddcb3a0c8b7062dc01469c6b43fdce Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Feb 2020 19:00:03 -0500 Subject: [PATCH 202/214] mesos: switch to https for maven Fixes: #78702 Closes: #79260 --- pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index cf7318ecb27..1e2840017b3 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -4,7 +4,7 @@ header "fetching Apache Mesos maven repo" function fetchArtifact { repoPath="$1" echo "Fetching $repoPath" - url="http://repo.maven.apache.org/maven2/$repoPath" + url="https://repo.maven.apache.org/maven2/$repoPath" mkdir -p $(dirname $out/$repoPath) curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" } From 6c3c1f0c0a9bbb219c81ef8c016562df1b22412b Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Mon, 10 Feb 2020 19:32:42 -0500 Subject: [PATCH 203/214] ngt: init at 1.8.4 --- pkgs/development/libraries/ngt/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/ngt/default.nix diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix new file mode 100644 index 00000000000..c66eceb5e7f --- /dev/null +++ b/pkgs/development/libraries/ngt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "NGT"; + version = "v1.8.4"; + nativeBuildInputs = [ cmake ]; + src = fetchFromGitHub { + owner = "yahoojapan"; + repo = "NGT"; + rev = version; + sha256 = "f2019e7916b81f8aeabc57d682904c8447776bf9ba94525d20265b329aa43eb5"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/yahoojapan/NGT; + description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ tomberek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e75a840771..f2c745db4b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20641,6 +20641,8 @@ in nedit = callPackage ../applications/editors/nedit { }; + ngt = callPackage ../development/libraries/ngt { }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; From 1a297c817fd5b9869a05cdaf1568455030c46db0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 14:23:27 -0800 Subject: [PATCH 204/214] python3Packages.xmlschema: 1.0.18 -> 1.1.0 --- .../python-modules/xmlschema/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index ade478bf82c..d3db09bc022 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "1.0.18"; + version = "1.1.0"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1pwq2sfh7klcxismsqzgw80cp3cdkq9wv8x9g3h1zx1p66xpas9p"; + sha256 = "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy"; }; propagatedBuildInputs = [ elementpath ]; @@ -20,19 +20,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "elementpath~=1.3.0" "elementpath~=1.3" + --replace "elementpath~=1.4.0" "elementpath~=1.4" ''; # Ignore broken fixtures, and tests for files which don't exist. # For darwin, we need to explicity say we can't reach network checkPhase = '' - substituteInPlace xmlschema/tests/__init__.py \ - --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #" - pytest . \ - --ignore=xmlschema/tests/test_factory.py \ - --ignore=xmlschema/tests/test_memory.py \ - --ignore=xmlschema/tests/test_validators.py \ - --ignore=xmlschema/tests/test_schemas.py \ + pytest tests \ + --ignore=tests/test_factory.py \ + --ignore=tests/test_schemas.py \ + --ignore=tests/test_memory.py \ + --ignore=tests/test_validation.py \ -k 'not element_tree_import_script' ''; From facdac01c7f1911e22eb583e4feaf1a807247511 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 14:00:04 -0800 Subject: [PATCH 205/214] python3Packages.pytest-black: 0.3.7 -> 0.3.8 --- .../python-modules/pytest-black/black-version.patch | 13 ------------- .../python-modules/pytest-black/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/python-modules/pytest-black/black-version.patch diff --git a/pkgs/development/python-modules/pytest-black/black-version.patch b/pkgs/development/python-modules/pytest-black/black-version.patch deleted file mode 100644 index 93bb4180930..00000000000 --- a/pkgs/development/python-modules/pytest-black/black-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 5c9ce5f..84b148a 100644 ---- a/setup.py -+++ b/setup.py -@@ -26,6 +26,6 @@ setup( - python_requires=">=2.7", - install_requires=[ - "pytest>=3.5.0", -- 'black==19.3b0; python_version >= "3.6"', -+ 'black; python_version >= "3.6"', - "toml", - ], - use_scm_version=True, \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index b129f9eec4b..1f01e7fb65f 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -7,14 +7,13 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "03gwwy1h3qnfh6vpfhgsa5ag53a9sw1g42sc2s8a2hilwb7yrfvm"; + sha256 = "04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81"; }; - patches = [ ./black-version.patch ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ black pytest toml ]; From 70580587de5abd5d4b4461da565f68f9ba8ce6d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 13:51:23 -0800 Subject: [PATCH 206/214] python3Packages.msrest: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/msrest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 70fa6f361ca..6f53314bd28 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.10"; + version = "0.6.11"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1l08daq748lk8rwiv4jdlnmfl9mi7g1ln46gibhnd9xvrrjp0sdx"; + sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi"; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "The runtime library 'msrest' for AutoRest generated Python clients."; - homepage = https://github.com/Azure/msrest-for-python; + homepage = "https://github.com/Azure/msrest-for-python"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ]; }; From 17377f441ce80970b4a0afc7726ed5c6c251c6f6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 14:31:10 -0800 Subject: [PATCH 207/214] python3Packages.azure-mgmt-applicationinsights: fix build --- .../azure-mgmt-applicationinsights/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 0a485f05f91..274cb181d2d 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { ]; postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests @@ -39,6 +38,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Application Insights Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ jonringer mwilsoninsight ]; }; } From 3f7f043deaa7c06e42af045b93eac53db4efaa53 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 14:48:59 -0800 Subject: [PATCH 208/214] azure-cli: force PEP420 for azure-mgmt packages --- pkgs/tools/admin/azure-cli/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index f0bebeed679..4cf0a5d3554 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -37,6 +37,11 @@ let substituteInPlace setup.cfg \ --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; + + # force PEP420 + postInstall = '' + rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py + ''; }); py = python.override { From 524af32c15e5b389f630782b35085892ecb8c440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Miguel?= Date: Thu, 6 Feb 2020 20:38:41 +0000 Subject: [PATCH 209/214] pythonPackages.wordcloud: init at 1.6.0 --- .../python-modules/wordcloud/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/wordcloud/default.nix diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix new file mode 100644 index 00000000000..759e48eb997 --- /dev/null +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, codecov, coverage +, flake8 +, matplotlib +, mock +, numpy +, pillow +, pytest +, pytestcov +, pytest-sugar +, setuptools +, twine +, wheel +}: + +buildPythonPackage rec { + pname = "word_cloud"; + version = "1.6.0"; + + # tests are not included in pypi tarball + src = fetchFromGitHub { + owner = "amueller"; + repo = pname; + rev = version; + sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2"; + }; + + propagatedBuildInputs = [ matplotlib numpy pillow ]; + + # Tests require extra dependencies + checkInputs = [ codecov coverage flake8 mock pytest pytestcov pytest-sugar setuptools twine wheel ]; + # skip tests which make assumptions about installation + checkPhase = '' + pytest -k 'not cli_as_executable' + ''; + + meta = with stdenv.lib; { + description = "A little word cloud generator in Python"; + homepage = "https://github.com/amueller/word_cloud"; + license = licenses.mit; + maintainers = with maintainers; [ jm2dev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f307c0da05..de926517fbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1484,6 +1484,8 @@ in { webapp2 = callPackage ../development/python-modules/webapp2 { }; + wordcloud = callPackage ../development/python-modules/wordcloud { }; + wrf-python = callPackage ../development/python-modules/wrf-python { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; From b86f4d52cf83890cb8d2558cf7010efe90ef8323 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 11 Feb 2020 00:09:53 +0100 Subject: [PATCH 210/214] gunicorn: add 19.x branch for python2.7 support The nixos/moinmoin module uses gunicorn, however the 20.0 version dropped python2 support which broke the module as there's no python3 port planned for moinmoin: http://moinmo.in/Python3 --- .../python-modules/gunicorn/19.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/gunicorn/19.nix diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix new file mode 100644 index 00000000000..f9681eef97e --- /dev/null +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage +, mock +, pytest +, pytestcov +, setuptools +}: + +buildPythonPackage rec { + pname = "gunicorn"; + version = "19.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1080jk1ly8j0rc6lv8i33sj94rxjaskd1732cdq5chdqb3ij9ppr"; + }; + + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytest mock pytestcov coverage ]; + + prePatch = '' + substituteInPlace requirements_test.txt --replace "==" ">=" \ + --replace "coverage>=4.0,<4.4" "coverage" + ''; + + # better than no tests + checkPhase = '' + $out/bin/gunicorn --help > /dev/null + ''; + + pythonImportsCheck = [ "gunicorn" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/benoitc/gunicorn"; + description = "WSGI HTTP Server for UNIX"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de926517fbc..04fd9e76192 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3802,7 +3802,10 @@ in { rebulk = callPackage ../development/python-modules/rebulk { }; - gunicorn = callPackage ../development/python-modules/gunicorn { }; + gunicorn = if isPy27 then + callPackage ../development/python-modules/gunicorn/19.nix { } + else + callPackage ../development/python-modules/gunicorn { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; From 212b24a566ffd1e30fdecf179a8777355dacab18 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 10 Feb 2020 19:27:45 -0800 Subject: [PATCH 211/214] python3Packages.gunicorn: fix homepage --- pkgs/development/python-modules/gunicorn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 75a3d745a3f..8bdc4296903 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/gunicorn; + homepage = "https://github.com/benoitc/gunicorn"; description = "WSGI HTTP Server for UNIX"; license = licenses.mit; }; From 6c52b3ade9cc43bbb15f88297493b8505968887b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Feb 2020 09:49:23 +0100 Subject: [PATCH 212/214] =?UTF-8?q?ocamlPackages.reason:=203.5.1=20?= =?UTF-8?q?=E2=86=92=203.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/reason/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 20286dcc43c..ef27fc41b07 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,24 +1,23 @@ { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune -, menhir, merlin-extend, ppx_tools_versioned, utop, cppo -, ocaml_lwt +, fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "aea245a43eb44034d2fccac7028b640a437af239"; - sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf"; + rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; + sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; }; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune cppo utop menhir ]; + buildInputs = [ ocaml findlib dune cppo fix utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -27,8 +26,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ - --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \ - --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ + --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; meta = with stdenv.lib; { From c81a2e6a1ee5cc4f4571b480599af9e33da70353 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 5 Jan 2020 14:10:50 -0500 Subject: [PATCH 213/214] ocamlPackages.npy: init at unstable-2019-04-02 --- .../development/ocaml-modules/npy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/npy/default.nix diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix new file mode 100644 index 00000000000..87fd72b7567 --- /dev/null +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub, numpy, camlzip }: + +buildDunePackage rec { + pname = "npy"; + version = "unstable-2019-04-02"; + + minimumOCamlVersion = "4.06"; + + src = fetchFromGitHub { + owner = "LaurentMazare"; + repo = "${pname}-ocaml"; + rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; + sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; + }; + + propagatedBuildInputs = [ camlzip ]; + checkInputs = [ numpy ]; + + doCheck = true; + + meta = with lib; { + inherit (src.meta) homepage; + description = "OCaml implementation of the Npy format spec"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 56ae90ae392..baa1d862e53 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -558,6 +558,10 @@ let lwt = ocaml_lwt; }; + npy = callPackage ../development/ocaml-modules/npy { + inherit (pkgs.python3Packages) numpy; + }; + num = if lib.versionOlder "4.06" ocaml.version then callPackage ../development/ocaml-modules/num {} else null; From 7cc5d84cd79c31db524acd31556cf97675e7596d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Feb 2020 18:06:54 -0500 Subject: [PATCH 214/214] libtasn1: fix on darwin Test binaries are linked to the libraries at their install path, but those are not installed when checkPhase executes. --- pkgs/development/libraries/libtasn1/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 215d67dc0b1..d266817c5d7 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo perl ]; doCheck = true; + preCheck = if stdenv.isDarwin then + "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs" + else + null; meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libtasn1/;