From 8c270aea543b48ea4b913ecbeeaad800cd0d4218 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Sat, 6 Apr 2024 15:55:53 +0200 Subject: [PATCH 001/217] ycmd: add rust completion support --- pkgs/by-name/yc/ycmd/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 986390a19dae..eb9a3db9e33d 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -8,6 +8,8 @@ , godef , withGotools ? true , gotools +, withRustAnalyzer ? true +, rust-analyzer , withTypescript ? true , typescript , abseil-cpp @@ -82,6 +84,10 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls mkdir -p $TARGET ln -sf ${gotools}/bin/gopls $TARGET + '' + lib.optionalString withRustAnalyzer '' + TARGET=$out/lib/ycmd/third_party/rust-analyzer + mkdir -p $TARGET + ln -sf ${rust-analyzer} $TARGET '' + lib.optionalString withTypescript '' TARGET=$out/lib/ycmd/third_party/tsserver ln -sf ${typescript} $TARGET From b9d30709a592a52a73c8f7aca2d4bbbfed08f828 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 25 Mar 2022 11:17:27 +0100 Subject: [PATCH 002/217] extlinux-conf-builder: don't emit MENU when timeout is zero --- .../extlinux-conf-builder.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 1a0da0050291..96d96e3cf62c 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -11,18 +11,24 @@ usage() { } timeout= # Timeout in centiseconds +menu=1 # Enable menu by default default= # Default configuration target=/boot # Target directory numGenerations=0 # Number of other generations to include in the menu while getopts "t:c:d:g:n:r" opt; do case "$opt" in - t) # U-Boot interprets '0' as infinite and negative as instant boot + t) # U-Boot interprets '0' as infinite if [ "$OPTARG" -lt 0 ]; then + # When negative (or null coerced to -1), disable timeout which means that we wait forever for input timeout=0 elif [ "$OPTARG" = 0 ]; then - timeout=-10 + # When zero, which means disabled in Nix module, disable menu which results in instant boot of the default item + # .. timeout is actually ignored by u-Boot but set here for the rest of the script + timeout=1 + menu=0 else + # Positive results in centi-seconds of timeout, which when passed with no input results in boot of the default item timeout=$((OPTARG * 10)) fi ;; @@ -126,10 +132,12 @@ cat > $tmpFile <> $tmpFile + addEntry $default default >> $tmpFile if [ "$numGenerations" -gt 0 ]; then From 16934a90e6a85762bb1be20c1ecf8405ee84627f Mon Sep 17 00:00:00 2001 From: Justin Rubek <25621857+justinrubek@users.noreply.github.com> Date: Sat, 17 Aug 2024 15:37:26 -0500 Subject: [PATCH 003/217] maintainers: add justinrubek --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e3ac4dd33a4..099b85814add 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10365,6 +10365,11 @@ githubId = 7183441; name = "Justin Lovinger"; }; + justinrubek = { + github = "justinrubek"; + githubId = 25621857; + name = "Justin Rubek"; + }; justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; From 45e1048834cd1d8974e3fec4a09a329bd9f0a592 Mon Sep 17 00:00:00 2001 From: thomaslepoix Date: Sun, 13 Oct 2024 20:01:22 +0200 Subject: [PATCH 004/217] maintainers: add thomaslepoix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a0df938571f1..af25756413b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21406,6 +21406,12 @@ githubId = 1634990; name = "Tom McLaughlin"; }; + thomaslepoix = { + email = "thomas.lepoix@protonmail.ch"; + github = "thomaslepoix"; + githubId = 26417323; + name = "Thomas Lepoix"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; From ce97cf12501e420538ea15e758c6f6d086e6aeff Mon Sep 17 00:00:00 2001 From: Justin Rubek <25621857+justinrubek@users.noreply.github.com> Date: Sat, 17 Aug 2024 15:25:16 -0500 Subject: [PATCH 005/217] rain-bittorrent: init at 1.30.0 --- pkgs/by-name/ra/rain-bittorrent/package.nix | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ra/rain-bittorrent/package.nix diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix new file mode 100644 index 000000000000..469fe096db0f --- /dev/null +++ b/pkgs/by-name/ra/rain-bittorrent/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule { + pname = "rain"; + version = "1.30.0"; + + src = fetchFromGitHub { + owner = "cenkalti"; + repo = "rain"; + rev = "v1.13.0"; + sha256 = "sha256-pz20vhr3idXja7wYIdVr1dosSpqYiQfeho66rqd718I="; + }; + + vendorHash = "sha256-40DK0D9TRJDfrMbBJNpcNzvjKb/uXN/Yz5Bb7oXBh+E="; + + meta = with lib; { + description = "BitTorrent client and library in Go"; + homepage = "https://github.com/cenkalti/rain"; + license = licenses.mit; + maintainers = with maintainers; [ justinrubek ]; + mainProgram = "rain"; + }; +} From f12daedb13ab9e895de79b6a83be33b6738d8f0b Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 31 Oct 2024 20:32:24 +0100 Subject: [PATCH 006/217] python3Packages.databricks-sql-connector: drop bad patch, relax thrift dep --- .../databricks-sql-connector/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 923cfa7a8cb2..2c3243a11576 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -16,7 +16,6 @@ thrift, requests, urllib3, - fetchpatch, }: buildPythonPackage rec { @@ -33,16 +32,9 @@ buildPythonPackage rec { hash = "sha256-8q5qWN+i2mGbzXvkop/G6mjZegzZ/6kr1Fl7FaHwLYA="; }; - patches = [ - (fetchpatch { - name = "fix-pandas.patch"; - url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch"; - sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek="; - }) - ]; - pythonRelaxDeps = [ "pyarrow" + "thrift" ]; nativeBuildInputs = [ From 1f24e9b5f5ac6b23b0024543c78abe0f9dca1013 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 21 Oct 2024 20:48:22 +0200 Subject: [PATCH 007/217] minion: init at 3.0.12 --- pkgs/by-name/mi/minion/package.nix | 76 ++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 pkgs/by-name/mi/minion/package.nix diff --git a/pkgs/by-name/mi/minion/package.nix b/pkgs/by-name/mi/minion/package.nix new file mode 100644 index 000000000000..03f964b27740 --- /dev/null +++ b/pkgs/by-name/mi/minion/package.nix @@ -0,0 +1,76 @@ +{ + stdenvNoCC, + lib, + fetchzip, + openjfx21, + openjdk21, + makeDesktopItem, + wrapGAppsHook3, + makeBinaryWrapper, +}: + +let + openjfx_jdk = openjfx21.override { withWebKit = true; }; + openjdk = openjdk21.override { + enableJavaFX = true; + inherit openjfx_jdk; + }; + + jvmArgs = [ + "-cp $out/share/minion/lib" + "--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED" + "--add-exports=javafx.graphics/javafx.scene.image=ALL-UNNAMED" + "--add-opens=javafx.graphics/javafx.scene.image=ALL-UNNAMED" + "--add-opens=java.base/java.lang=ALL-UNNAMED" + ]; +in +stdenvNoCC.mkDerivation rec { + version = "3.0.12"; + pname = "minion"; + + src = fetchzip { + url = "https://cdn.mmoui.com/minion/v3/Minion${version}-java.zip"; + hash = "sha256-KjSj3TBMY3y5kgIywtIDeil0L17dau/Rb2HuXAulSO8="; + stripRoot = false; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + wrapGAppsHook3 + ]; + + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + install -D Minion-jfx.jar "$out/share/minion/Minion-jfx.jar" + cp -r ./lib "$out/share/minion/" + + makeWrapper ${lib.getExe openjdk} $out/bin/minion \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "${lib.concatStringsSep " " jvmArgs} -jar $out/share/minion/Minion-jfx.jar" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "minion"; + exec = "minion"; + comment = "MMO Addon manager for Elder Scrolls Online and World of Warcraft"; + desktopName = "Minion"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "Addon manager for World of Warcraft and The Elder Scrolls Online"; + homepage = "https://minion.mmoui.com/"; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + mainProgram = "minion"; + maintainers = with lib.maintainers; [ patrickdag ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +} From a60bf9d8bcebbf3fc39fcdf69748b8e3811f47f6 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 9 Nov 2024 17:03:14 +0000 Subject: [PATCH 008/217] python312Packages.graph-tool: 2.78 -> 2.79 https://git.skewed.de/count0/graph-tool/-/compare/refs/tags/release-2.78..refs/tags/release-2.79 --- .../python-modules/graph-tool/default.nix | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index ff0ab4f62787..923634117b28 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -4,7 +4,6 @@ fetchurl, stdenv, - autoreconfHook, boost185, cairomm, cgal, @@ -34,26 +33,19 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.78"; + version = "2.79"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-gG9TWKRJISOowRIXI1/ROTIwrVwhxFtMOextXqN6KiU="; + hash = "sha256-UqJUlC517TBw3qcOaSrhAYd7vvEAnkPsYv4YBqjeAVQ="; }; - # Remove error messages about tput during build process without adding ncurses, - # and replace unavailable git commit hash and date. postPatch = '' - substituteInPlace configure.ac \ + # remove error messages about tput during build process without adding ncurses + substituteInPlace configure \ --replace-fail 'tput setaf $1' : \ - --replace-fail 'tput sgr0' : \ - --replace-fail \ - "\"esyscmd(git show | head -n 1 | sed 's/commit //' | grep -o -e '.\{8\}' | head -n 1 |tr -d '\n')\"" \ - '["(nixpkgs-${version})"]' \ - --replace-fail \ - "\"esyscmd(git log -1 | head -n 3 | grep 'Date:' | sed s/'Date: '// | tr -d '\n')\"" \ - '["(unavailable)"]' + --replace-fail 'tput sgr0' : ''; configureFlags = [ @@ -64,10 +56,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - build-system = [ - autoreconfHook - pkg-config - ]; + build-system = [ pkg-config ]; # https://graph-tool.skewed.de/installation.html#manual-compilation dependencies = [ From 12b908e27f74c7dd8948a17a5f72a81069171f44 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 27 Nov 2024 11:37:52 -0500 Subject: [PATCH 009/217] graphia: 4.2 -> 5.1 --- pkgs/applications/science/misc/graphia/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index 88fc3a8c0e57..5aaab612f9ae 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -13,24 +13,15 @@ stdenv.mkDerivation rec { pname = "graphia"; - version = "4.2"; + version = "5.1"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-8+tlQbTr6BGx+/gjviuNrQQWcxC/j6dJ+PxwB4fYmqQ="; + sha256 = "sha256-gAJwAz3iKa4auRtsrPS9dz3ieiB09FeL6VN5Psq1i8Y="; }; - patches = [ - # Fix gcc-13 build: - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/graphia-app/graphia/commit/78fb55a4d73f96e9a182de433c7da60330bd5b5e.patch"; - hash = "sha256-waI2ur3gOKMQvqB2Qnyz7oMOMConl3jLMVKKmOmTpJs="; - }) - ]; - nativeBuildInputs = [ cmake git # needs to define some hash as a version From 43afe45c4a8279a0e0df11ca17179987bc45c30e Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 30 Nov 2024 23:15:16 -0500 Subject: [PATCH 010/217] skim: format with nixfmt --- pkgs/by-name/sk/skim/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 4e09f021cc5f..979b011a3544 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, installShellFiles +{ + lib, + stdenv, + fetchCrate, + installShellFiles, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -16,7 +17,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - outputs = [ "out" "vim" ]; + outputs = [ + "out" + "vim" + ]; cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos="; @@ -49,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "Command-line fuzzy finder written in Rust"; homepage = "https://github.com/lotabout/skim"; license = licenses.mit; - mainProgram = "sk"; maintainers = with maintainers; [ dywedir ]; + mainProgram = "sk"; }; } From 38383e40957f955e7fcb31a6a4b0f1063b98df9e Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 30 Nov 2024 23:40:46 -0500 Subject: [PATCH 011/217] skim: modernize --- pkgs/by-name/sk/skim/package.nix | 57 ++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 979b011a3544..195f2deb0b69 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -3,6 +3,8 @@ stdenv, fetchCrate, installShellFiles, + nix-update-script, + runtimeShell, rustPlatform, }: @@ -10,50 +12,57 @@ rustPlatform.buildRustPackage rec { pname = "skim"; version = "0.10.4"; + outputs = [ + "out" + "man" + "vim" + ]; + src = fetchCrate { inherit pname version; hash = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0="; }; - nativeBuildInputs = [ installShellFiles ]; - - outputs = [ - "out" - "vim" - ]; - - cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos="; - postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - postInstall = '' - install -D -m 555 bin/sk-tmux -t $out/bin + cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos="; - install -D -m 444 plugin/skim.vim -t $vim/plugin + nativeBuildInputs = [ installShellFiles ]; - install -D -m 444 shell/* -t $out/share/skim - - installManPage man/man1/* - - cat <