diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-08 18:01:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-08 18:01:29 +0000 |
commit | d7cee51c43b898b2d28551f087e1646efbf0e173 (patch) | |
tree | a166ab41b6092cf9f322ed105b9c5b65d9e5d06e | |
parent | 94a364b82c6c2c5280411b3c935b70a85eda73f9 (diff) | |
parent | f509e9dc8789950ad9d9c93d171228f4e91076de (diff) | |
download | nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar.gz nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar.bz2 nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar.lz nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar.xz nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.tar.zst nixpkgs-d7cee51c43b898b2d28551f087e1646efbf0e173.zip |
Merge master into staging-next
-rw-r--r-- | nixos/modules/services/web-apps/snipe-it.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/zee/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/misc/syncthingtray/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/wezterm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/v2ray-geoip/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/common/configure-flags.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/unison/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/kics/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/outils/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/package-management/opkg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/sile/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
15 files changed, 92 insertions, 24 deletions
diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 3059e67cb43..e2562ddd985 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -472,6 +472,7 @@ in { "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/private_uploads 0700 ${user} ${group} - -" ]; users = { diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 5c39de0dde7..2c4b0b8f3ba 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -188,7 +188,7 @@ in runUsingSystemd = mkOption { description = lib.mdDoc "Use systemd to manage the Plasma session"; type = types.bool; - default = false; + default = true; }; excludePackages = mkOption { diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix new file mode 100644 index 00000000000..9442044a169 --- /dev/null +++ b/pkgs/applications/editors/zee/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "zee"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zee-editor"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + # disable downloading and building the tree-sitter grammars at build time + # grammars can be configured in a config file and installed with `zee --build` + # see https://github.com/zee-editor/zee#syntax-highlighting + ZEE_DISABLE_GRAMMAR_BUILD=1; + + cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + + meta = with lib; { + description = "A modern text editor for the terminal written in Rust"; + homepage = "https://github.com/zee-editor/zee"; + license = licenses.mit; + maintainers = with maintainers; [ booklearner ]; + }; +} diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 020015ccd6c..6febcab3947 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -21,14 +21,14 @@ }: mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-qcfmePPSuaCydATNhUCZ9ee9tV1KqclP9PPX6UPILTM="; + sha256 = "sha256-BdcMW9ePOLXOZnFxFb1h/mn5a6c8fHYFr9ckK9hXJAM="; }; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 7a39a487e5f..70f933e7b20 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220624-141144-bd1b7c5d"; + version = "20220807-113146-c2fee766"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; + sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA="; }; postPatch = '' @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; + cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f8e28c452c3..047cdf6a491 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -480,7 +480,7 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString targetPlatform.isAvr '' hardening_unsupported_flags+=" stackprotector pic" - '' + optionalString (targetPlatform.libc == "newlib") '' + '' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) '' hardening_unsupported_flags+=" stackprotector" diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5323348c2f3..8fc5d744850 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220708161253"; + version = "20220808014309"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s="; + sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 790c323e57f..0788bff7f36 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202207070057"; + version = "202208040058"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77"; - sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk="; + rev = "97174fe0eeb28838b0e5e805687d230df773e661"; + sha256 = "sha256-hodJ4HQHbv9voSS847pAHd3YSmfkV7fKyJhEUApVN+w="; }; installPhase = '' diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 3bcfd4b3e89..8ac7152d7e2 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -97,7 +97,7 @@ let # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" + ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index a3df686e9d6..2c8150f764b 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M3"; + milestone_id = "M4"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; - sha256 = "sha256-xshqqERBr60vz1qEnewlgNIvd24aE6/VtK5iBlanQHg="; + sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; - sha256 = "sha256-rt8Y1ZEQVHH6gk4JV3lH38H10TDwdLDnbnqjG2vyyy4="; + sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index c6cc5db4027..8bf7544fdba 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kics"; - version = "1.5.12"; + version = "1.5.13"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-jHspStyjq5T9jzYDRYaf2gOI4F/X+h4nDn0PFUOHoBY="; + sha256 = "sha256-+trrtcK0zIjgl8SzURbvaabB/RtDKMEYyU8ZttD0hOs="; }; - vendorSha256 = "sha256-q5NuuP04kOoLVj210s17fIW2cxrsC/tAyET8YYGai0M="; + vendorSha256 = "sha256-/hoyT/PJ/nEQFg/1CJTb4lwOQ8ZYZtuHQeQUpPZepvc="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/tools/misc/outils/default.nix new file mode 100644 index 00000000000..065d641f4f3 --- /dev/null +++ b/pkgs/tools/misc/outils/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "outils"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/leahneukirchen/outils"; + description = "Port of OpenBSD-exclusive tools such as `calendar`, `vis`, and `signify`"; + license = with licenses; [ + beerware + bsd2 + bsd3 + bsdOriginal + isc + mit + publicDomain + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 1853c080166..2fbdebebb10 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.6.0"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-oSFKdfo0+5Io242kcwjg5xGxyT/Yk4zxZMEP0o61Dx4="; + sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 60eefa32c8b..d8a6e01dade 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -33,7 +33,6 @@ let luasocket luautf8 penlight - stdlib vstruct ] ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [ bit32 @@ -44,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.13.3"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0x8w63xr3nd0is1pv55dlgnv7fkn8s5ny6453wn84h44i7qwdc8s"; + sha256 = "1l0cl5rwpndn2zmcrydnd80cznpfr8m6v3s4qkx6n6q0lrcnxa56"; }; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84500b338a3..89cfbadd199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5848,6 +5848,10 @@ with pkgs; zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zee = callPackage ../applications/editors/zee { + inherit (darwin.apple_sdk.frameworks) Security; + }; + zeek = callPackage ../applications/networking/ids/zeek { }; zoekt = callPackage ../tools/text/zoekt { }; @@ -10029,6 +10033,8 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; + outils = callPackage ../tools/misc/outils {}; + mpi = openmpi; # this attribute should used to build MPI applications ucx = callPackage ../development/libraries/ucx {}; |