From 286bca18306a5c15903ebfd35ba256702c288dd1 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 9 May 2021 21:24:06 +0200 Subject: [PATCH 01/61] croc.passthru.tests: partially revert 77c0a490 `--overwrite` is no longer needed for receiving text --- pkgs/tools/networking/croc/test-local-relay.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix index 4ddad86bd009..bdcecb6b54c2 100644 --- a/pkgs/tools/networking/croc/test-local-relay.nix +++ b/pkgs/tools/networking/croc/test-local-relay.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation { ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & # wait for things to settle sleep 1 - # receive, as of croc 9 --overwrite is required for noninteractive use - MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple) + MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) # compare [ "$MSG" = "$MSG2" ] && touch $out ''; From babd906230da851b27fb66f18b90a2beac4c7ddd Mon Sep 17 00:00:00 2001 From: lunik1 Date: Fri, 21 May 2021 00:01:03 +0100 Subject: [PATCH 02/61] ppsspp: fix build against ffmpeg 4.4 --- pkgs/misc/emulators/ppsspp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4f5b4f7d69b6..cadbbd3810d9 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,5 +1,6 @@ { mkDerivation , fetchFromGitHub +, fetchpatch , SDL2 , cmake , ffmpeg @@ -26,6 +27,14 @@ mkDerivation rec { sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; + patches = [ + (fetchpatch { + name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; + sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; + }) + ]; + postPatch = '' substituteInPlace git-version.cmake --replace unknown ${src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share From 89cbb28f64b3406164e61cd1fcd7504a89b6e8fd Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Fri, 21 May 2021 22:49:22 +0100 Subject: [PATCH 03/61] Update pkgs/misc/emulators/ppsspp/default.nix Co-authored-by: Sandro --- pkgs/misc/emulators/ppsspp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index cadbbd3810d9..124b8cb8e690 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -28,8 +28,9 @@ mkDerivation rec { }; patches = [ + # fix compability with ffmpeg 4.4, remove on next release after 1.11 (fetchpatch { - name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + name = "fix_ffmpeg_4.4.patch"; url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; }) From e11cc898352a201cf07d02476a1aab732e145fcf Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 3 Jun 2021 14:38:33 +0200 Subject: [PATCH 04/61] jetbrains-jdk: inherit license and platforms from openjdk --- pkgs/development/compilers/jetbrains-jdk/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 4012aa260f8c..575f1985c208 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -24,9 +24,8 @@ openjdk11.overrideAttrs (oldAttrs: rec { your own risk. ''; homepage = "https://bintray.com/jetbrains/intellij-jdk/"; - license = licenses.gpl2; + inherit (openjdk11.meta) license platforms; maintainers = with maintainers; [ edwtjo petabyteboy ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = oldAttrs.passthru // { home = "${jetbrains.jdk}/lib/openjdk"; From f6594d72ad3cfd2884d83020186a4ae749c69ab1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 3 Jun 2021 14:19:00 +0200 Subject: [PATCH 05/61] jetbrains-jdk: set mainProgram --- pkgs/development/compilers/jetbrains-jdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 575f1985c208..f3bd5d9f4a31 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -24,7 +24,7 @@ openjdk11.overrideAttrs (oldAttrs: rec { your own risk. ''; homepage = "https://bintray.com/jetbrains/intellij-jdk/"; - inherit (openjdk11.meta) license platforms; + inherit (openjdk11.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo petabyteboy ]; }; passthru = oldAttrs.passthru // { From 87b65fa13fabb1a3d895d8d0b0185bf2a556951e Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 3 Jun 2021 14:24:13 +0200 Subject: [PATCH 06/61] jetbrains: add mainPrograms --- pkgs/applications/editors/jetbrains/common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 635a8dbf46f7..c9903b4a4604 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -3,7 +3,7 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }: +{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args: with lib; @@ -18,7 +18,9 @@ let loName = toLower product; in with stdenv; lib.makeOverridable mkDerivation rec { - inherit name src meta; + inherit name src; + meta = args.meta // { mainProgram = execName; }; + desktopItem = makeDesktopItem { name = execName; exec = execName; From 632417e36968d4881fa64a4d4be0e217c11db45b Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 3 Jun 2021 14:25:20 +0200 Subject: [PATCH 07/61] jetbrains: execName -> mainProgram For consistency --- pkgs/applications/editors/jetbrains/common.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index c9903b4a4604..dcbaa136795a 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -9,7 +9,7 @@ with lib; let loName = toLower product; hiName = toUpper product; - execName = concatStringsSep "-" (init (splitString "-" name)); + mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) then "" @@ -19,16 +19,16 @@ in with stdenv; lib.makeOverridable mkDerivation rec { inherit name src; - meta = args.meta // { mainProgram = execName; }; + meta = args.meta // { inherit mainProgram; }; desktopItem = makeDesktopItem { - name = execName; - exec = execName; + name = mainProgram; + exec = mainProgram; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = "Development;"; - icon = execName; + icon = mainProgram; extraEntries = '' StartupWMClass=${wmClass} ''; @@ -66,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec { installPhase = '' mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png + ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png mv bin/fsnotifier* $out/libexec/${name}/. jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ + makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 From 87abfc228d35a2a944754c5c8e3a32caaab0e668 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 15 Jun 2021 16:48:01 +1000 Subject: [PATCH 08/61] vivid: 0.6.0 -> 0.7.0 https://github.com/sharkdp/vivid/releases/tag/v0.7.0 --- pkgs/tools/misc/vivid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index ef7bd00f0e1e..d0a6114316fc 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla"; + sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA="; }; - cargoSha256 = "1sn1cq3kaswnz2z9q5h84qipp64ha7jv5kix31lm7v6nam0f5awz"; + cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg="; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; From 75d0e4645eb1506d994bd2e316a54c8c7e3f4efd Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 16 Jun 2021 12:32:06 +0200 Subject: [PATCH 09/61] openjdk: extract common meta Also expands Darwin's openjdk.meta to include most attrs of Linux' --- pkgs/development/compilers/openjdk/11.nix | 9 +-------- pkgs/development/compilers/openjdk/12.nix | 9 +-------- pkgs/development/compilers/openjdk/13.nix | 9 +-------- pkgs/development/compilers/openjdk/14.nix | 9 +-------- pkgs/development/compilers/openjdk/15.nix | 9 +-------- pkgs/development/compilers/openjdk/16.nix | 9 +-------- pkgs/development/compilers/openjdk/darwin/11.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/8.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/default.nix | 6 +----- pkgs/development/compilers/openjdk/darwin/meta.nix | 4 ++++ pkgs/development/compilers/openjdk/meta.nix | 8 ++++++++ 11 files changed, 21 insertions(+), 63 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/darwin/meta.nix create mode 100644 pkgs/development/compilers/openjdk/meta.nix diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 15238e63ecbd..151f6731e0b1 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -136,14 +136,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo asbachb ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 33169be53026..636db1c899bc 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index d3db493c5fe7..f65f15e19575 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 3804999376ed..7d5ed43cd218 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6430c9709362..31ff0904b77e 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 9a710ed6fa46..04e6b6beeb94 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -147,14 +147,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 6bcd79b274be..8157f1ba72a5 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -53,10 +53,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index a5cd15817e9a..6d8875d26936 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -57,10 +57,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 731ff4d56de2..b458974d7f19 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -54,10 +54,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix new file mode 100644 index 000000000000..abe469af6915 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -0,0 +1,4 @@ +lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // { + platforms = lib.platforms.darwin; + homepage = "https://www.azul.com/"; +} diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix new file mode 100644 index 000000000000..ee4d6e23d791 --- /dev/null +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -0,0 +1,8 @@ +lib: with lib; { + homepage = "http://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo asbachb ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; +} From 9dc58496dd0d5657eccac4aea9031f39b9de59ab Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 16 Jun 2021 12:40:15 +0200 Subject: [PATCH 10/61] openjdk: correct license --- pkgs/development/compilers/openjdk/meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index ee4d6e23d791..12fe50e17672 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -1,6 +1,6 @@ lib: with lib; { homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; From 23731ae2a3feb4471f11bba1c19f4aeb1ddaa60d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 12:01:42 +0000 Subject: [PATCH 11/61] zimlib: 6.3.0 -> 6.3.2 --- pkgs/development/libraries/zimlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 76d54ed62563..9f8e357d3ab0 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "6.3.0"; + version = "6.3.2"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s"; + sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI="; }; nativeBuildInputs = [ From 9f0e1ad7c619d74bc57bc3702ab0bdd4d8e33eb0 Mon Sep 17 00:00:00 2001 From: George Shammas Date: Tue, 8 Jun 2021 09:05:49 -0400 Subject: [PATCH 12/61] maintainers: add georgyo --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cbaf090611e..e330121555f7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3739,6 +3739,16 @@ githubId = 1176131; name = "George Whewell"; }; + georgyo = { + email = "george@shamm.as"; + github = "georgyo"; + githubId = 19374; + name = "George Shammas"; + keys = [{ + longkeyid = "rsa4096/0x82BB70D541AE2DB4"; + fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; + }]; + }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; From b2cae371fe5ad1b64ed9ab3839c0bf337f2b1afd Mon Sep 17 00:00:00 2001 From: George Shammas Date: Tue, 8 Jun 2021 08:58:44 -0400 Subject: [PATCH 13/61] usql: init at 0.9.1 --- pkgs/applications/misc/usql/default.nix | 56 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/misc/usql/default.nix diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix new file mode 100644 index 000000000000..7a83ec05c10a --- /dev/null +++ b/pkgs/applications/misc/usql/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, unixODBC +, icu +}: + +buildGoModule rec { + pname = "usql"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "xo"; + repo = "usql"; + rev = "v${version}"; + sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU="; + }; + + vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus="; + + buildInputs = [ unixODBC icu ]; + + # These tags and flags are copied from build-release.sh + buildFlags = [ "-tags" ]; + buildFlagsArray = [ + "most" + "sqlite_app_armor" + "sqlite_fts5" + "sqlite_introspect" + "sqlite_json1" + "sqlite_stat4" + "sqlite_userauth" + "sqlite_vtable" + "sqlite_icu" + "no_adodb" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/xo/usql/text.CommandVersion=${version}" + ]; + + # All the checks currently require docker instances to run the databases. + doCheck = false; + + meta = with lib; { + description = "Universal command-line interface for SQL databases"; + homepage = "https://github.com/xo/usql"; + license = licenses.mit; + maintainers = with maintainers; [ georgyo ]; + # usql does not build on ARM. + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 752644a41aa1..1be979de7dcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31337,6 +31337,8 @@ in urbit = callPackage ../misc/urbit { }; + usql = callPackage ../applications/misc/usql { }; + utf8cpp = callPackage ../development/libraries/utf8cpp { }; utf8proc = callPackage ../development/libraries/utf8proc { }; From fcb6e881c25310d5c7c6ffae4efd47653cba7b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Jun 2021 15:19:04 +0200 Subject: [PATCH 14/61] home-assistant: move availableComponents to passthru --- pkgs/servers/home-assistant/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ac84462d9f39..12a0c97f7e90 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -192,8 +192,6 @@ in with py.pkgs; buildPythonApplication rec { # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - inherit availableComponents; - # PyPI tarball is missing tests/ directory src = fetchFromGitHub { owner = "home-assistant"; @@ -798,6 +796,7 @@ in with py.pkgs; buildPythonApplication rec { ''; passthru = { + inherit availableComponents; python = py; tests = { inherit (nixosTests) home-assistant; From 00bda76bc7bff22c1477a2bec071dec64aa69802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 15 Jun 2021 14:25:21 +0200 Subject: [PATCH 15/61] dina-font: use fonttosfnt instead of fontforge --- pkgs/data/fonts/dina/default.nix | 46 ++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 2a770222ed10..3b5d75acb503 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,53 +1,59 @@ { lib, stdenv, fetchurl, unzip -, bdftopcf, mkfontscale, fontforge +, bdftopcf, mkfontscale, fonttosfnt }: stdenv.mkDerivation { pname = "dina-font"; version = "2.92"; + outputs = [ "out" "bdf" ]; + src = fetchurl { url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; }; nativeBuildInputs = - [ unzip bdftopcf mkfontscale fontforge ]; + [ unzip bdftopcf mkfontscale fonttosfnt ]; - patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; + postPatch = '' + sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf + ''; buildPhase = '' + runHook preBuild + newName() { - test "''${1:5:1}" = i && _it=Italic || _it= - case ''${1:6:3} in - 400) test -z $it && _weight=Medium ;; - 700) _weight=Bold ;; - esac - _pt=''${1%.bdf} - _pt=''${_pt#*-} - echo "Dina$_weight$_it$_pt" + test "''${1:5:1}" = i && _it=Italic || _it= + case ''${1:6:3} in + 400) test -z $it && _weight=Medium ;; + 700) _weight=Bold ;; + esac + _pt=''${1%.bdf} + _pt=''${_pt#*-} + echo "Dina$_weight$_it$_pt" } - # convert bdf fonts to pcf - for i in *.bdf; do - bdftopcf -t -o $(newName "$i").pcf "$i" + for f in *.bdf; do + name=$(newName "$f") + bdftopcf -t -o "$name.pcf" "$f" + fonttosfnt -v -o "$name.otb" "$f" done gzip -n -9 *.pcf - # convert bdf fonts to otb - for i in *.bdf; do - fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")" - done + runHook postBuild ''; installPhase = '' + runHook preInstall + install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf mkfontdir "$out/share/fonts/misc" mkfontdir "$bdf/share/fonts/misc" - ''; - outputs = [ "out" "bdf" ]; + runHook postInstall + ''; meta = with lib; { description = "A monospace bitmap font aimed at programmers"; From fc1c4bab77a00e831a0c22438b86f3cb910e5712 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 3 Jun 2021 12:04:26 +0200 Subject: [PATCH 16/61] git: fix pkgsStatic build --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8ad150f13060..90505091d29c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.isFreeBSD) "-lthr"; configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ From 0af0d5c5c3299a4668183d4c85097f46332dc8b1 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 13 Mar 2021 12:03:22 +0100 Subject: [PATCH 17/61] mastodon-archive: init at 1.3.1 --- .../tools/backup/mastodon-archive/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/backup/mastodon-archive/default.nix diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/tools/backup/mastodon-archive/default.nix new file mode 100644 index 000000000000..10e500339ee0 --- /dev/null +++ b/pkgs/tools/backup/mastodon-archive/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mastodon-archive"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "kensanata"; + repo = "mastodon-backup"; + rev = "v${version}"; + sha256 = "1dlrkygywxwm6xbn0pnfwd3f7641wnvxdyb5qihbsf62w1w08x8r"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + html2text + mastodon-py + progress + ]; + + # There is no test + doCheck = false; + + meta = with lib; { + description = "Utility for backing up your Mastodon content"; + homepage = "https://alexschroeder.ch/software/Mastodon_Archive"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ julm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51cbb4ac1fa9..c116d440f049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13669,6 +13669,8 @@ in massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; + mastodon-archive = callPackage ../tools/backup/mastodon-archive { }; + maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; From 61a9aafda6327883ffeadd9102c878387a4be704 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 16 Jun 2021 17:57:16 +0000 Subject: [PATCH 18/61] rust-bindgen: some features of bindgen require a recent version of llvm Features likes 'asm goto' are only available if compiled with llvm >= 11. This is required for rust-in-linux development for example. I believe binding to llvmPackages_latest is an acceptable tradeoff. ``` RUSTC L rust/build_error.o error: unknown argument: '-fmacro-prefix-map=./=' error: unknown argument: '-fno-stack-clash-protection' error: unknown warning option '-Wno-frame-address'; did you mean '-Wno-address'? [-Wunknown-warning-option] error: unknown warning option '-Wno-pointer-to-enum-cast' [-Wunknown-warning-option] ./arch/x86/include/asm/bitops.h:138:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/bitops.h:162:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/bitops.h:201:9: error: 'asm goto' constructs are not supported yet ./include/linux/list.h:282:9: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] ./include/linux/list.h:318:27: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] ./include/linux/list.h:821:10: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] ./include/linux/list.h:830:10: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] ./arch/x86/include/asm/atomic.h:83:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic.h:123:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic.h:137:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic.h:152:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic64_64.h:76:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic64_64.h:118:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic64_64.h:132:9: error: 'asm goto' constructs are not supported yet ./arch/x86/include/asm/atomic64_64.h:147:9: error: 'asm goto' constructs are not supported yet ./include/linux/jump_label.h:278:2: error: expected '(' after 'asm' ./include/linux/jump_label.h:284:2: error: expected '(' after 'asm' ./include/linux/jump_label.h:306:2: error: expected '(' after 'asm' ./include/linux/jump_label.h:309:3: error: expected '(' after 'asm' ./include/linux/jump_label.h:317:2: error: expected '(' after 'asm' ./include/linux/jump_label.h:320:3: error: expected '(' after 'asm' ./include/linux/llist.h:189:9: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] fatal error: too many errors emitted, stopping now [-ferror-limit=] error: unknown argument: '-fmacro-prefix-map=./=', err: true error: unknown argument: '-fno-stack-clash-protection', err: true error: unknown warning option '-Wno-frame-address'; did you mean '-Wno-address'? [-Wunknown-warning-option], err: true error: unknown warning option '-Wno-pointer-to-enum-cast' [-Wunknown-warning-option], err: true ./arch/x86/include/asm/bitops.h:138:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/bitops.h:162:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/bitops.h:201:9: error: 'asm goto' constructs are not supported yet, err: true ./include/linux/list.h:282:9: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier], err: false ./include/linux/list.h:318:27: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier], err: false ./include/linux/list.h:821:10: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier], err: false ./include/linux/list.h:830:10: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier], err: false ./arch/x86/include/asm/atomic.h:83:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic.h:123:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic.h:137:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic.h:152:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic64_64.h:76:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic64_64.h:118:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic64_64.h:132:9: error: 'asm goto' constructs are not supported yet, err: true ./arch/x86/include/asm/atomic64_64.h:147:9: error: 'asm goto' constructs are not supported yet, err: true ./include/linux/jump_label.h:278:2: error: expected '(' after 'asm', err: true ./include/linux/jump_label.h:284:2: error: expected '(' after 'asm', err: true ./include/linux/jump_label.h:306:2: error: expected '(' after 'asm', err: true ./include/linux/jump_label.h:309:3: error: expected '(' after 'asm', err: true ./include/linux/jump_label.h:317:2: error: expected '(' after 'asm', err: true ./include/linux/jump_label.h:320:3: error: expected '(' after 'asm', err: true ./include/linux/llist.h:189:9: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier], err: false fatal error: too many errors emitted, stopping now [-ferror-limit=], err: true thread 'main' panicked at 'Unable to generate bindings: ()', src/main.rs:54:36 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace make[1]: *** [rust/Makefile:141: rust/bindings_generated.rs] Error 1 make[1]: *** Deleting file 'rust/bindings_generated.rs' ``` Signed-off-by: Arthur Gautier --- pkgs/development/tools/rust/bindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 598d01a8af5f..267cc4fcfbab 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin , runtimeShell , bash }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; #for substituteAll - libclang = llvmPackages.libclang.lib; + libclang = llvmPackages_latest.libclang.lib; inherit bash; buildInputs = [ libclang ]; From 43f4cfd381b4dbf81f307972b697b41f92a9cd15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Jun 2021 21:01:02 +0200 Subject: [PATCH 19/61] esphome: 1.18.0 -> 1.19.0 --- pkgs/tools/misc/esphome/dashboard.nix | 20 ++++++++++++++++++++ pkgs/tools/misc/esphome/default.nix | 14 ++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/esphome/dashboard.nix diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix new file mode 100644 index 000000000000..3edf59002b3d --- /dev/null +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -0,0 +1,20 @@ +{ lib +, python3 +}: + +with python3.pkgs; buildPythonPackage rec { + pname = "esphome-dashboard"; + version = "20210615.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9"; + }; + + meta = with lib; { + description = "ESPHome dashboard"; + homepage = "https://esphome.io/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index fe02fe0d5219..1daf4f139cf6 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,4 +1,5 @@ { lib +, pkgs , python3 , fetchFromGitHub , platformio @@ -6,15 +7,18 @@ , git }: +let + esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; +in python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq"; + sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi"; }; postPatch = '' @@ -44,6 +48,7 @@ python3.pkgs.buildPythonApplication rec { click colorama cryptography + esphome-dashboard ifaddr paho-mqtt pillow @@ -66,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ hypothesis mock + pytest-asyncio pytest-mock pytest-sugar pytestCheckHook @@ -75,6 +81,10 @@ python3.pkgs.buildPythonApplication rec { $out/bin/esphome --help > /dev/null ''; + passthru = { + dashboard = esphome-dashboard; + }; + meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; From 79481fba6256e557e9b740d7e61378adf945aea4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 03:32:10 +0000 Subject: [PATCH 20/61] gcsfuse: 0.35.0 -> 0.35.1 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index ee7f86760707..92d35338d180 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564="; + sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; From a62e112d593277e3cac587e3083fd10d550c0202 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 01:00:44 +0000 Subject: [PATCH 21/61] jackett: 0.18.231 -> 0.18.234 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 116fd9bae927..d78524039858 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.231"; + version = "0.18.234"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4="; + sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8="; }; nativeBuildInputs = [ makeWrapper ]; From fbbd31e0e8cdee727cebb4477549a78c58b61bf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 06:10:53 +0000 Subject: [PATCH 22/61] python39Packages.foxdot: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/foxdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index 072129e6ea5a..eff080fa2f8f 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb"; + sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90"; }; propagatedBuildInputs = [ tkinter supercollider ]; From 2f4769197b70535c8c81cd601a0bc6ddc39bed52 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 15:19:23 +0000 Subject: [PATCH 23/61] gallery-dl: 1.17.4 -> 1.17.5 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 854b8a5f9b36..ac33025b727e 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.4"; + version = "1.17.5"; src = fetchPypi { inherit pname version; - sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293"; + sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9"; }; propagatedBuildInputs = [ requests ]; From 7d2f265e011263786c5ba316ddbbeb50181353a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 00:43:50 +0000 Subject: [PATCH 24/61] i3lock-color: 2.13.c.3 -> 2.13.c.4 --- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 4182c8689ed2..63a49953115a 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.3"; + version = "2.13.c.4"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k"; + sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 2491f89b950826ff7a7639d12b8685dafb3a5d3e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 12:53:39 -0700 Subject: [PATCH 25/61] python3Packages.pybids: 0.13 -> 0.13.1 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 143f578b08d5..3ed34b4e73d7 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13"; + version = "0.13.1"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zVFaGAKgTP9UiUdmO4+Tut8Qc64xuGyB26cQLRHOqYw="; + sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; }; propagatedBuildInputs = [ From 154cd7d9afabbca6f9b52ea54bd939ce7aaee996 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 01:30:22 +0000 Subject: [PATCH 26/61] alembic: 1.8.1 -> 1.8.2 --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 333dbb053f52..0ed9aa204706 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo="; + sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo="; }; outputs = [ "bin" "dev" "out" "lib" ]; From b556b25aad5997a65ec1715f2fd8974454cf94d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 2 Jun 2021 17:51:31 +0300 Subject: [PATCH 27/61] fritzing: 0.9.4-498 -> 0.9.6 --- .../science/electronics/fritzing/default.nix | 73 ++++++++----------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 79c01d3ec718..30cbd8f92b57 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,86 +1,75 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config -, qtbase, qtsvg, qttools, qtserialport, boost, libgit2 +{ mkDerivation +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtsvg +, qttools +, qtserialport +, boost +, libgit2 }: let # build number corresponding to a release, has no further relation # see https://github.com/fritzing/fritzing-app/releases/tag/CD-498 - fritzingBuild = "498"; + # fritzingBuild = "498"; + # version 0.9.6 is properly tagged, hope it continues + # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62"; + partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb"; in mkDerivation rec { pname = "fritzing"; - version = "0.9.4-${fritzingBuild}"; + version = "0.9.6"; src = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-app"; - rev = "CD-${fritzingBuild}"; - sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34"; + rev = version; + sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"; }; parts = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-parts"; name = "fritzing-parts"; rev = partsSha; - sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc"; + sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs"; }; buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; - patches = [(fetchpatch { - name = "fix-libgit2-version.patch"; - url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch"; - sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak"; - })]; - postPatch = '' substituteInPlace phoenix.pro \ --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' - substituteInPlace tools/linux_release_script/release.sh \ - --replace 'git status' 'echo >/dev/null' \ - --replace 'git clean' 'echo >/dev/null' \ - --replace 'git clone' 'echo >/dev/null' \ - --replace 'release_folder="' 'release_folder="$out" #' \ - --replace './Fritzing -db' '# run after fixup' - substituteInPlace src/fapplication.cpp \ --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' - ''; - buildPhase = '' - bash tools/linux_release_script/release.sh ${version} - ''; - - installPhase = '' - rm "$out/Fritzing" # remove script file - mkdir "$out/bin" - mv "$out/lib/Fritzing" "$out/bin/Fritzing" - mkdir --parents "$out/share/applications" "$out/share/metainfo" - mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop" - mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml" - cp --recursive --no-target-directory "$parts" "$out/fritzing-parts" + mkdir parts + cp -a ${parts}/* parts/ ''; postFixup = '' # generate the parts.db file - QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out" + QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \ + -db "$out/share/fritzing/parts/parts.db" \ + -pp "$out/fritzing/parts" \ + -folder "$out/share/fritzing" ''; qmakeFlags = [ "phoenix.pro" ]; - meta = { + meta = with lib; { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.robberer ]; - platforms = lib.platforms.linux; + license = with licenses; [ gpl3 cc-by-sa-30 ]; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.linux; }; } From f0f4601d3a1ebfe41b344c164431971dfa165488 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Jun 2021 13:34:23 -0400 Subject: [PATCH 28/61] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 65cc5a185b99..1c53300f8bca 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -714,12 +714,12 @@ final: prev: completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-06-01"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "c8db953a8e9f4bc8183e31831297cf84d6f521b8"; - sha256 = "0p35msrh7g100ayl0g8285q43v20n6hlv1grdb0rmw8sil0j881a"; + rev = "d62fff879b29fa1ce915887a75305af0fff57d32"; + sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -3336,12 +3336,12 @@ final: prev: nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-06-02"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "7c85366c9d457ed0e3c3532ee312307476afbbdc"; - sha256 = "02hxjwi8g07zhx6xagma5m3sa0j4ljg79377zfn2vy4snnib452p"; + rev = "2afb852177a28e579c1348033dbc043a99ca6dc7"; + sha256 = "1aghwwcwsh4dka8jwq254pdb9l9c193iwnax9ab8s0zzcyk0x4bq"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; From 435032e8c17fbf842d4fff23d3e06d1803e2e001 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Jun 2021 13:34:42 -0400 Subject: [PATCH 29/61] vimPlugins.snap: init at 2021-06-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1c53300f8bca..531fc45ac182 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4512,6 +4512,18 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; + snap = buildVimPluginFrom2Nix { + pname = "snap"; + version = "2021-06-16"; + src = fetchFromGitHub { + owner = "camspiers"; + repo = "snap"; + rev = "8628478288bb64ed59989910e736879054facda3"; + sha256 = "0sq7wv07hckk8qfg39qv507i33vg1c6nr5gjrjl5126i1h5afa8j"; + }; + meta.homepage = "https://github.com/camspiers/snap/"; + }; + snippets-nvim = buildVimPluginFrom2Nix { pname = "snippets-nvim"; version = "2020-09-09"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d7cf9b811dd5..942d358f0def 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -47,6 +47,7 @@ bronson/vim-trailing-whitespace brooth/far.vim buoto/gotests-vim camspiers/lens.vim +camspiers/snap@main carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml From 07f392cd0c12354a45f565ee5e5f445bfa97ff90 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 17 Jun 2021 01:33:13 +0800 Subject: [PATCH 30/61] vimPlugins.{vim-speeddating,vim-surround,vim-unimpaired}: add dependency vim-repeat --- pkgs/misc/vim-plugins/overrides.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 201304023739..0901531a8aa3 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -755,6 +755,10 @@ self: super: { dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); + vim-speeddating = super.vim-speeddating.overrideAttrs (old: { + dependencies = with self; [ vim-repeat ]; + }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" + '' substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ @@ -763,6 +767,14 @@ self: super: { ''; }); + vim-surround = super.vim-surround.overrideAttrs (old: { + dependencies = with self; [ vim-repeat ]; + }); + + vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: { + dependencies = with self; [ vim-repeat ]; + }); + vim-wakatime = super.vim-wakatime.overrideAttrs (old: { buildInputs = [ python ]; }); From 911244ebe2dc750398ad8137d50452b1a3a56e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Jun 2021 18:51:41 +0200 Subject: [PATCH 31/61] croc: 9.1.5 -> 9.1.6 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 6b3e9f839c70..1110c2cdb645 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.5"; + version = "9.1.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc="; + sha256 = "sha256-FMx2Siw1J7UKtuwLcSkgMhs4Dl0erQcRb5FGkq2hFv0="; }; - vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4="; + vendorSha256 = "sha256-tPBPmZLcBR16RxqvL3UYlIAwK8IeV+DYkRrVOgBkm58="; doCheck = false; From 01b496b92f2af4dddb585466e5fd27aecfae2fbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 11:27:43 +0000 Subject: [PATCH 32/61] libwpe: 1.10.0 -> 1.10.1 --- pkgs/development/libraries/libwpe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 9e7886eb68d1..1fcb91a7fb39 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0="; + sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA="; }; nativeBuildInputs = [ From 6f58047b1f7c90d0f53df37d066ea7d63d86f287 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Jun 2021 20:55:31 +0200 Subject: [PATCH 33/61] electrum: 4.1.2 -> 4.1.3 --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 676efb2aa042..4197c1af040b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.2"; + version = "4.1.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5"; + sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk"; + sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; }; postUnpack = '' From 9854c5b979b706d3834040789a0688d1d5e187a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 06:50:30 +0000 Subject: [PATCH 34/61] janet: 1.16.0 -> 1.16.1 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 4c836264017b..c0438d1e0076 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems="; + sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; }; nativeBuildInputs = [ meson ninja ]; From 068b26fa111f9f1d1312167b338cf5f8a223acd9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 05:29:13 +0000 Subject: [PATCH 35/61] jruby: 9.2.17.0 -> 9.2.18.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 4e540dc8aacb..f5368e405387 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.17.0"; + version = "9.2.18.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI="; + sha256 = "sha256-QlpclwptkYrlMSdYUGNNEhaeNVd1SyuBf7+3mHoywac="; }; nativeBuildInputs = [ makeWrapper ]; From ed50ad5a9a248360bd6e52ae5ceca0ccdbad7501 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Jun 2021 22:58:59 +0000 Subject: [PATCH 36/61] spleen: 1.9.0 -> 1.9.1 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 4dea9253c02d..162197006ba7 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.9.0"; + version = "1.9.1"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM="; + sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; meta = with lib; { description = "Monospaced bitmap fonts"; From acf469c651c881e6f280d894f92eb51f43983758 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 01:16:48 +0000 Subject: [PATCH 37/61] gensio: 2.2.5 -> 2.2.7 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index a0c4f5a3e216..3978c05f2c71 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s="; + sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g="; }; passthru = { From a92e4782ae207ce895cedc3c8773d2ee4795c188 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Jun 2021 23:12:36 +0000 Subject: [PATCH 38/61] fn-cli: 0.6.6 -> 0.6.7 --- pkgs/applications/networking/cluster/fn-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 118e3e0fbe2c..8620c43cdbe7 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7"; + sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY="; }; vendorSha256 = null; From 816d212fa2d4975c4e4475f504e84829f3d53142 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Jun 2021 22:50:52 +0000 Subject: [PATCH 39/61] gappa: 1.3.5 -> 1.4.0 --- pkgs/applications/science/logic/gappa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index 73f34f60fc47..c7c5c9c6fa70 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, gmp, mpfr, boost }: stdenv.mkDerivation { - name = "gappa-1.3.5"; + name = "gappa-1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz"; - sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"; + url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz"; + sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA="; }; buildInputs = [ gmp mpfr boost.dev ]; From 08581dc64c95dab5b478eeacd2f1b9531e1f71e7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Jun 2021 13:36:04 -0700 Subject: [PATCH 40/61] dwarf-therapist: 41.1.5 -> 41.2.2 --- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index bd8825582c43..243db1e1c398 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dwarf-therapist"; - version = "41.1.5"; + version = "41.2.2"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4"; + sha256 = "sha256-zsEG68ioSw64UfmqlTLO1i5sObg8C4zxvdPxdQGMhhU="; }; nativeBuildInputs = [ texlive cmake ninja ]; From 90022056f5fff3fbd1aadbc83ef6fb4e63f0b77c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 20:48:51 +0000 Subject: [PATCH 41/61] byacc: 20210109 -> 20210520 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 756d99c6e7f4..50e8101c17a5 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210109"; + version = "20210520"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c="; + sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4="; }; configureFlags = [ From 8fe37ad09e71a60b8cced1b15b91517ddd85ef7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 04:44:27 +0000 Subject: [PATCH 42/61] gnumeric: 1.12.49 -> 1.12.50 --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index aacc2a2a579c..5ab9be9fa75a 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.49"; + version = "1.12.50"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc="; + sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg="; }; configureFlags = [ "--disable-component" ]; From 1d3dbf14331475b90a4471224341596f14e3d62f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 12:52:27 +0000 Subject: [PATCH 43/61] leatherman: 1.12.4 -> 1.12.5 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 61d87211e0a5..2d439db5934e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { - sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU="; + sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4="; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 7a370f0016f15967f843b6a51e1882206cab110a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 15 Jun 2021 19:30:18 +0200 Subject: [PATCH 44/61] moarvm: 2021.02 -> 2021.05 --- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index e5baacf5c295..0dbe0f5d97e3 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.02"; + version = "2021.05"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r"; + sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i"; }; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; From edb61aba85dfc31d38b4b0196b9055cb8710f55c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 15 Jun 2021 19:30:33 +0200 Subject: [PATCH 45/61] nqp: 2021.02 -> 2021.05 --- pkgs/development/interpreters/rakudo/nqp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index cd60bb3b7900..317a8226852e 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.02"; + version = "2021.05"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj"; + sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l"; }; buildInputs = [ perl ]; From 3a058740c5ef7f437adc3081801fb7177628afd0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 15 Jun 2021 19:30:46 +0200 Subject: [PATCH 46/61] rakudo: 2021.02.1 -> 2021.05 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 358b8663196b..1b2655fe7712 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.02.1"; + version = "2021.05"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8"; + sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk"; }; buildInputs = [ icu zlib gmp perl ]; From 5117c97a5a36a8e4d425551ffa082f2e037e8478 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:27 -0700 Subject: [PATCH 47/61] hqplayer-desktop: run pre/postInstall hooks --- pkgs/applications/audio/hqplayer-desktop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index af1818fe7188..85af26f57cf2 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -47,6 +47,8 @@ mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + # main executable mkdir -p $out/bin cp ./usr/bin/* $out/bin @@ -62,6 +64,8 @@ mkDerivation rec { # pixmaps mkdir -p $out/share/pixmaps cp ./usr/share/pixmaps/* $out/share/pixmaps + + runHook postInstall ''; postInstall = '' From 137f46dd4d67f913783c9dd90cee64dd2c12e55f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:43 -0700 Subject: [PATCH 48/61] hqplayer-desktop: 4.12.0-34 -> 4.12.1-35 --- pkgs/applications/audio/hqplayer-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 85af26f57cf2..f054d5a811c4 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -17,11 +17,13 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.0-34"; + version = "4.12.1-35"; src = fetchurl { + # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs + # c.f. https://github.com/NixOS/nixpkgs/pull/111616 url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE="; + sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8="; }; unpackPhase = '' From 9e4940589808bae536b42d1aaab0949fbea340e3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:58 -0700 Subject: [PATCH 49/61] hqplayer-desktop: remove broken changelog link --- pkgs/applications/audio/hqplayer-desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index f054d5a811c4..18a75f3135aa 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -87,7 +87,6 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; - changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; }; From a48ceda40ca498af4e44c9df8e0346f49f77c31f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:51:47 -0700 Subject: [PATCH 50/61] hqplayer-desktop: don't use single quotes around $out --- pkgs/applications/audio/hqplayer-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 18a75f3135aa..9e9a5ecf49ae 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -73,8 +73,8 @@ mkDerivation rec { postInstall = '' for desktopFile in $out/share/applications/*; do substituteInPlace "$desktopFile" \ - --replace '/usr/bin/' '$out/bin/' \ - --replace '/usr/share/doc/' '$out/share/doc/' + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/doc/ $out/share/doc/ done gunzip $out/share/doc/${pname}/*.gz From 3e80c137a3bc00e1e9e7801c1995ecf43d6fce2f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:56:24 -0700 Subject: [PATCH 51/61] hqplayer-desktop: don't try to de-compress already de-compressed docs --- pkgs/applications/audio/hqplayer-desktop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 9e9a5ecf49ae..2551c610c573 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -76,8 +76,6 @@ mkDerivation rec { --replace /usr/bin/ $out/bin/ \ --replace /usr/share/doc/ $out/share/doc/ done - - gunzip $out/share/doc/${pname}/*.gz ''; postFixup = '' From 1bdcc68fbb2a713718505610ebfb9e8d462ba656 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 13 Jun 2021 15:12:55 -0700 Subject: [PATCH 52/61] hqplayerd: run postInstall hook --- pkgs/servers/hqplayerd/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 10524c71612b..721de0a2866f 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + # main executable mkdir -p $out/bin cp ./usr/bin/hqplayerd $out/bin @@ -62,12 +64,14 @@ stdenv.mkDerivation rec { cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system # documentation - mkdir -p $out/share/doc/${pname} - cp ./usr/share/doc/${pname}/* $out/share/doc/${pname} + mkdir -p $out/share/doc/hqplayerd + cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd # misc service support files - mkdir -p $out/var/lib/${pname} - cp -r ./var/hqplayer/web $out/var/lib/${pname} + mkdir -p $out/var/lib/hqplayerd + cp -r ./var/hqplayer/web $out/var/lib/hqplayerd + + runHook postInstall ''; postInstall = '' From 8c3bd1ff89703f40bd7aa12d4b3551ff92e0003f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:35:47 -0700 Subject: [PATCH 53/61] hqplayerd: 4.24.0-61 -> 4.24.1-62 --- pkgs/servers/hqplayerd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 721de0a2866f..8b8b39315f39 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.24.0-61"; + version = "4.24.1-62"; src = fetchurl { + # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs + # c.f. https://github.com/NixOS/nixpkgs/pull/111616 url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-VouqkWRu9lcbCQNmXJayrsZZnhvM5xEZlUyBEkURBOQ="; + sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs="; }; unpackPhase = '' From 664c0feab860b2d8b487dd04ee89620eea10cff5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:36:07 -0700 Subject: [PATCH 54/61] hqplayerd: remove broken changelog link --- pkgs/servers/hqplayerd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 8b8b39315f39..ea6cd9ae04c3 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software embedded HD-audio player"; - changelog = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.changes"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; }; From eceb128a2606d16bd4d476ed3e42d18cfe24d531 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 04:20:32 +0000 Subject: [PATCH 55/61] goffice: 0.10.49 -> 0.10.50 --- pkgs/development/libraries/goffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 3a48fa524842..85c9b77c6bdc 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.49"; + version = "0.10.50"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k="; + sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w="; }; nativeBuildInputs = [ pkg-config intltool ]; From 6847861652915a28a45a32326c9e33b10b854028 Mon Sep 17 00:00:00 2001 From: Subhrajyoti Sen Date: Thu, 17 Jun 2021 02:36:47 +0530 Subject: [PATCH 56/61] kotlin: 1.5.0 -> 1.5.10 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 5fdf58e56f5d..0fb58bfeda4f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.0"; + version = "1.5.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3"; + sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g"; }; propagatedBuildInputs = [ jre ] ; From d2134e6603a1edadfb12a1cb3259a3399552450d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Jun 2021 19:35:38 +0000 Subject: [PATCH 57/61] bluez-alsa: 3.0.0 -> 3.1.0 --- pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 175fa92bad2f..a108d55c6b5a 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8"; + sha256 = "sha256-bohc/0hUr1mcV2JbFy71TjY8MXOU3oBBPCcupgkWsWY="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From c97b3d8502b514b148856927151885c36355c083 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 11 Jun 2021 20:40:02 -0700 Subject: [PATCH 58/61] _389-ds-base: 1.3.9.1 -> 2.0.5 --- pkgs/servers/ldap/389/default.nix | 152 +++++++++++++++++++++++------- 1 file changed, 120 insertions(+), 32 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 4387542e5af0..e445184b9561 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,32 +1,107 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3 +{ stdenv +, autoreconfHook +, fetchFromGitHub +, lib + +, bzip2 +, cmocka +, cracklib +, cyrus_sasl +, db +, doxygen +, icu +, libevent +, libkrb5 +, lm_sensors +, net-snmp +, nspr +, nss +, openldap +, openssl +, pcre +, perl +, perlPackages +, pkg-config +, python3 +, svrcore +, zlib + +, enablePamPassthru ? true +, pam + +, enableCockpit ? true +, rsync + +, enableDna ? true +, enableLdapi ? true +, enableAutobind ? false +, enableAutoDnSuffix ? false +, enableBitwise ? true +, enableAcctPolicy ? true +, enablePosixWinsync ? true }: stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "1.3.9.1"; + version = "2.0.5"; - src = fetchurl { - url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; + src = fetchFromGitHub { + owner = "389ds"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; - buildInputs = [ - perl pam nspr nss openldap db cyrus_sasl svrcore icu - net-snmp libkrb5 pcre libevent openssl python3 - ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); - patches = [ - (fetchpatch { - name = "389-ds-nss.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9"; - sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk"; - }) - ]; + buildInputs = [ + bzip2 + cracklib + cyrus_sasl + db + icu + libevent + libkrb5 + lm_sensors + net-snmp + nspr + nss + openldap + openssl + pcre + perl + python3 + svrcore + zlib + + # tests + cmocka + libevent + + # lib389 + (python3.withPackages (ps: with ps; [ + setuptools + ldap + six + pyasn1 + pyasn1-modules + dateutil + argcomplete + libselinux + ])) + + # logconv.pl + perlPackages.DBFile + perlPackages.ArchiveTar + ] + ++ lib.optional enableCockpit rsync + ++ lib.optional enablePamPassthru pam; + postPatch = '' substituteInPlace Makefile.am \ --replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g' + + patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py ''; preConfigure = '' @@ -38,21 +113,37 @@ stdenv.mkDerivation rec { export PERLPATH ''; - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-openldap" - "--with-db" - "--with-db-inc=${db.dev}/include" - "--with-db-lib=${db.out}/lib" - "--with-sasl=${cyrus_sasl.dev}" - "--with-netsnmp=yes" - "--with-netsnmp-inc=${lib.getDev net-snmp}/include" - "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" - ]; + configureFlags = + let + mkEnable = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; + in + [ + "--enable-cmocka" + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-db-inc=${db.dev}/include" + "--with-db-lib=${db.out}/lib" + "--with-db=yes" + "--with-netsnmp-inc=${lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" + "--with-netsnmp=yes" + "--with-openldap" + + "${mkEnable enableCockpit "cockpit"}" + "${mkEnable enablePamPassthru "pam-passthru"}" + "${mkEnable enableDna "dna"}" + "${mkEnable enableLdapi "ldapi"}" + "${mkEnable enableAutobind "autobind"}" + "${mkEnable enableAutoDnSuffix "auto-dn-suffix"}" + "${mkEnable enableBitwise "bitwise"}" + "${mkEnable enableAcctPolicy "acctpolicy"}" + "${mkEnable enablePosixWinsync "posix-winsync"}" + ]; enableParallelBuilding = true; + doCheck = true; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" "localstatedir=${placeholder "TMPDIR"}" @@ -65,8 +156,5 @@ stdenv.mkDerivation rec { description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514 - ]; }; } From 95f7365265482a8cda6f5a5ebe0f25759ef35a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Jun 2021 14:53:28 +0200 Subject: [PATCH 59/61] postfix: 3.6.0 -> 3.6.1 http://www.postfix.org/announcements/postfix-3.6.1.html --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index ad704ca792b7..2fddaae47b28 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4="; + sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw="; }; nativeBuildInputs = [ makeWrapper m4 ]; From 8bae808a2152cf0d1e2d2cf3bf591cfcb960686f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 17 Jun 2021 06:00:33 +0700 Subject: [PATCH 60/61] rcs: 5.9.4 -> 5.10.0 (#112014) --- .../version-management/rcs/default.nix | 56 ++++--------------- .../version-management/rcs/disable-t810.patch | 10 ---- 2 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 pkgs/applications/version-management/rcs/disable-t810.patch diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index f8143711318c..d814e0ca0a52 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,55 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }: stdenv.mkDerivation rec { - name = "rcs-5.9.4"; + pname = "rcs"; + version = "5.10.0"; src = fetchurl { - url = "mirror://gnu/rcs/${name}.tar.xz"; - sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"; + url = "mirror://gnu/rcs/${pname}-${version}.tar.xz"; + sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU"; }; - buildInputs = [ ed ]; + ac_cv_path_ED = "${ed}/bin/ed"; + DIFF = "${diffutils}/bin/diff"; + DIFF3 = "${diffutils}/bin/diff3"; - patches = lib.optionals stdenv.isDarwin [ - # This failure appears unrelated to the subject of the test. This - # test seems to rely on a bash bug where `test $x -nt $y` ignores - # subsecond values in timetamps. This bug has been fixed in Bash - # 5, and seemingly doesn't affect Darwin. - ./disable-t810.patch - - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch"; - extraPrefix = ""; - sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3"; - }) - - # Expected to appear in the next release - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch"; - sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx"; - }) - ]; - - doCheck = true; - - checkFlags = [ "VERBOSE=1" ]; - - checkPhase = '' - # If neither LOGNAME or USER are set, rcs will default to - # getlogin(), which is unreliable on macOS. It will often return - # things like `_spotlight`, or `_mbsetupuser`. macOS sets both - # environment variables in user sessions, so this is unlikely to - # affect regular usage. - - export LOGNAME=$(id -un) - - print_logs_and_fail() { - grep -nH -e . -r tests/*.d/{out,err} - return 1 - } - - make $checkFlags check || print_logs_and_fail - ''; + disallowedReferences = + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ buildPackages.diffutils buildPackages.ed ]; NIX_CFLAGS_COMPILE = "-std=c99"; diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch deleted file mode 100644 index 745f1868a369..000000000000 --- a/pkgs/applications/version-management/rcs/disable-t810.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900 -+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900 -@@ -1372,7 +1372,6 @@ - t803 \ - t804 \ - t805 \ -- t810 \ - t900 \ - t999 - From ec9b2e2424f69dd25a0141cc9719403511a65767 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 17 Jun 2021 01:22:29 +0200 Subject: [PATCH 61/61] openjdk: update meta.homepage --- pkgs/development/compilers/openjdk/meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index 12fe50e17672..d635d5c01e6b 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -1,5 +1,5 @@ lib: with lib; { - homepage = "http://openjdk.java.net/"; + homepage = "https://openjdk.java.net/"; license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ];