From 06113f18b48600431a38f7c61dc195edd59e79a8 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 22 Mar 2022 12:36:05 -0700 Subject: [PATCH 01/10] _1password: 1.12.2 -> 2.0.0 --- pkgs/applications/misc/1password/default.nix | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 512f5546aecd..fed406b42975 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,26 +2,26 @@ stdenv.mkDerivation rec { pname = "1password-cli"; - version = "1.12.2"; + version = "2.0.0"; src = if stdenv.isLinux then fetchzip { url = { - "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip"; + "i686-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_386_v${version}.zip"; + "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_amd64_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_arm64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; - "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp"; + "i686-linux" = "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4="; + "x86_64-linux" = "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE="; + "aarch64-linux" = "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA="; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg"; - sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4="; + url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_apple_universal_v${version}.pkg"; + sha256 = "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo="; }; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "1Password command-line tool"; - homepage = "https://support.1password.com/command-line/"; - downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; + homepage = "https://developer.1password.com/docs/cli/"; + downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; From 8b5bf9f26494c87f9c55a889afb91d2e20fb8cfe Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sun, 27 Mar 2022 17:37:19 +0800 Subject: [PATCH 02/10] vivaldi: 5.1.2567.66-1 -> 5.1.2567.73-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index bce4fe533673..30d719593e83 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.66-1"; + version = "5.1.2567.73-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1v9hcjgvblscpsw8c2nm8x7frzkfv2ph8l5hibyidnfjppx1qqz2"; + sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g"; }; unpackPhase = '' From 158a2972eb8c54f9a516d5fd314ec207ed305828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 27 Mar 2022 13:23:44 +0200 Subject: [PATCH 03/10] nixos/filesystems: Move options into the fs module This was probably forgotten during a refactoring. The module is where the values of the options are actually used. --- nixos/modules/system/boot/stage-2.nix | 30 --------------------------- nixos/modules/tasks/filesystems.nix | 29 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f6b6a8e4b0b4..fa2bf938df4f 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -47,36 +47,6 @@ in ''; }; - devSize = mkOption { - default = "5%"; - example = "32m"; - type = types.str; - description = '' - Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - - devShmSize = mkOption { - default = "50%"; - example = "256m"; - type = types.str; - description = '' - Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - - runSize = mkOption { - default = "25%"; - example = "256m"; - type = types.str; - description = '' - Size limit for the /run tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - systemdExecutable = mkOption { default = "systemd"; type = types.str; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index f3da6771197e..d68edd8d7d39 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -215,6 +215,35 @@ in ''; }; + boot.devSize = mkOption { + default = "5%"; + example = "32m"; + type = types.str; + description = '' + Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; + + boot.devShmSize = mkOption { + default = "50%"; + example = "256m"; + type = types.str; + description = '' + Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; + + boot.runSize = mkOption { + default = "25%"; + example = "256m"; + type = types.str; + description = '' + Size limit for the /run tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; }; From 7a9e86f0191cade202861ee47ef989683b8fb1c0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 27 Mar 2022 18:07:20 +0100 Subject: [PATCH 04/10] mc: 4.8.27 -> 4.8.28 A notable thing is removal of obsolete builtin smb support. changelog: http://midnight-commander.org/wiki/NEWS-4.8.28 --- pkgs/tools/misc/mc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index a3e6ff2fd946..6f80c2c5e928 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.27"; + version = "4.8.28"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q="; + sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; }; nativeBuildInputs = [ pkg-config autoreconfHook unzip ] @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ]; + configureFlags = [ "PERL=${perl}/bin/perl" ]; postPatch = '' substituteInPlace src/filemanager/ext.c \ From 93eb4dbde177b5a0ede1c3174f5cb8a7c566906a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 22 Mar 2022 12:58:32 -0700 Subject: [PATCH 05/10] _1password: refactor code to reduce duplication --- pkgs/applications/misc/1password/default.nix | 54 +++++++++++--------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index fed406b42975..826b8558b377 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,28 +1,36 @@ { lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: -stdenv.mkDerivation rec { +let + inherit (stdenv.hostPlatform) system; + fetch = srcPlatform: sha256: extension: + let + args = { + url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}"; + inherit sha256; + } // lib.optionalAttrs (extension == "zip") { stripRoot = false; }; + in + if extension == "zip" then fetchzip args else fetchurl args; + pname = "1password-cli"; version = "2.0.0"; + sources = rec { + aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip"; + i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg"; + x86_64-darwin = aarch64-darwin; + }; + platforms = builtins.attrNames sources; + mainProgram = "op"; +in + +stdenv.mkDerivation { + inherit pname version; src = - if stdenv.isLinux then - fetchzip - { - url = { - "i686-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_386_v${version}.zip"; - "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_amd64_v${version}.zip"; - "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_arm64_v${version}.zip"; - }.${stdenv.hostPlatform.system}; - sha256 = { - "i686-linux" = "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4="; - "x86_64-linux" = "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE="; - "aarch64-linux" = "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA="; - }.${stdenv.hostPlatform.system}; - stripRoot = false; - } else - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_apple_universal_v${version}.pkg"; - sha256 = "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo="; - }; + if (builtins.elem system platforms) then + sources.${system} + else + throw "Source for ${pname} is not available for ${system}"; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -32,7 +40,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D op $out/bin/op + install -D ${mainProgram} $out/bin/${mainProgram} ''; dontStrip = stdenv.isDarwin; @@ -42,7 +50,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/op --version + $out/bin/${mainProgram} --version ''; meta = with lib; { @@ -51,6 +59,6 @@ stdenv.mkDerivation rec { downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + inherit mainProgram platforms; }; } From 47417621a5a54a78944f959230a94e5f5ac1836c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 14:53:32 -0700 Subject: [PATCH 06/10] _1password: add shell completions --- pkgs/applications/misc/1password/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 826b8558b377..25685b2e125e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: let inherit (stdenv.hostPlatform) system; @@ -32,6 +32,8 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; unpackPhase = lib.optionalString stdenv.isDarwin '' @@ -41,11 +43,13 @@ stdenv.mkDerivation { installPhase = '' install -D ${mainProgram} $out/bin/${mainProgram} + runHook postInstall ''; - dontStrip = stdenv.isDarwin; + postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings + (s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + dontStrip = stdenv.isDarwin; doInstallCheck = true; From 6f9296d1b6b7da4b88b848ef36e1bccf3a615300 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 18:33:28 -0700 Subject: [PATCH 07/10] cocoapods: move to more appropriate directory --- pkgs/development/{mobile => tools}/cocoapods/Gemfile | 0 pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta | 0 .../development/{mobile => tools}/cocoapods/Gemfile-beta.lock | 0 pkgs/development/{mobile => tools}/cocoapods/Gemfile.lock | 0 pkgs/development/{mobile => tools}/cocoapods/default.nix | 0 pkgs/development/{mobile => tools}/cocoapods/gemset-beta.nix | 0 pkgs/development/{mobile => tools}/cocoapods/gemset.nix | 0 pkgs/development/{mobile => tools}/cocoapods/update | 0 pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta.lock (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile.lock (100%) rename pkgs/development/{mobile => tools}/cocoapods/default.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/gemset-beta.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/gemset.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/update (100%) diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/tools/cocoapods/Gemfile similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile rename to pkgs/development/tools/cocoapods/Gemfile diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta b/pkgs/development/tools/cocoapods/Gemfile-beta similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta rename to pkgs/development/tools/cocoapods/Gemfile-beta diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta.lock rename to pkgs/development/tools/cocoapods/Gemfile-beta.lock diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile.lock rename to pkgs/development/tools/cocoapods/Gemfile.lock diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/default.nix rename to pkgs/development/tools/cocoapods/default.nix diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset-beta.nix rename to pkgs/development/tools/cocoapods/gemset-beta.nix diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset.nix rename to pkgs/development/tools/cocoapods/gemset.nix diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/tools/cocoapods/update similarity index 100% rename from pkgs/development/mobile/cocoapods/update rename to pkgs/development/tools/cocoapods/update diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471a..aba4266c4eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4556,9 +4556,9 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - cocoapods = callPackage ../development/mobile/cocoapods { }; + cocoapods = callPackage ../development/tools/cocoapods { }; - cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); + cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; }); cocom = callPackage ../tools/networking/cocom { inherit (darwin.apple_sdk.frameworks) Security; From a48d78cb66d86458efe2b34fa94a02345d9b7c12 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 18:36:40 -0700 Subject: [PATCH 08/10] cocoapods: add meta.mainProgram --- pkgs/development/tools/cocoapods/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix index 8559ff5c74ca..54411fc01586 100644 --- a/pkgs/development/tools/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -21,5 +21,6 @@ bundlerApp { peterromfeldhk lilyball ]; + mainProgram = "pod"; }; } From fc3331b5223deb61ba7482c9794471665c34d577 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 19:15:31 -0700 Subject: [PATCH 09/10] neovim-remote: add meta.mainProgram (#166173) --- pkgs/applications/editors/neovim/neovim-remote.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 2b1281ae21be..aca88252ebe1 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -41,5 +41,6 @@ with python3.pkgs; buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ edanaher ]; platforms = platforms.unix; + mainProgram = "nvr"; }; } From 0e671e2b2b6e65c5712e0ccd8c2645d47f18f362 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 23:47:04 +0000 Subject: [PATCH 10/10] strawberry: 1.0.2 -> 1.0.3 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index b607e2c9a0f1..fb440c6dc514 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-/pwHWmQTV1QBK+5SS0/NC6wMm2QQm+iCZArxiHjn4M4="; + sha256 = "sha256-wa7r6maHAgCTD/TFjqtMuoRt1BqQ38T8KpbMUOoS2ZE="; }; buildInputs = [