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. + ''; + }; }; 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 = [ 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"; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 512f5546aecd..25685b2e125e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,28 +1,38 @@ -{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: + +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; -stdenv.mkDerivation rec { pname = "1password-cli"; - version = "1.12.2"; + 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/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"; - }.${stdenv.hostPlatform.system}; - sha256 = { - "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; - "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp"; - }.${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="; - }; + if (builtins.elem system platforms) then + sources.${system} + else + throw "Source for ${pname} is not available for ${system}"; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -32,25 +42,27 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D op $out/bin/op + 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; installCheckPhase = '' - $out/bin/op --version + $out/bin/${mainProgram} --version ''; 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" ]; + inherit mainProgram platforms; }; } 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 = '' 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 96% rename from pkgs/development/mobile/cocoapods/default.nix rename to pkgs/development/tools/cocoapods/default.nix index 8559ff5c74ca..54411fc01586 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -21,5 +21,6 @@ bundlerApp { peterromfeldhk lilyball ]; + mainProgram = "pod"; }; } 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/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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 045ba9d45a30..192c9d88ce7c 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;