From a98025bd2109e855bdf6f334d555e66a6e0d6876 Mon Sep 17 00:00:00 2001 From: Reed Date: Sun, 29 Nov 2020 13:47:52 -0500 Subject: [PATCH 01/27] maintainers: add reedrw --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1967e7bee86..164b4eee555 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7301,6 +7301,12 @@ githubId = 816465; name = "Redvers Davies"; }; + reedrw = { + email = "reedrw5601@gmail.com"; + github = "reedrw"; + githubId = 21069876; + name = "Reed Williams"; + }; refnil = { email = "broemartino@gmail.com"; github = "refnil"; From ba5e56f3e6bf56dacfff012e497fa8f3144e9e4a Mon Sep 17 00:00:00 2001 From: Reed Date: Sun, 29 Nov 2020 14:05:26 -0500 Subject: [PATCH 02/27] r2mod_cli: init at 1.0.5 --- pkgs/games/r2mod_cli/default.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/games/r2mod_cli/default.nix diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix new file mode 100644 index 00000000000..d49dda36e57 --- /dev/null +++ b/pkgs/games/r2mod_cli/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub +, jq +, makeWrapper +, p7zip +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "r2mod_cli"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "Foldex"; + repo = "r2mod_cli"; + rev = "v${version}"; + sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m"; + }; + + buildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}"; + ''; + + meta = with stdenv.lib; { + description = "A Risk of Rain 2 Mod Manager in Bash"; + homepage = "https://github.com/foldex/r2mod_cli"; + license = licenses.gpl3Only; + maintainers = [ maintainers.reedrw ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 259a468b686..6137f9af738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25777,6 +25777,8 @@ in quantumminigolf = callPackage ../games/quantumminigolf {}; + r2mod_cli = callPackage ../games/r2mod_cli { }; + racer = callPackage ../games/racer { }; redeclipse = callPackage ../games/redeclipse { }; From fecbcb76816202e10c467d48837b66e60d5a4846 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 15 Dec 2020 21:42:28 +0700 Subject: [PATCH 03/27] knightos-kcc: 4.0.0 -> 4.0.4 --- pkgs/development/tools/knightos/kcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix index 2ec7d7f2020..364d46de56d 100644 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ b/pkgs/development/tools/knightos/kcc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kcc"; - version = "4.0.0"; + version = "4.0.4"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kcc"; rev = version; - sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; nativeBuildInputs = [ cmake bison flex ]; From 2636ff59fba11de326eb0f920874d5875439d604 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sat, 12 Dec 2020 10:56:50 +0100 Subject: [PATCH 04/27] evdi: unstable-20200416 -> v1.7.2 --- pkgs/os-specific/linux/evdi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 119ba22ca26..986bb402e57 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-20200416"; + version = "v1.7.2"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "dc595db636845aef39490496bc075f6bf067106c"; - sha256 = "1yrny6jj9403z0rxbd3nxf49xc4w0rfpl7xsq03pq32pb3vlbqw7"; + rev = version; + sha256 = "074j0xh037n8mc4isihfz9lap57wvxaxib32pvy6jhjl3wyik632"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From ef562bfe84660f7db955b1d8ee91f0b9408023f0 Mon Sep 17 00:00:00 2001 From: mohe2015 Date: Fri, 18 Dec 2020 21:54:23 +0100 Subject: [PATCH 05/27] sudo: 1.9.4 -> 1.9.4p1 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index ae29eeafd00..048c5166d6a 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4"; + version = "1.9.4p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb"; + sha256 = "EXIJnfzdL6SX4To8J0qfWSCr02rn0veqrNa8a8kv1nc="; }; prePatch = '' From 9aac494076bbc6e28029b28d8fdcf43fa758a380 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 18 Dec 2020 23:36:31 +0100 Subject: [PATCH 06/27] bazel-buildtools: 3.3.0 -> 3.5.0 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 43a70c6a765..66560e768d2 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.3.0"; + version = "3.5.0"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k"; + sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85"; }; goDeps = ./deps.nix; From 8d3f49ac0f1d76a7fbe5042f26d74413852c88f4 Mon Sep 17 00:00:00 2001 From: andys8 Date: Sat, 19 Dec 2020 11:25:32 +0100 Subject: [PATCH 07/27] maintainers: add andys8 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1b00052948..9ea9b318441 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -580,6 +580,12 @@ githubId = 3808928; name = "Anders Sildnes"; }; + andys8 = { + email = "andys8@users.noreply.github.com"; + github = "andys8"; + githubId = 13085980; + name = "Andy"; + }; aneeshusa = { email = "aneeshusa@gmail.com"; github = "aneeshusa"; From 47586f24512096c6c339512fe3fa9396cd6bf75c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 19 Dec 2020 21:48:52 +0100 Subject: [PATCH 08/27] tomb: 2.8 -> 2.8.1 --- pkgs/os-specific/linux/tomb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 9a21aab9f25..0c5a02061b8 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tomb"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "sha256-bmkUwj0FFq51MUPbNK7xsyyq4swjZcwFeMwOO3fXCzA="; + sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s"; }; buildInputs = [ sudo zsh pinentry ]; From fb5b36afc61a20515fd86cf2e4aad7f806e468ca Mon Sep 17 00:00:00 2001 From: andys8 Date: Sat, 19 Dec 2020 11:25:45 +0100 Subject: [PATCH 09/27] tty-share: init at 2.0.0 --- pkgs/applications/misc/tty-share/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/tty-share/default.nix diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix new file mode 100644 index 00000000000..a9fcb969f67 --- /dev/null +++ b/pkgs/applications/misc/tty-share/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# Upstream has a `./vendor` directory with all deps which we rely upon. +buildGoPackage rec { + pname = "tty-share"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "elisescu"; + repo = "tty-share"; + rev = "v${version}"; + sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5"; + }; + + goPackagePath = "github.com/elisescu/tty-share"; + + meta = with stdenv.lib; { + homepage = "https://tty-share.com"; + description = "Share terminal via browser for remote work or shared sessions"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ andys8 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25adca6946e..4b40d8e609d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7882,6 +7882,8 @@ in tty-clock = callPackage ../tools/misc/tty-clock { }; + tty-share = callPackage ../applications/misc/tty-share { }; + ttyplot = callPackage ../tools/misc/ttyplot { }; ttyrec = callPackage ../tools/misc/ttyrec { }; From 66a14b3e23b7faf14ec668e04d922f7df37122ff Mon Sep 17 00:00:00 2001 From: mohe2015 Date: Sun, 20 Dec 2020 16:08:21 +0100 Subject: [PATCH 10/27] eclipses: 2020-09 -> 2020-12 --- pkgs/applications/editors/eclipse/default.nix | 20 +++++++++---------- pkgs/applications/editors/eclipse/plugins.nix | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 2c175f32d62..e76983b5f8f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -12,13 +12,13 @@ assert stdenv ? glibc; # find the downloads needed for new versions # # to test: -# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done +# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "17"; + platform_minor = "18"; year = "2020"; - month = "09"; + month = "12"; timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; + sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ=="; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; + sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ=="; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; + sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg=="; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; + sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ=="; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; + sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ=="; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; + sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA=="; }; }; @@ -122,7 +122,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj"; + sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g=="; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 43ab2a796eb..0b58bc21069 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.0.1"; + version = "10.1.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; - sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { @@ -472,12 +472,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.17"; + version = "4.18"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; - sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { From 56b0eb0c6fe0749f7c5f8a45d66683b5f8fceae0 Mon Sep 17 00:00:00 2001 From: mohe2015 Date: Sun, 20 Dec 2020 16:13:31 +0100 Subject: [PATCH 11/27] eclipses.eclipse-rust: init at 2020-12 --- pkgs/applications/editors/eclipse/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e76983b5f8f..586e2343cd3 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -126,6 +126,18 @@ in rec { }; }; + ### Eclipse IDE for Rust Developers + + eclipse-rust = buildEclipse { + name = "eclipse-rust-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Rust Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw=="; + }; + }; + ### Environments # Function that assembles a complete Eclipse environment from an From b1499452b8c7e0ae584e4bbfadd5b63836249bbf Mon Sep 17 00:00:00 2001 From: Tim Kleinschmidt Date: Sun, 20 Dec 2020 18:47:42 +0100 Subject: [PATCH 12/27] duf: Add darwin supoort --- pkgs/tools/misc/duf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 29456f54cd1..ed8a11e182c 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ petabyteboy penguwin ]; }; } From 68dfd5df473b544ba65d85abc1496d176d10d9ad Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Dec 2020 04:20:00 +0000 Subject: [PATCH 13/27] languagetool: add platforms --- pkgs/tools/text/languagetool/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index fc0ec487ad5..30029d2d4e9 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; + platforms = jre.meta.platforms; description = "A proofreading program for English, French German, Polish, and more"; }; } From 4a8ed1661dcc22f90f24c80c9ab1f88a43d71563 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Dec 2020 04:20:00 +0000 Subject: [PATCH 14/27] nuspell: add platforms --- pkgs/development/libraries/nuspell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 3fac1421899..ce682e5b881 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; + platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; license = licenses.lgpl3Plus; }; From f03215596d1f264fb32637833b868b0209ae06e5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 20 Dec 2020 22:36:06 +0700 Subject: [PATCH 15/27] knightos-kimg: 0.3.0 -> 0.4.0 --- pkgs/development/tools/knightos/kimg/default.nix | 14 ++++++-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index bd4320637dc..3f3f698693d 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: +{ stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kimg"; rev = version; - sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; - - buildInputs = [ imagemagick ]; + nativeBuildInputs = [ cmake asciidoc ]; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { homepage = "https://knightos.org/"; - description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + description = "Converts image formats supported by stb_image to the KnightOS image format"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cdf4ec1650..1af242fba01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9737,7 +9737,6 @@ in knightos-kimg = callPackage ../development/tools/knightos/kimg { asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; From e853b90763feb568fec1f76b69ace1dd5610c4c0 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 20 Dec 2020 18:04:51 +0200 Subject: [PATCH 16/27] pijul: 1.0.0-alpha.21 -> 1.0.0-alpha.24 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b09267fb939..1439f792248 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.21"; + version = "1.0.0-alpha.24"; src = fetchCrate { inherit version pname; - sha256 = "0csa2a8ci6b9vgq57hyz2ng0x8pv1p1ilw72z2b8rrpacdrzb633"; + sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s"; }; - cargoSha256 = "05z5iqs63s6cvaq4sjfxhcg5ka3rwn6ikcjs26jyqcbkp2bd9z88"; + cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; From b4c6029ed8597da04ef22ca8246c15c46355263d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 17:38:34 +0100 Subject: [PATCH 17/27] geoipupdate: 4.5.0 -> 4.6.0 --- pkgs/applications/misc/geoipupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 1f2c275b13d..707a7adb8a1 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr"; + sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq"; }; vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; From 72e4e843367fe93ff14df709a84a4597bfef5ede Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Dec 2020 19:07:49 +0100 Subject: [PATCH 18/27] python3Packages.hstspreload: 2020.6.9 -> 2020.11.21 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 99612882814..cf6206d346a 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.6.9"; + version = "2020.11.21"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2"; + sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij"; }; # tests require network connection From fbefb7e7a19f2b4a91c8cd7ebe2898985cea0039 Mon Sep 17 00:00:00 2001 From: vojta001 Date: Sun, 20 Dec 2020 20:21:32 +0100 Subject: [PATCH 19/27] mirage: 0.5.2 -> 0.6.4 (#99121) * mirage: 0.5.2 -> 0.6.4 * mirage: Use qtquickcompiler to prevent QML cache problems * mirage: Mark it as broken on Darwin * mirage: refactor --- .../instant-messengers/mirage/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889b..decdb18aa06 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; From 70bcf62c0590d9aba12a1b3476dee16c0dd1d0d2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Dec 2020 05:28:47 +1000 Subject: [PATCH 20/27] conmon: 2.0.21 -> 2.0.22 https://github.com/containers/conmon/releases/tag/v2.0.22 --- pkgs/applications/virtualization/conmon/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d2f1f2debe5..e143ebcca75 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,20 +9,25 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; + sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installFlags = [ "PREFIX=$(out)" ]; + # manpage requires building the vendored go-md2man + makeFlags = [ "bin/conmon" ]; + + installPhase = '' + install -D bin/conmon -t $out/bin + ''; passthru.tests = { inherit (nixosTests) cri-o podman; }; From 5abcf9c669f5af924799a4a961caae9a44b5522e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 20 Dec 2020 20:49:25 +0100 Subject: [PATCH 21/27] perlPackages.MetaCPANClient: 2.028000 -> 2.029000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2475b1ab6be..39e203aa170 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12558,10 +12558,10 @@ let MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.028000"; + version = "2.029000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz"; - sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a"; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz"; + sha256 = "0z75qzrr6r9ijp469majavq8la2jbgn1dq02vdm5m6ip7f887n65"; }; # Most tests are online, so we only include offline tests From 4ac0d7fb6b36865a5cb1794812957ab7df0362ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:17:00 +0100 Subject: [PATCH 22/27] deluge: move files to match common nixpkgs layout No other packages have an own directory for each version with only one file in each directory. --- .../networking/p2p/deluge/{1/default.nix => 1.nix} | 0 pkgs/applications/networking/p2p/deluge/{2 => }/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/networking/p2p/deluge/{1/default.nix => 1.nix} (100%) rename pkgs/applications/networking/p2p/deluge/{2 => }/default.nix (100%) diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1.nix similarity index 100% rename from pkgs/applications/networking/p2p/deluge/1/default.nix rename to pkgs/applications/networking/p2p/deluge/1.nix diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix similarity index 100% rename from pkgs/applications/networking/p2p/deluge/2/default.nix rename to pkgs/applications/networking/p2p/deluge/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceb9bb56961..c71776008ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,11 +3331,11 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + deluge-2_x = callPackage ../applications/networking/p2p/deluge { pythonPackages = python3Packages; libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { pythonPackages = python2Packages; libtorrentRasterbar = libtorrentRasterbar-1_1_x; }; From 0dcf65711c829fc3f9816680e26ef8b2dc06b9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:19:31 +0100 Subject: [PATCH 23/27] libtorrentRasterbar: move files to match common nixpkgs layout No other packages have an own directory for each version with only one file in each directory. --- .../libtorrent-rasterbar/{1.1/default.nix => 1.1.nix} | 0 .../libtorrent-rasterbar/{1.2/default.nix => 1.2.nix} | 0 .../libraries/libtorrent-rasterbar/{2.0 => }/default.nix | 0 pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/libtorrent-rasterbar/{1.1/default.nix => 1.1.nix} (100%) rename pkgs/development/libraries/libtorrent-rasterbar/{1.2/default.nix => 1.2.nix} (100%) rename pkgs/development/libraries/libtorrent-rasterbar/{2.0 => }/default.nix (100%) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/1.1.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/1.2.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/2.0/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/2.0/default.nix rename to pkgs/development/libraries/libtorrent-rasterbar/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71776008ac..1e4670e667c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14676,16 +14676,16 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar/2.0 { + libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; python = python3; }; - libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { + libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; - libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; + libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; libtorrentRasterbar = libtorrentRasterbar-2_0_x; From a333985d59dd190f7b3dd96c862962fc8a09c5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 20 Dec 2020 14:35:14 +0100 Subject: [PATCH 24/27] libtorrentRasterbar: rename to libtorrent-rasterbar This is done to match upstream naming: https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379 --- pkgs/applications/networking/p2p/deluge/1.nix | 4 ++-- pkgs/applications/networking/p2p/deluge/default.nix | 4 ++-- .../networking/p2p/qbittorrent/default.nix | 4 ++-- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/games/spring/springlobby.nix | 4 ++-- pkgs/os-specific/linux/btfs/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 12 ++++++------ pkgs/top-level/python-packages.nix | 6 +++--- 10 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/p2p/deluge/1.nix b/pkgs/applications/networking/p2p/deluge/1.nix index 7ab33792415..aa70f969d22 100644 --- a/pkgs/applications/networking/p2p/deluge/1.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 2e9f08ce98a..f9c421c4087 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools setproctitle pillow rencode six zope_interface dbus-python pygobject3 pycairo gtk3 gobject-introspection librsvg diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ac671729392..2e69ad23e14 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig -, boost, libtorrentRasterbar, qtbase, qttools, qtsvg +, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -24,7 +24,7 @@ mkDerivation rec { # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] + buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support ++ optional trackerSearch python3; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd71..d30697a4df0 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - python3Packages.libtorrentRasterbar + python3Packages.libtorrent-rasterbar python3Packages.twisted python3Packages.netifaces python3Packages.pycrypto diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6863ef9ca62..12c16a744b0 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -467,7 +467,7 @@ let self = rec { propagatedBuildInputs = [ simpleplugin python2Packages.requests - python2Packages.libtorrentRasterbar + python2Packages.libtorrent-rasterbar ]; meta = { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 33dc364c5b7..231090419e6 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar +{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; buildInputs = [ - wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp + wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 glib minizip alure ]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 762baa58711..6d919ce57d4 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, python3, boost, fuse, libtorrentRasterbar, curl }: +, python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { pname = "btfs"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - boost fuse libtorrentRasterbar curl python3 + boost fuse libtorrent-rasterbar curl python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4ce4b4536..3f7b4c424e5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -700,6 +700,10 @@ mapAliases ({ gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 + libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e4670e667c..92c9ff5286d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3333,11 +3333,11 @@ in deluge-2_x = callPackage ../applications/networking/p2p/deluge { pythonPackages = python3Packages; - libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; }; deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { pythonPackages = python2Packages; - libtorrentRasterbar = libtorrentRasterbar-1_1_x; + libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; }; deluge = deluge-2_x; @@ -14676,18 +14676,18 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { + libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; python = python3; }; - libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { + libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; - libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; + libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; - libtorrentRasterbar = libtorrentRasterbar-2_0_x; + libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ceb6cda984f..440b53aaf2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3514,10 +3514,10 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrentRasterbar = if isPy27 then - (toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python + libtorrent-rasterbar = if isPy27 then + (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python else - (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; From 08319d052222c506248776373d08089d849d0a08 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 20 Dec 2020 16:11:31 -0700 Subject: [PATCH 25/27] sdrangel: add soapysdr dependency --- pkgs/applications/radio/sdrangel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index dd8c56610c2..007be93b78e 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -26,6 +26,7 @@ qtserialport, qtwebsockets, rtl-sdr, serialdv, +soapysdr-with-plugins, uhd }: @@ -46,7 +47,7 @@ mkDerivation rec { glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport - libbladeRF uhd + libbladeRF uhd soapysdr-with-plugins ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" From 640d92513d69cc1a3188c72297816133fbd467e0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 7 Dec 2020 00:42:18 +0100 Subject: [PATCH 26/27] buildDunePackage: use dune install instead of opaline --- pkgs/build-support/ocaml/dune.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index b134effab8a..fce0096c83d 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, dune_2, opaline }: +{ stdenv, ocaml, findlib, dune, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: @@ -25,7 +25,7 @@ stdenv.mkDerivation ({ ''; installPhase = '' runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} runHook postInstall ''; From e55f77277b59fabd3c220f4870a44de705b1babb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Dec 2020 01:29:55 +0100 Subject: [PATCH 27/27] python3Packages.hstspreload: add pythonImportsCheck --- pkgs/development/python-modules/hstspreload/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index cf6206d346a..9944816f8a1 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # tests require network connection doCheck = false; + pythonImportsCheck = [ "hstspreload" ]; + meta = with lib; { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload";