Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-06-03 18:01:49 +00:00 committed by GitHub
commit d8ea5b9435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 451 additions and 267 deletions

View file

@ -1514,10 +1514,6 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in
Packages inside nixpkgs are written by hand. However many tools exist in
community to help save time. No tool is preferred at the moment.
- [pypi2nix](https://github.com/nix-community/pypi2nix): Generate Nix
expressions for your Python project. Note that [sharing derivations from
pypi2nix with nixpkgs is possible but not
encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376).
- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools)
- [poetry2nix](https://github.com/nix-community/poetry2nix)

View file

@ -192,8 +192,6 @@ In addition to numerous new and updated packages, this release has the following
};
```
- Many `services.syncthing` options have been moved to `services.syncthing.settings`, as part of [RFC 42](https://github.com/NixOS/rfcs/pull/42)'s implementation, see [#226088](https://github.com/NixOS/nixpkgs/pull/226088).
- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.

View file

@ -2,7 +2,7 @@
, glib
, gobject-introspection
, python3
, wrapGAppsHook
, wrapGAppsNoGuiHook
, lib
}:
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
strictDeps = false;
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsNoGuiHook
gobject-introspection
];

View file

@ -7,20 +7,21 @@
, alsa-lib
, dbus
, fontconfig
, libsixel
}:
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.13.1";
version = "0.14.1";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-c+CbIDg4WlzRStiA+yBkjfSmMJ183tLBGiK340bZgnA=";
hash = "sha256-+YPtu3hsKvk2KskVSpqcFufnWL5PxN8+xbkcz/JXW6g=";
};
cargoHash = "sha256-nhRXFxSrzkq3SdJ4ZmWlKl7SwxwOz6ZYboIsBmgdFJ8=";
cargoHash = "sha256-WgQ+v9dJyriqq7+WpXpPhjdwm2Sr0jozA1oW2inSPik=";
nativeBuildInputs = [
pkg-config
@ -32,6 +33,7 @@ rustPlatform.buildRustPackage rec {
alsa-lib
dbus
fontconfig
libsixel
];
buildNoDefaultFeatures = true;
@ -41,6 +43,10 @@ rustPlatform.buildRustPackage rec {
"media-control"
"image"
"lyric-finder"
"daemon"
"notify"
"streaming"
"sixel"
];
meta = with lib; {

View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.62.0";
version = "2.62.1";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-DmS0rn1v9zksSzO7FVl5YsIIXvhQ3zhSBC/i7tosdag=";
hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c=";
};
vendorHash = null;

View file

@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "01fbeb139b9fceb775fefc91f27835408a4f04a9";
sha256 = "18isr6l1cb7hjwglv1ybm93z9yqkc9z2g86jj862swq29kdhclg7";
rev = "1efe3a96b2a82a68d20c8fd78fe01bdb4ec677c9";
sha256 = "05m6skc6mfj5837cwmkyv8dqag883hrpqy4q7k945fdzw4lva0i0";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
rev = "2abd49152215395cee5e7aa2c49451c459a2dbb3";
sha256 = "1f6fwv7w443r3yy7fjfciikgnxy6icx9xq91vc1jr7iqfrd3vb3q";
rev = "aff1bb8fecff83d3e3a2d544c4d4e6d65718bd19";
sha256 = "0xdnalqqf5cqmwkwss8lhiwr4zb925al80wwlpjyln18hayjpii4";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -1135,12 +1135,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2023-05-21";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "32d74d5d044f7cc89892d4781a83d55ee4ed552a";
sha256 = "00bw1br0p9gvwrirrp3byazmr51klzbl512aqcp2j4x2g9s3zksq";
rev = "02d795081e6a24ec1fd506c513491543793d0780";
sha256 = "1zq4vnqq5sq679nw8zvwvkkrw0gnpina2nf4iq66s8qgqiqsm43d";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -1963,12 +1963,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
version = "2023-05-19";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "581ba9718f4416b4107273ffbce9c0a821835832";
sha256 = "1fnlfz3m644zbdsr7iwdlkgcnyp0p07fpcxpwrd47bl5c00sf343";
rev = "48eaf767680e7e35b89110e0193f99520e76f666";
sha256 = "0v99z5amg6pjh2gbvrgdrm62zgb9x0dr5v594l7sa4wziczh3kl1";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@ -2035,12 +2035,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
version = "2023-05-03";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
rev = "e1fe53117aab24c378d5e6deaad786789c360123";
sha256 = "13ypypkb63j8spg9av9i7n0yp0g4d1hwrym0f9659r0kxmzy9h88";
rev = "c8043290f2d77f61025494d839d88e414608c460";
sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@ -2299,12 +2299,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "2d1f1e5192c9484320802b61e465d10c9199fbb2";
sha256 = "0axn19ly5xcmg773mm1an90ph29ja711jn3jhpzbxvlngfy1zlm0";
rev = "7d7cebb459d1157c8fac2e8b64686f216008337a";
sha256 = "1bm5rc6kg42281nndd2flhgrwv482zpqvrs9myafjsfcwz8asvjr";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2853,12 +2853,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-05-26";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "bff58a6ea3e081ca50049700f9848b2f84ea57be";
sha256 = "0il9i8jdvvf29k6c7vsms37k6cdx5w19lw7614rxy3qb1328nvcx";
rev = "86bf6182e2ea767c21711de8a3c396d9b635d970";
sha256 = "1gbmpd3sbf8zw2fc386cygy3d5mwy4zbnsrasg45bxr86vzc4gx4";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2901,12 +2901,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "9128f2893767cf0fa5f57e6041770ee6cf1c4fdb";
sha256 = "0lwrb65p62wq0mialc9igxghrq8lhckw4q0qy4ha124scx05gz4j";
rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4";
sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@ -3516,12 +3516,12 @@ final: prev:
git-blame-nvim = buildVimPluginFrom2Nix {
pname = "git-blame.nvim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "f-person";
repo = "git-blame.nvim";
rev = "c2c0504451a5a2d8141befea7e4a90d21cc4c5c7";
sha256 = "1pyywcycwc4am1142vkqxyh6f7yppn28hphr0415d3jsm2r8ygi6";
rev = "a1a41cf25e985b7bf0b2e6b41b3cd4d1012a63c6";
sha256 = "08qy16j4psxa7x14wi9wnb1wsxqjp74z9kn0c2y18alnpk0pa9kv";
};
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
@ -3648,12 +3648,12 @@ final: prev:
godbolt-nvim = buildVimPluginFrom2Nix {
pname = "godbolt.nvim";
version = "2023-03-24";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "p00f";
repo = "godbolt.nvim";
rev = "7e526ff6d04107161a732a6cba674d69bdc7e198";
sha256 = "03l60x3mz3apma2hp7ls2vila19lfgdds9h3c4q35j4rb839mnfg";
rev = "4a7e88041c9350ca7252585c7720eac0933af384";
sha256 = "0nj5v1nqqgriz5420sqlrqqjrgki6xqgkj8s0ak70qnpx2rc0l2r";
};
meta.homepage = "https://github.com/p00f/godbolt.nvim/";
};
@ -4499,24 +4499,24 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-05-26";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "be918a8e6aa00a6cfa7270d4bfcc11b2f80d6902";
sha256 = "17iknjihcp6f6gw4qsylj7nh9y0zi1bsyxwbwrif7d6qmdvvz585";
rev = "14b5a65190fe69388a8f59c695ed3394a10d6af8";
sha256 = "1p3bz2zs4s2kg1q1gyaf2pffp1fwd0hmh5cds8s8a1r3cab9mnap";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2023-05-10";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "ba2bb47ca6b183c59047565967f649be52b3ddf6";
sha256 = "1b1n2g6wpkw9x2ak88k3m9qpyl716jq83538dzdwc5w7pb6218yq";
rev = "6a3b2411146432f83ef44c7980d7a2b20f7a39ce";
sha256 = "0hl6ax2j9k0vfjxra6lvh01v1bid9y4yzdhj56h27iafhd321i14";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -5171,12 +5171,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "afa6f0a3dc27b910501651f5fc26ef3b551fd99b";
sha256 = "0khp6ij0p8jjdh3nqcll6czyg85027v7f6a5is923vym8lq82v42";
rev = "81de16f854396094b4118d5d6eb660bd9a188cf5";
sha256 = "094pigwidzaak4gc6p2blkb7hlsmiv71y0wd0kb7jvy6k6xr0yyr";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5235,8 +5235,8 @@ final: prev:
src = fetchFromGitHub {
owner = "loctvl842";
repo = "monokai-pro.nvim";
rev = "25b7c5ea92f2a5d6417acb6cbf1a4885ec39a0de";
sha256 = "19q5b2axmhqv53aqfcszrfpj95da8a1fzx4wk5d8198xmmgrxnhl";
rev = "2095bb6604485d97574c9933c114dc577e7b8e98";
sha256 = "17vij0f1p05jz6c2gmpldg6g8vankcfzrggn2h1021a1c9hw8war";
};
meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
};
@ -5531,12 +5531,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "27714f819bb1030f00d437c0341d420b649e0021";
sha256 = "138pl6a9q3cj3ld5wc6z0jj5zszi40xvfh1gfnn51g7jgd2sfamk";
rev = "33a1f1899629117374b3ef62d43fd85311fc5442";
sha256 = "0cvj2v6f6h4qb5v3jic9625fy0ifwmppy01r3sik7kg9aa8fkdcy";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5591,12 +5591,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "80be328067b370744c39323674a2ebaf515dea14";
sha256 = "1ryss8k6bixj2ky6nj45lyqmhizq58vykwl2wsz93g5x2f60cix3";
rev = "4cebc271b13cb7af6b5a3e8ad76a356660c0c00c";
sha256 = "0m6bvxymqb32x4h77diq6d7rxy7vbp2sx12d1pa3i8vp8vqwcm9b";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -5651,12 +5651,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-05-31";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "e0fcf254fbdb95fa0918692aee1c93b938e883f8";
sha256 = "08db5lj5ikj3pl63gdksarjv133gjlsvsgmfmsv1hj6yakl8sdza";
rev = "44ee0cb8db3d655d45d5ca5cedc2b0745b232659";
sha256 = "0ir7c38k73r2q6vvd0hh16bgi8j2wrss6d1p6lb8p0k5qhi57ll4";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -6083,12 +6083,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "5c63b4c0c5efcf67df10ed7dda14e52ad6f3a0cb";
sha256 = "12k4f8dfz4r0vimfvf4gm90i3k2y4zx7lydcbjsmq8sa4pm779ca";
rev = "5be7583cca09b8cca53a1a23711287375f48f22e";
sha256 = "0hf09z75zlv9hvb4is5s0aq4wlpplyirq8jpykjg9sj2q4k3cajm";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -6215,12 +6215,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
rev = "9c10201ef383f4c4c9caacd2050f76e8fbb76b1c";
sha256 = "0rby0rd8yjd8lj4lwqfmjghvhigh6fisjkk6m91ngyhlcj1lggvc";
rev = "f8a489ea1a670569eead0fe5651c0c48add743e8";
sha256 = "0xq9rmhgqy3jbzdyw5x8lnynhs22dw8vsy0nzkinbhc58b0jlr2l";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@ -6443,12 +6443,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2023-05-17";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "56118cee6af15cb9ddba9d080880949d8eeb0c9f";
sha256 = "12byna7q3c72gij51lnyvgmibmxbw0xdswk6zny6p58b9hk4b3w9";
rev = "7c1d47cf7188fc31acdf951f9eee22da9d479152";
sha256 = "0mgv11jkyq5zkr6a0bk7wbfb5z7r5q070yh7s8nqijnc0i1n55f1";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -6575,12 +6575,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2023-05-31";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "eea19a837c770f177377b4d2e7eaaebce0ec528d";
sha256 = "0i5phqicji2pkk0dbw3bnmx5a98q7anfrj7rb1nhpx83rx29swvf";
rev = "2646e30f686b321638f82510162e4dc8104a57ff";
sha256 = "1nrjwfh2iv1nqg2miqdl7f277kwcgzc9n08dliiga8r01fsz1h4a";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -6611,12 +6611,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-05-23";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "365811ecf97a08d0e2055fba210d65017344fd15";
sha256 = "06axkic8h0a3k0i2x9s989hkyxalndgqih0bmpviqyd73xwncg8m";
rev = "8597d57fb40d4ad503cf3acb2fdcfe1b0d8a193d";
sha256 = "1s7xnl8rsav4237mzh37q4qflhbfb2sq7vasdfgzx4mgad2x6kx5";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -6755,12 +6755,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2023-05-21";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "51cd9fabe8ba7ff9abafd0c1ec4292f3a2eb1a31";
sha256 = "001zjqgiqf61c7x3r1np8za7naxph4qizilngckxahxa8myams44";
rev = "1b9053139342ed9ab47b29e5a1076fcbd971a565";
sha256 = "1fqc4bl5c9r1sgigfc1kmnzgnmgjpcb0sw32a2g2syz0fg9n7h6k";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@ -6887,12 +6887,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "e64fb82b4e1c2b314d1d5d4511f7a9e73b9dc59d";
sha256 = "00kh7jzh719ag22ym0vll3a3nnzbvdrany6vz4018iiccx8mggr2";
rev = "331637ddeeba29bfa1e95878f0202f17f6000de1";
sha256 = "16jvaj37zbpyv8qrvn37qhd71npwxpqf1lm9zjpjzjl5c163azws";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -6995,24 +6995,24 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-01";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "a6063b22c9e6d8660b82255d251c19d150725d9f";
sha256 = "1jhzypbsps5ckgbykgii8x2zcawfnp6v0ibz6kgckjngi9pxc97z";
rev = "2cbe8a4296612b2cd603548a31b020f013be512c";
sha256 = "1gp5h2w35j1q0s67gmjxmlk05lbmyvn360j4m637gxyw2x0n49hf";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
rev = "2182556aab4524b4fa8d00031bf1228ea2e4a023";
sha256 = "0xybwafqdq540nlvcdax48xa04d85blm19gndlg1zyrkhs7hbd7i";
rev = "e2ea37627c0681421ccf4a3cf19d68bb958e1817";
sha256 = "01y9h86zvf4rj6zy0hlw59y9ynijj1ljpxhaz5kg689fyhq277cc";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@ -7055,12 +7055,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2023-05-23";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "95b76b95eff25e1e64f363938cd853852355d70a";
sha256 = "0j1mrq2djx5f7xvxdjj441skkh4dmjz8frd06951pnxdar3ljqbn";
rev = "23e883b99228f8d438254e5ef8c897e5e60e75d1";
sha256 = "1xjwah0g96mjv01lhd7yfml2gd15syhj2axbvid9xk4yn4m6hks8";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -7222,12 +7222,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
rev = "95a7f271eff4397e593c90246891c18058bdffc2";
sha256 = "1yw8kch7jn04y89jdr8zxrpkcfalmk8mq4kl4m41ylsdk93865mh";
rev = "2d2769ff80a82a0da24dcf636ae146f3ed5d7ae5";
sha256 = "1dj2dzrd9p34k5f3m6l1qhxf74zmrq07rk94s18q2vzfhkqznbv8";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@ -7367,24 +7367,24 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "c5249aabbbe5a67acb24675672cdd7d07ec42611";
sha256 = "00ifdmaxlrn3wk1lq729nv70w89w60mpk988ixa61rja0wgcbm1l";
rev = "7d4a3ffe9f766db7eab4c98610078f62f83965df";
sha256 = "123vpmj4mw8avkiw4xwfzip4sa3sfpg6wpcb1xdk0lw5k0jjnhc8";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
other-nvim = buildVimPluginFrom2Nix {
pname = "other.nvim";
version = "2023-05-29";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "rgroli";
repo = "other.nvim";
rev = "b87013f5d54920d6db36d605a6433495ea47d6c0";
sha256 = "0fr7p0y443x4g7025id4g4gbphaqnc5j9ksaprin2nwrm9dyvgc9";
rev = "f297d32bbfc388e94fbd70ec769c8ee78c0f9982";
sha256 = "05zr71d9skja9p5nfajdlzmavibgx5vxxzbc0604psfm05nvsj89";
};
meta.homepage = "https://github.com/rgroli/other.nvim/";
};
@ -9572,12 +9572,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-05-31";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "53270a472badda2d96b3fb4305f3cca244d3bd1f";
sha256 = "0jn3683vc80b76mdfmj45sd2ml2h5f7333dqy0lygkdhszbc1b96";
rev = "f754a9742fb58e292390eec53f2eb4ee67c157dc";
sha256 = "068bgabncpqx32nj716940977hjyfbzmkw4ml9kf19n5qrij59dm";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -10484,12 +10484,12 @@ final: prev:
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2023-05-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "09ee74ce6afb9604a430d7425d7f0d67a35f30d7";
sha256 = "19bb68rr3f9yxk02gx19kpvqw71xppal0slmfdd3pcdjhi7wcb76";
rev = "6ee1e7e22a6ff793331da96c0884f0b906e7dc96";
sha256 = "116r2hrbf87silgzp5py7chp8wcb64rhxcg5vhscq2gp7080yv7h";
};
meta.homepage = "https://github.com/google/vim-codefmt/";
};
@ -11312,12 +11312,12 @@ final: prev:
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2023-04-27";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "2ee95686c5944f99b42dd04fec005b30497006de";
sha256 = "1lg74l6rw6m1fy39c039vynpb97gq0j066k9gn9wll7zjxqjwfss";
rev = "538fba90fb85b712a3a52a33a736bb29afde1ec2";
sha256 = "0hj06nfimi98bsnb5bwz179gjdwkpjd6gjyr70cvvk1h3k2hrd20";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -11408,12 +11408,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
version = "2022-03-20";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
rev = "f94afba273ec544e1e73e82c78674eed4ccb1c8c";
sha256 = "1gjnp05a10bad1f12xc5pb1m54jzkq3hh8a83l8aq6377a1z9bky";
rev = "566a182367207d2835546946aed714a6c354d253";
sha256 = "0b7g6dmq35iyj3l50jl23hna5fn1chz8pz75gdw7n7fh1qadg2q2";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@ -11936,6 +11936,18 @@ final: prev:
meta.homepage = "https://github.com/mroavi/vim-julia-cell/";
};
vim-just = buildVimPluginFrom2Nix {
pname = "vim-just";
version = "2023-04-21";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "9fc9a1afaa9e3567b25f4141a01f6172a1992a0b";
sha256 = "0wjrqjb0vwp5pk4q2xyrachx9974lxnync1lj40778v5wlsc4w9v";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
};
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
version = "2023-05-25";
@ -12287,12 +12299,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2023-05-29";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "02b906cf772811a6845f2d5caaa81152beb65d6b";
sha256 = "1cvi5as7wawzlmsjkjycy6s40460isfz90q4h2pzqzhhijr2ys0n";
rev = "3625e099b09bff2db5f04082cb09ba679525980c";
sha256 = "0nb7xnypv046lh73wfqhch54jx5h3xaxjin0qv9b3g0k5zd0mdi6";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -13571,12 +13583,12 @@ final: prev:
vim-solarized8 = buildVimPluginFrom2Nix {
pname = "vim-solarized8";
version = "2023-04-30";
version = "2023-06-02";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-solarized8";
rev = "b0b5d4dd1e582cd5f681bb438346ce5848d845fd";
sha256 = "0dp3vj80dgkm5zv0hjmmx1810z1ajl77sbwb1v2sbhk2c3mgr0cv";
rev = "4004d6a10e7e0a7838fa32d0146b8cf16cdf7e12";
sha256 = "0pqhw2ca5w1vm118ijv9hpk2aq6q2pld2xp97vamwv1acra3yzn1";
};
meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
};
@ -13643,12 +13655,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2023-05-25";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "8eed46917c5c4882b295729ce053265c2a74ac4d";
sha256 = "1f893npcny3zgms031nwk872i0f4kgdwk6r2znjm4pb1mqjqa92b";
rev = "b5c144367fad9846bd288be6c3933f6c7ddd69ef";
sha256 = "06fsq0i9i1kbswvbm25f4h4089aisgrhnjyb45nn78s8x1377yz5";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -15026,12 +15038,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-05-30";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "52adf33cc1e8e6f92f4670561c19ad702180c129";
sha256 = "053gim0j9z59i053w8p9cvspnyqny81zc96f4bhhg0ga8nhxargi";
rev = "1b0120993633a0e4f25fa9c720ce3894ebf36cb4";
sha256 = "0swwn8l30l5h8lqvcn5c158b0r4i8zx6sh8shyz1d4gzqnr5fx6i";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -15074,12 +15086,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2023-05-29";
version = "2023-06-01";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "c4e6259dda346babc71970bd00e03e211b44614d";
sha256 = "1dfmdcbrslksnaa6416ccdbrbkbzg16f49bsc6w552cwndj7fx6d";
rev = "c475ace5b8882631b351ef7c3e8078ca9ebbb751";
sha256 = "1dg96sg0262nm2rzq6h80f51grc4www7ljcx6c7j3l8p0c003gha";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};

View file

@ -280,12 +280,12 @@
};
cue = buildGrammar {
language = "cue";
version = "0.0.0+rev=971130a";
version = "0.0.0+rev=0deecf4";
src = fetchFromGitHub {
owner = "eonpatapon";
repo = "tree-sitter-cue";
rev = "971130aa1d2da22098d75062c024bb1250ff9d62";
hash = "sha256-s1Y4lGB8DAcZ4ugUs088DXHMDrT46zNeIvZLqZK493s=";
rev = "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4";
hash = "sha256-myHuYl3JfJ/JvVKM9toprsZ+RJ7L2G0LpzcNTmPTfHE=";
};
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
};
@ -634,12 +634,12 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=29dcda3";
version = "0.0.0+rev=53ca269";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "29dcda3e8299b91df24cafd24bba43cdd3ca2456";
hash = "sha256-oBb+Mkyoz74+VrMSCK0z8UtP6O/Cfwo0V/IlF9b9Gk4=";
rev = "53ca269cae2a47b1b75791e2bfe843baeb02e903";
hash = "sha256-qDysihoyGlzAFvhnu6qOjNTIRT9ii/A1B1wNiZNlJs8=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@ -777,12 +777,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=e7e2670";
version = "0.0.0+rev=eeb138a";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "e7e2670872c2f1a6556eeedd0b80778b5653e187";
hash = "sha256-i7tloMXu/0PU5eozP1zyZr4lB+jRWTJ/udgENmq+cmY=";
rev = "eeb138aba44de8379dae474624fef65d4288476a";
hash = "sha256-FIf8rKxM0jTfisjHhNUm/5IXj7njCVhPOXFR8Fhr3Ek=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -997,12 +997,12 @@
};
latex = buildGrammar {
language = "latex";
version = "0.0.0+rev=b0686a8";
version = "0.0.0+rev=dfe8919";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
rev = "b0686a83c2429cc04e6d01f067f5a0a8efc0d17b";
hash = "sha256-/80/7HRLMt0p+SqO4d2wcRjHxZZCLH0ooJs4tNrw+oY=";
rev = "dfe891922ccd2e7cef52eccb2775e1b576727165";
hash = "sha256-xZUrAikgYoSCwFB6vWvV4K5S3sk0RAEUdDhOqLV9PVw=";
};
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
};
@ -1608,12 +1608,12 @@
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=e7f7d01";
version = "0.0.0+rev=236c7b2";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "e7f7d016308e47bfb387581206b77c8c48947fdc";
hash = "sha256-oC8txJr5efT48jzRErPTfK9k10jNibogeoiHjT4RDm0=";
rev = "236c7b20dbddedb031ce40517fafc027434f6860";
hash = "sha256-M6HOkS/E5OKDUpzG5hgXdD7ZkWIVIdbFUXW4TC+Spkg=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -1785,13 +1785,13 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=b4dca35";
version = "0.0.0+rev=4e581fc";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "xasc";
repo = "tree-sitter-t32";
rev = "b4dca3527463274de1f3263c0e1c329bc3b4f514";
hash = "sha256-qWtlk7r6UmEEsbz6k7eGTv4WdWbcaUn2rUQsQ4SxqJA=";
rev = "4e581fcd17d76651aa92759a68f9a8186b9fe8dc";
hash = "sha256-SUft3MpM8fSLyojgRs6uaZxWDfoxNvL5Orb7XcrztYo=";
};
meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32";
};

View file

@ -1006,6 +1006,7 @@ https://github.com/mogelbrod/vim-jsonpath/,HEAD,
https://github.com/MaxMEllon/vim-jsx-pretty/,,
https://github.com/peitalin/vim-jsx-typescript/,,
https://github.com/mroavi/vim-julia-cell/,HEAD,
https://github.com/NoahTheDuke/vim-just/,,
https://github.com/knubie/vim-kitty-navigator/,,
https://github.com/farmergreg/vim-lastplace/,,
https://github.com/xuhdev/vim-latex-live-preview/,,

View file

@ -0,0 +1,44 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, nodejs
}:
buildNpmPackage rec {
pname = "pairdrop";
version = "1.7.6";
src = fetchFromGitHub {
owner = "schlagmichdoch";
repo = "PairDrop";
rev = "v${version}";
hash = "sha256-AOFATOCLf2KigeqoUzIfNngyeDesNrThRzxFvqtsXBs=";
};
npmDepsHash = "sha256-3nKjmC5eizoV/mrKDBhsSlVQxEHyIsWR6KHFwZhBugI=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/lib
cp -r * $out/lib
makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" --add-flags "index.js public --rate-limit --auto-restart"
wrapProgram $out/bin/pairdrop --chdir "$out/lib"
runHook postInstall
'';
meta = with lib; {
description = "Local file sharing in your browser";
longDescription = ''
PairDrop is a sublime alternative to AirDrop that works on all platforms.
Send images, documents or text via peer to peer connection to devices in the same local network/Wi-Fi or to paired devices.
'';
homepage = "https://github.com/schlagmichdoch/PairDrop";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dit7ya ];
};
}

View file

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, dpkg
, electron_16
, electron_24
, makeWrapper
, nixosTests
, nodePackages
@ -12,13 +12,13 @@
let
inherit (stdenv.hostPlatform) system;
version = "3.1.0";
version = "3.3.0";
systemArgs = rec {
x86_64-linux = rec {
src = fetchurl {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb";
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
sha256 = "sha256-12mbdxklje9msnRtNk1RAtIg3OCybev/vUersDZj2i4=";
};
nativeBuildInputs = [
@ -49,7 +49,7 @@ let
}
EOF
makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
makeWrapper ${electron_24}/bin/electron $out/bin/breitbandmessung \
--add-flags $out/share/breitbandmessung/resources/build/electron.js
# Fix the desktop link
@ -61,7 +61,7 @@ let
x86_64-darwin = {
src = fetchurl {
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg";
sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20=";
sha256 = "sha256-a27R/N13i4qU2znTKz+LGxSdgSzJ0MzIHeiPHyRd65k=";
};
nativeBuildInputs = [ undmg ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-BjNJIHPFAytiZIrHPcEuxYCXlp35kMR3OA3KXOdBj8w=";
hash = "sha256-pgWNmjIyRWsshuP+GGc/Kxd32DIoHphwYvBIx2hBWZg=";
};
vendorHash = "sha256-btZHQ0sqgbMm0WWswY9ChNNtXX/xedv/d0BrO03MBns=";
vendorHash = "sha256-Fr4yfwRdhwH1UHAb4rQ74rzAGjIyEX4+0lFujUs8Tos=";
ldflags = [ "-s" "-w" ];

View file

@ -44,11 +44,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.48.2";
version = "3.48.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "rigYzxC6jyLsGgwN/4gkVSRkMMMikN1VJvTh/i5i6rc=";
sha256 = "ZhJexH/XcBcRdNDAhYZu/7aoNEQBW34sdkEpUtbLDiM=";
};
nativeBuildInputs = [

View file

@ -14,21 +14,21 @@
}:
let
version = "1.17.3";
version = "1.17.4";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0";
sha256 = "68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb";
sha256 = "70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99";
};
in mkDerivation {

View file

@ -0,0 +1,36 @@
{ lib
, stdenvNoCC
, fetchurl
, dbip-country-lite
}:
stdenvNoCC.mkDerivation rec {
pname = "dbip-country-lite";
version = "2023-06";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz";
hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc=";
};
dontUnpack = true;
installPhase = ''
runHook preBuild
gzip -c -d "$src" > dbip-country-lite.mmdb
install -Dm444 dbip-country-lite.mmdb "$out/share/dbip/dbip-country-lite.mmdb"
runHook postBuild
'';
passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb";
meta = with lib; {
description = "The free IP to Country Lite database by DB-IP";
homepage = "https://db-ip.com/db/download/ip-to-country-lite";
license = licenses.cc-by-40;
maintainers = with maintainers; [ nickcao ];
platforms = platforms.all;
};
}

View file

@ -2,7 +2,7 @@
, stdenvNoCC
, buildGoModule
, fetchFromGitHub
, clash-geoip
, dbip-country-lite
}:
let
@ -34,7 +34,7 @@ let
in
stdenvNoCC.mkDerivation rec {
inherit (generator) pname;
inherit (clash-geoip) version;
inherit (dbip-country-lite) version;
dontUnpack = true;
@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation rec {
buildPhase = ''
runHook preBuild
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn
${pname} ${dbip-country-lite.mmdb} geoip.db
${pname} ${dbip-country-lite.mmdb} geoip-cn.db cn
runHook postBuild
'';
@ -61,6 +61,6 @@ stdenvNoCC.mkDerivation rec {
passthru = { inherit generator; };
meta = generator.meta // {
inherit (clash-geoip.meta) license;
inherit (dbip-country-lite.meta) license;
};
}

View file

@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.48.2";
version = "3.48.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "HzJD3xK08dMpjJl31iIaZWX9J578mE4czyVSRdBM/9U=";
sha256 = "tx5BLlL1Z8gzlLWSbfkrT09tLN3rrThKUXxyBnH62ZY=";
};
patches = [

View file

@ -141,6 +141,11 @@ let
"$out/bin/python"
else pythonForBuild.interpreter;
src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
inherit hash;
};
# The CPython interpreter contains a _sysconfigdata_<platform specific suffix>
# module that is imported by the sysconfig and distutils.sysconfig modules.
# The sysconfigdata module is generated at build time and contains settings
@ -216,15 +221,11 @@ let
in with passthru; stdenv.mkDerivation {
pname = "python3";
inherit version;
inherit src version;
inherit nativeBuildInputs;
buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs
src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
inherit hash;
};
prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
@ -523,7 +524,24 @@ in with passthru; stdenv.mkDerivation {
separateDebugInfo = true;
inherit passthru;
passthru = passthru // {
doc = stdenv.mkDerivation {
inherit src;
name = "python${pythonVersion}-${version}-doc";
dontConfigure = true;
dontBuild = true;
sphinxRoot = "Doc";
postInstallSphinx = ''
mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version}
'';
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];
};
};
enableParallelBuilding = true;

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.2.1";
version = "2.2.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ku96N3n71mrYuott6E6UwbloP6RzM9tiEATvYHzdYnM=";
hash = "sha256-ZvyAZ/VLkkZkDTBzuxt7hrCuYxNsMHm0C0wkabnE3Ek=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "apycula";
version = "0.8";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Apycula";
hash = "sha256-IUyhqOuftx06+dvN9afad10IpaefHoUeMwFyTzgBvOQ=";
hash = "sha256-IznOt69gzWO/+Snw9YfmDU2CE15IZ+jlPz+ZGfPzK+Q=";
};
nativeBuildInputs = [
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Open Source tools for Gowin FPGAs";
homepage = "https://github.com/YosysHQ/apicula";
changelog = "https://github.com/YosysHQ/apicula/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ newam ];
};

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.14.1";
version = "0.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
hash = "sha256-+BtXi+O+Ef4p4b+8FJCrZFsxX22ZYOPXylexFtsldnA=";
hash = "sha256-q30/oNP1NjyxiJuSfxyjFgciydImMUgPdGJ/tqVtwZk=";
};
propagatedBuildInputs = [

View file

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.7.2";
version = "1.7.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = "maestral";
rev = "refs/tags/v${version}";
hash = "sha256-XyyEAeEQEc7MhGyXBBLZDqzBL7K+0dMMCKhr0iENvog=";
hash = "sha256-HOM7BlrKpqm16plTMLFpC6VScEoMlxCJFhZ0mcIFIcE=";
};
propagatedBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "minio";
version = "7.1.14";
version = "7.1.15";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "minio";
repo = "minio-py";
rev = "refs/tags/${version}";
hash = "sha256-GT9XMHzEOg04DZ/saacBfqAKc5A755m2zblJvwQjd1w=";
hash = "sha256-eqQPOMEJOTdvYHaQ+ty+bDJn4/S5KnUOtF42O1wc+mw=";
};
propagatedBuildInputs = [

View file

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "python-benedict";
version = "0.30.1";
version = "0.30.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7X8a9033r6MJT1KgPH7FiXL0EZqwi4wnKVw5AYAaVR8=";
hash = "sha256-MT1oZqzYFK37z6YpRZ9LBg0ynCaq2UrrQzlDDb3YIvo=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchFromGitHub, sphinx }:
buildPythonPackage rec {
pname = "python_docs_theme";
version = "2023.3.1";
format = "flit";
src = fetchFromGitHub {
owner = "python";
repo = "python-docs-theme";
rev = version;
sha256 = "sha256-WyO5Xc67k5ExB4eCFd17sZCBMaV5djle9BAM0tn5CPc=";
};
propagatedBuildInputs = [ sphinx ];
pythonImportsCheck = [ "python_docs_theme" ];
meta = with lib; {
homepage = "https://github.com/python/python-docs-theme";
description = "Sphinx theme for CPython project";
license = licenses.psfl;
maintainers = with maintainers; [ kaction ];
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "bearer";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-5Vd6knHm9r2VicHuvPKE7jzRGcNog8THNwDQmW2MJ5Q=";
hash = "sha256-p+nQiIZfTScS6zNc8+qa+X5onfSecJzIrwMkWonJ3/w=";
};
vendorHash = "sha256-FRB01Tfz87MZp4V0HPeiEgYV8KEPcbzkeUM0uIBh6DU=";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
version = "2.15.2";
version = "2.16.0";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
rev = "v${version}";
sha256 = "sha256-0fpVSFo+o+M7vwwHIrYQZcAjdZjASdWz/cKXnPr6Je8=";
sha256 = "sha256-yoy3wESegXxlyaelex2gqr3GdzwwjxK7YTAzDCILr/c=";
};
vendorHash = "sha256-WHwZ0EAJIz7mZr27x+Z7PKLLAiw1z2rQvvNynpMJQDw=";
vendorHash = "sha256-dxzAiLEiZ+2+J9ZrkBemUt+slxz1zUa9Fx0VhUjFdN0=";
meta = with lib; {
description =

View file

@ -25,13 +25,13 @@ let makeArcWrapper = toolset: ''
in
stdenv.mkDerivation {
pname = "arcanist";
version = "20230401";
version = "20230530";
src = fetchFromGitHub {
owner = "phacility";
repo = "arcanist";
rev = "0fc22183e796fb8ac2e3a0a3f3f37aa964c6d7fa";
hash = "sha256-DPq0SJTOUzQFo6r/o5R0rS9FPaKebWYxaOd1Ocn7Ic8=";
rev = "e50d1bc4eabac9c37e3220e9f3fb8e37ae20b957";
hash = "sha256-u+HRsaCuAAyLrEihrZtLrdZ6NTVjPshieJATK3t5Fo4=";
};
patches = [

View file

@ -1,17 +1,17 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
rustPlatform.buildRustPackage rec {
version = "0.5.1";
version = "0.5.2";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${version}";
sha256 = "sha256-RcosHR+PD78hk7XMClUCWICrtWR/9OxIuyCFy2EK/Qs=";
sha256 = "sha256-CriVsjxbfe3iJ0FD9HAve3QunBt3rWkzWqQDuJcPR9A=";
};
cargoSha256 = "sha256-qDFBIU/IbQjLpTulI8tolFg54+2m2mV/JHuX4bsJYWw=";
cargoSha256 = "sha256-/pr+YT0ZejF0EpxZUlUBS21crtuhE/M222kvLAXaoyU=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.28.1";
version = "1.29.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-YzkPAKwkV8io0lz7JxIX4lciv85iqldkyitrLicbFJc=";
hash = "sha256-oHGs1Bx5k02k6mp9WAe8wIQ4FjMOREcUYv0DKZaXGdE=";
};
vendorHash = "sha256-ZWOIF3vmtoXzdGHHzjPy/351bHzMTTXcgSRBso+ixyM=";
vendorHash = "sha256-I2vL4uRmUbgaf3KGUHSQV2jWozStKHyjek3BQlxyY/c=";
nativeBuildInputs = [
makeWrapper

View file

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "pip-audit";
version = "2.5.5";
version = "2.5.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-tHNDJF4gmg5JnL+bt7kaLE+Xho721K5+gg1kpIjKY1k=";
hash = "sha256-hpzJtKtvhudT7OzZnuv6LbnMHnHIBYmQsAR1oRglvT0=";
};
nativeBuildInputs = [

View file

@ -1,26 +0,0 @@
{ python3
, fetchPypi
}:
with python3;
pkgs.buildPythonApplication rec {
pname = "pypi2nix";
version = "2.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d";
};
propagatedBuildInputs = with pkgs; [
attrs
click
jinja2
nix-prefetch-github
packaging
parsley
setuptools
toml
jsonschema
];
# https://github.com/nix-community/pypi2nix/issues/460
meta.broken = true;
}

View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "zprint";
version = "1.2.5";
version = "1.2.6";
src = fetchurl {
url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
sha256 = "sha256-mzhl7boAMKZ5bj184LLCWR/faDjJI+crX4Vzbh7eosY=";
};
extraNativeImageBuildArgs = [

View file

@ -0,0 +1,46 @@
{ stdenvNoCC, fetchurl, dpkg, lib, qt5, autoPatchelfHook, SDL2 }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gamepad-tool";
version = "1.2";
src = fetchurl {
url = "https://generalarcade.com/gamepadtool/linux/gamepadtool_${finalAttrs.version}_amd64.deb";
hash = "sha256-ZuB0TOyT2B5QkU1o5h3/8PL85tBq06hlz5YclRanD88=";
};
nativeBuildInputs = [ dpkg qt5.wrapQtAppsHook autoPatchelfHook ];
unpackCmd = ''
mkdir -p root
dpkg-deb -x $curSrc root
'';
dontBuild = true;
buildInputs = [
SDL2
qt5.qtbase
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/applications
cp usr/bin/gamepad-tool $out/bin
cp -r usr/share/icons $out/share/icons
substitute usr/share/applications/gamepad-tool-debian.desktop \
$out/share/applications/gamepad-tool.desktop \
--replace "Exec=gamepad-tool" "Exec=$out/bin/gamepad-tool" \
--replace "/usr/share/icons/hicolor/256x256/apps/gamepad-tool.png" "$out/share/icons/hicolor/256x256/apps/gamepad-tool.png"
runHook postInstall
'';
meta = with lib; {
description = "A simple GUI tool to create/modify gamepad mappings for games that use SDL2 Game Controller API";
homepage = "https://generalarcade.com/gamepadtool/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ gador ];
};
})

View file

@ -12,7 +12,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "switcheroo-control";
version = "2.3";
version = "2.6";
format = "other";
@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "hadess";
repo = pname;
rev = version;
hash = "sha256-1Pze2TJ9mggfcpiLFwJ7/9WhsdJx4G3GoA7+Z47shuc=";
hash = "sha256-F+5HhMxM8pcnAGmVBARKWNCL0rIEzHW/jsGHHqYZJug=";
};
nativeBuildInputs = [

View file

@ -5,7 +5,7 @@ in
# This is a separate derivation, not just an additional output of
# usbrelay, because otherwise, we have a cyclic dependency between
# usbrelay (default.nix) and the python module (python.nix).
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "usbrelayd";
inherit (usbrelay) src version;

View file

@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "usbrelay";
version = "1.0.1";
version = "1.2";
src = fetchFromGitHub {
owner = "darrylb123";
repo = "usbrelay";
rev = version;
sha256 = "sha256-2elDrO+WaaRYdTrG40Ez00qSsNVQjXE6GdOJbWPfugE=";
rev = finalAttrs.version;
sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs=";
};
nativeBuildInputs = [
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
];
makeFlags = [
"DIR_VERSION=${version}"
"DIR_VERSION=${finalAttrs.version}"
"PREFIX=${placeholder "out"}"
"LDCONFIG=${stdenv.cc.libc.bin}/bin/ldconfig"
];
postInstall = ''
@ -34,4 +35,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ wentasah ];
platforms = platforms.linux;
};
}
})

View file

@ -1,6 +1,6 @@
{ buildPythonPackage, usbrelay }:
buildPythonPackage rec {
buildPythonPackage {
pname = "usbrelay_py";
inherit (usbrelay) version src;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "reproxy";
version = "0.11.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "umputun";
repo = pname;
rev = "v${version}";
hash = "sha256-3kpGeG60WSpcIqVLw437gkDT8XLsDyhGL8/sEnhTgBw=";
hash = "sha256-ac4fOOMht2WGlrXLN95NEIA8ivqghhVuxHnBumvajx0=";
};
postPatch = ''
@ -25,7 +25,7 @@ buildGoModule rec {
--replace "TestFile_Events_BusyListener" "SkipFile_Events_BusyListener"
'';
vendorSha256 = null;
vendorHash = null;
ldflags = [
"-s" "-w" "-X main.revision=${version}"

View file

@ -15,12 +15,12 @@ let
}.${system} or throwSystem;
sha256 = {
x86_64-linux = "sha256-DrPV1TSoWACk9331lYznLZbkPvx124XWrtCet4uSroo=";
x86_64-darwin = "sha256-UDovorRWOAEP8zugtd7iXmJe2YusH0ShBr8Hz4bc9Qk=";
aarch64-darwin = "sha256-UDovorRWOAEP8zugtd7iXmJe2YusH0ShBr8Hz4bc9Qk=";
x86_64-linux = "sha256-5AdMuVHYX41O+iUSUlbHLQkATY2sPb9e8y4pfmvj07U=";
x86_64-darwin = "sha256-5GX8dglvEgvWMnIG54G3jPxHUAKlS4E6aDMvvjYGidQ=";
aarch64-darwin = "sha256-5GX8dglvEgvWMnIG54G3jPxHUAKlS4E6aDMvvjYGidQ=";
}.${system} or throwSystem;
version = "16.2.7";
version = "16.5.0";
src = fetchzip {
url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip";
inherit sha256;

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "hunt";
version = "1.7.6";
version = "2.0.0";
src = fetchFromGitHub {
owner = "LyonSyonII";
repo = "hunt-rs";
rev = "v${version}";
sha256 = "sha256-mNQY2vp4wNDhVqrFNVS/RBXVi9EMbTZ6pE0Z79dLUeM=";
sha256 = "sha256-TwxNVT2x9Y0jnLXiIquf/bQ31B+2VwFfh9EFbJQHpt4=";
};
cargoSha256 = "sha256-hjvJ9E5U6zGSWUXNDdu0GwUcd7uZeconfjiCSaEzZXU=";
cargoHash = "sha256-GU3AXZJ8yGFnj0SXRezS/YI6aS/lJowwo+GBBv5wNik=";
meta = with lib; {
description = "Simplified Find command made with Rust";

View file

@ -101,6 +101,12 @@ buildPythonApplication rec {
deactivate
'';
# Propagating dependencies leaks them through $PYTHONPATH which causes issues
# when used in nix-shell.
postFixup = ''
rm $out/nix-support/propagated-build-inputs
'';
disabledTests = [
# ERROR: The install method you used for conda--probably either `pip install conda`
# or `easy_install conda`--is not compatible with using conda as an application.

View file

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "0.17.2";
version = "0.18.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
hash = "sha256-W2vBKgdPOLGdAIxbHD4Qi4ivAabFSuu7ikvu5kItwN8=";
hash = "sha256-6VROgVx1bQRgoCZJYXQPAgkqArqAnMwTNg7iHLhbKro=";
};
makeWrapperArgs = [

View file

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "cnspec";
version = "8.11.0";
version = "8.12.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-ypDosK+vA7EEQsfZh9PUZrXY0uO+mPI1GC6RS80gP1o=";
hash = "sha256-ixKBfsb3e1FvvXj0iN2odD2T5x2wtYbdonQ08fbtnY8=";
};
proxyVendor = true;
vendorHash = "sha256-Iyi1OoJEHHeCS+W922e+3o+pru/UhTUWwkkY2nurRGY=";
vendorHash = "sha256-COwAmcd6lcHF2YixOJG/X5PT7kDDdrpN9NdI66kRZQo=";
subPackages = [
"apps/cnspec"

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gotrue";
version = "2.69.1";
version = "2.69.2";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-OMAicqkwx/9OjM3Q42LOrv2gIkUNV7I9+UGuxNfL39U=";
hash = "sha256-Jx9TDTJkf5Bp4VWhJ2j04bqp6zXlrOBriSHLhW414h8=";
};
vendorHash = "sha256-gv6ZzteQmx8AwYv6+EbZMSVKttf2T0okQyvfrvKpozM=";

View file

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kdiff3";
version = "1.10.1";
version = "1.10.4";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-IFQ0kw9nU2wgUZFir33fQ1hG4qGhJdegmG9M4n+bM8g=";
sha256 = "sha256-sq//S3pJib9KCjeGfyW3a6uI3zq2Wi99QJp7S+0HBZ0=";
};
buildInputs = [ boost ];

View file

@ -4,24 +4,28 @@
, installShellFiles
, pandoc
, makeWrapper
, testers
, ov
}:
buildGoModule rec {
pname = "ov";
version = "0.23.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
rev = "refs/tags/v${version}";
hash = "sha256-zIPJvlzq9N5sjc7OkdQnxZZYK4RuM6jW4EWLrEzSabg=";
hash = "sha256-xTnUTtMm986MnQEKgExWfABU8E8C+ZiRZvOpg3FY5cY=";
};
vendorHash = "sha256-bQREazHu0SQrMKyNPtUvzeKR/zb0FJOLpHBwHml43Hs=";
ldflags = [
"-X main.Version=v${version}"
"-X main.Revision=${src.rev}"
"-s"
"-w"
"-X=main.Version=v${version}"
"-X=main.Revision=${src.rev}"
];
subPackages = [ "." ];
@ -50,11 +54,18 @@ buildGoModule rec {
cp $src/ov.yaml $doc/share/$name/sample-config.yaml
'';
passthru.tests = {
version = testers.testVersion {
package = ov;
version = "v${version}";
};
};
meta = with lib; {
description = "Feature-rich terminal-based text viewer";
homepage = "https://noborus.github.io/ov";
changelog = "https://github.com/noborus/ov/releases/tag/v${version}";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ farcaller ];
maintainers = with maintainers; [ farcaller figsoda ];
};
}

View file

@ -1389,6 +1389,7 @@ mapAliases ({
pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24
pyo3-pack = maturin;
pypi2nix = throw "pypi2nix has been removed due to being unmaintained";
pypolicyd-spf = spf-engine; # Added 2022-10-09
pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12
pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12

View file

@ -519,6 +519,8 @@ with pkgs;
databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
dbip-country-lite = callPackage ../data/misc/dbip-country-lite { };
dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { };
@ -3624,6 +3626,8 @@ with pkgs;
pacparser = callPackage ../tools/networking/pacparser { };
pairdrop = callPackage ../applications/misc/pairdrop { };
opencbm = callPackage ../tools/misc/opencbm { };
parquet-tools = callPackage ../tools/misc/parquet-tools { };
@ -12439,7 +12443,9 @@ with pkgs;
sing-geosite = callPackage ../data/misc/sing-geosite { };
sing-geoip = callPackage ../data/misc/sing-geoip { };
sing-geoip = callPackage ../data/misc/sing-geoip {
buildGoModule = buildGo119Module;
};
sipcalc = callPackage ../tools/networking/sipcalc { };
@ -17289,8 +17295,6 @@ with pkgs;
check-jsonschema = callPackage ../development/tools/check-jsonschema { };
pypi2nix = callPackage ../development/tools/pypi2nix { };
pypi-mirror = callPackage ../development/tools/pypi-mirror { };
setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { };
@ -36162,6 +36166,8 @@ with pkgs;
freenukum = callPackage ../games/freenukum { };
gamepad-tool = callPackage ../games/gamepad-tool { };
gnome-hexgl = callPackage ../games/gnome-hexgl { };
gotypist = callPackage ../games/gotypist { };

View file

@ -7235,6 +7235,8 @@ self: super: with self; {
pallets-sphinx-themes = callPackage ../development/python-modules/pallets-sphinx-themes { };
python_docs_theme = callPackage ../development/python-modules/python_docs_theme { };
pamela = callPackage ../development/python-modules/pamela { };
pamqp = callPackage ../development/python-modules/pamqp { };