diff options
41 files changed, 281 insertions, 188 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d9903128c73df..64ea6982cd1d7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15702,4 +15702,10 @@ githubId = 5228243; name = "waelwindows"; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; } diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index e85ad4efd0089..aa6e40f43705e 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -56,6 +56,7 @@ let ) pkgSet; in scrubbedEval.options; + baseOptionsJSON = let filter = @@ -67,9 +68,9 @@ let ); in pkgs.runCommand "lazy-options.json" { - libPath = filter "${toString pkgs.path}/lib"; - pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; - nixosPath = filter "${toString pkgs.path}/nixos"; + libPath = filter (pkgs.path + "/lib"); + pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib"); + nixosPath = filter (pkgs.path + "/nixos"); modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; } '' export NIX_STORE_DIR=$TMPDIR/store @@ -99,6 +100,7 @@ let exit 1 } >&2 ''; + inherit (cfg.nixos.options) warningsAreErrors allowDocBook; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/idris2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/idris2-mode/default.nix new file mode 100644 index 0000000000000..c415b783bc948 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/idris2-mode/default.nix @@ -0,0 +1,32 @@ +{ lib +, trivialBuild +, fetchFromGitHub +, emacs +, prop-menu +}: + +trivialBuild rec { + pname = "idris2-mode"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "idris-community"; + repo = pname; + rev = version; + hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q="; + }; + + buildInputs = propagatedUserEnvPkgs; + + propagatedUserEnvPkgs = [ + prop-menu + ]; + + meta = with lib; { + homepage = "https://github.com/idris-community/idris2-mode"; + description = "This is an emacs mode for editing Idris 2 code."; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wuyoli ]; + inherit (emacs.meta) platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 7b624e1bb97d3..304e2482dccc7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -182,6 +182,8 @@ helm-words = callPackage ./helm-words { }; + idris2-mode = callPackage ./idris2-mode { }; + isearch-plus = callPackage ./isearch-plus { }; isearch-prop = callPackage ./isearch-prop { }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 23d5e4ce0c3ac..d6798821ffcb8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -285,8 +285,8 @@ final: prev: src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a2b72f1b4c354e716b6d3349a5d67f21352469fd"; - sha256 = "0b5dfrmx22fs1nb83pmr3ryhkd25xyd53zidbizi9hv43pgp1m5m"; + rev = "0a4a5da030dc0c4bd69abd846aa87a1a4a30eb2b"; + sha256 = "1hki2hpagb0jp65a401jh9g7mwqjvs9qgap7dcmplig1414bckrc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "9c179f5932e3a6237f2dd29500e44b9b8cd47f48"; - sha256 = "0n4b62jw40jxpb0ayp5za202as1wy53f3bv4q0z744zpkvfilqbk"; + rev = "62b6ebb0d0c557a25c403a5344e090eabcd114dd"; + sha256 = "0214ck4sw493h536jrqg2b8m4vcv4sma4inmhmvyaiv8rqm2sn1g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -931,12 +931,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-10-19"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "e70be6232f632d16d2412b1faf85554285036278"; - sha256 = "13bbhhmqnygb92crn3pyrk66nc33sick7x23s8d1ffna7qcqirw6"; + rev = "028a87933d99f8bb88f2f70a4def3ff9574f3594"; + sha256 = "04s1d44yq7hncvi3x3i2k47pak239shxfz8anv117h3zxcgdzg8r"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1615,12 +1615,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2022-05-01"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36"; - sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj"; + rev = "18095520391186d634a0045dacaa346291096566"; + sha256 = "0b91ap1l3nph46r7b5hcn7413yj3zhrz1jmn4xqp387ng35qz537"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -2011,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "6cc7fd56b3f593d6c2eded31d56f59286a218c1b"; - sha256 = "046z9f4avykflavc2s5b5jg2nv6zlxv75fq2rp70mza5i3niapdz"; + rev = "ae5449e1cefa352a62e863a5e647de10bfa01145"; + sha256 = "16g5fz7z7rm0qgk5qlghl969x2q534mv3njl7hsh7g6gwjzr4hv5"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "1766b40665c9bd5946c2dc612de285fbb1b6db99"; - sha256 = "1mlcdslawk2z833pxwd3lay405sm1bk82h18gsfdvngj8c7zvprx"; + rev = "7d3d68df15a1123b14af4035a2eafdc41854c2d1"; + sha256 = "16qhapgkcbpqdxmij49jp12xpkgpgm6kyk9ld8dvrj9vdbjq323n"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "5714bca1767620f0f470c2968f66a750b82387f4"; - sha256 = "02zavylg8arnqi13sm0478lz9sjy70nw8ijbmw44xwv30paajw3v"; + rev = "fc0081034a90a5e9d901b3269185b9a46b836ed5"; + sha256 = "1gp25949v6a8zlp10aspv2rh4pizbjxpjyk0j5qvfv88fcv0pmzl"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2964,12 +2964,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-10-25"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "bb318c455e4e8946d64c79753f5bb07f7c27d711"; - sha256 = "1fixlb14s38d5wy5a92yraj572q25gxxc9rgpjbq288q96pshnmi"; + rev = "c93311fbcc840210a2c0db574177d84a35a2c9c1"; + sha256 = "1kisjlwa2nad9xcwzal1yfdnwpcklkpz2ks6gpqqjfarnxw25c16"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3228,12 +3228,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-25"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "851cd32caaea84f303c4fdf51d72dfa5fcd795bb"; - sha256 = "0d5fbxljh2mqsjjmzbk4hgwgq9cyl7vrqplsqvxzrhs58c41f9m5"; + rev = "6321c884b1a462918b1a7c7c016bcc2f0944832c"; + sha256 = "0s2frxp25pf7fig25g5p99pq4hbhhhqlm7727h3lcwnjy60jfb59"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3984,12 +3984,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-10-25"; + version = "2022-10-27"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "46de7a0aed7fab5e38d146fef45074d16cf67d27"; - sha256 = "098n6qf3qmpya8ib15ybx02k4cx0sm2idrgqsijq8bsrabvld18c"; + rev = "44bc45ad6cdf697b6e2f04d844804aed6c133d06"; + sha256 = "1d1lc7qjz67b6zkamdhbwvd9nc4ycklc743d5r1qhan1994mi61y"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4548,12 +4548,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-10-25"; + version = "2022-10-27"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "da70b62c602ae682b3d091fb8c14a6a3bcac55db"; - sha256 = "1hsz66vs858yj0l823v938r69d1ly6fqi03927rh45a58mx94ilh"; + rev = "7c79f4d9d22a42d35a093be3df215849bee68bd0"; + sha256 = "19fhzf0db23w5d250jbwghg7x70zjb4dck141x6kaaaq69x42jny"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4584,12 +4584,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-07-15"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3801d9dfaa5431e7b83ae6f98423ac077d9f5c3f"; - sha256 = "1qgrfmbdk420qa7v6r6c6galbr8cg0jkib4i0jvx0m3pdg4sw4rp"; + rev = "2b0151d7302f87f90c4664d119518dda73cc4633"; + sha256 = "0isasr5d0hmr818sbwax6q0cwbr0nja72s2ll93wgq6i3l51z964"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4944,12 +4944,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "9f2bd5ca1b7bdc184069a0b2db8d7be1c377d3ac"; - sha256 = "0zqzjlq2x576vc7z4bc72a6d7vp5fvg5fq4qvppv7zyhvgwmg1jk"; + rev = "1d311ffb45779650d03f16d3e5215212a857cbc0"; + sha256 = "1vzf2jsz1ichi27g0kj2sknsjp9kicc45af36shvwfmcnahl87gd"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5268,12 +5268,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "ac29174bebeedb86983eea7436dabcf2b17dbc19"; - sha256 = "0byphv8m0g0mj2msw2dcrd6g3pkj81ssabm1zh1980w85z0pkcj6"; + rev = "36f1a5628c84b145bdf16e6d2aeea7d43fd7ade5"; + sha256 = "1p3b5c54jpvnv98i609gfq1ajfp55vhhfrmdx5hcdq9q9ai6b314"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5724,12 +5724,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-10-23"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "47472f648f329c1bf23257c9e5230535949baeec"; - sha256 = "1flyjwzma2vrmf8vbpwck5x74xv490r19d2y733llxr34vkmip2y"; + rev = "f39efa0e823bcc876d18a7b44d3b61191c42e61c"; + sha256 = "1wzqvqg7dzs2150wdnagkw0yaf6k73f0bzzwm4lhz0pn927hlwn1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6000,12 +6000,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-10-14"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "81f672ad6525b5d8cc27bc6ff84636cc12664485"; - sha256 = "10xrnl3aqgz85knlf8ypxcq0zk9k4rby2pcfvh0kiyc46shqcwlr"; + rev = "7e5096b736ae252d04d543af6a13280125dc6d0f"; + sha256 = "1hqa8c0bfj7yl3zdpid4aj26jay65f40ixaydh7ic79rxm9a1k0i"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6024,24 +6024,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-24"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "1be1e17be5841274253fb445f1b5db90bade7539"; - sha256 = "1dman1mrg6f2w1hi74si20gnzhs0ldqa0b6pi4jlphp7ba2bkm5f"; + rev = "65c2ba895213c3641fc58dd33bc7a44423a6cdbe"; + sha256 = "1j5g0d4sw5ngzpf77vbgf4mac0dr9y4db8dc951d9m4sg7q1hhjq"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c155b6bb308269ca4a376777a8621261efbd17cb"; - sha256 = "0g95nl121gkqcs5w0r31qcn11mxy9g9ws829mcb41y3h5jkbly1a"; + rev = "287ffdccc1dd7ed017d844a4fad069fd3340fa94"; + sha256 = "1xhizc124dqgxvqyin42sk9kcm5rg2rwi2g94sm9mir8x326nibi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6252,12 +6252,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-10-22"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "7aeca4713a922139b5e14c037b5faf34dc41c8d2"; - sha256 = "10s589bxij0g55m9fab64338av6g21b9ahpf2ncrsihgnr1319x5"; + rev = "cad3d983e57f467ba8e8252b0567e96dde9a8f0d"; + sha256 = "1jsj9a1ggii2zcjpi6wn6clzsj0vbl2frwqp0h259zlkvwrkx2ri"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6770,12 +6770,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-10-22"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "9c11534cbc01aeba573805522d2f8f9bcc24379c"; - sha256 = "0pchq82jrzg1ip00fwv44cxp14k6l6j8xp916l1wbqc0izvfq775"; + rev = "6671ecda17977a65c1dd251463cd1289deecf87d"; + sha256 = "10h0m1vz765grjdsvjhawmw3dsa98zldndpqlrnim2ih2g9cdgaw"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -8035,12 +8035,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "1814feca54540497de99d474dd6c9de6b691cf01"; - sha256 = "0qlbdmrq0c3fxc6d3rfwq6nckj4cg8ws9p98kwsx1s39ia56ycqf"; + rev = "530eb3a896e9eef270f00f4baafa102361afc93b"; + sha256 = "1bk1mdna3f792b48xasxmkwgyyb49dg6b6vd1bal3z461sk8zi7j"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -13069,12 +13069,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-10-26"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "1b7f09a38afb48e295109137790c3a3099881c2f"; - sha256 = "0hzh53ahx96kzhhz9rhxakvdqzy0k2px5693wi3fg9q7i67v945x"; + rev = "61553aeb3d5ca8c11eea8be6eadf478062982ac9"; + sha256 = "11wvm95484axpjzar8y3pc8ah9162gn6s63yhn7z7y4c7zm4zci1"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13212,6 +13212,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yuck-vim = buildVimPluginFrom2Nix { + pname = "yuck.vim"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "elkowar"; + repo = "yuck.vim"; + rev = "6dc3da77c53820c32648cf67cbdbdfb6994f4e08"; + sha256 = "0890cyxnnvbbhv1irm0nxl5x7a49h1327cmhl1gmayigd4jym7ln"; + }; + meta.homepage = "https://github.com/elkowar/yuck.vim/"; + }; + zeavim-vim = buildVimPluginFrom2Nix { pname = "zeavim.vim"; version = "2019-06-07"; @@ -13334,12 +13346,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-27"; + version = "2022-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "830c86fb0d6096a0a3ff87855a574bb686f6fa97"; - sha256 = "1b6b4hcyfjhbmwlq7h63ahb19zxla0kcb5xq9g2jfkvx4j0n2k4k"; + rev = "671a11051e945b45e3e93c124a65adf84289d830"; + sha256 = "18408ixpkgwgs9in65qi60lqpy1p40vb5mmmnrlimjncghy05dr5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ccb3df1b98da3..c9146135928fe 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1108,6 +1108,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, https://github.com/jnurmine/zenburn/,, diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index c19383c2b7936..f5129e6d9a5d9 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-XCfT2uSYFszxxj9JS9A+nnFX6gz3gY03xokjoH3/kVA="; + sha256 = "sha256-KvwW5VJ5HDXDxaPssmVnqBWmk3Y1qbu9PcZsd+CLeXE="; }; - vendorSha256 = "sha256-DVrGpWtHiWWDx4fCpA7fBGr8r+OUzworpwHcK0jj3AY="; + vendorSha256 = "sha256-i+SUDFOffh4Ky2kawIb3M6M2Han25yYQbWI0wFjZwtU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 46303d9c92abf..d3c01aff7695d 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace 'Terminal=false' 'Terminal=true' \ --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' substituteInPlace src/dwgpsd.c \ - --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 12' + --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14' ''; meta = { diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index e2a16cce7fcbc..2555cf3b04da5 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "sha256-Q09+6dPwdeW3jkGgPNAcHI3FHcYPQ+w61PmV+TkQ+H8="; + sha256 = "sha256-hKMHJF/FXPeQjkEXLTN6zjKMaVGa3LdIebXya3NRSzU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/development/libraries/urdfdom-headers/default.nix index 91fc747b84a62..138597ad89a61 100644 --- a/pkgs/development/libraries/urdfdom-headers/default.nix +++ b/pkgs/development/libraries/urdfdom-headers/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "urdfdom-headers"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; rev = version; - sha256 = "1abzhcyv2vad8l36vy0fcz9kpgns834la7hf9zal962bwycqnkmg"; + hash = "sha256-ry5wDMRxR7TtupUghe9t1XP0XMvWKiOesO5RFHPrSdI="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) (fetchpatch { - url = "https://github.com/ros/urdfdom_headers/commit/990fd233b1a3ff68872a3552f3ea5ccbe105848c.patch"; - sha256 = "1hxf2kw3mkll3fzvsby104b2m854bdpiy9gr3r9ysmw2r537gqdy"; + url = "https://github.com/ros/urdfdom_headers/commit/c9c993147bbf18d5ec83bae684c5780281e529b4.patch"; + hash = "sha256-BnYPdcetYSim2O1R38N0d1tY0Id++AgKNic8+dlM6Vg="; }) ]; diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index 3410789c21cc3..89accbd70ec51 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -1,26 +1,41 @@ -{ buildPythonPackage, fetchFromGitHub, lib, poetry-core, pyspark }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "chispa"; version = "0.8.3"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { - repo = "chispa"; owner = "MrPowers"; + repo = "chispa"; rev = "v${version}"; - sha256 = "sha256-1ePx8VbU8pMd5EsZhFp6qyMptlUxpoCvJfuDm9xXOdc="; + hash = "sha256-1ePx8VbU8pMd5EsZhFp6qyMptlUxpoCvJfuDm9xXOdc="; }; - checkInputs = [ pyspark ]; + nativeBuildInputs = [ + poetry-core + ]; - nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "chispa" ]; + # Tests require a spark installation + doCheck = false; + + # pythonImportsCheck needs spark installation meta = with lib; { - homepage = "https://github.com/MrPowers/chispa"; description = "PySpark test helper methods with beautiful error messages"; + homepage = "https://github.com/MrPowers/chispa"; license = licenses.mit; maintainers = with maintainers; [ ratsclub ]; }; diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 11f387d2469cb..26be9f9301ea8 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.22"; + version = "0.9.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EK/JT2pfHLiziCTgQuJeVBTh+q7f05s0iujZdyKSGoY="; + hash = "sha256-MQGW0+OM4gUbYe670vHQj8yTT6M2DyIDGGTRbv6Lync="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 616d69d389b85..4c551bc7150fb 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , isPy3k , daemonize , dbus-python @@ -16,7 +16,7 @@ let common = import ./common.nix { inherit lib fetchFromGitHub; }; in -buildPythonApplication (common // rec { +buildPythonPackage (common // rec { pname = "openrazer_daemon"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index d5837fd90a1c9..848f50fe62f5d 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029"; + sha256 = "sha256-z5awVvmKubphXQMR7Kg3s9oBIBXNxZTz/uJIyvcCKLc="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index a596a2226c5e3..b436eecbcb12a 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -1,16 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, numpy +, pandas , py4j +, pyarrow +, pythonOlder }: buildPythonPackage rec { pname = "pyspark"; - version = "3.3.0"; + version = "3.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fr6OlQVke00STVqC/KYN/TiRAhz4rWxeyId37uzpLPc="; + hash = "sha256-6Z+n3pK+QGiEv9gxwyuTBqOpneRM/Dmi7vtu0HRF1fo="; }; # pypandoc is broken with pandoc2, so we just lose docs. @@ -25,6 +32,20 @@ buildPythonPackage rec { py4j ]; + passthru.optional-dependencies = { + ml = [ + numpy + ]; + mllib = [ + numpy + ]; + sql = [ + numpy + pandas + pyarrow + ]; + }; + # Tests assume running spark instance doCheck = false; @@ -40,6 +61,6 @@ buildPythonPackage rec { binaryBytecode ]; license = licenses.asl20; - maintainers = [ maintainers.shlevy ]; + maintainers = with maintainers; [ shlevy ]; }; } diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 0d2be6a4d145e..ea96e00abeaf7 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -1,34 +1,50 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests +, poetry-core , python-jose -, httmock -, unittestCheckHook +, pythonOlder +, requests +, requests-toolbelt +, urllib3 }: buildPythonPackage rec { pname = "python-keycloak"; - version = "0.27.0"; + version = "2.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; - rev = version; - sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI="; + rev = "v${version}"; + hash = "sha256-cuj0gJlZDkbJ2HRSMcQvO4nxpjw65CKGEpWCL5sucvg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + + buildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - requests python-jose + urllib3 + requests + requests-toolbelt ]; - checkInputs = [ - unittestCheckHook - httmock - ]; + # Test fixtures require a running keycloak instance + doTest = false; - pythonImportsCheck = [ "keycloak" ]; + pythonImportsCheck = [ + "keycloak" + ]; meta = with lib; { description = "Provides access to the Keycloak API"; diff --git a/pkgs/build-support/skaware/build-skaware-man-pages.nix b/pkgs/development/skaware-packages/build-skaware-man-pages.nix index 92d8202ae95a8..92d8202ae95a8 100644 --- a/pkgs/build-support/skaware/build-skaware-man-pages.nix +++ b/pkgs/development/skaware-packages/build-skaware-man-pages.nix diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 3ae9b7ce8aac2..3ae9b7ce8aac2 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/development/skaware-packages/clean-packaging.nix index d51cbec8aeb26..d51cbec8aeb26 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/development/skaware-packages/clean-packaging.nix diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/development/skaware-packages/execline-man-pages/default.nix index 822bbea1aee51..822bbea1aee51 100644 --- a/pkgs/data/documentation/execline-man-pages/default.nix +++ b/pkgs/development/skaware-packages/execline-man-pages/default.nix diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index 953a081051677..953a081051677 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c index c8e91813b7744..c8e91813b7744 100644 --- a/pkgs/tools/misc/execline/execlineb-wrapper.c +++ b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix index 2a55676fc7675..2a55676fc7675 100644 --- a/pkgs/os-specific/linux/mdevd/default.nix +++ b/pkgs/development/skaware-packages/mdevd/default.nix diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix index e6db2aee60c54..e6db2aee60c54 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/skaware-packages/nsss/default.nix diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index 3c1e984f86c5e..3c1e984f86c5e 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index 27773a90e2834..27773a90e2834 100644 --- a/pkgs/os-specific/linux/s6-linux-init/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix index 98199516a04e4..98199516a04e4 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix index 44430eacbe08a..44430eacbe08a 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-man-pages/default.nix diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix index 99dc9b891f57d..99dc9b891f57d 100644 --- a/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 6eae406fa22a5..6eae406fa22a5 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix diff --git a/pkgs/data/documentation/s6-portable-utils-man-pages/default.nix b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix index 6380071d7629e..6380071d7629e 100644 --- a/pkgs/data/documentation/s6-portable-utils-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix index 490a38e1031bb..490a38e1031bb 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index 0f2662fd72405..0f2662fd72405 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index 1c3795a3f6afe..1c3795a3f6afe 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index b4b6a7f42a7e4..b4b6a7f42a7e4 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c index 3ad3cbc690639..3ad3cbc690639 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c diff --git a/pkgs/development/libraries/skalibs/2_10.nix b/pkgs/development/skaware-packages/skalibs/2_10.nix index af4c04dab1e7f..af4c04dab1e7f 100644 --- a/pkgs/development/libraries/skalibs/2_10.nix +++ b/pkgs/development/skaware-packages/skalibs/2_10.nix diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 19c8ea98ec917..19c8ea98ec917 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix index a7063f198c508..a7063f198c508 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/skaware-packages/utmps/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c923c4698988..51ba03eec3ba2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13,23 +13,22 @@ with pkgs; { # A module system style type tag # - # Allows the nixpkgs fixpoint, usually known as `pkgs` - # to be distinguished nominally. + # Allows the nixpkgs fixpoint, usually known as `pkgs` to be distinguished + # nominally. # # pkgs._type == "pkgs" # pkgs.pkgsStatic._type == "pkgs" # # Design note: - # While earlier stages of nixpkgs fixpoint construction - # are supertypes of this stage, they're generally not - # usable in places where a `pkgs` is expected. - # (earlier stages being the various `super` variables - # that precede all-packages.nix) + # While earlier stages of nixpkgs fixpoint construction are supertypes of this + # stage, they're generally not usable in places where a `pkgs` is expected. + # (earlier stages being the various `super` variables that precede + # all-packages.nix) _type = "pkgs"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, - # it uses GCC compiled with multilib support; on i686-linux, it's - # just the plain stdenv. + # A stdenv capable of building 32-bit binaries. + # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux, + # it's just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); stdenvNoCC = stdenv.override ( @@ -39,8 +38,8 @@ with pkgs; # TODO: This is a hack to use stdenvNoCC to produce a CF when cross # compiling. It's not very sound. The cross stdenv has: # extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ] - # and uses stdenvNoCC. In order to make this not infinitely recursive, we need to exclude - # this extraBuildInput. + # and uses stdenvNoCC. In order to make this not infinitely recursive, we + # need to exclude this extraBuildInput. extraBuildInputs = []; } ); @@ -84,7 +83,6 @@ with pkgs; # For convenience, allow callers to get the path to Nixpkgs. path = ../..; - ### Helper functions. inherit lib config overlays; @@ -6384,8 +6382,6 @@ with pkgs; boost = if stdenv.isDarwin then boost else boost15x; }; - execline = skawarePackages.execline; - executor = with python3Packages; toPythonApplication executor; exif = callPackage ../tools/graphics/exif { }; @@ -9463,10 +9459,6 @@ with pkgs; netselect = callPackage ../tools/networking/netselect { }; - nettee = callPackage ../tools/networking/nettee { - inherit (skawarePackages) cleanPackaging; - }; - networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; @@ -11067,16 +11059,6 @@ with pkgs; s5cmd = callPackage ../tools/networking/s5cmd { }; - s6-dns = skawarePackages.s6-dns; - - s6-linux-init = skawarePackages.s6-linux-init; - - s6-linux-utils = skawarePackages.s6-linux-utils; - - s6-networking = skawarePackages.s6-networking; - - s6-portable-utils = skawarePackages.s6-portable-utils; - sacad = callPackage ../tools/misc/sacad { }; sad = callPackage ../tools/text/sad { }; @@ -21322,8 +21304,6 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - nsss = skawarePackages.nsss; - ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -22082,8 +22062,6 @@ with pkgs; SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - sdnotify-wrapper = skawarePackages.sdnotify-wrapper; - sdrplay = callPackage ../applications/radio/sdrplay {}; sdrpp = callPackage ../applications/radio/sdrpp { @@ -22153,45 +22131,71 @@ with pkgs; skjold = callPackage ../development/tools/skjold { }; - skalibs = skawarePackages.skalibs; - skalibs_2_10 = skawarePackages.skalibs_2_10; - skawarePackages = recurseIntoAttrs rec { - cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { + buildManPages = callPackage ../development/skaware-packages/build-skaware-man-pages.nix { }; + buildPackage = callPackage ../development/skaware-packages/build-skaware-package.nix { inherit cleanPackaging; }; - buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { }; - - skalibs = callPackage ../development/libraries/skalibs { }; - skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { }; - execline = callPackage ../tools/misc/execline { }; + cleanPackaging = callPackage ../development/skaware-packages/clean-packaging.nix { }; - execline-man-pages = callPackage ../data/documentation/execline-man-pages { + execline = callPackage ../development/skaware-packages/execline { }; + execline-man-pages = callPackage ../development/skaware-packages/execline-man-pages { inherit buildManPages; }; - s6 = callPackage ../tools/system/s6 { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; - s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; - s6-networking = callPackage ../tools/networking/s6-networking { }; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; - s6-rc = callPackage ../tools/system/s6-rc { }; - s6-man-pages = callPackage ../data/documentation/s6-man-pages { + mdevd = callPackage ../development/skaware-packages/mdevd { }; + nsss = callPackage ../development/skaware-packages/nsss { }; + sdnotify-wrapper = callPackage ../development/skaware-packages/sdnotify-wrapper { }; + utmps = callPackage ../development/skaware-packages/utmps { }; + + skalibs = callPackage ../development/skaware-packages/skalibs { }; + skalibs_2_10 = callPackage ../development/skaware-packages/skalibs/2_10.nix { }; + + s6 = callPackage ../development/skaware-packages/s6 { }; + s6-dns = callPackage ../development/skaware-packages/s6-dns { }; + s6-linux-init = callPackage ../development/skaware-packages/s6-linux-init { }; + s6-linux-utils = callPackage ../development/skaware-packages/s6-linux-utils { }; + s6-networking = callPackage ../development/skaware-packages/s6-networking { }; + s6-portable-utils = callPackage ../development/skaware-packages/s6-portable-utils { }; + s6-rc = callPackage ../development/skaware-packages/s6-rc { }; + + s6-man-pages = callPackage ../development/skaware-packages/s6-man-pages { inherit buildManPages; }; - s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages { + s6-networking-man-pages = callPackage ../development/skaware-packages/s6-networking-man-pages { inherit buildManPages; }; - s6-portable-utils-man-pages = callPackage ../data/documentation/s6-portable-utils-man-pages { + s6-portable-utils-man-pages = callPackage ../development/skaware-packages/s6-portable-utils-man-pages { inherit buildManPages; }; + }; - mdevd = callPackage ../os-specific/linux/mdevd { }; - nsss = callPackage ../development/libraries/nsss { }; - utmps = callPackage ../development/libraries/utmps { }; - sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; + inherit (skawarePackages) + execline + execline-man-pages + mdevd + nsss + s6 + s6-dns + s6-linux-init + s6-linux-utils + s6-man-pages + s6-networking + s6-networking-man-pages + s6-portable-utils + s6-portable-utils-man-pages + s6-rc + sdnotify-wrapper + skalibs + skalibs_2_10 + utmps; + + kgt = callPackage ../development/tools/kgt { + inherit (skawarePackages) cleanPackaging; + }; + + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; }; slang = callPackage ../development/libraries/slang { }; @@ -22595,8 +22599,6 @@ with pkgs; uthenticode = callPackage ../development/libraries/uthenticode { }; - utmps = skawarePackages.utmps; - ucommon = callPackage ../development/libraries/ucommon { }; v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; @@ -24268,10 +24270,6 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - s6 = skawarePackages.s6; - - s6-rc = skawarePackages.s6-rc; - supervise = callPackage ../tools/system/supervise { }; spamassassin = callPackage ../servers/mail/spamassassin { }; @@ -25205,8 +25203,6 @@ with pkgs; mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; - inherit (skawarePackages) mdevd; - metastore = callPackage ../os-specific/linux/metastore { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -26115,8 +26111,6 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; - execline-man-pages = skawarePackages.execline-man-pages; - ezra-sil = callPackage ../data/fonts/ezra-sil { }; fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; @@ -26753,12 +26747,6 @@ with pkgs; open-fonts = callPackage ../data/fonts/open-fonts { }; - s6-man-pages = skawarePackages.s6-man-pages; - - s6-networking-man-pages = skawarePackages.s6-networking-man-pages; - - s6-portable-utils-man-pages = skawarePackages.s6-portable-utils-man-pages; - scientifica = callPackage ../data/fonts/scientifica { }; siji = callPackage ../data/fonts/siji { }; @@ -29562,10 +29550,6 @@ with pkgs; kexi = libsForQt514.callPackage ../applications/office/kexi { }; - kgt = callPackage ../development/tools/kgt { - inherit (skawarePackages) cleanPackaging; - }; - khronos = callPackage ../applications/office/khronos { }; keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; @@ -30908,7 +30892,7 @@ with pkgs; libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; - openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; + openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; opusfile = callPackage ../applications/audio/opusfile { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2b690422ecd52..766edb74b5e84 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -249,6 +249,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = hardenedKernelFor kernels.linux_5_19 { }; + linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -575,6 +576,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { }); + linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); |