From 3f2f086616eed3ca9916d708b56310111be29c5b Mon Sep 17 00:00:00 2001 From: p3psi Date: Fri, 4 Jun 2021 20:16:19 +0800 Subject: [PATCH 1/9] variety: fixed GLib-GIO-ERROR error --- pkgs/applications/misc/variety/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 2366d04b9ca1..c9e3a86487d9 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -10,6 +10,7 @@ , hicolor-icon-theme , librsvg , wrapGAppsHook +, makeWrapper }: with python37Packages; @@ -27,10 +28,12 @@ buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook ]; - buildInputs = [ distutils_extra ]; + buildInputs = [ makeWrapper distutils_extra ]; doCheck = false; + postInstall = "wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; + prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" @@ -76,7 +79,7 @@ buildPythonApplication rec { blur, as well as options to layer quotes and a clock onto the background. ''; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; platforms = with platforms; linux; }; } From cf69e3dc605b2d213989c4e339459ed3ad3575e8 Mon Sep 17 00:00:00 2001 From: p3psi <43925055+p3psi-boo@users.noreply.github.com> Date: Sun, 13 Jun 2021 12:17:29 +0800 Subject: [PATCH 2/9] Update pkgs/applications/misc/variety/default.nix Co-authored-by: Sandro --- pkgs/applications/misc/variety/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index c9e3a86487d9..5e7765a16fde 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -32,7 +32,9 @@ buildPythonApplication rec { doCheck = false; - postInstall = "wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; + postInstall = '' + wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + ''; prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ From 79f7b9652fff02c8b0a3bec383b56ff6251f5eab Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 13 Jun 2021 09:49:14 +0200 Subject: [PATCH 3/9] pdns-recursor: 2.5.1 -> 2.5.2 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index ee3d8aafa1c6..2228bc9163fd 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0yaf25jg3gfsi9c9rnxz1ywy3b563plv33aibxrq79iqwk8a289p"; + sha256 = "1101izvyknxqhzz987j3acsa221ymgrnmyciaz8v7jziai9ksa5i"; }; nativeBuildInputs = [ pkg-config ]; From 07a8f0c95f0c0b55d23b607b8914a66876ce0ce9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 13 Jun 2021 11:03:16 +0200 Subject: [PATCH 4/9] pdns-recursor: fix ambiguous license --- pkgs/servers/dns/pdns-recursor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 2228bc9163fd..70e7e758bb94 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { badPlatforms = [ "i686-linux" # a 64-bit time_t is needed ]; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; }; } From a88ad63642bcf793ffb3a0527f3e222bcedb3f8d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 07:40:27 -0300 Subject: [PATCH 5/9] ocamlPackages.fileutils: 0.5.3 -> 0.6.3 --- .../ocaml-modules/fileutils/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 39c41e8eba04..819298ac8cf1 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,28 +1,30 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fileutils-0.5.3"; +buildDunePackage rec { + pname = "fileutils"; + version = "0.6.3"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz"; - sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd"; + url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz"; + sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + minimumOCamlVersion = "4.03"; + useDune2 = true; - configureFlags = [ "--enable-tests" ]; + propagatedBuildInputs = [ + stdlib-shims + ]; + + checkInputs = [ + ounit + ]; doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; - - preInstall = "make doc"; - - meta = { - homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; - platforms = ocaml.meta.platforms or []; - description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ vbgl ]; + meta = with lib; { + description = "OCaml API to manipulate real files (POSIX like) and filenames"; + homepage = "https://github.com/gildor478/ocaml-fileutils"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ vbgl ]; }; } From a3e6044fa663ab77b3a34dc002b314b588f53250 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Jun 2021 18:03:08 +0000 Subject: [PATCH 6/9] ncurses: fix build on NetBSD Only tested cross-compiling, but is probably necessary for native too. Fixes errors like this: linking ../lib/libncursesw.so x86_64-unknown-netbsd-gcc --param max-inline-insns-single=1200 -Wl,-shared -Wl,-Bshareable -o ../lib/libncursesw.so ../obj_s/hardscroll.o ../obj_s/hashmap.o ../obj_s/lib_addch.o ../obj_s/lib_addstr.o ../obj_s/lib_beep.o ../obj_s/lib_bkgd.o ../obj_s/lib_box.o ../obj_s/lib_chgat.o ../obj_s/lib_clear.o ../obj_s/lib_clearok.o ../obj_s/lib_clrbot.o ../obj_s/lib_clreol.o ../obj_s/lib_color.o ../obj_s/lib_colorset.o ../obj_s/lib_delch.o ../obj_s/lib_delwin.o ../obj_s/lib_echo.o ../obj_s/lib_endwin.o ../obj_s/lib_erase.o ../obj_s/lib_flash.o ../obj_s/lib_gen.o ../obj_s/lib_getch.o ../obj_s/lib_getstr.o ../obj_s/lib_hline.o ../obj_s/lib_immedok.o ../obj_s/lib_inchstr.o ../obj_s/lib_initscr.o ../obj_s/lib_insch.o ../obj_s/lib_insdel.o ../obj_s/lib_insnstr.o ../obj_s/lib_instr.o ../obj_s/lib_isendwin.o ../obj_s/lib_leaveok.o ../obj_s/lib_mouse.o ../obj_s/lib_move.o ../obj_s/lib_mvcur.o ../obj_s/lib_mvwin.o ../obj_s/lib_newterm.o ../obj_s/lib_newwin.o ../obj_s/lib_nl.o ../obj_s/lib_overlay.o ../obj_s/lib_pad.o ../obj_s/lib_printw.o ../obj_s/lib_redrawln.o ../obj_s/lib_refresh.o ../obj_s/lib_restart.o ../obj_s/lib_scanw.o ../obj_s/lib_screen.o ../obj_s/lib_scroll.o ../obj_s/lib_scrollok.o ../obj_s/lib_scrreg.o ../obj_s/lib_set_term.o ../obj_s/lib_slk.o ../obj_s/lib_slkatr_set.o ../obj_s/lib_slkatrof.o ../obj_s/lib_slkatron.o ../obj_s/lib_slkatrset.o ../obj_s/lib_slkattr.o ../obj_s/lib_slkclear.o ../obj_s/lib_slkcolor.o ../obj_s/lib_slkinit.o ../obj_s/lib_slklab.o ../obj_s/lib_slkrefr.o ../obj_s/lib_slkset.o ../obj_s/lib_slktouch.o ../obj_s/lib_touch.o ../obj_s/lib_tstp.o ../obj_s/lib_ungetch.o ../obj_s/lib_vidattr.o ../obj_s/lib_vline.o ../obj_s/lib_wattroff.o ../obj_s/lib_wattron.o ../obj_s/lib_winch.o ../obj_s/lib_window.o ../obj_s/nc_panel.o ../obj_s/safe_sprintf.o ../obj_s/tty_update.o ../obj_s/varargs.o ../obj_s/vsscanf.o ../obj_s/lib_freeall.o ../obj_s/charable.o ../obj_s/lib_add_wch.o ../obj_s/lib_box_set.o ../obj_s/lib_cchar.o ../obj_s/lib_erasewchar.o ../obj_s/lib_get_wch.o ../obj_s/lib_get_wstr.o ../obj_s/lib_hline_set.o ../obj_s/lib_in_wch.o ../obj_s/lib_in_wchnstr.o ../obj_s/lib_ins_wch.o ../obj_s/lib_inwstr.o ../obj_s/lib_key_name.o ../obj_s/lib_pecho_wchar.o ../obj_s/lib_slk_wset.o ../obj_s/lib_unget_wch.o ../obj_s/lib_vid_attr.o ../obj_s/lib_vline_set.o ../obj_s/lib_wacs.o ../obj_s/lib_wunctrl.o ../obj_s/expanded.o ../obj_s/legacy_coding.o ../obj_s/lib_dft_fgbg.o ../obj_s/lib_print.o ../obj_s/new_pair.o ../obj_s/resizeterm.o ../obj_s/use_screen.o ../obj_s/use_window.o ../obj_s/wresize.o ../obj_s/access.o ../obj_s/add_tries.o ../obj_s/alloc_ttype.o ../obj_s/codes.o ../obj_s/comp_captab.o ../obj_s/comp_error.o ../obj_s/comp_hash.o ../obj_s/comp_userdefs.o ../obj_s/db_iterator.o ../obj_s/doalloc.o ../obj_s/entries.o ../obj_s/fallback.o ../obj_s/free_ttype.o ../obj_s/getenv_num.o ../obj_s/home_terminfo.o ../obj_s/init_keytry.o ../obj_s/lib_acs.o ../obj_s/lib_baudrate.o ../obj_s/lib_cur_term.o ../obj_s/lib_data.o ../obj_s/lib_has_cap.o ../obj_s/lib_kernel.o ../obj_s/lib_keyname.o ../obj_s/lib_longname.o ../obj_s/lib_napms.o ../obj_s/lib_options.o ../obj_s/lib_raw.o ../obj_s/lib_setup.o ../obj_s/lib_termcap.o ../obj_s/lib_termname.o ../obj_s/lib_tgoto.o ../obj_s/lib_ti.o ../obj_s/lib_tparm.o ../obj_s/lib_tputs.o ../obj_s/lib_trace.o ../obj_s/lib_ttyflags.o ../obj_s/lib_twait.o ../obj_s/name_match.o ../obj_s/names.o ../obj_s/obsolete.o ../obj_s/read_entry.o ../obj_s/read_termcap.o ../obj_s/strings.o ../obj_s/tries.o ../obj_s/trim_sgr0.o ../obj_s/unctrl.o ../obj_s/visbuf.o ../obj_s/alloc_entry.o ../obj_s/captoinfo.o ../obj_s/comp_expand.o ../obj_s/comp_parse.o ../obj_s/comp_scan.o ../obj_s/parse_entry.o ../obj_s/write_entry.o ../obj_s/define_key.o ../obj_s/hashed_db.o ../obj_s/key_defined.o ../obj_s/keybound.o ../obj_s/keyok.o ../obj_s/version.o -L../lib /nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: /nix/store/dy4bg91z7g0p8k3cdq8rbmzj27lsmx5k-libc-netbsd-9.1-x86_64-unknown-netbsd/lib/crt0.o: in function `__start': (.text+0x31): undefined reference to `__fini_array_start' /nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: /nix/store/dy4bg91z7g0p8k3cdq8rbmzj27lsmx5k-libc-netbsd-9.1-x86_64-unknown-netbsd/lib/crt0.o: relocation R_X86_64_PC32 against undefined hidden symbol `__fini_array_start' can not be used when making a shared object /nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: final link failed: bad value collect2: error: ld returned 1 exit status --- pkgs/development/libraries/ncurses/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 742de6cf92e7..dd1eea632e18 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional unicode "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" + ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath" ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" From ea67c657ccc81c84d380522dec694852d8684e0f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 07:50:06 -0300 Subject: [PATCH 7/9] ocamlPackages.sha: 1.13 -> 1.14 --- .../development/ocaml-modules/sha/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index a506e6795fd1..80a5205a2301 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -1,28 +1,29 @@ -{ lib -, fetchurl -, buildDunePackage -, ounit -}: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: buildDunePackage rec { pname = "sha"; - version = "1.13"; - - useDune2 = true; + version = "1.14"; src = fetchurl { url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304"; + sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19"; }; + useDune2 = true; + + propagatedBuildInputs = [ + stdlib-shims + ]; + doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ + ounit + ]; meta = with lib; { description = "Binding for SHA interface code in OCaml"; - maintainers = [ maintainers.arthurteisseire ]; - homepage = "https://github.com/djs55/ocaml-${pname}"; + homepage = "https://github.com/djs55/ocaml-sha/"; license = licenses.isc; + maintainers = with maintainers; [ arthurteisseire ]; }; - } From 8e06a39574aeb6500ad233e3b529e0e43fb80788 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sun, 13 Jun 2021 16:07:49 +0300 Subject: [PATCH 8/9] clang-tools: fix clangd Whatever change has necessitated https://github.com/NixOS/nixpkgs/pull/122044, it also broke clangd -- /resource-root/include is no longer automagically searched for includes, which kills pretty much any indexing since that directory contains vital stuff like stddef.h etc. Fix by appending the directory to CPATH & CPLUS_INCLUDE_PATH in the clangd wrapper. --- pkgs/development/tools/clang-tools/wrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clang-tools/wrapper b/pkgs/development/tools/clang-tools/wrapper index eebc152d11b1..1008023fdc0d 100755 --- a/pkgs/development/tools/clang-tools/wrapper +++ b/pkgs/development/tools/clang-tools/wrapper @@ -19,9 +19,9 @@ buildcpath() { } export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ $(<@clang@/nix-support/libcxx-cxxflags) \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" From 363140fd276b96f0022125c5636ad0ca2b7c5771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 6 Jun 2021 17:12:00 +0300 Subject: [PATCH 9/9] micropython: 1.13 -> 1.15 --- pkgs/development/interpreters/micropython/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 0441e48685ea..089fd11067b8 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.13"; + version = "1.15"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "0m9g6isys4pnlnkdmrw7lxaxdrjn02j481wz5x5cdrmrbi4zi17z"; + sha256 = "11bf1lq4kgfs1nzg5cnshh2dqxyk5w2k816i04innri6fj0g7y6p"; fetchSubmodules = true; }; @@ -25,13 +25,15 @@ stdenv.mkDerivation rec { checkPhase = '' pushd tests - MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests + MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests.py popd ''; installPhase = '' + runHook preInstall mkdir -p $out/bin - install -Dm755 ports/unix/micropython $out/bin/micropython + install -Dm755 ports/unix/micropython -t $out/bin + runHook postInstall ''; meta = with lib; {