From 1a3841fd824083f57992c36c7daa7851a7909e5e Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Sun, 5 Apr 2020 15:39:30 -0400 Subject: AdGuardHome: init at 0.101.0 --- pkgs/servers/adguardhome/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/adguardhome/default.nix diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix new file mode 100644 index 000000000000..54000a81b67d --- /dev/null +++ b/pkgs/servers/adguardhome/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "adguardhome"; + version = "0.101.0"; + + src = fetchurl { + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "17k37hh04zhy5csl0p9g4hybfc403i38n754in1xrkzxi81r8dh5"; + }; + + installPhase = '' + install -m755 -D ./AdGuardHome $out/bin/adguardhome + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/AdguardTeam/AdGuardHome"; + description = "Network-wide ads & trackers blocking DNS server"; + platforms = platforms.linux; + maintainers = with maintainers; [ numkem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49ab4d06c106..de857990d709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15347,6 +15347,8 @@ in kerberos = libkrb5; }; + adguardhome = callPackage ../servers/adguardhome {}; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; -- cgit 1.4.1 From a83003476265e3c5577f3e5138cca2f7db46108d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:26:29 +0000 Subject: heimer: 1.15.1 -> 1.16.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index f301122a92de..628ec7900417 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic"; + sha256 = "0j00652lgcfy5vr001c24agnfnm9v2l4r5vvvb2484mfck335grf"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 4752e21de0c607034e16994691581327d40f2d34 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 20 Sep 2019 19:01:13 +0000 Subject: meli: init at alpha-0.5.1 Co-authored-by: 0x4A6F <0x4A6F@users.noreply.github.com> --- .../networking/mailreaders/meli/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/meli/default.nix diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix new file mode 100644 index 000000000000..719965455f9c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchgit +, rustPlatform +, pkgconfig +, openssl +, dbus +, sqlite +, file +, gzip +, notmuch + # Build with support for notmuch backend +, withNotmuch ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "meli"; + version = "alpha-0.5.1"; + + src = fetchgit { + url = "https://git.meli.delivery/meli/meli.git"; + rev = version; + sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv"; + }; + + cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y"; + + cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; + + nativeBuildInputs = [ pkgconfig gzip ]; + + buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; + + checkInputs = [ file ]; + + postInstall = '' + mkdir -p $out/share/man/man1 + gzip < meli.1 > $out/share/man/man1/meli.1.gz + mkdir -p $out/share/man/man5 + gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + ''; + + meta = with stdenv.lib; { + description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; + homepage = "https://meli.delivery"; + license = licenses.gpl3; + maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95517f754119..15019d8d8b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20567,6 +20567,8 @@ in meld = callPackage ../applications/version-management/meld { }; + meli = callPackage ../applications/networking/mailreaders/meli { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { -- cgit 1.4.1 From 1ef7bea94ddc85c3131bd4dde407699b5c2be311 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 29 Jan 2020 18:05:14 +0100 Subject: dovecot_fts_xapian: init at 1.3.1 --- .../mail/dovecot/plugins/fts_xapian/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix new file mode 100644 index 000000000000..3736c78d4b60 --- /dev/null +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: +stdenv.mkDerivation { + pname = "fts-xapian"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "grosjo"; + repo = "fts-xapian"; + rev = "1.3.1"; + sha256 = "10yl5fyfbx2ijqckx13vbmzj9mpm5pkh8qzichbdgplrzm738q43"; + }; + + buildInputs = [ dovecot xapian icu64 sqlite ]; + + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + + preConfigure = '' + export PANDOC=false + autoreconf -vi + ''; + + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" + "--without-dovecot-install-dirs" + "--with-moduledir=$(out)/lib/dovecot" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/grosjo/fts-xapian"; + description = "Dovecot FTS plugin based on Xapian"; + license = licenses.lgpl21; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c9d3d0f687..f3a357c8fea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15425,6 +15425,7 @@ in dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; + dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { }; dspam = callPackage ../servers/mail/dspam { }; -- cgit 1.4.1 From 8be7358384acc60102c1f7451c7d8452d3841ec9 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 9 May 2020 14:13:31 +0200 Subject: maintainers: add julm --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35dd144796e2..610750d12ab8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3813,6 +3813,12 @@ githubId = 11947756; name = "Julien Dehos"; }; + julm = { + email = "julm+nix@sourcephile.fr"; + github = "ju1m"; + githubId = 21160136; + name = "Julien Moutinho"; + }; jumper149 = { email = "felixspringer149@gmail.com"; github = "jumper149"; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 3736c78d4b60..8a0f2d4efab2 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/grosjo/fts-xapian"; description = "Dovecot FTS plugin based on Xapian"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ julm ]; platforms = platforms.unix; }; } -- cgit 1.4.1 From d7c9582ba8f7e953218e239fcca3145fb31cd79a Mon Sep 17 00:00:00 2001 From: luc65r Date: Fri, 8 May 2020 11:55:53 +0200 Subject: pythonPackages.playsound: init at 1.2.2 --- .../python-modules/playsound/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/playsound/default.nix diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix new file mode 100644 index 000000000000..589a8f3db819 --- /dev/null +++ b/pkgs/development/python-modules/playsound/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "playsound"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "TaylorSMarks"; + repo = "playsound"; + rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; + sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + }; + + doCheck = false; + + pythonImportsCheck = [ "playsound" ]; + + meta = with lib; { + homepage = "https://github.com/TaylorSMarks/playsound"; + description = "Pure Python, cross platform, single function module with no dependencies for playing sounds"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ luc65r ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e40fa679622e..164a3d9ba8d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3203,6 +3203,8 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + playsound = callPackage ../development/python-modules/playsound { }; + plexapi = callPackage ../development/python-modules/plexapi { }; plexauth = callPackage ../development/python-modules/plexauth { }; -- cgit 1.4.1 From e338c1250d73656ac5f7c916d20b0b3d12132742 Mon Sep 17 00:00:00 2001 From: luc65r Date: Thu, 7 May 2020 22:32:09 +0200 Subject: tartube: 2.0.016 -> 2.1.0 --- pkgs/applications/video/tartube/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index ae222ae05a79..23ee76eb4693 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.0.016"; + version = "2.1.0"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9"; + sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda"; }; nativeBuildInputs = [ @@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec { pygobject3 pyxdg requests + feedparser + playsound ]; buildInputs = [ @@ -45,6 +47,10 @@ python3Packages.buildPythonApplication rec { pango ]; + postPatch = '' + sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py + ''; + postInstall = '' mkdir -p $out/share/{man/man1,applications,pixmaps} cp pack/tartube.1 $out/share/man/man1 -- cgit 1.4.1 From 4688ec0eb2e36cf4ed05a7ab11051c2d356af3fc Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 10 May 2020 22:34:19 +0100 Subject: linux: explicitly enable AIO This is disabled by default in the linux-hardened patchset, but is required by e.g. LVM. Fixes #87260. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 636d174b1551..32e49852af5b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -639,6 +639,8 @@ let SYSVIPC = yes; # System-V IPC + AIO = yes; # POSIX asynchronous I/O + UNIX = yes; # Unix domain sockets. MD = yes; # Device mapper (RAID, LVM, etc.) -- cgit 1.4.1 From 164985ab68e3a10b75c58dd00bd325f8f219025d Mon Sep 17 00:00:00 2001 From: Matías Lang Date: Sun, 31 May 2020 16:45:01 -0300 Subject: mpv: disable samba support by default samba support will be dropped in mpv upstream in its next release (see https://github.com/mpv-player/mpv/commit/3b8b7cb9d481828953f105f92bacc07a3cb2f332). Also, using it triggered segmentation faults when using luasocket. Closes #88584 --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 9cb39d681401..ff837756e3db 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,7 +39,7 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -, sambaSupport ? stdenv.isLinux, samba ? null +, sambaSupport ? false, samba ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null -- cgit 1.4.1 From 8589af0a558b1e0eb030316260d9a46fa3cd0de9 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 10 May 2020 12:00:00 +0000 Subject: python3Packages.matrix-nio: use matrix-nio as pname fixes the confusion of https://repology.org/project/python:nio/versions and anyway nio just means that no io is performed directly, so the matrix part of the name is important. --- pkgs/development/python-modules/matrix-nio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index ff4f6198aa5e..e8849cfecf08 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - pname = "nio"; + pname = "matrix-nio"; version = "0.10.0"; src = fetchFromGitHub { -- cgit 1.4.1 From bfed70b3f1e1961a64300ebc345284be6fa2deec Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 10 May 2020 12:00:00 +0000 Subject: python3Packages.matrix-nio: 0.10.0 -> 0.11.2 changelog: https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index e8849cfecf08..1e59dcbf49bc 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; + sha256 = "0j39waql69rn96q4qc1df4w0z6zz48gkr2m924j3ba7v7pj6p7w4"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 98ebd83d4658c64e38cafbb99b80f97ecf910df1 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 21 May 2020 12:00:00 +0000 Subject: matrix-nio: 0.11.2 -> 0.12.0 Changelog: https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 1e59dcbf49bc..aca4bf35434b 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0j39waql69rn96q4qc1df4w0z6zz48gkr2m924j3ba7v7pj6p7w4"; + sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 5a8de771660e9160e8a1cbd160d272727d6c2b5e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 17 May 2020 02:47:51 +0100 Subject: mercurial: 5.3.1 -> 5.4.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index ffbd98791358..47453cb5e6fe 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; + sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763"; }; format = "other"; -- cgit 1.4.1 From 5930a0ea449514cff02563326f95a1947db85d00 Mon Sep 17 00:00:00 2001 From: Matías Lang Date: Fri, 29 May 2020 02:56:21 -0300 Subject: mpvScripts.simple-mpv-webui: init at 1.0.0 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/applications/video/mpv/default.nix | 3 ++ .../video/mpv/scripts/simple-mpv-webui.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 43 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5329efeab87e..e918a5ba7ad3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1616,6 +1616,12 @@ githubId = 12202789; name = "CrazedProgrammer"; }; + cript0nauta = { + email = "shareman1204@gmail.com"; + github = "cript0nauta"; + githubId = 1222362; + name = "Matías Lang"; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ff837756e3db..51d284f277a1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,6 +39,9 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null +# NOTE: samba support should be removed on the next mpv release, see also: +# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362 +# Please remove this line on the next mpv release. , sambaSupport ? false, samba ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix new file mode 100644 index 000000000000..d51434e241c9 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "simple-mpv-ui"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "open-dynaMIX"; + repo = "simple-mpv-webui"; + rev = "v${version}"; + sha256 = "1glrnnl1slcl0ri0zs4j64lc9aa52p9ffh6av0d81fk95nm98917"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r webui.lua webui-page $out/share/mpv/scripts/ + ''; + passthru.scriptName = "webui.lua"; + + meta = with stdenv.lib; { + description = "A web based user interface with controls for the mpv mediaplayer"; + homepage = "https://github.com/open-dynaMIX/simple-mpv-webui"; + maintainers = [ maintainers.cript0nauta ]; + longDescription = '' + You can access the webui when accessing http://127.0.0.1:8080 or + http://[::1]:8080 in your webbrowser. By default it listens on + 0.0.0.0:8080 and [::0]:8080 + ''; + license = licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f6c5dfea4f8..df883aa5abb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20967,6 +20967,7 @@ in mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; -- cgit 1.4.1 From b64ecc3b5f3b0dab2622bbccc596b80b5aa470a5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 09:19:04 +0300 Subject: polybar: Don't reference gcc Polybar wants to be capable of printing the compiler that was used to build it with `polybar -vv` but that makes it reference gcc. See: https://github.com/polybar/polybar/blob/15e79b09d33c7cac888f93d218ae8be5ae617a2b/src/settings.cpp.cmake#L55 --- pkgs/applications/misc/polybar/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index a793ee887243..c324a3f8be40 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,7 @@ { cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper +, removeReferencesTo # optional packages-- override the variables ending in 'Support' to enable or # disable modules @@ -74,6 +75,10 @@ stdenv.mkDerivation rec { '' else ""; nativeBuildInputs = [ - cmake pkgconfig + cmake pkgconfig removeReferencesTo ]; + + postFixup = '' + remove-references-to -t ${stdenv.cc} $out/bin/polybar + ''; } -- cgit 1.4.1 From 063043fa63a7d5fc4f885626e8fab671514eed23 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Mon, 8 Jun 2020 16:47:46 +0100 Subject: Fix typo --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b8d0606be7c1..be06d6feb11f 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -448,7 +448,7 @@ in description = '' An alternate BIOS (such as qboot) with which to start the VM. - Should containin a file named bios.bin. + Should contain a file named bios.bin. If null, QEMU's builtin SeaBIOS will be used. ''; }; -- cgit 1.4.1 From 66fd218bac8838e7f062ca870e87ddef5e4e1e85 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 3 Jun 2020 16:42:54 +0200 Subject: bitcoin: 0.19.1 -> 0.20.0 - drop openssl from buildInputs as it is no longer used by the project - drop rapidcheck from check checkInputs as it is no longer used by the project - reformat with nixpkgs-fmt - add meta.downloadPage and meta.changelog --- pkgs/applications/blockchains/bitcoin.nix | 73 +++++++++++++++++++------------ 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 450102da66f3..7a4386d23866 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,59 +1,74 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump -, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent -, withGui }: +{ stdenv +, fetchurl +, pkgconfig +, autoreconfHook +, db48 +, boost +, zeromq +, hexdump +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, wrapQtAppsHook ? null +, utillinux +, python3 +, qrencode +, libevent +, withGui +}: with stdenv.lib; - let - version = "0.19.1"; + version = "0.20.0"; majorMinorVersion = versions.majorMinor version; - desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; - pixmap = fetchurl { url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"; sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d"; }; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; inherit version; src = fetchurl { - urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - ]; - sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0"; + urls = [ + "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + ]; + sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optional stdenv.isDarwin hexdump ++ optional withGui wrapQtAppsHook; - buildInputs = [ openssl db48 boost zlib zeromq - miniupnpc libevent] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png ''; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - "--disable-bench" - ] ++ optionals (!doCheck) [ - "--disable-tests" - "--disable-gui-tests" - ] - ++ optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + ] ++ optionals (!doCheck) [ + "--disable-tests" + "--disable-gui-tests" + ] + ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; - checkInputs = [ rapidcheck python3 ]; + checkInputs = [ python3 ]; doCheck = true; @@ -67,13 +82,15 @@ in stdenv.mkDerivation rec { meta = { description = "Peer-to-peer electronic cash system"; - longDescription= '' + longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; homepage = "https://bitcoin.org/"; + downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; + changelog = "https://bitcoincore.org/en/releases/${version}/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; -- cgit 1.4.1 From 08815104f541a36708a9d11eefc22fb6eb864fe0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2020 23:40:29 +0200 Subject: microcodeIntel: 20200520 -> 20200609 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index c0201fb01fd4..bbf584b2fa3b 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200520"; + version = "20200609"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8"; + sha256 = "0vzsv0fqp44dhmvj6syjjab3cs1bc4r0g7g97lna8l91vj2yin9j"; }; nativeBuildInputs = [ iucode-tool libarchive ]; -- cgit 1.4.1 From 8c22f783549d836bef033c07926306526c1c2eed Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 10 Jun 2020 17:16:35 +0200 Subject: maintainers: add fabianhauser --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97123feaafc9..6a175cd7c5fa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2540,6 +2540,16 @@ githubId = 11909469; name = "Fabian Geiselhart"; }; + fabianhauser = { + email = "fabian.nixos@fh2.ch"; + github = "fabianhauser"; + githubId = 368799; + name = "Fabian Hauser"; + keys = [{ + longkeyid = "rsa4096/0x8A52A140BEBF7D2C"; + fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; + }]; + }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; -- cgit 1.4.1 From 9c95e8150ab98e6ea68304c0f9cbdcfe04020890 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 10 Jun 2020 17:31:46 +0200 Subject: hamster: init at 3.0.2 --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/hamster.nix | 15 ++++++++ pkgs/applications/misc/hamster/default.nix | 62 ++++++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 5 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/programs/hamster.nix create mode 100644 pkgs/applications/misc/hamster/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 978d33e75852..2e82424d58db 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -126,6 +126,7 @@ ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/hamster.nix ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix diff --git a/nixos/modules/programs/hamster.nix b/nixos/modules/programs/hamster.nix new file mode 100644 index 000000000000..ddf26a22fb53 --- /dev/null +++ b/nixos/modules/programs/hamster.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = maintainers.fabianhauser; + + options.programs.hamster.enable = + mkEnableOption "Whether to enable hamster time tracking."; + + config = lib.mkIf config.programs.hamster.enable { + environment.systemPackages = [ pkgs.hamster ]; + services.dbus.packages = [ pkgs.hamster ]; + }; +} diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix new file mode 100644 index 000000000000..57b36e00436e --- /dev/null +++ b/pkgs/applications/misc/hamster/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: + +python3Packages.buildPythonApplication rec { + pname = "hamster"; + version = "3.0.2"; + + format = "other"; + + src = fetchFromGitHub { + owner = "projecthamster"; + repo = pname; + rev = "v${version}"; + sha256 = "09ikiwc2izjvwqbbyp8knn190x5y4anwslkmb9k2h3r3jwrg2vd2"; + }; + + nativeBuildInputs = [ + python3Packages.setuptools + wrapGAppsHook + intltool + itstool + wafHook + glib + gobject-introspection + ]; + + buildInputs = [ + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pyxdg + dbus-python + ]; + + # Setup hooks have trouble with strict deps. + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn $out/libexec "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "Time tracking application"; + homepage = "http://projecthamster.org/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.fabianhauser ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30d9ce5bcfd8..2b0b1c70fd71 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -198,7 +198,6 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 - hamster-time-traker = throw "hamster-time-tracker has been removed from nixpkgs, as it was unmaintained."; # added 2019-12-10 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d090040832..0bca332c3941 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19996,6 +19996,8 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; + hamster = callPackage ../applications/misc/hamster { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; -- cgit 1.4.1 From 789db72b2e34075d7a079ecae84682a6b1569f5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:52:58 +0000 Subject: orca: 3.36.2 -> 3.36.3 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 0ca4f11e548b..849e156b5292 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.2"; + version = "3.36.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g"; + sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n"; }; patches = [ -- cgit 1.4.1 From 021570aaf03da92a288bf1db4ed84814967073ab Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sat, 13 Jun 2020 20:07:34 +0200 Subject: lmdb: 0.9.24 -> 0.9.25 Change to official repo. The Github read-only mirror is abandoned. --- pkgs/development/libraries/lmdb/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 513e842edfa5..64f6fccefa79 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.24"; + version = "0.9.25"; - src = fetchFromGitHub { - owner = "LMDB"; - repo = "lmdb"; + src = fetchgit { + url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"; + sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; -- cgit 1.4.1 From 6e125ae9e45dd5bd7c0fb979dc59ff5da9b39df6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 13 Jun 2020 14:25:44 -0700 Subject: heimer: 1.16.0 -> 1.17.0 --- pkgs/applications/misc/heimer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 628ec7900417..7709a42baee1 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "0j00652lgcfy5vr001c24agnfnm9v2l4r5vvvb2484mfck335grf"; + sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar"; }; nativeBuildInputs = [ cmake ]; @@ -19,5 +19,6 @@ mkDerivation rec { homepage = "https://github.com/juzzlin/Heimer"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From fcc3603ed82cca5c5b178d05eb5180b4f578870a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 10:09:34 +0000 Subject: bitwarden_rs: 1.15.0 -> 1.15.1 --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 158485dc982f..f2d0eb9b7d3a 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "12mr7d0mjlh7za4nc3s7cizzbd6v0zfmd7q9s0f7pqz56vw5m21s"; + sha256 = "1982bfprixdp8mx2hwidfvsi0zy7wmzf40m9m3cl5r7i2qydznwb"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0nacc8xvbkdzbyx4c17hdh03v9ykpis74pbpxkn6v95njw14wq53"; + cargoSha256 = "08cygzgv82i10cj8lkjdah0arrdmlfcbdjwc8piwa629rr0584zf"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' -- cgit 1.4.1 From f96842292ffae0cbc067e503fe0e75e904da1d05 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 09:57:15 +0200 Subject: mono: don't propagate a dependency to glib-dev This was added in 2005 back in r51ce4ea2. This was not commented or explained anywhere, and it does not seem to be necessary anymore according to some quick testing I did. Reduces mono closure size by ~100M. --- pkgs/development/compilers/mono/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index f22771a35e9d..e4d99dcec955 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); - propagatedBuildInputs = [glib]; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" -- cgit 1.4.1 From 0cb5116fafd1611b0eabc371098259158a0d89b9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:56:33 +0200 Subject: gio-sharp: add missing glib dependency --- pkgs/development/libraries/gio-sharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index d7df4ab72127..a19febbfd66e 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; -- cgit 1.4.1 From 8dd26c6d858c57b7e55e4ef685502739c23d40f4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:58:12 +0200 Subject: dotnetPackages.FSharpAutoComplete: add missing glib dependency --- pkgs/top-level/dotnet-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3b58e1937b60..f14ae3133b8b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -4,6 +4,7 @@ , fetchurl , fetchFromGitHub , fetchNuGet +, glib , pkgconfig , mono , fsharp @@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ fsharp + glib dotnetPackages.FSharpCompilerService dotnetPackages.NewtonsoftJson dotnetPackages.NDeskOptions -- cgit 1.4.1 From fb3caa93a4e970412c8aec311b085c65af5e48e1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 12:56:52 +0200 Subject: pythonPackages.pythonnet: add missing glib dependency --- pkgs/development/python-modules/pythonnet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 0027c8d32a63..82ddb8c810b0 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -9,6 +9,7 @@ , pkgconfig , dotnetbuildhelpers , clang +, glib , mono }: @@ -63,6 +64,7 @@ buildPythonPackage rec { ]; buildInputs = [ + glib mono psutil # needed for memory leak tests ]; -- cgit 1.4.1 From 731f722289f4beebbd2cf884156388ecfe28da1e Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 8 Jun 2020 18:08:57 +0100 Subject: julius: init at 1.4.1 --- pkgs/games/julius/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/julius/default.nix diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix new file mode 100644 index 000000000000..d1dad86e1c54 --- /dev/null +++ b/pkgs/games/julius/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: + +stdenv.mkDerivation rec { + pname = "julius"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "bvschaik"; + repo = "julius"; + rev = "v${version}"; + sha256 = "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_mixer libpng ]; + + meta = with stdenv.lib; { + description = "An open source re-implementation of Caesar III"; + homepage = "https://github.com/bvschaik/julius"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26a5e269629a..c2f5db82bac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10611,6 +10611,8 @@ in jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; + julius = callPackage ../games/julius { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; -- cgit 1.4.1 From b5bb2015795e6bee3d87f81eb406caedd991e903 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 8 Jun 2020 19:50:52 +0100 Subject: augustus: init at 1.4.1a --- pkgs/games/augustus/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/augustus/default.nix diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix new file mode 100644 index 000000000000..cabe419ef5bc --- /dev/null +++ b/pkgs/games/augustus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: + +stdenv.mkDerivation rec { + pname = "augustus"; + version = "1.4.1a"; + + src = fetchFromGitHub { + owner = "Keriew"; + repo = "augustus"; + rev = "v${version}"; + sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_mixer libpng ]; + + meta = with stdenv.lib; { + description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; + homepage = "https://github.com/Keriew/augustus"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2f5db82bac4..57d9cc5a5479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10613,6 +10613,8 @@ in julius = callPackage ../games/julius { }; + augustus = callPackage ../games/augustus { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; -- cgit 1.4.1 From a8b635ee12d932452091e3f09d353f1ba8731c78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:00:23 +0000 Subject: namecoin: nc0.19.1 -> nc0.20.0 --- pkgs/applications/blockchains/namecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 02f2249862d0..d52d87b9571c 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.19.1"; + version = "nc0.20.0"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m"; + sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0bb9260fa8ee03bbf5cb36e08e7a7f9810157585 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 01:45:45 +0000 Subject: pt2-clone: 1.17 -> 1.19 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index b72406b064dd..8121c0caeec8 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.17"; + version = "1.19"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0paagzc1c7gdnvs2wwsw2h15d0x8a7fl995qq3pi06g8kmdm85pi"; + sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 914b060f26fb0f92fbf496721e5245be97cd767a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:03:39 +0000 Subject: strawberry: 0.6.10 -> 0.6.12 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index dce73c386707..4a195b4c3456 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.10"; + version = "0.6.12"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; + sha256 = "0p09xp7andfg0gvarzc979pwglr0xjj1c0cziqj0c9z7p1v0fkws"; }; buildInputs = [ -- cgit 1.4.1 From 0be2f125e52564c2a33062bf1b2db44c05db9064 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 15 Jun 2020 21:09:12 +0900 Subject: purescript: 0.13.6 -> 0.13.8 --- pkgs/development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 6f61068738af..5143b83df45b 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.6"; + version = "0.13.8"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25"; + sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns"; + sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy"; }; -- cgit 1.4.1 From 0a2b461959c95076c3957f8e40c616efe1ef94e4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 15 Jun 2020 21:10:29 +0900 Subject: purescript: add cdepillabout as maintainer --- pkgs/development/compilers/purescript/purescript/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5143b83df45b..8a7fb96723a7 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = "https://www.purescript.org/"; license = licenses.bsd3; - maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ]; + maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } -- cgit 1.4.1 From b24cd9444e7082fbe00475e09acdeb868b17cedc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:20:40 +0000 Subject: cppcheck: 2.0 -> 2.1 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index bdd275a218b8..8e2c28336cf7 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; + sha256 = "1xx5i6z9a36h7k4ipikrk2zidk7jcjv8ryqyq2m5hnwy0gpyw9mb"; }; buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; -- cgit 1.4.1 From e1aff9e44d6c7b808c7f4cd2b735708685c5e718 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 15 Jun 2020 17:46:39 +0200 Subject: perlPackages.CryptEksblowfish: fix darwin build --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89bf25c15908..a6cba6ccdc77 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3614,7 +3614,7 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptIDEA = buildPerlPackage { -- cgit 1.4.1 From 1ef76221a0659e3b555cffdcbae4e9784b2f605c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 15 Jun 2020 18:14:48 +0200 Subject: perlPackages.CryptMySQL: fix darwin build --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89bf25c15908..36f417d3e644 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3734,7 +3734,7 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptRijndael = buildPerlPackage { -- cgit 1.4.1 From 470ce4784e825663dd3357c4e8de07b8012e354f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 23 Mar 2020 02:13:02 +0100 Subject: nixos/users: validate password hashes --- nixos/modules/config/users-groups.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 141e43fec39b..7fbbfcec7510 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -600,6 +600,38 @@ in { } ]; + warnings = + builtins.filter (x: x != null) ( + flip mapAttrsToList cfg.users (name: user: + # This regex matches a subset of the Modular Crypto Format (MCF)[1] + # informal standard. Since this depends largely on the OS or the + # specific implementation of crypt(3) we only support the (sane) + # schemes implemented by glibc and BSDs. In particular the original + # DES hash is excluded since, having no structure, it would validate + # common mistakes like typing the plaintext password. + # + # [1]: https://en.wikipedia.org/wiki/Crypt_(C) + let + sep = "\\$"; + base64 = "[a-zA-Z0-9./]+"; + id = "[a-z0-9-]+"; + value = "[a-zA-Z0-9/+.-]+"; + options = "${id}(=${value})?(,${id}=${value})*"; + scheme = "${id}(${sep}${options})?"; + content = "${base64}${sep}${base64}"; + mcf = "^${sep}${scheme}${sep}${content}$"; + in + if (user.hashedPassword != null + && builtins.match mcf user.hashedPassword == null) + then + '' + The password hash of user "${name}" may be invalid. You must set a + valid hash or the user will be locked out of his account. Please + check the value of option `users.users."${name}".hashedPassword`. + '' + else null + )); + }; } -- cgit 1.4.1 From 7a891404668a43e85b73081ff7c5579ca1feead1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 06:43:29 +0000 Subject: krop: 0.5.1 -> 0.6.0 --- pkgs/applications/graphics/krop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 2337dfb370ef..c88d04826d14 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "arminstraub"; repo = pname; rev = "v${version}"; - sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr"; + sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; }; propagatedBuildInputs = with python3Packages; [ -- cgit 1.4.1 From 4378ec4805ea6cb501d566692ddb3c5638d94b74 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 15 Jun 2020 08:34:06 +0100 Subject: i3pystatus: 2019-06-10 -> 2020-06-12 --- pkgs/applications/window-managers/i3/pystatus.nix | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 29bda8e4e2b0..1a6d3d591e1d 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,26 +1,32 @@ { stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: -python3Packages.buildPythonApplication rec { +let + ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${stdenv.lib.makeLibraryPath [ libpulseaudio ]}\""; +in python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2019-06-10"; + version = "unstable-2020-06-12"; pname = "i3pystatus"; - src = fetchFromGitHub - { + src = fetchFromGitHub { owner = "enkore"; repo = "i3pystatus"; - rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2"; - sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg"; + rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b"; + sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++ [ libpulseaudio ] ++ extraLibs; - libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; # LC_TIME != C results in locale.Error: unsupported locale setting - makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + makeWrapperArgs = [ + "--set" "LC_TIME" "C" + ldWrapperSuffix + ]; # libpulseaudio.so is loaded manually + + postConfigure = '' + makeWrapperArgs+=("--set" "GI_TYPELIB_PATH" "$GI_TYPELIB_PATH") + ''; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ -- cgit 1.4.1 From 5360dec935e26d5b76eb53c42e4c45f6608f05e5 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 11 Jun 2020 10:43:37 +0100 Subject: i3pystatus: fix desktop notifications --- pkgs/applications/window-managers/i3/pystatus.nix | 34 ++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1a6d3d591e1d..beefdaf891c6 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: - -let - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${stdenv.lib.makeLibraryPath [ libpulseaudio ]}\""; -in python3Packages.buildPythonApplication rec { +{ stdenv +, fetchFromGitHub +, libpulseaudio +, libnotify +, gobject-introspection +, python3Packages +, wrapGAppsHook +, extraLibs ? [] }: + +python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 version = "unstable-2020-06-12"; @@ -15,23 +20,26 @@ in python3Packages.buildPythonApplication rec { sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; - propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++ - [ libpulseaudio ] ++ extraLibs; + buildInputs = [ libpulseaudio libnotify gobject-introspection ]; + + propagatedBuildInputs = with python3Packages; [ + keyring colour netifaces psutil basiciw pygobject3 + ] ++ extraLibs; - # LC_TIME != C results in locale.Error: unsupported locale setting makeWrapperArgs = [ + # LC_TIME != C results in locale.Error: unsupported locale setting "--set" "LC_TIME" "C" - ldWrapperSuffix - ]; # libpulseaudio.so is loaded manually + "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}" + ]; - postConfigure = '' - makeWrapperArgs+=("--set" "GI_TYPELIB_PATH" "$GI_TYPELIB_PATH") + postPatch = '' + makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH") ''; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ --prefix PYTHONPATH : "$PYTHONPATH" \ - ${ldWrapperSuffix} + ''${makeWrapperArgs[@]} ''; # no tests in tarball -- cgit 1.4.1 From 35f3cb442b41161eaac78d404e86d56b2774eb31 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 16 Jun 2020 12:10:43 +0200 Subject: webdis: 0.1.9 -> 0.1.10 --- pkgs/development/tools/database/webdis/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index fd705c4fc1b0..96b39e42d101 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk"; + sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw"; }; - patches = [ - # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172 - (fetchpatch { - url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch"; - sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb"; - }) - ]; - buildInputs = [ hiredis http-parser jansson libevent ]; makeFlags = [ -- cgit 1.4.1 From 1e55d5c20dba35ac6a0e8290ba645a30d4851878 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 14:36:56 +0000 Subject: menumaker: 0.99.11 -> 0.99.12 --- pkgs/applications/misc/menumaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 22cf63e536c7..f76d6cb6b8a8 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "menumaker"; - version = "0.99.11"; + version = "0.99.12"; src = fetchurl { url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz"; - sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; + sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3"; }; format = "other"; -- cgit 1.4.1 From b3fa11fa3e1b272ad9846c580206bec21f698309 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Tue, 16 Jun 2020 08:10:24 -0700 Subject: node-exporter: 1.0.0 -> 1.0.1 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index ba10cfa1485a..8d5134437d98 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "node_exporter"; - version = "1.0.0"; + version = "1.0.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "12v7vaknvll3g1n7730miwxiwz8nbjq8y18lzljq9d9s8apcy32f"; + sha256 = "1r0xx81r9v019fl0iv078yl21ndhb356y7s7zx171zi02k7a4p2l"; }; # FIXME: tests fail due to read-only nix store -- cgit 1.4.1 From 56f04cb368db1d8609a135331856576030cb1c20 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 16 Jun 2020 17:27:22 +0200 Subject: ssb/patchwork-classic: remove Marked as deprecated by upstream, hasn't been updated in years. --- .../networking/ssb/patchwork-classic/default.nix | 106 --------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 108 deletions(-) delete mode 100644 pkgs/applications/networking/ssb/patchwork-classic/default.nix diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix deleted file mode 100644 index 74a02f47c3bf..000000000000 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, fetchurl, lib, makeWrapper, - # build dependencies - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, - freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, systemd -}: - -stdenv.mkDerivation { - - version = "2.12.0"; - - pname = "patchwork-classic"; - - src = fetchurl { - url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; - sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; - }; - - sourceRoot = "."; - - unpackCmd = '' - ar p "$src" data.tar.xz | tar xJ - ''; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R usr/share opt $out/ - - # fix the path in the desktop file - substituteInPlace \ - $out/share/applications/ssb-patchwork-electron.desktop \ - --replace /opt/ $out/opt/ - - # symlink the binary to bin/ - ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic - ''; - - - preFixup = let - packages = [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - nspr - nss - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - stdenv.cc.cc.lib - stdenv.cc.cc - glibc - ]; - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - in '' - # patch executable - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ - $out/opt/ssb-patchwork-electron/ssb-patchwork-electron - - # patch libnode - patchelf \ - --set-rpath "${libPath}" \ - $out/opt/ssb-patchwork-electron/libnode.so - - # libffmpeg is for some reason not executable - chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so - - # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 - wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ - --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron - ''; - - meta = with stdenv.lib; { - description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; - homepage = "https://github.com/ssbc/patchwork-classic-electron"; - license = licenses.gpl3; - maintainers = with maintainers; [ mrVanDalo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8465c5060030..2a1e00e590eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5871,8 +5871,6 @@ in patchage = callPackage ../applications/audio/patchage { }; - patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { }; - pcapfix = callPackage ../tools/networking/pcapfix { }; pbzip2 = callPackage ../tools/compression/pbzip2 { }; -- cgit 1.4.1 From fe26b6241cc6f591130d9bb1e4b6cba7aaa942e8 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 16 Jun 2020 17:28:47 +0200 Subject: ssb-patchwork: move to ssb-patchwork dir Since there's no other ssb package anymore (see previous commit), there's no need to group them together in a common subdirectory. --- .../networking/ssb-patchwork/default.nix | 53 ++++++++++++++++++++++ .../networking/ssb/patchwork/default.nix | 53 ---------------------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 pkgs/applications/networking/ssb-patchwork/default.nix delete mode 100644 pkgs/applications/networking/ssb/patchwork/default.nix diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix new file mode 100644 index 000000000000..db33e7e6bb21 --- /dev/null +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -0,0 +1,53 @@ +{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }: + +let + pname = "ssb-patchwork"; + version = "3.17.7"; + name = "Patchwork-${version}"; + + src = fetchurl { + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; + sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; + }; + + binary = appimageTools.wrapType2 { + name = pname; + inherit src; + }; + # we only use this to extract the icon + appimage-contents = appimageTools.extractType2 { + inherit name src; + }; + + desktopItem = makeDesktopItem { + name = "ssb-patchwork"; + exec = "${binary}/bin/ssb-patchwork"; + icon = "ssb-patchwork.png"; + comment = "Client for the decentralized social network Secure Scuttlebutt"; + desktopName = "Patchwork"; + genericName = "Patchwork"; + categories = "Network;"; + }; + +in + symlinkJoin { + inherit name; + paths = [ binary ]; + + postBuild = '' + mkdir -p $out/share/pixmaps/ $out/share/applications + cp ${appimage-contents}/ssb-patchwork.png $out/share/pixmaps + cp ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + meta = with lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = "https://www.scuttlebutt.nz/"; + license = licenses.agpl3; + maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix deleted file mode 100644 index db33e7e6bb21..000000000000 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }: - -let - pname = "ssb-patchwork"; - version = "3.17.7"; - name = "Patchwork-${version}"; - - src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; - }; - - binary = appimageTools.wrapType2 { - name = pname; - inherit src; - }; - # we only use this to extract the icon - appimage-contents = appimageTools.extractType2 { - inherit name src; - }; - - desktopItem = makeDesktopItem { - name = "ssb-patchwork"; - exec = "${binary}/bin/ssb-patchwork"; - icon = "ssb-patchwork.png"; - comment = "Client for the decentralized social network Secure Scuttlebutt"; - desktopName = "Patchwork"; - genericName = "Patchwork"; - categories = "Network;"; - }; - -in - symlinkJoin { - inherit name; - paths = [ binary ]; - - postBuild = '' - mkdir -p $out/share/pixmaps/ $out/share/applications - cp ${appimage-contents}/ssb-patchwork.png $out/share/pixmaps - cp ${desktopItem}/share/applications/* $out/share/applications/ - ''; - - meta = with lib; { - description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; - longDescription = '' - sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. - ''; - homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a1e00e590eb..cd9d7dbe5745 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6840,7 +6840,7 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { }; + ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -15768,7 +15768,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { + home-assistant = callPackage ../servers/home-assistant { python3 = python37; }; -- cgit 1.4.1 From 77730556e070f73bdfecc46794a03b66a41647b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Jun 2020 19:22:31 +0200 Subject: microcodeIntel: 20200609 -> 20200616 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index bbf584b2fa3b..475288a0b6f6 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200609"; + version = "20200616"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0vzsv0fqp44dhmvj6syjjab3cs1bc4r0g7g97lna8l91vj2yin9j"; + sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563"; }; nativeBuildInputs = [ iucode-tool libarchive ]; -- cgit 1.4.1 From 88f749545c8a3299bdf6f856285c32058063f6cf Mon Sep 17 00:00:00 2001 From: Bastian Köcher Date: Tue, 16 Jun 2020 15:55:01 +0200 Subject: hplip: Add missing library Otherwise, things like `hp-setup` fail finding gi: ``` HP Linux Imaging and Printing System (ver. 3.20.5) Printer/Fax Setup Utility ver. 9.0 Copyright (c) 2001-18 HP Development Company, LP This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to distribute it under certain conditions. See COPYING file for more details. Traceback (most recent call last): File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/setup.py", line 314, in ui = import_module(ui_package + ".setupdialog") File "/nix/store/n0b076p351ma864q38if4yglsg99hw2s-python3-3.8.3/lib/python3.8/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1014, in _gcd_import File "", line 991, in _find_and_load File "", line 975, in _find_and_load_unlocked File "", line 671, in _load_unlocked File "", line 783, in exec_module File "", line 219, in _call_with_frames_removed File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/ui5/setupdialog.py", line 31, in from base import device, utils, models, pkit File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/base/pkit.py", line 38, in from gi import _gobject as gobject ModuleNotFoundError: No module named 'gi' ``` --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 2ecd163fbf24..daedbe73e200 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { pythonPath = with python3Packages; [ dbus pillow - pygobject2 + pygobject3 reportlab usbutils sip -- cgit 1.4.1 From 907353b1e43195af775c6dc2075479774cb49783 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Jun 2020 20:34:30 +0200 Subject: hplip: use wrapQtApp Otherwise, things like hp-setup segfault if you run them from another nixpkgs checkout: ``` HP Linux Imaging and Printing System (ver. 3.20.5) Printer/Fax Setup Utility ver. 9.0 Copyright (c) 2001-18 HP Development Company, LP This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to distribute it under certain conditions. See COPYING file for more details. qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. [1] 4543 abort (core dumped) result/bin/hp-setup ``` --- pkgs/misc/drivers/hplip/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index daedbe73e200..98ced28b8773 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -5,7 +5,7 @@ , net-snmp, openssl, perl, nettools , bash, coreutils, utillinux # To remove references to gcc-unwrapped -, removeReferencesTo +, removeReferencesTo, qt5 , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -67,7 +67,10 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ + pkgconfig + removeReferencesTo + ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus @@ -219,6 +222,10 @@ python3Packages.buildPythonApplication { --replace {,${utillinux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) + '' + stdenv.lib.optionalString withQt5 '' + for f in $out/bin/hp-*;do + wrapQtApp $f + done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. -- cgit 1.4.1 From 147dff2b5dd8904c473ef3538aa47c430c5e2f5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 19:38:27 +0000 Subject: prometheus-mysqld-exporter: 0.11.0 -> 0.12.1 --- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 3ef947b28738..8787a39de32a 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mysqld_exporter"; - version = "0.11.0"; + version = "0.12.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "1684jf96dy5bs0y0689vlcw82lqw8kw2phlnp6pq1cq56fcwdxjn"; + sha256 = "0nzbfzx4dzs3cagdid1fqddrqimgr8x6r8gmmxglrss05c8srgs8"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From db20a2371cf67678aa01411b6cc40704000f05b9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 16 Jun 2020 23:02:48 +0300 Subject: krop: move libsForQt5.poppler out of propagatedBuildInputs (#87790) --- pkgs/applications/graphics/krop/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index c88d04826d14..ee4906769770 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -15,9 +15,11 @@ python3Packages.buildPythonApplication rec { pyqt5 pypdf2 poppler-qt5 - libsForQt5.poppler ghostscript ]; + buildInputs = [ + libsForQt5.poppler + ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeWrapperArgs = [ -- cgit 1.4.1 From 0d4134de4a3436fabf7ea8afbac3c0a3028d0fbb Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 16 Jun 2020 14:34:03 +0200 Subject: nixos/systemd: Update warning for restarting oneshots Restart= can be anything other than on-success and always for onehost units as of https://github.com/systemd/systemd/pull/13754/commits/10e72727eeeeb1a495303ec406fa8d1e1a83dc6e which is contained in systemd 245. --- nixos/modules/system/boot/systemd.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 99892a28115c..a8e51fc09014 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -826,8 +826,13 @@ in config = { warnings = concatLists (mapAttrsToList (name: service: - optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no") - "Service ‘${name}.service’ with ‘Type=oneshot’ must have ‘Restart=no’") cfg.services); + let + type = service.serviceConfig.Type or ""; + restart = service.serviceConfig.Restart or "no"; + in optional + (type == "oneshot" && (restart == "always" || restart == "on-success")) + "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'") + cfg.services); system.build.units = cfg.units; -- cgit 1.4.1 From 59678c11527e90426f9382d3beca0a89317f033f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Jun 2020 23:18:42 +0200 Subject: riot-web: 1.6.4 -> 1.6.5 https://github.com/vector-im/riot-web/releases/tag/v1.6.5 --- pkgs/applications/networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 942917a46757..c08d1dbe0332 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2"; + sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5"; }; installPhase = '' -- cgit 1.4.1 From dcf36b65c3f9c2753bc51d4e45fce4f98b823c31 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Jun 2020 23:19:20 +0200 Subject: riot-desktop: 1.6.4 -> 1.6.5 https://github.com/vector-im/riot-desktop/releases/tag/v1.6.5 --- .../networking/instant-messengers/riot/riot-desktop-package.json | 4 ++-- .../networking/instant-messengers/riot/riot-desktop-yarndeps.nix | 8 ++++---- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index acb63ff7454f..f9a5ebdbebe3 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.4", + "version": "1.6.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.1", + "matrix-js-sdk": "6.2.2", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index e6573a508184..30e1c9464755 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -3154,11 +3154,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz"; - sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz"; + sha1 = "103d951f61945217b110962f55ae43996756f615"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 64652afd7e4d..acdf40e772ea 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2"; + sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60"; }; electron = electron_7; -- cgit 1.4.1 From 51e995cc055f95ee4d7d0313cc5b9a71378e5afc Mon Sep 17 00:00:00 2001 From: tmplt Date: Tue, 16 Jun 2020 23:42:56 +0200 Subject: nixos/physlock: add suspend-then-hibernate to suspend/hibernate units --- nixos/modules/services/security/physlock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 61bcd84f2e64..690eb70079d8 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -107,6 +107,7 @@ in ++ cfg.lockOn.extraTargets; before = optional cfg.lockOn.suspend "systemd-suspend.service" ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service" ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; -- cgit 1.4.1 From 56762ad60a449abfa8c4b5faf46ec11e11889d13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 21:59:34 +0000 Subject: opentx: 2.3.7 -> 2.3.9 --- pkgs/applications/misc/opentx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index f20d5ccdc4ac..a117ecc06a9c 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.7"; + version = "2.3.9"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "1wl3bk7s8h20dfys1hblzxc0br9zlwhcqlghgsbn81ki0xb6jmkf"; + sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 213275ca72e271acc0881bcce4a1e7e8cb58ac8d Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Wed, 17 Jun 2020 00:42:12 +0200 Subject: protobufc: 1.3.1 -> 1.3.3 (#90327) --- pkgs/development/libraries/protobufc/1.3.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index 304f9d61f397..82126727282c 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,12 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // { - version = "1.3.1"; +callPackage ./generic.nix (args // rec { + version = "1.3.3"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - #rev = "v${version}"; - rev = "9412830d0680150d429d2aa170b8d7218ab49397"; - sha256 = "175cmaj5231iqzhf5a9sxw2y3i165chk3681m1b5mp8di927q5ai"; + rev = "v${version}"; + sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv"; }; }) -- cgit 1.4.1 From fc179ef8a6968a171a51de4b69bbd9b147f4cb7e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Jun 2020 23:54:36 +0200 Subject: nixos/dovecot2: add autoexpunge setting To automatically purge old email. See also https://wiki.dovecot.org/MailboxSettings --- nixos/modules/services/mail/dovecot.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 9fbf0c19752c..ee797f9c42f1 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -125,6 +125,8 @@ let mailboxConfig = mailbox: '' mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} + '' + optionalString (mailbox.autoexpunge != null) '' + autoexpunge = ${mailbox.autoexpunge} '' + optionalString (mailbox.specialUse != null) '' special_use = \${toString mailbox.specialUse} '' + "}"; @@ -148,6 +150,15 @@ let example = "Junk"; description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid."; }; + autoexpunge = mkOption { + type = types.nullOr types.str; + default = null; + example = "60d"; + description = '' + To automatically remove all email from the mailbox which is older than the + specified time. + ''; + }; }; }; in -- cgit 1.4.1 From 70187773bc2c029a090d21d554c795a3bdf4635e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 23:15:26 +0000 Subject: openmpi: 4.0.3 -> 4.0.4 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 38041e6b5d80..5c185f630d98 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -19,7 +19,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.3"; + version = "4.0.4"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl"; + sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; }; postPatch = '' -- cgit 1.4.1 From f360637db440d612be71ba9011a2a7d78eb6f7e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jun 2020 02:08:34 +0200 Subject: bees: fix documentation build by moving to python3 --- pkgs/tools/filesystems/bees/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index c6bb07e7b87d..e87cecbf8fd3 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }: let @@ -22,7 +22,7 @@ let ]; nativeBuildInputs = [ - pythonPackages.markdown # documentation build + python3Packages.markdown # documentation build ]; preBuild = '' -- cgit 1.4.1 From 52633ca14b372f7a502fd4cf1e457a29f30cf648 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 17 Jun 2020 01:57:39 +0200 Subject: linuxPackages.wireguard: 1.0.20200520 -> 1.0.20200611 https://lists.zx2c4.com/pipermail/wireguard/2020-June/005480.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 4617db5e7671..6af465da4731 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200520"; + version = "1.0.20200611"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1zggpm0zh6m30b9mchj3bg3z721k346r5m5a130inp779s4xm0sm"; + sha256 = "0a8xsjxp8krmm2px07x9qw8nhvp5ispf4mnc6k59p0qp26qbva5d"; }; hardeningDisable = [ "pic" ]; -- cgit 1.4.1 From cf810b54e097d8a561b28f46767feac5dd111bd9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 17 Jun 2020 01:58:14 +0200 Subject: vagrant: 2.2.8 -> 2.2.9 https://github.com/hashicorp/vagrant/blob/v2.2.9/CHANGELOG.md#229-may-07-2020 --- pkgs/development/tools/vagrant/default.nix | 4 ++-- pkgs/development/tools/vagrant/gemset.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 32e205a6f8d3..338e8f68d355 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.8"; + version = "2.2.9"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; + sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index f5d70b912df5..00838c6e0c55 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -85,10 +85,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gssapi = { dependencies = ["ffi"]; @@ -149,10 +149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2020.0425"; + version = "3.2020.0512"; }; multi_json = { groups = ["default"]; -- cgit 1.4.1 From 612b7f71a0af7d665a289dfdbdfa6bcd50c2694b Mon Sep 17 00:00:00 2001 From: Andy Tockman Date: Tue, 16 Jun 2020 19:48:50 -0500 Subject: feh: add enableAutoreload option This change enables the inotify-based auto-reload feature of feh, which causes images to be refreshed when the image file changes. --- pkgs/applications/graphics/feh/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index cecd2a3776d3..4782d9201480 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng -, curl, libexif, jpegexiforient, perlPackages }: +, curl, libexif, jpegexiforient, perlPackages +, enableAutoreload ? true }: with stdenv.lib; @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ optional stdenv.isDarwin "verscmp=0"; + ] ++ optional stdenv.isDarwin "verscmp=0" + ++ optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; postInstall = '' -- cgit 1.4.1 From a2e6ff2cceea8190f19409e10e5590f57a3b8072 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 4 Jun 2020 14:01:51 +1000 Subject: buildGoModule: require vendorSha256 to be set in packages --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 9baeefe1b2cb..0d8b382167e5 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -17,7 +17,7 @@ # # if vendorSha256 is null, then we won't fetch any dependencies and # rely on the vendor folder within the source. -, vendorSha256 ? null +, vendorSha256 # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false -- cgit 1.4.1 From f6ac90cd0953dc34ceb77c5da0d2a3b1cac6ca93 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 12 Jun 2020 09:01:50 +1000 Subject: dnscrypt-proxy2: 2.0.43 -> 2.0.44 https://github.com/DNSCrypt/dnscrypt-proxy/releases/tag/2.0.44 --- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 508d9ecd0f30..d5b92c17a65a 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.43"; + version = "2.0.44"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "1c12y8h7dww72a3agb74vr5fzxzy6k8394rdbgz9knk82fdwah1c"; + sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 78e324d2726127828a15f87a75b4d3199a8955ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 13 Jun 2020 12:31:01 +1000 Subject: treewide: ffmpeg_4 -> ffmpeg --- .../audio/pulseaudio-modules-bt/default.nix | 6 +++--- .../networking/browsers/firefox/wrapper.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../networking/remote/waypipe/default.nix | 4 ++-- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/applications/video/wf-recorder/default.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 4 ++-- pkgs/development/python-modules/av/default.nix | 4 ++-- .../tools/poetry2nix/poetry2nix/overrides.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 20 ++++++-------------- 13 files changed, 30 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 49cc83189359..556dd5f10619 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pulseaudio , pkgconfig -, ffmpeg_4 +, ffmpeg , patchelf , fdk_aac , libtool @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pulseaudio - ffmpeg_4 + ffmpeg fdk_aac libtool ldacbt @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 52773bf291a6..7505e7e21967 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -66,7 +66,7 @@ let ++ extraNativeMessagingHosts ); libs = lib.optionals stdenv.isLinux [ udev libva ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 388144c4e12f..d4493355951f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst @@ -42,7 +42,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 03be60a99489..c72c7c6da8ab 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, openssh -, mesa, lz4, zstd, ffmpeg_4, libva +, mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols # Optional dependencies: - mesa lz4 zstd ffmpeg_4 libva + mesa lz4 zstd ffmpeg libva ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 51d284f277a1..697a468f8908 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,6 +1,6 @@ { config, stdenv, fetchurl, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which -, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs +, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -155,7 +155,7 @@ in stdenv.mkDerivation rec { ++ optional swiftSupport swift; buildInputs = [ - ffmpeg_4 freetype libass libpthreadstubs + ffmpeg freetype libass libpthreadstubs luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index cb97e5b1090b..09b67149f5a9 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc -, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers +, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; buildInputs = [ - wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers + wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 104e0c3440aa..33db6e9d75b1 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4 +, libpng, ffmpeg }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 + libpng ffmpeg ]; postInstall = '' diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7ccc569a87e5..ca750f32dba9 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, ffmpeg_4 +, ffmpeg , pkgconfig }: @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg_4 ]; + buildInputs = [ ffmpeg ]; # Tests require downloading files from internet doCheck = false; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index c5ae5e191211..62f2ed6e3065 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -24,7 +24,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ]; } ); diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 91a58438c17d..6fe433daf8b9 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg_4, x264, libvpx, libwebp, x265 +, ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -60,7 +60,7 @@ in buildPythonApplication rec { pango cairo gdk-pixbuf atk.out gtk3 glib - ffmpeg_4 libvpx x264 libwebp x265 + ffmpeg libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index dfd227f917ed..5e5550e0b41d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar +, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , enableBloat ? false @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals enableBloat ([ - abootimg apksigner apktool cbfstool colord ffmpeg_4 fpc ghc ghostscriptX giflib gnupg gnumeric + abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt ] ++ (with python3Packages; [ binwalk guestfs h5py ])); diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9e28e8785732..94f4de6e364f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -36,7 +36,7 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e2316652719..52cdce81aab7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1968,7 +1968,7 @@ in interlock = callPackage ../servers/interlock {}; - jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -11719,8 +11719,6 @@ in ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - ffmpeg = ffmpeg_4; - # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; @@ -12077,7 +12075,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg_4; }; + callPackage = newScope { libav = pkgs.ffmpeg; }; inherit (darwin.apple_sdk.frameworks) CoreServices; }); @@ -13811,7 +13809,7 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -14367,9 +14365,7 @@ in kpmcore = callPackage ../development/libraries/kpmcore { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_4; - }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; @@ -18871,7 +18867,6 @@ in bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { - ffmpeg = ffmpeg_4; glew = glew110; }; @@ -21382,7 +21377,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23663,7 +23658,6 @@ in inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; - ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -26370,9 +26364,7 @@ in vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { - ffmpeg = ffmpeg_4; - }; + vbam = callPackage ../misc/emulators/vbam { }; vice = callPackage ../misc/emulators/vice { giflib = giflib_4_1; -- cgit 1.4.1 From 0b420ecce44226ac8079a1fa07fe93bde40301db Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:24:51 +1000 Subject: conmon: 2.0.17 -> 2.0.18 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index be6196855e2b..d5abb569e7b1 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7"; + sha256 = "0f32g048jamfhrds68vzirx8iqizr45wf2d4bfvdsk176amrj4k0"; }; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From 2643082af4edab6d76dc1400312105f5735a348e Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Wed, 3 Jun 2020 17:09:25 +0300 Subject: hikari: init at 2.0.2 --- .../window-managers/hikari/default.nix | 75 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/applications/window-managers/hikari/default.nix diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix new file mode 100644 index 000000000000..274c75a3c13c --- /dev/null +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchzip, + pkgconfig, bmake, + cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, + libucl, wayland, wayland-protocols, wlroots, + features ? { + gammacontrol = true; + layershell = true; + screencopy = true; + xwayland = true; + } +}: + +let + pname = "hikari"; + version = "2.0.2"; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; + sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68"; + }; + + nativeBuildInputs = [ pkgconfig bmake ]; + + buildInputs = [ + cairo + glib + libevdev + libinput + libxkbcommon + linux-pam + pango + pixman + libucl + wayland + wayland-protocols + wlroots + ]; + + enableParallelBuilding = true; + + # Must replace GNU Make by bmake + buildPhase = with stdenv.lib; concatStringsSep " " ( + [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] + ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" + ++ mapAttrsToList (feat: enabled: + optionalString enabled "WITH_${toUpper feat}=YES" + ) features + ); + + # Can't suid in nix store + # Run hikari as root (it will drop privileges as early as possible), or create + # a systemd unit to give it the necessary permissions/capabilities. + patchPhase = '' + substituteInPlace Makefile --replace '4555' '555' + ''; + + installPhase = '' + bmake \ + PREFIX=$out \ + install + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; + homepage = "https://hikari.acmelabs.space"; + license = licenses.bsd2; + platforms = platforms.linux ++ platforms.freebsd; + maintainers = with maintainers; [ jpotier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe2a3831c164..0c7690bf3efa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20205,6 +20205,8 @@ in pulseSupport = config.pulseaudio or false; }; + hikari = callPackage ../applications/window-managers/hikari { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; -- cgit 1.4.1 From 0b671216bb3a170ba720b34c2640574999849d2e Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 17 Jun 2020 08:23:34 +0200 Subject: binwalk: disable Qt support by default --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9871624e830..331f7292b930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1927,7 +1927,9 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; - binwalk = callPackage ../development/python-modules/binwalk { }; + binwalk = callPackage ../development/python-modules/binwalk { + pyqtgraph = null; + }; binwalk-full = appendToName "full" (self.binwalk.override { pyqtgraph = self.pyqtgraph; -- cgit 1.4.1 From 9836a3042219fa2d975270f31748585bb6a73b5d Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 16 Jun 2020 15:15:11 +0200 Subject: bazel-buildtools: 3.2.0 -> 3.2.1 --- pkgs/development/tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 0d2d1f318443..2f026c9d99c0 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.2.0"; + version = "3.2.1"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0r3vc47w5vxgy5rzh75q0lng1c490ic1a1dcc0ih7dcl6i5p1p88"; + sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn"; }; goDeps = ./deps.nix; -- cgit 1.4.1 From 745245a62a78ec3b13040b9fc947b3943ecc9838 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 16 Jun 2020 23:11:12 +0200 Subject: vlc: 3.0.10 -> 3.0.11 Includes a security fix for CVE-2020-13428. Also available at: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=blobdiff;f=modules/packetizer/hxxx_nal.c;h=6bdfd5a2a58ab9397d5758726ef16dfb27fec2a0;hp=73450606e382329a301e04d37c5ac259951448e8;hb=d5c43c21c747ff30ed19fcca745dea3481c733e0;hpb=441907f4352107737523bf9cfb56eabe3563edb4 Release notes: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=tag;h=1519d3219a8d151bca792f40003051fa8b967734 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3ee662f73c53..91fb36c39748 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra stdenv.mkDerivation rec { pname = "vlc"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; - sha256 = "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9"; + sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of -- cgit 1.4.1 From 4eb9c8cae5be59dc176afabdd82247271b02ff78 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 17 Jun 2020 11:15:49 +0200 Subject: olm: fix homepage link --- pkgs/development/libraries/olm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index c84e66608f2a..d5c230862333 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = "https://matrix.org/git/olm/about"; + homepage = "https://gitlab.matrix.org/matrix-org/olm"; platforms = with stdenv.lib.platforms; darwin ++ linux; }; } -- cgit 1.4.1 From 52c906147c5bbf65fea3e56954241d69d02fda99 Mon Sep 17 00:00:00 2001 From: pablo1107 Date: Mon, 15 Jun 2020 19:27:16 -0300 Subject: luaPackages.ldbus: init at scm-0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../development/lua-modules/generated-packages.nix | 27 ++++++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 11 +++++++++ 3 files changed, 39 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 89a1c0bbbe09..8cc63963370d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ dkjson,,,,, fifo,,,,, http,,,,,vcunat inspect,,,,, +ldbus,,http://luarocks.org/dev,,, ldoc,,,,, lgi,,,,, linenoise,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2dbda51bfe8b..7eae27d85c6f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -359,6 +359,33 @@ inspect = buildLuarocksPackage { license.fullName = "MIT "; }; }; +ldbus = buildLuarocksPackage { + pname = "ldbus"; + version = "scm-0"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; + sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/daurnimator/ldbus.git", + "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", + "date": "2019-08-16T14:26:05+10:00", + "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/daurnimator/ldbus"; + description = "A Lua library to access dbus."; + license.fullName = "MIT/X11"; + }; +}; ldoc = buildLuarocksPackage { pname = "ldoc"; version = "1.4.6-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 30be2c197a5d..94edbd0737b7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -76,6 +76,17 @@ with super; */ }); + ldbus = super.ldbus.override({ + extraVariables = { + DBUS_DIR="${pkgs.dbus.lib}"; + DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + }; + buildInputs = with pkgs; [ + dbus + ]; + }); + ljsyscall = super.ljsyscall.override(rec { version = "unstable-20180515"; # package hasn't seen any release for a long time -- cgit 1.4.1 From a866a6b7f09997a98722fef3592404431ae782dd Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 14 Jun 2020 18:16:43 -0600 Subject: tut: 0.0.8 -> 0.0.9 There has been a new release that fixes a crash-causing bug. https://github.com/RasmusLindroth/tut/releases/tag/0.0.9 --- pkgs/applications/misc/tut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 30868a9900e7..7b9efb6bbe5d 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.8"; + version = "0.0.9"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3"; + sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From e76f83c266f7b03afe798cfcd9ff068ac369d5e4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 17 Jun 2020 08:13:07 -0400 Subject: oh-my-zsh: 2020-06-10 -> 2020-06-17 --- 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 a062b346fda0..6896904ec9a4 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-06-10"; + version = "2020-06-17"; pname = "oh-my-zsh"; - rev = "db94f60d342ba2be7dbe3bfd86f4edb335c2a6a7"; + rev = "d47447a5e63715ae6ab6c2f46924dc8766c8e746"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "14zvbnrnkcmqnjbw71j4jgfm7gkrgpchkfrpdw006q25gqxj0bgm"; + sha256 = "1hfinbmwwinvqnv3ldcja8gqh9n6ll6749055vk8icdixa9jwcyl"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit 1.4.1 From 4b5880f01563b1303d60da83c703742b713059f5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 17 Jun 2020 08:27:55 -0400 Subject: xdg_utils: xdg-open: add $out to PATH Otherwise, xdg-open cannot call xdg-mime and this does not work: "${pkgs.xdg_utils}/bin/xdg-open" --- pkgs/tools/X11/xdg-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 64b205bada58..ccea6a2233cc 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { xset() { ${xset}/bin/xset "$@"; }\ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ + PATH=$PATH:'"$out"'/bin\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ -- cgit 1.4.1 From e8ddc0cfa73d61d12bd824e03cf9b49bbcfd70e5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 17 Jun 2020 08:32:34 -0400 Subject: google-chrome: add coreutils to PATH google-chrome-stable can't run without coreutils in PATH --- pkgs/applications/networking/browsers/google-chrome/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e5cd08f7df7f..fb30bbfd2b6c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -7,6 +7,9 @@ , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +# Command line programs +, coreutils + # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,7 +61,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa + kerberos libdrm mesa coreutils ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; -- cgit 1.4.1 From 2ee84ca8e2adb0ef5b5ea52ad38fe0e107893d3e Mon Sep 17 00:00:00 2001 From: jakobrs Date: Wed, 17 Jun 2020 13:36:06 +0000 Subject: nixos/manual: Document `boot.debug1mounts` and clarify what `exit` does with `shell_on_fail` (#89365) * nixos/manual: document boot.debug1mounts * nixos/manual: clarify what `exit` does with shell_on_fail --- nixos/doc/manual/administration/boot-problems.xml | 31 ++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index 5fa0b29e6d62..badc374ebcfd 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -19,9 +19,9 @@ - Start a root shell if something goes wrong in stage 1 of the boot process - (the initial ramdisk). This is disabled by default because there is no - authentication for the root shell. + Allows the user to start a root shell if something goes wrong in stage 1 + of the boot process (the initial ramdisk). This is disabled by default + because there is no authentication for the root shell. @@ -49,6 +49,22 @@ + + + boot.debug1mounts + + + + Like boot.debug1 or + boot.debug1devices, but runs stage1 until all + filesystems that are mounted during initrd are mounted (see + + ). As a motivating example, this could be useful if you've forgotten to set + + on a file system. + + + boot.trace @@ -90,6 +106,15 @@ 1. + + Notice that for boot.shell_on_fail, + boot.debug1, boot.debug1devices, and + boot.debug1mounts, if you did not + select "start the new shell as pid 1", and you exit from + the new shell, boot will proceed normally from the point where it failed, as + if you'd chosen "ignore the error and continue". + + If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start -- cgit 1.4.1 From 459cf94991754d391f7808bbc306f52653298ada Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 9 May 2020 19:16:06 -0700 Subject: Nixpkgs support for `dhall-to-nixpkgs` The motivation for this change is to enable a new Dhall command-line utility called `dhall-to-nixpkgs` which converts Dhall packages to buildable Nix packages. You can think of `dhall-to-nixpkgs` as the Dhall analog of `cabal2nix`. You can find the matching pull request for `dhall-to-nixpkgs` here: https://github.com/dhall-lang/dhall-haskell/pull/1826 The two main changes required to support `dhall-to-nixpkgs` are: * Two new `buildDhall{Directory,GitHub}Package` utilities are added `dhall-to-nixpkgs` uses these in the generated output * `pkgs.dhallPackages` now selects a default version for each package using the `prefer` utility All other versions are still buildable via a `passthru` attribute --- pkgs/development/dhall-modules/Prelude.nix | 31 +++++--------- .../development/dhall-modules/dhall-kubernetes.nix | 31 ++++---------- pkgs/development/dhall-modules/dhall-packages.nix | 39 ++++++----------- .../dhall/build-dhall-directory-package.nix | 25 +++++++++++ .../dhall/build-dhall-github-package.nix | 50 ++++++++++++++++++++++ pkgs/top-level/dhall-packages.nix | 28 ++++++++++-- 6 files changed, 131 insertions(+), 73 deletions(-) create mode 100644 pkgs/development/interpreters/dhall/build-dhall-directory-package.nix create mode 100644 pkgs/development/interpreters/dhall/build-dhall-github-package.nix diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix index c689f7156fb4..6af08edf88a7 100644 --- a/pkgs/development/dhall-modules/Prelude.nix +++ b/pkgs/development/dhall-modules/Prelude.nix @@ -1,26 +1,17 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makePrelude = - version: - lib.makeOverridable - ( { rev, sha256, file ? "package.dhall" }: - buildDhallPackage { - name = "Prelude-${version}"; - - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-lang"; - - inherit rev sha256; - }; - - in - "${src}/Prelude/${file}"; - } - ); + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "Prelude-${version}"; + owner = "dhall-lang"; + repo = "dhall-lang"; + directory = "Prelude"; + file = "package.dhall"; + + inherit rev sha256; + }; in lib.mapAttrs makePrelude { diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix index 23a1123eacb3..2de89d63ec37 100644 --- a/pkgs/development/dhall-modules/dhall-kubernetes.nix +++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix @@ -1,29 +1,16 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makeDhallKubernetes = - version: - lib.makeOverridable - ( { rev - , sha256 - , file ? "package.dhall" - }: - buildDhallPackage { - name = "dhall-kubernetes-${version}"; + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "dhall-kubernetes-${version}"; + owner = "dhall-lang"; + repo = "dhall-kubernetes"; + file = "package.dhall"; - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-kubernetes"; - - inherit rev sha256; - }; - - in - "${src}/${file}"; - } - ); + inherit rev sha256; + }; in lib.mapAttrs makeDhallKubernetes { diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix index 34ebbed68699..866b689e38a1 100644 --- a/pkgs/development/dhall-modules/dhall-packages.nix +++ b/pkgs/development/dhall-modules/dhall-packages.nix @@ -1,47 +1,32 @@ -{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }: +{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }: let makeDhallPackages = - version: - lib.makeOverridable - ( { rev - , sha256 - , dependencies - }: - buildDhallPackage { - name = "dhall-packages-${version}"; + version: { rev, sha256, dependencies }: + buildDhallGitHubPackage { + name = "dhall-packages-${version}"; + owner = "EarnestResearch"; + repo = "dhall-packages"; + file = "package.dhall"; - inherit dependencies; - - code = - let - src = fetchFromGitHub { - owner = "EarnestResearch"; - repo = "dhall-packages"; - - inherit rev sha256; - }; - - in - "${src}/package.dhall"; - } - ); + inherit rev sha256 dependencies; + }; in lib.mapAttrs makeDhallPackages { "0.11.1" = let - k8s_6a47bd = dhall-kubernetes."3.0.0".override { + k8s_6a47bd = dhall-kubernetes.override { rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4"; sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh"; }; - k8s_4ad581 = dhall-kubernetes."3.0.0".override { + k8s_4ad581 = dhall-kubernetes.override { rev = "4ad58156b7fdbbb6da0543d8b314df899feca077"; sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0"; }; - k8s_fee24c = dhall-kubernetes."3.0.0".override { + k8s_fee24c = dhall-kubernetes.override { rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d"; sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk"; }; diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix new file mode 100644 index 000000000000..b4401a85d141 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -0,0 +1,25 @@ +{ buildDhallPackage, lib }: + +# This is a minor variation on `buildDhallPackage` that splits the `code` +# argument into `src` and `file` in such a way that you can easily override +# the `file` +# +# This function is used by `dhall-to-nixpkgs` when given a directory +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , src + , # The file to import, relative to the root directory + file ? "package.dhall" + }: + + buildDhallPackage { + inherit name dependencies source; + + code = "${src}/${file}"; + } + ) + diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix new file mode 100644 index 000000000000..9289e9b656d3 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -0,0 +1,50 @@ +{ buildDhallPackage, fetchFromGitHub, lib }: + +# This function is used by `dhall-to-nixpkgs` when given a GitHub repository +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , # The directory containing the Dhall files, if other than the root of the + # repository + directory ? "" + , # The file to import, relative to the above directory + file ? "package.dhall" + + # Arguments passed through to `fetchFromGitHub` + , owner + , repo + , rev + # Extra arguments passed through to `fetchFromGitHub`, such as the hash + # or `fetchSubmodules` + , ... + }@args: + + buildDhallPackage { + inherit name dependencies source; + + code = + let + src = fetchFromGitHub ({ + name = "${name}-source"; + + inherit owner repo rev; + } // removeAttrs args [ + "name" + "dependencies" + "source" + "directory" + "file" + "owner" + "repo" + "rev" + ]); + + prefix = lib.optionalString (directory != "") "${directory}/"; + + in + "${src}/${prefix}${file}"; + } + ) diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 6cdd84c22799..9d4801e9dc5c 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -8,20 +8,40 @@ let let callPackage = newScope self; + prefer = version: path: + let + packages = callPackage path { }; + + in + packages."${version}".overrideAttrs (_: { + passthru = packages; + } + ); + buildDhallPackage = callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; + buildDhallGitHubPackage = + callPackage ../development/interpreters/dhall/build-dhall-github-package.nix { }; + + buildDhallDirectoryPackage = + callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { }; + in - { inherit buildDhallPackage; + { inherit + buildDhallPackage + buildDhallGitHubPackage + buildDhallDirectoryPackage + ; dhall-kubernetes = - callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; + prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix; dhall-packages = - callPackage ../development/dhall-modules/dhall-packages.nix { }; + prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix; Prelude = - callPackage ../development/dhall-modules/Prelude.nix { }; + prefer "13.0.0" ../development/dhall-modules/Prelude.nix; }; in -- cgit 1.4.1 From eb296c501011675953ef1a93445359fb6d6dffed Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 24 May 2020 18:15:15 +0200 Subject: wesnoth: 1.14.11 -> 1.14.12 --- pkgs/games/wesnoth/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 20ec0a978f5b..2eb45ded7e29 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false @@ -6,11 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.11"; + version = "1.14.12"; - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v"; + src = fetchFromGitHub { + rev = version; + owner = "wesnoth"; + repo = "wesnoth"; + sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = "http://www.wesnoth.org/"; + homepage = "https://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; -- cgit 1.4.1 From d6af70fa90e520df286533776ab9aea4753a56de Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 17 Jun 2020 12:39:10 +0200 Subject: libjcat: 0.1.2 -> 0.1.3 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-10759 Changelog: https://github.com/hughsie/libjcat/blob/0.1.3/NEWS See also: https://github.com/justinsteven/advisories/blob/master/2020_fwupd_dangling_s3_bucket_and_CVE-2020-10759_signature_verification_bypass.md --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 1d6f274cbb3b..bbf0db233821 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.2"; + version = "0.1.3"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "0smd1i6gzpp34gv494jcnx40wm36v1s8bypqlfrf8l6q9cl77gyd"; + sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; }; patches = [ -- cgit 1.4.1 From 8e94e61aec5c2065788a10850d1f9d9caa3f969b Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 12:46:53 +0200 Subject: tpm2-tss: 2.3.2 -> 2.4.1 --- pkgs/development/libraries/tpm2-tss/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b264c3bc6c6e..5a62c8e45ecd 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,32 +1,24 @@ { stdenv, lib, fetchurl, fetchpatch -, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps +, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps, json_c, curl , uthash, which }: stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2"; + sha256 = "03g6l64nzkpadjyabmbhnhs8648iqb95fviinnpslggzp75azmsq"; }; - patches = [ - # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch"; - sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n"; - }) - ]; - nativeBuildInputs = [ doxygen perl pkgconfig # For unit tests and integration tests. ibm-sw-tpm2 iproute procps which ]; buildInputs = [ - openssl + openssl json_c curl # For unit tests and integration tests. cmocka uthash ]; -- cgit 1.4.1 From de064be98405ba4767735cf2efe33a9828809d11 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:00:02 +0200 Subject: tpm2-tss: enable parallel building --- pkgs/development/libraries/tpm2-tss/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 5a62c8e45ecd..a242484e8976 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { cmocka uthash ]; + enableParallelBuilding = true; + postPatch = "patchShebangs script"; configureFlags = [ -- cgit 1.4.1 From 1ec50ac39efead05c70b65949ebf32ed8070ba50 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:47:34 +0200 Subject: tpm2-tss: extract checkPhase dependencies into checkInputs --- pkgs/development/libraries/tpm2-tss/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index a242484e8976..b2595193aad2 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen perl pkgconfig - # For unit tests and integration tests. - ibm-sw-tpm2 iproute procps which ]; buildInputs = [ openssl json_c curl - # For unit tests and integration tests. - cmocka uthash + ]; + checkInputs = [ + cmocka uthash ibm-sw-tpm2 iproute procps which ]; enableParallelBuilding = true; -- cgit 1.4.1 From 09791689dfa4e9a5c1fdfadb51e531f670078752 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:14:42 +0200 Subject: tpm2-tss: build from source instead of release tarball --- pkgs/development/libraries/tpm2-tss/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b2595193aad2..f4d8b58a0da2 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchurl, fetchpatch -, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps, json_c, curl -, uthash, which +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl +, openssl, json_c, curl, libgcrypt +, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which }: stdenv.mkDerivation rec { pname = "tpm2-tss"; version = "2.4.1"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "03g6l64nzkpadjyabmbhnhs8648iqb95fviinnpslggzp75azmsq"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs"; }; nativeBuildInputs = [ - doxygen perl pkgconfig - ]; - buildInputs = [ - openssl json_c curl + autoreconfHook autoconf-archive pkg-config doxygen perl libgcrypt.dev ]; + buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ cmocka uthash ibm-sw-tpm2 iproute procps which ]; + preAutoreconf = "./bootstrap"; + enableParallelBuilding = true; postPatch = "patchShebangs script"; -- cgit 1.4.1 From ef9e6b3aa8516fd68cdad91c19aed9be5b6fafa5 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 18:23:01 +0200 Subject: tpm2-tss: remove libgcrypt from explicit build inputs --- pkgs/development/libraries/tpm2-tss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index f4d8b58a0da2..2421d3f88990 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook autoconf-archive pkg-config doxygen perl libgcrypt.dev + autoreconfHook autoconf-archive pkg-config doxygen perl ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ -- cgit 1.4.1 From fb667c1beb7c67d131008fe4044f2f744d9dedcf Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 12:47:37 +0200 Subject: tpm2-abrmd: 2.2.0 -> 2.3.2 --- pkgs/tools/security/tpm2-abrmd/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index fbebde2e7bf6..76e511662bac 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, lib -, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +, makeWrapper, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; - version = "2.2.0"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1lbfhyyh9k54r8s1h8ca2czxv4hg0yq984kdh3vqh3990aca0x9a"; + sha256 = "040d01pdzkj0nc1c0vsf6gfqf28cgil03ix8dasijvhiha4c20nz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ tpm2-tss glib which dbus cmocka ]; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { #configureFlags = [ "--enable-unit" ]; doCheck = false; + # Even though tpm2-tss is in the RUNPATH, starting from 2.3.0 abrmd + # seems to require the path to the device TCTI (used for accessing + # /dev/tpm0) in it's LD_LIBRARY_PATH + postFixup = '' + wrapProgram $out/bin/tpm2-abrmd \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ tpm2-tss ]}" + ''; + meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; homepage = "https://github.com/tpm2-software/tpm2-tools"; -- cgit 1.4.1 From 3cc29166a72dc743ca6771143bfb72b431907650 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:18:11 +0200 Subject: tpm2-abrmd: enable parallel building --- pkgs/tools/security/tpm2-abrmd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index 76e511662bac..b1edf6123707 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { tpm2-tss glib which dbus cmocka ]; + enableParallelBuilding = true; + # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. #configureFlags = [ "--enable-unit" ]; doCheck = false; -- cgit 1.4.1 From 1a1ab9474e17dd0e65306dbce00e638d582324bf Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:01:11 +0200 Subject: tpm2-abrmd: build from source instead of release tarball --- pkgs/tools/security/tpm2-abrmd/default.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index b1edf6123707..de584438ed62 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, lib -, makeWrapper, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, pkg-config, autoconf-archive, makeWrapper, which +, tpm2-tss, glib, dbus +, cmocka +}: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; version = "2.3.2"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "040d01pdzkj0nc1c0vsf6gfqf28cgil03ix8dasijvhiha4c20nz"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - tpm2-tss glib which dbus cmocka - ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; + buildInputs = [ tpm2-tss glib dbus cmocka ]; enableParallelBuilding = true; + # Emulate the required behavior of ./bootstrap in the original + # package + preAutoreconf = '' + echo "${version}" > VERSION + ''; + # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. #configureFlags = [ "--enable-unit" ]; doCheck = false; -- cgit 1.4.1 From a7aab1fff33573d3ef58c4c9b80ce603e8fc8f48 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:01:40 +0200 Subject: tpm2-abrmd: separate checkPhase dependencies into checkInputs --- pkgs/tools/security/tpm2-abrmd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index de584438ed62..6fe116d7015a 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; - buildInputs = [ tpm2-tss glib dbus cmocka ]; + buildInputs = [ tpm2-tss glib dbus ]; + checkInputs = [ cmocka ]; enableParallelBuilding = true; -- cgit 1.4.1 From 4e5b9f8b2e3298e6d9d3cfc81829798b0e070691 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Jun 2020 17:07:40 +0200 Subject: nvme-cli: 1.11.2 -> 1.12 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index c05adb33eca1..80a00082b81a 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.11.2"; + version = "1.12"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i"; + sha256 = "0ldky34sn0m5c4hgiip0fkzm465nca69bhxicpd5dg8wxhzxqrp3"; }; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From 7198d973c100958b1fd014db98ba4bc03c31ac26 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 04:56:50 +0200 Subject: wireshark: compile with QT_NO_DEBUG to avoid depending on qt*-dev --- pkgs/applications/networking/sniffers/wireshark/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c6dc66a0ca78..d025222b0100 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -31,6 +31,9 @@ in stdenv.mkDerivation { "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # Avoid referencing -dev paths because of debug assertions. + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + nativeBuildInputs = [ bison cmake flex pkgconfig ] ++ optional withQt qt5.wrapQtAppsHook; -- cgit 1.4.1 From ec618a9120acb298e69afe9d02478722978781ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Jun 2020 16:46:08 +0200 Subject: python.pkgs.bleach: add missing dependency `packaging` --- pkgs/development/python-modules/bleach/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1b10fe166f8a..9b27ae254903 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -6,6 +6,7 @@ , six , html5lib , setuptools +, packaging }: buildPythonPackage rec { @@ -18,11 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six html5lib setuptools ]; - - postPatch = '' - substituteInPlace setup.py --replace ",<3dev" "" - ''; + propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests checkPhase = '' -- cgit 1.4.1 From 84b7946079c3f7581818e722c9055a59b16d0bd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:21:20 +0000 Subject: flyway: 6.4.3 -> 6.4.4 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1349d4c009aa..adb36d8e92cb 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.3"; + version = "6.4.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b"; + sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; -- cgit 1.4.1 From bfc1914423f2367ae150c775c95b05b85b94faca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 08:32:58 +0000 Subject: libfprint: 1.90.1 -> 1.90.2 --- pkgs/development/libraries/libfprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index e2552ba713e0..7c6168c3d3e4 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.1"; + version = "1.90.2"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0505a47c8e6177196600bbb327c68e3fd8bd0c9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:09:51 +0000 Subject: gitkraken: 7.0.0 -> 7.0.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 88f8df4e2547..2afed8c099c8 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.0.0"; + version = "7.0.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx"; + sha256 = "0vj2ggbm617fypl69ksbrbl048xp4v6wc46y4sp7hrk6lg0gw1b0"; }; dontBuild = true; -- cgit 1.4.1 From 7b104edf89dbba80d1d7acd1c2910f1b845428e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 17:30:39 +0000 Subject: eagle: 9.6.1 -> 9.6.2 --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 58bdd5c722da..4cfad20e695f 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.1"; + version = "9.6.2"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; + sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0"; }; desktopItem = makeDesktopItem { -- cgit 1.4.1 From 03ff03db4f5d423af4d97a310cad2e315b575825 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:27:35 +0000 Subject: freetds: 1.1.40 -> 1.1.42 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index f244bdc7ad2b..c1b9318130c1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.40"; + version = "1.1.42"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq"; + sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg"; }; buildInputs = [ -- cgit 1.4.1 From ec13b27348f98e74e0fbb1ab5e5723ec3127b7a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:07:43 +0000 Subject: gmm: 5.3 -> 5.4 --- pkgs/development/libraries/gmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index eb23f5c82c23..278059465ecb 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gmm"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; - sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; + sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 36f5cb2a8857987f1bcfef39c726b943d35cc9ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:33:05 +0000 Subject: amiri: 0.112 -> 0.113 --- pkgs/data/fonts/amiri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 9ecde1939e8c..9867b84757aa 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.112"; + version = "0.113"; in fetchzip rec { name = "Amiri-${version}"; url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; - sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl"; + sha256 = "0v5xm4spyww8wy6j9kpb01ixrakw7wp6jng4xnh220iy6yqcxm7v"; postFetch = '' unzip $downloadedFile -- cgit 1.4.1 From d588c2dcc5507f15decd21732c5f033abf7c2c01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:58:51 +0000 Subject: geekbench: 5.1.1 -> 5.2.0 --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 153a74f94567..9c250390e11c 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; + sha256 = "1rvzll57igivhlxp058mhmcbq07q2zr52xbi1wyn85qr9ihrhx08"; }; dontConfigure = true; -- cgit 1.4.1 From 2ea468a8d57a5e468b35f933a0318b60fcf448e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:47:54 +0000 Subject: asunder: 2.9.5 -> 2.9.6 --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 7d90ac36f366..998535a8eb0b 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.5"; + version = "2.9.6"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4"; + sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; -- cgit 1.4.1 From 59e7c74f4c94701ff445a876b03afcadb0dc473c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 11:33:46 +0000 Subject: beancount: 2.2.3 -> 2.3.0 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 045dd14da0d8..9709037792dc 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.3"; + version = "2.3.0"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; + sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs"; }; # Tests require files not included in the PyPI archive. -- cgit 1.4.1 From 5af11c6a0da8239175b9369415198e9ff9fe4b6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:44:53 +0000 Subject: vis: 0.5 -> 0.6 --- pkgs/applications/editors/vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 85f78035a0f3..5191b916b6c5 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vis"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb"; + sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh"; repo = "vis"; owner = "martanne"; }; -- cgit 1.4.1 From 09a09c3aed597b362edff6861e2c1eadb97d9da8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:22:46 +0000 Subject: bacula: 9.6.3 -> 9.6.5 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index a9fd2f19b897..8bf253a7b121 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.3"; + name = "bacula-9.6.5"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc"; + sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] -- cgit 1.4.1 From 8a61274a5d41980dfb3e930c76e7f682ec089e4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:30:39 +0000 Subject: alsaUtils: 1.2.2 -> 1.2.3 --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index f05bb6a0d59c..470536db4b7b 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024"; + sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; patchPhase = '' -- cgit 1.4.1 From 2c65581b4d99f538dacd0f63e2e080ea774b2adf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 13:45:58 +0000 Subject: ckbcomp: 1.194 -> 1.195 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index dc665bf9c41b..74a6777d9491 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.194"; + version = "1.195"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh"; + sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; }; buildInputs = [ perl ]; -- cgit 1.4.1 From 6326c02e0e958833744603e7c3720e70aba3bdac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:16:52 +0000 Subject: telegraf: 1.14.3 -> 1.14.4 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index adc42173f8e5..388d7fe37908 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.3"; + version = "1.14.4"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "11rd54brdbxb5ari6zan7gyr0fa1m0rmwcn5a8h8dla3xprw30wp"; + sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm"; }; vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; -- cgit 1.4.1 From 778ffb0334b25e51142b7c5858bcd76249d3079b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:53:10 +0000 Subject: webhook: 2.6.8 -> 2.7.0 --- pkgs/servers/http/webhook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index d40adb171a63..fe428926704e 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "webhook"; - version = "2.6.8"; + version = "2.7.0"; goPackagePath = "github.com/adnanh/webhook"; excludedPackages = [ "test" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "adnanh"; repo = "webhook"; rev = version; - sha256 = "05q6nv04ml1gr4k79czg03i3ifl05xq29iapkgrl3k0a36czxlgs"; + sha256 = "1spiqjy0z84z96arf57bn6hyvfsd6l8w6nv874mbis6vagifikci"; }; meta = with lib; { -- cgit 1.4.1 From df7aef73f75d3e34afce0c8bf0b22fb48b4bf89f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 03:54:16 +0000 Subject: stella: 6.1.2 -> 6.2 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 14189e5b3871..591b2daaf15b 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.1.2"; + version = "6.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; + sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 47d8d4a54d3e94b8be622a8ea523d144ab440e97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:10:39 +0000 Subject: nats-server: 2.1.0 -> 2.1.7 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 3685589fa70a..743fc0fa1e56 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.1.0"; + version = "2.1.7"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "1zp43v69cawbp6bpby1vx51z6nyv8gxnnl2qkhwr9zrgnhlcflnl"; + sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27"; }; meta = { -- cgit 1.4.1 From 00c9983e02f0a211ef0ca4335371cc50dd4a1b26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:28:26 +0000 Subject: terraform-providers.libvirt: 0.6.1 -> 0.6.2 --- .../networking/cluster/terraform-providers/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index daffb5930903..42ed3d21066f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { pname = "terraform-provider-libvirt"; - version = "0.6.1"; + version = "0.6.2"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; + sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; -- cgit 1.4.1 From 99d0aefab9e578b6daea6e694d1ed3d23cc6f467 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:08:47 +0000 Subject: activemq: 5.15.12 -> 5.15.13 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 7ea38b6472b8..c09fb8d91ee1 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.12"; + version = "5.15.13"; src = fetchurl { - sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; + sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; -- cgit 1.4.1 From 02bbd55229bbd8128db89aea5d95b97c5af5bd4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:01:15 +0000 Subject: wkhtmltopdf: 0.12.5 -> 0.12.6 --- pkgs/tools/graphics/wkhtmltopdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index ee083c3e301b..093ab9ad5c43 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -3,14 +3,14 @@ , openssl, libX11, libXext, libXrender }: mkDerivation rec { - version = "0.12.5"; + version = "0.12.6"; pname = "wkhtmltopdf"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; + sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg"; }; buildInputs = [ -- cgit 1.4.1 From 29e87975da628a7eeb2c0a90a28012062337d20b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:16:10 +0000 Subject: xmrig: 5.11.2 -> 5.11.3 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 8fb07b1ae79c..d4d93c77ed42 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.11.2"; + version = "5.11.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1mhqa9jb4475phhqnkc7k1mwgkan7zp7y4z2c7n2x43r48ghxpfx"; + sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 595883171e677fd4782967f6223cef0c4bc57d6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:57:02 +0000 Subject: liquibase: 3.9.0 -> 3.10.0 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a92c96684a48..ae993f9611e0 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8"; + sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y"; }; buildInputs = [ jre makeWrapper ]; -- cgit 1.4.1 From 5013183ff98aa1c9c0068e8d76ee8018c69e7e17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:20:33 +0000 Subject: xmrig-proxy: 5.10.2 -> 5.11.0 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 524e2a99ae92..39cd50204095 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.10.2"; + version = "5.11.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1mkamkqhqj7nbvaxdim1rbc3f5sw410wzly4ln73ackzlvdwn319"; + sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From fc9ddd85c48db80ada7d96efe0480a43a2637fe8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 21:30:20 +0000 Subject: matterircd: 0.18.2 -> 0.19.4 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index bb6d1584a670..d644e985db5a 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.18.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r"; + sha256 = "1kwyk6gy4d4v2rzyr7vwvi8vm69rz1hdn0gkpan2kh1p63z77gbv"; }; goPackagePath = "github.com/42wim/matterircd"; -- cgit 1.4.1 From ce1ea86f1bc24521e5c59f081b8529600cd13422 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Tue, 16 Jun 2020 17:26:11 +0200 Subject: python3Packages.spacy: 2.2.4 -> 2.3.0 Changelog: https://github.com/explosion/spaCy/releases/tag/v2.3.0 --- pkgs/development/python-modules/spacy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 6a54cc1ec715..f0a143ec30c7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh"; + sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { # ''; postPatch = '' - substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8" ''; meta = with lib; { @@ -62,5 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; - }; + }; } -- cgit 1.4.1 From b0909224e7643d8e6c2a6cef047c3b1302ea4f0c Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Tue, 16 Jun 2020 17:48:19 +0200 Subject: python3Packages.spacy_models: 2.2.5 -> 2.3.0 Update all *existing* models for compatibility with spaCy 2.3.0. --- pkgs/development/python-modules/spacy/models.json | 72 +++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 1f1558b23c39..1c02b05d303e 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,108 +1,108 @@ [{ "pname": "de_core_news_md", - "version": "2.2.5", - "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", + "version": "2.3.0", + "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.5", - "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", + "version": "2.3.0", + "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.5", - "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", + "version": "2.3.0", + "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.5", - "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", + "version": "2.3.0", + "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.5", - "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", + "version": "2.3.0", + "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.5", - "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", + "version": "2.3.0", + "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.5", - "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", + "version": "2.3.0", + "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.1.0", - "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", + "version": "2.3.0", + "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.2.5", - "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", + "version": "2.3.0", + "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.5", - "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", + "version": "2.3.0", + "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.5", - "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", + "version": "2.3.0", + "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.5", - "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", + "version": "2.3.0", + "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.5", - "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", + "version": "2.3.0", + "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.5", - "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", + "version": "2.3.0", + "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.5", - "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", + "version": "2.3.0", + "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, { "pname": "nl_core_news_sm", - "version": "2.2.1", - "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny", + "version": "2.3.0", + "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.2.5", - "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", + "version": "2.3.0", + "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.2.0", - "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb", + "version": "2.3.0", + "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", "license": "cc-by-sa-40" }] -- cgit 1.4.1 From 1b6ab4ef7e21701a9a691a76448581ee83660029 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:17:14 +0000 Subject: kubeless: 1.0.4 -> 1.0.6 --- pkgs/applications/networking/cluster/kubeless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 48540bffb536..5b1f12452469 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubeless"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; + sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; }; goPackagePath = "github.com/kubeless/kubeless"; -- cgit 1.4.1 From 07600d718c54c38cbe9d8f5cd0bf47adb2aaaddd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 13:55:20 +0000 Subject: cpp-hocon: 0.2.1 -> 0.2.2 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index dc742a5c051a..01da4753b0e6 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "cpp-hocon"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { - sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3"; + sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; -- cgit 1.4.1 From e198af2067d612487ba5138950a7bb82ffbb0d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:07:55 +0000 Subject: liblouis: 3.13.0 -> 3.14.0 --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 83d08dc019bf..5d0459b4f308 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza"; + sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; -- cgit 1.4.1 From 1b47d503de407bd6437921bd6d7ef3cd4177d547 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:12:45 +0000 Subject: kubecfg: 0.13.1 -> 0.16.0 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index bf4ec9492157..b8bef9ecc052 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.13.1"; in +let version = "0.16.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "0x2mg13p8r1sgqr1bbzh57kfymb8z392y43djgks2agc7rjnd45f"; + sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4"; }; goPackagePath = "github.com/bitnami/kubecfg"; -- cgit 1.4.1 From d93e3ad74f5f64451d009c9125d893262e01bfcf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:47:49 +0000 Subject: icingaweb2: 2.7.3 -> 2.8.0 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index c4aaedf4ab67..a35b54592721 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.7.3"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1qdsrpk6jbq9b4v4f2lfpdqs1yh3irbsm5fx02wxnnwvad05bcfv"; + sha256 = "18q3d15w7d46g4vyq4iph5c1bbxcl8ikcdc8djrfi30wx36ziybs"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 526472bbd6c22620b48536222cac87f8d6b0515e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:08:13 +0000 Subject: kube-router: 0.3.1 -> 0.4.0 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index a3cb55ce329c..cd946284fa77 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.3.1"; + version = "0.4.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h"; + sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; }; buildFlagsArray = '' -- cgit 1.4.1 From bfd4de099ca318366cb85f8239762e47fbba7250 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:32:51 +0000 Subject: kapacitor: 1.5.4 -> 1.5.5 --- pkgs/servers/monitoring/kapacitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 93f0531887c1..6f2e51fffd61 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.4"; + version = "1.5.5"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz"; + sha256 = "17zk7fs6yl5hmhr3inwkafwmg2ihaicj43gdi5888dinhpa9bij1"; }; meta = with lib; { -- cgit 1.4.1 From 514c250e728a15b07efcafe792554200e212a85e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:59:53 +0000 Subject: gllvm: 1.2.3 -> 1.2.6 --- pkgs/development/tools/gllvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index c0c398926352..6b64a088353e 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.3"; + version = "1.2.6"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "12kdgsma62nzksvw266qm3ivkbz62ma93dd25wy0p19789v4fi7s"; + sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From fdc434621ceb398efac51e3e899a879b9d79349a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:42:28 +0000 Subject: goxel: 0.10.5 -> 0.10.6 --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 6fb5b91c2a92..40d0f4a3db8a 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goxel"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "1b63jqryq19qa81g1ml6d85f27wj1ci3h56r02cl9xn8di5p674f"; + sha256 = "1wmxy5wfk1xrqgz0y0zcr4vkddylqc70cv4vzk117x6whjnldsm3"; }; patches = [ ./disable-imgui_ini.patch ]; -- cgit 1.4.1 From 96744012446c41664268ec49300eba221381e3fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:51:16 +0000 Subject: gh-ost: 1.0.47 -> 1.0.49 --- pkgs/tools/misc/gh-ost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index d78e7f9439fd..17893ef18ae6 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/github/gh-ost"; - version = "1.0.47"; - sha256 = "0yyhkqis4j2cl6w2drrjxdy5j8x9zp4j89gsny6w4ql8gm5qgvvk"; + version = "1.0.49"; + sha256 = "0mncjhmv25wnhgjkn9gwkz2gzh0v6954w47ql7fs2iqr9al111dq"; in buildGoPackage ({ -- cgit 1.4.1 From 01fd63bee2191e6fbcb6b1017419c7ebbf1793bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:12:17 +0000 Subject: go-protobuf: 1.3.2 -> 1.4.2 --- pkgs/development/tools/go-protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 43731b72a55a..62a750269209 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; -- cgit 1.4.1 From 30823d5389a38a43e8cb797677079f0dc95f2ef7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:27:05 +0000 Subject: jx: 2.1.31 -> 2.1.65 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index df39e5d86768..304a3c6fa289 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.31"; + version = "2.1.65"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; + sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx"; }; - vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; + vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf"; subPackages = [ "cmd/jx" ]; -- cgit 1.4.1 From 979fdaefa4c8ff8224f5881b27faae361f0e3628 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 14:52:55 +0000 Subject: flannel: 0.11.0 -> 0.12.0 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index a52088ed231d..7ecfb559dcc7 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.11.0"; + version = "0.12.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9"; + sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; }; meta = { -- cgit 1.4.1 From fe0d7fbcd1e7afa8562ea32c8bb1c8b3c76d1c88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:14:57 +0000 Subject: flyctl: 0.0.123 -> 0.0.131 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 339286015917..1a7a3d6607f4 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.123"; + version = "0.0.131"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3"; + sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; + vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; -- cgit 1.4.1 From 1b56c5b9209bce050a97a51b585e59fd9b391a12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:53:38 +0000 Subject: curlcpp: 1.1 -> 1.4 --- pkgs/development/libraries/curlcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 274a657cb1af..9f2710f42a46 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curlcpp"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = version; - sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; + sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; }; buildInputs = [ cmake curl ]; -- cgit 1.4.1 From 51c901433b40bdf17460bc527f8d3cd4e1b2d402 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:24:47 +0000 Subject: convoy: 0.5.0 -> 0.5.2 --- pkgs/tools/filesystems/convoy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 77d6dca066a4..f12187be810f 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "convoy"; - version = "0.5.0"; + version = "0.5.2"; goPackagePath = "github.com/rancher/convoy"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "rancher"; repo = "convoy"; - sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; + sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj"; }; buildInputs = [lvm2]; -- cgit 1.4.1 From 4acf4330fe0dd923dcc42e9a1084283e79c10f80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:39:46 +0000 Subject: i2pd: 2.30.0 -> 2.32.1 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 7c6e6ada4c5a..b686ea4d04f2 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.30.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1wvn8hs2ps3yzxzv05jnbm7zr1v8gv0phbx38m7l5xhqjmrpnscw"; + sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] -- cgit 1.4.1 From f6eeb8cb0aee5e55c2b345ce23b165e4da09731c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 08:37:26 +0000 Subject: aminal: 0.8.6 -> 0.9.0 --- pkgs/applications/misc/aminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index dff6b15494bb..7f04a93d6a32 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { pname = "aminal"; - version = "0.8.6"; + version = "0.9.0"; goPackagePath = "github.com/liamg/aminal"; @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "liamg"; repo = "aminal"; rev = "v${version}"; - sha256 = "0qhjdckj2kr0vza6qssd9z8dfrsif1qxb1mal1d4wgdsy12lrmwl"; + sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; }; preBuild = '' -- cgit 1.4.1 From 19a7c8f0bcd8ac591df13897b906e8abd8186821 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 00:48:09 +0000 Subject: plantuml: 1.2020.10 -> 1.2020.12 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 09dba27a1efe..cb8cf1ec0a8e 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.10"; + version = "1.2020.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy"; + sha256 = "0c0270kjw8vg8nphharap2p66yl72j5k4k3s5r9klafgp3sg4sjj"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From d8963f2a85091c5daab50c8b2328f95741e4b0c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:44:29 +0000 Subject: openwsman: 2.6.11 -> 2.7.0 --- pkgs/development/libraries/openwsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 17df9eee84e8..a16b8356e618 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.6.11"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "0s8xdxrxnh1l0v41n5cw89b89rrlqlxn1yj14sw224230y8m70ka"; + sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- cgit 1.4.1 From fdbe373e57b7d0e2be95ece20462e7ea063096a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 17:38:47 +0000 Subject: munin: 2.0.61 -> 2.0.63 --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index ecbed520bbdc..22828e574497 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.61"; + version = "2.0.63"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; + sha256 = "0p1gzy6in15d6596b260qa0a144x8n8567cxdq0x4arw18004s3a"; }; buildInputs = [ -- cgit 1.4.1 From 48d85ac3aa5c78f81526b1282bdb3cc61428d6b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:25:12 +0000 Subject: openfortivpn: 1.14.0 -> 1.14.1 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index bd1c02f9b545..a5e46c6bc575 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.14.0"; + version = "1.14.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1qn48sp3ydbik7nc9x5l22gvvnr99f89jy1lvnf64bdg218kr0z7"; + sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From bba6d992f88241b3252d860ac5711420d7d03c14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 19:48:51 +0000 Subject: osinfo-db: 20200515 -> 20200529 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 4460e7b40d7c..87425defb879 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200515"; + version = "20200529"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj"; + sha256 = "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; -- cgit 1.4.1 From 0c03dbf0a38ee4f8e04ed282bd1ce0f942591b3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 10:46:43 +0000 Subject: libnetfilter_queue: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/libnetfilter_queue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 556db28f8568..55e07c03b287 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "libnetfilter_queue"; src = fetchurl { url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; + sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 59f0025dc08caf41481f4a6756a395e074683db1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 07:03:22 +0000 Subject: libsolv: 0.7.13 -> 0.7.14 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 9443846acf1e..d559efd3aab5 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.13"; + version = "0.7.14"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; + sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g"; }; cmakeFlags = [ -- cgit 1.4.1 From 4d200ee63cbe0d887ceb2a30816e98fb4d6e197e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:14:30 +0000 Subject: kdev-python: 5.5.1 -> 5.5.2 --- pkgs/applications/editors/kdevelop5/kdev-python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 80a5436c9556..9fb251d52957 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c"; + sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652"; }; cmakeFlags = [ -- cgit 1.4.1 From 621c1f0042c0aba886cc450a16564eca2c98afde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:14:57 +0000 Subject: libmysofa: 1.0 -> 1.1 --- pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index df0eecfd0be9..5324fe0685d6 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa"; + sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 84696de0f9aac1f14bd049cc2b5a8fc223d9ed8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:55:56 +0000 Subject: interception-tools: 0.1.1 -> 0.2.1 --- pkgs/tools/inputmethods/interception-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index a6aed47d964c..39a28214fe20 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -2,14 +2,14 @@ libevdev, udev }: let - version = "0.1.1"; + version = "0.2.1"; baseName = "interception-tools"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz"; - sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j"; + sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- cgit 1.4.1 From 32b567cbd622d483008ad2085dc0249341a34590 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:42:16 +0000 Subject: grml-zsh-config: 0.16.2 -> 0.17.2 --- pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 3a34be6304b7..4a287e084449 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.16.2"; + version = "0.17.2"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "08a63cdjpbvgnja0637zbm8qif4qn8ydgkwcfq3145bxfh5rq8wz"; + sha256 = "1h17xdlxhnjqirqwksi8qhx2lyajz7b0hmvb80i7313splhjp6hn"; }; buildInputs = [ zsh coreutils txt2tags procps ] -- cgit 1.4.1 From 76a3219aa1dfbf01aa13df58ec2ba91d46c46709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:43:27 +0000 Subject: herbstluftwm: 0.8.1 -> 0.8.3 --- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7dc715e126cd..e547cea3c54c 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; + sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1"; }; outputs = [ -- cgit 1.4.1 From 3f5c873d263fc54ef43e84b20457e48ab18099d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 01:38:28 +0000 Subject: intel-graphics-compiler: 1.0.3627 -> 1.0.4062 --- pkgs/development/compilers/intel-graphics-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index e3dfa8ea324c..6374846f4407 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3627"; + version = "1.0.4062"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8"; + sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; -- cgit 1.4.1 From e607ed083df9e24551f8fd757582ec59a3c4382a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:37:51 +0000 Subject: google-authenticator: 1.08 -> 1.09 --- pkgs/os-specific/linux/google-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index e04b83143507..ce90a1d432f7 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.08"; + version = "1.09"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "1432sfgjv7xlas1saa0whnvqim2pb12g2522x3nf5a8v4qq7avbg"; + sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit 1.4.1 From 188394a666e66d21e1d2a9332c65db4cdffad24e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 04:13:26 +0000 Subject: visualvm: 2.0 -> 2.0.2 --- pkgs/development/tools/java/visualvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 3f33ff7c13a0..c59f6716a7b6 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.0.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr"; + sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx"; }; desktopItem = makeDesktopItem { -- cgit 1.4.1 From f27facee88fa81c5403df593975bf668e1616a14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:53:02 +0000 Subject: txt2man: 1.6.0 -> 1.7.0 --- pkgs/tools/misc/txt2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index c7d8837f8235..6013dc1c26b9 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; + sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; }; preConfigure = '' -- cgit 1.4.1 From e487f9f708dd7b47d5e4aebb0533d3349b3f1ed3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:43:06 +0000 Subject: avocode: 4.6.4 -> 4.7.0 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 098aee119e60..fa97ceb5eb2f 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.6.4"; + version = "4.7.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d"; + sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ -- cgit 1.4.1 From fa678b3228a697dc8d62cb73c929cead795c81a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:19:13 +0000 Subject: guile-cairo: 1.11.0 -> 1.11.1 --- pkgs/development/guile-modules/guile-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 99e3ddf34f17..000932cc010a 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp"; + sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From e826a6ce03dcee02ba2696e169dbb18711f73917 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Jun 2020 16:10:32 +0200 Subject: nixos/dovecot2: refactor mailboxes option Specifying mailboxes as a list isn't a good approach since this makes it impossible to override values. For backwards-compatibility, it's still possible to declare a list of mailboxes, but a deprecation warning will be shown. --- nixos/doc/manual/release-notes/rl-2009.xml | 23 +++++++++++++++++++++++ nixos/modules/services/mail/dovecot.nix | 24 ++++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index d1eecd65085c..900b1103f2b1 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -614,6 +614,29 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; queued on the kernel side of the netlink socket. + + + Specifying mailboxes in the dovecot2 module + as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the name + should be the key of the attribute. + + + This means that a configuration like this +{ + services.dovecot2.mailboxes = [ + { name = "Junk"; + auto = "create"; + } + ]; +} + should now look like this: +{ + services.dovecot2.mailboxes = { + Junk.auto = "create"; + }; +} + + diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index ee797f9c42f1..51cbcbf1cbc8 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -134,8 +134,9 @@ let mailboxes = { ... }: { options = { name = mkOption { - type = types.strMatching ''[^"]+''; + type = types.nullOr (types.strMatching ''[^"]+''); example = "Spam"; + default = null; description = "The name of the mailbox."; }; auto = mkOption { @@ -334,9 +335,24 @@ in }; mailboxes = mkOption { - type = types.listOf (types.submodule mailboxes); - default = []; - example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ]; + type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m); + default = {}; + apply = x: + if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x + else mapAttrsToList (name: value: + if value.name != null + then throw '' + When specifying dovecot2 mailboxes as attributes, declaring + a `name'-attribute is prohibited! The name ${value.name} should + be the attribute key! + '' + else value // { inherit name; } + ) x; + example = literalExample '' + { + Spam = { specialUse = "Junk"; auto = "create"; }; + } + ''; description = "Configure mailboxes and auto create or subscribe them."; }; -- cgit 1.4.1 From 5baa7541d73e57f26d1da9ca0c663cc7be31f256 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 17 Jun 2020 13:50:59 -0700 Subject: agda: fix manual build /build/doc/manual-full.xml:12764:35: error: ID "build-phase" has already been defined /build/doc/manual-full.xml:9029:33: error: first occurrence of ID "build-phase" --- doc/languages-frameworks/agda.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 72b895f5da12..9ce046d05b6f 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -67,13 +67,13 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim + `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. + `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. -### Build phase +### Building Agda packages The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. -### Install phase +### Installing Agda packages The default install phase copies agda source files, agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory. This can be overridden. -- cgit 1.4.1 From fb02974b97768ec4b553a5c9b8bec7f5e00e7499 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:39:15 +0000 Subject: kdevelop-unwrapped: 5.5.1 -> 5.5.2 --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 476819369cf1..e07e7300048a 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy"; + sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2"; }; nativeBuildInputs = [ -- cgit 1.4.1