From d42c42b164b670152d96289fe2cf455d3010deb7 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 19 Jun 2024 17:55:18 +0100 Subject: [PATCH 01/20] yazi: add eljamm as maintainer --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 77a9b9ad8b5b..7f536d92674c 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Blazing fast terminal file manager written in Rust, based on async I/O"; homepage = "https://github.com/sxyazi/yazi"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xyenon matthiasbeyer linsui ]; + maintainers = with lib.maintainers; [ xyenon matthiasbeyer linsui eljamm ]; mainProgram = "yazi"; }; } From 1f6b8d25b8b364908ca2aeac3bfc4b9ebb7d6aa4 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 20 Jun 2024 11:05:47 +0100 Subject: [PATCH 02/20] yazi: clean up wrapper, add options and format - Remove redundant `withX` options - Add `optionalDeps`: packages that provide additional features - Add `extraPackages`: user-defined packages - Format with nixfmt --- pkgs/by-name/ya/yazi/package.nix | 152 ++++++++++++++++--------------- 1 file changed, 78 insertions(+), 74 deletions(-) diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 276d0251710b..66d74e019d20 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -1,89 +1,93 @@ -{ lib -, runCommand -, makeWrapper -, yazi-unwrapped +{ + lib, + formats, + runCommand, + makeWrapper, -, withRuntimeDeps ? true -, withFile ? true -, file -, withJq ? true -, jq -, withPoppler ? true -, poppler_utils -, withUnar ? true -, unar -, withFfmpegthumbnailer ? true -, ffmpegthumbnailer -, withFd ? true -, fd -, withRipgrep ? true -, ripgrep -, withFzf ? true -, fzf -, withZoxide ? true -, zoxide -, settings ? { } -, formats -, plugins ? { } -, flavors ? { } -, initLua ? null + extraPackages ? [ ], + optionalDeps ? [ + jq + poppler_utils + unar + ffmpegthumbnailer + fd + ripgrep + fzf + zoxide + ], + + # deps + file, + yazi-unwrapped, + + # optional deps + jq, + poppler_utils, + unar, + ffmpegthumbnailer, + fd, + ripgrep, + fzf, + zoxide, + + settings ? { }, + plugins ? { }, + flavors ? { }, + initLua ? null, }: let - runtimePaths = with lib; - [ ] - ++ optional withFile file - ++ optional withJq jq - ++ optional withPoppler poppler_utils - ++ optional withUnar unar - ++ optional withFfmpegthumbnailer ffmpegthumbnailer - ++ optional withFd fd - ++ optional withRipgrep ripgrep - ++ optional withFzf fzf - ++ optional withZoxide zoxide; + runtimePaths = [ file ] ++ optionalDeps ++ extraPackages; settingsFormat = formats.toml { }; - files = [ "yazi" "theme" "keymap" ]; + files = [ + "yazi" + "theme" + "keymap" + ]; - configHome = if (settings == { } && initLua == null && plugins == { } && flavors == { }) then null else - runCommand "YAZI_CONFIG_HOME" { } '' - mkdir -p $out - ${lib.concatMapStringsSep - "\n" - (name: lib.optionalString (settings ? ${name} && settings.${name} != { }) '' - ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml - '') - files} + configHome = + if (settings == { } && initLua == null && plugins == { } && flavors == { }) then + null + else + runCommand "YAZI_CONFIG_HOME" { } '' + mkdir -p $out + ${lib.concatMapStringsSep "\n" ( + name: + lib.optionalString (settings ? ${name} && settings.${name} != { }) '' + ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml + '' + ) files} - mkdir $out/plugins - ${lib.optionalString (plugins != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins)} - ''} + mkdir $out/plugins + ${lib.optionalString (plugins != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins + )} + ''} - mkdir $out/flavors - ${lib.optionalString (flavors != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors)} - ''} + mkdir $out/flavors + ${lib.optionalString (flavors != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors + )} + ''} - ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} - ''; + ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} + ''; in -if (!withRuntimeDeps && configHome == null) then yazi-unwrapped else runCommand yazi-unwrapped.name -{ - inherit (yazi-unwrapped) pname version meta; + { + inherit (yazi-unwrapped) pname version meta; - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/bin - ln -s ${yazi-unwrapped}/share $out/share - makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ - ${lib.optionalString withRuntimeDeps "--prefix PATH : \"${lib.makeBinPath runtimePaths}\""} \ - ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} -'' + nativeBuildInputs = [ makeWrapper ]; + } + '' + mkdir -p $out/bin + ln -s ${yazi-unwrapped}/share $out/share + makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ + --prefix PATH : ${lib.makeBinPath runtimePaths} \ + ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} + '' From 03e36cbbecef9617c0bedaeb3fbb6fd1abbeaf84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 01:48:40 +0000 Subject: [PATCH 03/20] python311Packages.bundlewrap: 4.18.0 -> 4.19.0 --- pkgs/development/python-modules/bundlewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index c77d8bfe7af1..dcafcf140848 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.18.0"; + version = "4.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = "refs/tags/${version}"; - hash = "sha256-7jBFeJem+0vZot+BknKmCxozmoHCBCAZqDbfQQG3/Vw="; + hash = "sha256-sNdtJRpP54xlkYis4whoGiJJ/Tjnrs4TW6EO3eAMBAo="; }; nativeBuildInputs = [ setuptools ]; From 091d8370a215b384b6cdb5448e5c7110ada9d32b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 29 Jun 2024 16:25:25 +0200 Subject: [PATCH 04/20] devShellTools: init (empty) --- doc/build-helpers.md | 1 + doc/build-helpers/dev-shell-tools.chapter.md | 14 ++++++++++++++ pkgs/build-support/dev-shell-tools/README.md | 13 +++++++++++++ pkgs/build-support/dev-shell-tools/default.nix | 4 ++++ .../dev-shell-tools/tests/default.nix | 5 +++++ pkgs/test/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 ++ 7 files changed, 41 insertions(+) create mode 100644 doc/build-helpers/dev-shell-tools.chapter.md create mode 100644 pkgs/build-support/dev-shell-tools/README.md create mode 100644 pkgs/build-support/dev-shell-tools/default.nix create mode 100644 pkgs/build-support/dev-shell-tools/tests/default.nix diff --git a/doc/build-helpers.md b/doc/build-helpers.md index 06737e166760..010665484cfd 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -20,6 +20,7 @@ There is no uniform interface for build helpers. build-helpers/fetchers.chapter.md build-helpers/trivial-build-helpers.chapter.md build-helpers/testers.chapter.md +build-helpers/dev-shell-tools.chapter.md build-helpers/special.md build-helpers/images.md hooks/index.md diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md new file mode 100644 index 000000000000..09b9893daff7 --- /dev/null +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -0,0 +1,14 @@ +# Development Shell helpers {#chap-devShellTools} + +The `nix-shell` command has popularized the concept of transient shell environments for development or testing purposes. + +However, `nix-shell` is not the only way to create such environments, and even `nix-shell` itself can indirectly benefit from this library. + +This library provides a set of functions that help create such environments. + + diff --git a/pkgs/build-support/dev-shell-tools/README.md b/pkgs/build-support/dev-shell-tools/README.md new file mode 100644 index 000000000000..d6d9a8c8ad0d --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/README.md @@ -0,0 +1,13 @@ + +# `devShellTools` + +This directory implements the `pkgs.devShellTools` library. + +# Contributing to `devShellTools` + +- Documentation should be contributed to the Nixpkgs manual, not here. + +- Tests are available in the `tests` directory. + You may run them with `nix-build -A tests.devShellTools`. + +- See [../../README.md](../../README.md) for more information on contributing to Nixpkgs. diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix new file mode 100644 index 000000000000..b61813bb4eb6 --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -0,0 +1,4 @@ +{ }: + +{ +} diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix new file mode 100644 index 000000000000..d8147ea85118 --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 2b978ff3e1bc..1b7882bcbed3 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -83,6 +83,8 @@ with pkgs; inherit gccTests; }; + devShellTools = callPackage ../build-support/dev-shell-tools/tests { }; + stdenv-inputs = callPackage ./stdenv-inputs { }; stdenv = callPackage ./stdenv { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c202166f41a8..f5520bfe3631 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -837,6 +837,8 @@ with pkgs; grsync = callPackage ../applications/misc/grsync { }; + devShellTools = callPackage ../build-support/dev-shell-tools { }; + dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; } // { __attrsFailEvaluation = true; }; From 469039098bfb7f3c9b1c6229139f22e4ef89d704 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 29 Jun 2024 17:07:17 +0200 Subject: [PATCH 05/20] devShellTools.stringValue: init --- doc/build-helpers/dev-shell-tools.chapter.md | 17 ++++++- .../build-support/dev-shell-tools/default.nix | 18 ++++++-- .../dev-shell-tools/tests/default.nix | 44 ++++++++++++++++++- pkgs/build-support/docker/default.nix | 16 +++---- 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 09b9893daff7..4f6980143210 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -11,4 +11,19 @@ However, `nix-shell` is not the only way to create such environments, and even ` This library provides a set of functions that help create such environments. - +## `devShellTools.stringValue` {#sec-devShellTools-stringValue} + +Converts Nix values to strings in the way the [`derivation` built-in function](https://nix.dev/manual/nix/2.23/language/derivations) does. + +:::{.example} +## `stringValue` usage examples + +```nix +devShellTools.stringValue (builtins.toFile "foo" "bar") +=> "/nix/store/...-foo" +``` + +```nix +devShellTools.stringValue false +=> "" +``` diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix index b61813bb4eb6..f0f180dc1905 100644 --- a/pkgs/build-support/dev-shell-tools/default.nix +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -1,4 +1,16 @@ -{ }: - -{ +{ lib }: +let + inherit (builtins) typeOf; +in +rec { + # This function closely mirrors what this Nix code does: + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 + stringValue = value: + # We can't just use `toString` on all derivation attributes because that + # would not put path literals in the closure. So we explicitly copy + # those into the store here + if typeOf value == "path" then "${value}" + else if typeOf value == "list" then toString (map stringValue value) + else toString value; } diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix index d8147ea85118..d4b0872dd6b8 100644 --- a/pkgs/build-support/dev-shell-tools/tests/default.nix +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -1,5 +1,45 @@ -{ ... }: - { + devShellTools, + emptyFile, + lib, + stdenv, + hello, +}: +let + inherit (lib) escapeShellArg; +in +{ + # nix-build -A tests.devShellTools.stringValue + stringValue = + let inherit (devShellTools) stringValue; in + stdenv.mkDerivation { + name = "devShellTools-stringValue-built-tests"; + + # Test inputs + inherit emptyFile hello; + one = 1; + boolTrue = true; + boolFalse = false; + foo = "foo"; + list = [ 1 2 3 ]; + pathDefaultNix = ./default.nix; + packages = [ hello emptyFile ]; + # TODO: nested lists + + buildCommand = '' + touch $out + ( set -x + [[ "$one" = ${escapeShellArg (stringValue 1)} ]] + [[ "$boolTrue" = ${escapeShellArg (stringValue true)} ]] + [[ "$boolFalse" = ${escapeShellArg (stringValue false)} ]] + [[ "$foo" = ${escapeShellArg (stringValue "foo")} ]] + [[ "$hello" = ${escapeShellArg (stringValue hello)} ]] + [[ "$list" = ${escapeShellArg (stringValue [ 1 2 3 ])} ]] + [[ "$packages" = ${escapeShellArg (stringValue [ hello emptyFile ])} ]] + [[ "$pathDefaultNix" = ${escapeShellArg (stringValue ./default.nix)} ]] + [[ "$emptyFile" = ${escapeShellArg (stringValue emptyFile)} ]] + ) >log 2>&1 || { cat log; exit 1; } + ''; + }; } diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1d1989d27fbb..033969a7fc88 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -4,6 +4,7 @@ , callPackage , closureInfo , coreutils +, devShellTools , e2fsprogs , proot , fakeNss @@ -49,6 +50,10 @@ let toList ; + inherit (devShellTools) + stringValue + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -1173,17 +1178,6 @@ rec { # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 sandboxBuildDir = "/build"; - # This function closely mirrors what this Nix code does: - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 - stringValue = value: - # We can't just use `toString` on all derivation attributes because that - # would not put path literals in the closure. So we explicitly copy - # those into the store here - if builtins.typeOf value == "path" then "${value}" - else if builtins.typeOf value == "list" then toString (map stringValue value) - else toString value; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004 drvEnv = lib.mapAttrs' (name: value: let str = stringValue value; From 8398e087cdf4b41d5495a9b623a1fbf026471c78 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 29 Jun 2024 17:22:57 +0200 Subject: [PATCH 06/20] devShellTools.{stringValue -> valueToString} --- doc/build-helpers/dev-shell-tools.chapter.md | 8 +++--- .../build-support/dev-shell-tools/default.nix | 4 +-- .../dev-shell-tools/tests/default.nix | 26 +++++++++---------- pkgs/build-support/docker/default.nix | 6 ++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 4f6980143210..21636df8017b 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -11,19 +11,19 @@ However, `nix-shell` is not the only way to create such environments, and even ` This library provides a set of functions that help create such environments. -## `devShellTools.stringValue` {#sec-devShellTools-stringValue} +## `devShellTools.valueToString` {#sec-devShellTools-valueToString} Converts Nix values to strings in the way the [`derivation` built-in function](https://nix.dev/manual/nix/2.23/language/derivations) does. :::{.example} -## `stringValue` usage examples +## `valueToString` usage examples ```nix -devShellTools.stringValue (builtins.toFile "foo" "bar") +devShellTools.valueToString (builtins.toFile "foo" "bar") => "/nix/store/...-foo" ``` ```nix -devShellTools.stringValue false +devShellTools.valueToString false => "" ``` diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix index f0f180dc1905..cd5fa5f5937e 100644 --- a/pkgs/build-support/dev-shell-tools/default.nix +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -6,11 +6,11 @@ rec { # This function closely mirrors what this Nix code does: # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 - stringValue = value: + valueToString = value: # We can't just use `toString` on all derivation attributes because that # would not put path literals in the closure. So we explicitly copy # those into the store here if typeOf value == "path" then "${value}" - else if typeOf value == "list" then toString (map stringValue value) + else if typeOf value == "list" then toString (map valueToString value) else toString value; } diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix index d4b0872dd6b8..bfedc04409a9 100644 --- a/pkgs/build-support/dev-shell-tools/tests/default.nix +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -9,12 +9,12 @@ let inherit (lib) escapeShellArg; in { - # nix-build -A tests.devShellTools.stringValue - stringValue = - let inherit (devShellTools) stringValue; in + # nix-build -A tests.devShellTools.valueToString + valueToString = + let inherit (devShellTools) valueToString; in stdenv.mkDerivation { - name = "devShellTools-stringValue-built-tests"; + name = "devShellTools-valueToString-built-tests"; # Test inputs inherit emptyFile hello; @@ -30,15 +30,15 @@ in buildCommand = '' touch $out ( set -x - [[ "$one" = ${escapeShellArg (stringValue 1)} ]] - [[ "$boolTrue" = ${escapeShellArg (stringValue true)} ]] - [[ "$boolFalse" = ${escapeShellArg (stringValue false)} ]] - [[ "$foo" = ${escapeShellArg (stringValue "foo")} ]] - [[ "$hello" = ${escapeShellArg (stringValue hello)} ]] - [[ "$list" = ${escapeShellArg (stringValue [ 1 2 3 ])} ]] - [[ "$packages" = ${escapeShellArg (stringValue [ hello emptyFile ])} ]] - [[ "$pathDefaultNix" = ${escapeShellArg (stringValue ./default.nix)} ]] - [[ "$emptyFile" = ${escapeShellArg (stringValue emptyFile)} ]] + [[ "$one" = ${escapeShellArg (valueToString 1)} ]] + [[ "$boolTrue" = ${escapeShellArg (valueToString true)} ]] + [[ "$boolFalse" = ${escapeShellArg (valueToString false)} ]] + [[ "$foo" = ${escapeShellArg (valueToString "foo")} ]] + [[ "$hello" = ${escapeShellArg (valueToString hello)} ]] + [[ "$list" = ${escapeShellArg (valueToString [ 1 2 3 ])} ]] + [[ "$packages" = ${escapeShellArg (valueToString [ hello emptyFile ])} ]] + [[ "$pathDefaultNix" = ${escapeShellArg (valueToString ./default.nix)} ]] + [[ "$emptyFile" = ${escapeShellArg (valueToString emptyFile)} ]] ) >log 2>&1 || { cat log; exit 1; } ''; }; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 033969a7fc88..ea461ccffa07 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -51,7 +51,7 @@ let ; inherit (devShellTools) - stringValue + valueToString ; mkDbExtraCommand = contents: @@ -1146,7 +1146,7 @@ rec { # A binary that calls the command to build the derivation builder = writeShellScriptBin "buildDerivation" '' - exec ${lib.escapeShellArg (stringValue drv.drvAttrs.builder)} ${lib.escapeShellArgs (map stringValue drv.drvAttrs.args)} + exec ${lib.escapeShellArg (valueToString drv.drvAttrs.builder)} ${lib.escapeShellArgs (map valueToString drv.drvAttrs.args)} ''; staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; @@ -1180,7 +1180,7 @@ rec { # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004 drvEnv = lib.mapAttrs' (name: value: - let str = stringValue value; + let str = valueToString value; in if lib.elem name (drv.drvAttrs.passAsFile or []) then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str) else lib.nameValuePair name str From 92f973586453be67f4ab5cecf5acbb0a68794b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 26 Jun 2024 10:47:48 -0300 Subject: [PATCH 07/20] marwaita-icons: init at 5.0 --- pkgs/by-name/ma/marwaita-icons/package.nix | 53 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/by-name/ma/marwaita-icons/package.nix diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix new file mode 100644 index 000000000000..022e56b834e5 --- /dev/null +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, hicolor-icon-theme +, pantheon +}: + +stdenvNoCC.mkDerivation rec { + pname = "marwaita-icons"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-icons"; + rev = version; + hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + hicolor-icon-theme + pantheon.elementary-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Marwaita* $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache "$theme" + done + + runHook postInstall + ''; + + meta = { + description = "Icon pack for linux"; + homepage = "https://github.com/darkomarko42/Marwaita-Icons"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04cb6100324c..f9680635f62a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28637,6 +28637,10 @@ with pkgs; marwaita = callPackage ../data/themes/marwaita { }; + marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { + inherit (kdePackages) breeze-icons; + }; + marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; From 5ceac78a19405870e9861f1f6a66de8aadd70e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Jul 2024 08:39:34 -0700 Subject: [PATCH 08/20] python311Packages.here-routing: 1.0.0 -> 1.0.1 Diff: https://github.com/eifinger/here_routing/compare/v1.0.0...v1.0.1 Changelog: https://github.com/eifinger/here_routing/releases/tag/v1.0.1 --- .../python-modules/here-routing/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix index 0ab74bcd2bb6..d8e6e4a3c800 100644 --- a/pkgs/development/python-modules/here-routing/default.nix +++ b/pkgs/development/python-modules/here-routing/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-routing"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_routing"; rev = "v${version}"; - hash = "sha256-wdjPbM9J+2q3NisdlOHIddSWHHIfwQY/83v6IBAXSq0="; + hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_routing" ]; meta = { - changelog = "https://github.com/eifinger/here_routing/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_routing/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_routing"; license = lib.licenses.mit; From 55dbedb9590009e44aa4b1844754700dd5d722e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Jul 2024 08:40:16 -0700 Subject: [PATCH 09/20] python311Packages.here-transit: 1.2.0 -> 1.2.1 Diff: https://github.com/eifinger/here_transit/compare/v1.2.0...v1.2.1 Changelog: https://github.com/eifinger/here_transit/releases/tag/v1.2.1 --- .../python-modules/here-transit/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix index 8c9ef33e5715..2aae9b51fe53 100644 --- a/pkgs/development/python-modules/here-transit/default.nix +++ b/pkgs/development/python-modules/here-transit/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-transit"; - version = "1.2.0"; + version = "1.2.1"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_transit"; rev = "v${version}"; - hash = "sha256-C5HZZCmK9ILUUXyx1i/cUggSM3xbOzXiJ13hrT2DWAI="; + hash = "sha256-fORg1iqRcD75Is1EW9XeAu8astibypmnNXo3vHduQdk="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_transit" ]; meta = { - changelog = "https://github.com/eifinger/here_transit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_transit/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_transit"; license = lib.licenses.mit; From 00095ffa6097be5ac8379066d4a270087c9376fd Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 2 Jul 2024 18:05:14 +0800 Subject: [PATCH 10/20] glrnvim: fix build on darwin --- pkgs/by-name/gl/glrnvim/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index d855c419ed45..076eeb295d99 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, + darwin, }: rustPlatform.buildRustPackage rec { @@ -18,6 +19,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + DiskArbitration + Foundation + ]); + postInstall = '' install -Dm644 glrnvim.desktop -t $out/share/applications install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg From e791bf29598e652569d5feb920a9617175adb7da Mon Sep 17 00:00:00 2001 From: Roland Coeurjoly Date: Tue, 2 Jul 2024 15:05:02 +0200 Subject: [PATCH 11/20] mantainers: add rcoeurjoly --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1aa4d931b448..5a86763d3733 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16751,6 +16751,12 @@ githubId = 52847440; name = "Ryan Burns"; }; + rcoeurjoly = { + email = "rolandcoeurjoly@gmail.com"; + github = "RCoeurjoly"; + githubId = 16906199; + name = "Roland Coeurjoly"; + }; rconybea = { email = "n1xpkgs@hushmail.com"; github = "rconybea"; From d2ef3b395999a5d14a295cf30be3fbdad9873e15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jul 2024 13:16:10 +0000 Subject: [PATCH 12/20] cargo-tauri: 1.6.8 -> 1.7.1 --- pkgs/development/tools/rust/cargo-tauri/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index db1a2821de96..d6bc6ed75407 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-6GUgxSfuy2v38lYVdjsN0vd63/Aci0ERgG2kF2E2AFA="; + hash = "sha256-xQsj+NjfWc4nU/MKPzWal6n+YZpruypPoUm926JiI7k="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-HC+6AoBx51ahK6QA1Ug7jaKftkE5W3FS629uQ0yrV3Q="; + cargoHash = "sha256-xcytn3cV1Tw6O9glihbyCvERuUBA1yioR4PIbL1T53Q="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; From 3f023e0c2421879555821edd3cc3b58485c0c2a0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Jul 2024 16:37:58 +0200 Subject: [PATCH 13/20] python311Packages.transformers: 4.41.2 -> 4.42.3 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.41.2...v4.42.3 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.42.3 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f730d649361b..cc522d35fc01 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.41.2"; + version = "4.42.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3WYO+63n/ATT9RmRJ9JLuhFWUiuBO4NL2KzvzELi+M="; + hash = "sha256-vcwOFprscE8R3AdIJudYme9vvSFJvF+iCzRzBhiggr8="; }; build-system = [ setuptools ]; From 148e322192b7a451344fe335cc38b95043ee37d4 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 2 Jul 2024 21:28:18 +0200 Subject: [PATCH 14/20] maintainers/team-list: add piotrkwiecinski to php team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 30dc74f0361a..d5c7a218b4b5 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -769,6 +769,7 @@ with lib.maintainers; aanderse drupol ma27 + piotrkwiecinski talyz ]; githubTeams = [ "php" ]; From fca6a35960f3f39dddb21755b585e2089fbda0b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jul 2024 21:02:39 +0000 Subject: [PATCH 15/20] ansel: 0-unstable-2024-02-23 -> 0-unstable-2024-06-29 --- pkgs/by-name/an/ansel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 5645e92aa1ba..68364f7bf529 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "61eb388760d130476415a51e19f94b199a1088fe"; - hash = "sha256-68EX5rnOlBHXZnMlXjQk+ZXFIwR5ZFc1Wyg8EzCKaUg="; + rev = "3799e7893d6b5221706f64a00a6d139fb9717380"; + hash = "sha256-TyoLVZpKQ68/yjiUsJaXW1z0qr8krIAxRuFG7RtsToI="; fetchSubmodules = true; }; From 6868a97e5e9e9a5fef1579d3bda378835208d9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Jul 2024 23:59:41 +0200 Subject: [PATCH 16/20] nixos/kmscon: fix eval --- nixos/modules/services/ttys/kmscon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index b8e9330498c0..6b05886756fe 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -98,11 +98,11 @@ in { services.kmscon.extraConfig = let xkb = optionals cfg.useXkbConfig - lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( + (lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( lib.filterAttrs (n: v: builtins.elem n ["layout" "model" "options" "variant"] && v != "") config.services.xserver.xkb - ); + )); render = optionals cfg.hwRender [ "drm" "hwaccel" ]; fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"; in lib.concatStringsSep "\n" (xkb ++ render ++ fonts); From b1f384c6f7b1610ddacdbaa00fe869019ac0da71 Mon Sep 17 00:00:00 2001 From: tahanonu Date: Wed, 3 Jul 2024 01:19:37 +0100 Subject: [PATCH 17/20] rainbowcrack: init at 1.8 --- pkgs/by-name/ra/rainbowcrack/package.nix | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ra/rainbowcrack/package.nix diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix new file mode 100644 index 000000000000..bc138dbc9c74 --- /dev/null +++ b/pkgs/by-name/ra/rainbowcrack/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + alglib, + unzip, + autoPatchelfHook, +}: + +stdenv.mkDerivation rec { + pname = "rainbowcrack"; + version = "1.8"; + + src = fetchurl { + url = "http://project-rainbowcrack.com/rainbowcrack-${version}-linux64.zip"; + hash = "sha256-xMC9teHiDvBY/VHV63TsNQjdcuLqHGeXUyjHvRTO9HQ="; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + dontConfigure = true; + + dontBuild = true; + + unpackPhase = '' + mkdir -p $out/{bin,share/rainbowcrack} + unzip $src -d $out || true + ''; + + installPhase = '' + install -Dm644 $out/rainbowcrack-1.8-linux64/*.txt $out/share/rainbowcrack + install -Dm755 $out/rainbowcrack-1.8-linux64/rt* $out/rainbowcrack-1.8-linux64/rcrack $out/bin + chmod +x $out/bin/* + rm -rf $out/rainbowcrack-1.8-linux64 + ''; + + runtimeDependencies = [ alglib ]; + + meta = { + description = "Rainbow table generator used for password cracking"; + homepage = "http://project-rainbowcrack.com"; + maintainers = with lib.maintainers; [ tochiaha ]; + license = lib.licenses.unfree; + mainProgram = "rcrack"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux64" ]; + }; +} From 5fa70987331095ff8d18faca1c3c73713a08a816 Mon Sep 17 00:00:00 2001 From: crertel Date: Mon, 1 Jul 2024 18:59:56 -0500 Subject: [PATCH 18/20] maintainers: add crertel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47c60307108c..f60ac4e7da85 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4117,6 +4117,12 @@ githubId = 34543609; name = "creator54"; }; + crertel = { + email = "chris@kedagital.com"; + github = "crertel"; + githubId = 1707779; + name = "Chris Ertel"; + }; crinklywrappr = { email = "crinklywrappr@pm.me"; name = "Daniel Fitzpatrick"; From 4a509316fd8781479ce12e585f723df72d43d55f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 3 Jul 2024 04:06:54 +0200 Subject: [PATCH 19/20] go_1_21: 1.21.11 -> 1.21.12 (#324126) Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/development/compilers/go/1.21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 312106f6388c..68fe8a015c87 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.11"; + version = "1.21.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qq7pvytpVsdaetaqPwpRtYIf/qxX9aLnM6LW6uHm2dI="; + hash = "sha256-MOaK8nvB8d8jHjq3Tz0X07jVKgicebyqtXO08bgH7U8="; }; strictDeps = true; From 3156107d650bd451e1b39c816a52711251652a9f Mon Sep 17 00:00:00 2001 From: crertel Date: Mon, 1 Jul 2024 19:23:55 -0500 Subject: [PATCH 20/20] {libthai,glee,xscope,bemenu,muso}: add crertel as maintainer --- pkgs/applications/audio/muso/default.nix | 2 +- pkgs/applications/misc/bemenu/default.nix | 2 +- pkgs/applications/misc/xscope/default.nix | 2 +- pkgs/development/libraries/libthai/default.nix | 2 +- pkgs/tools/graphics/glee/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 8cf4e31b79e4..ba235b5157a5 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; }; } diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d017f4306fe7..021b793015ff 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 34425345f3d4..ed66ebc59313 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = with platforms; unix; mainProgram = "xscope"; }; diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index a88b427e3349..0406c3dbafb1 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; pkgConfigModules = [ "libthai" ]; }; } diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index aeec2ffb4939..ec0b4ffdf794 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = platforms.linux; license = licenses.gpl3; };