From 17e024867f0db475e5eb080c2e6e225a32bbce17 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 30 Jun 2021 18:20:22 -0300 Subject: [PATCH 01/22] sage: import sphinx and sympy update patches, update pari 2.13 patch --- .../sage/patches/sphinx-3.5-code-output.patch | 13 ----- .../science/math/sage/sage-src.nix | 54 +++++++++++++------ 2 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch diff --git a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch b/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch deleted file mode 100644 index f17897d4c89f..000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 6bad826a88..f4d7b8651c 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -24,7 +24,7 @@ see :trac:`12849`:: - ....: for line in fobj: - ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: - ....: print(line) -- numerical_approx(prec=None, digits=None, algorithm=None)... -+ numerical_approx(prec=None, digits=None, algorithm=None)... - - Check that sphinx is not imported at Sage start-up:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57234c660a5a..1ed174ebd460 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -16,7 +16,12 @@ let fetchSageDiff = { base, name, rev, sha256, ...}@args: ( fetchpatch ({ inherit name sha256; - url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; + + # We used to use + # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" + # but the former way does not squash multiple patches together. + url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff"; + # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; @@ -79,13 +84,6 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # sphinx 3.5 pretty-prints code slightly differently than sphinx - # 3.1--3.3. a similar patch is available at the sphinx 4 ticket - # (https://trac.sagemath.org/ticket/31696), but sphinx 3.5 uses - # tags while sphinx 4 uses tags so we cannot just - # import the patch from trac. - ./patches/sphinx-3.5-code-output.patch - # remove use of matplotlib function deprecated in 3.4 # https://trac.sagemath.org/ticket/31827 (fetchSageDiff { @@ -95,16 +93,38 @@ stdenv.mkDerivation rec { sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo="; }) - # https://trac.sagemath.org/ticket/30801. this patch has - # positive_review but has not been merged upstream yet, so we - # don't use fetchSageDiff because it returns a file that contains - # each commit as a separate patch instead of a single diff, and - # some commits from the pari update branch are already in 9.3.rc5 - # (auto-resolvable merge conflicts). - (fetchpatch { + # pari 2.13 update + # https://trac.sagemath.org/ticket/30801 + # + # the last commit in that ticket is + # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after + # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit + # and post-26635 breakage, none of which is relevant to us. since + # there are post-9.4.beta0 rebases after that, we just skip later + # commits. + (fetchSageDiff { + base = "9.3"; name = "pari-2.13.1.patch"; - url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff"; - sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4="; + rev = "10a4531721d2700fd717e2b3a1364508ffd971c3"; + sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E="; + }) + + # sympy 1.8 update + # https://trac.sagemath.org/ticket/31647 + (fetchSageDiff { + base = "9.4.beta0"; + name = "sympy-1.8.patch"; + rev = "fa864b36e15696450c36d54215b1e68183b29d25"; + sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o="; + }) + + # sphinx 4 update + # https://trac.sagemath.org/ticket/31696 + (fetchSageDiff { + base = "9.4.beta3"; + name = "sphinx-4.patch"; + rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; + sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) ]; From 07e2b260d24b5d0e8347b19bd1aa77a36d30133b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 1 Jul 2021 09:01:45 -0700 Subject: [PATCH 02/22] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 138 ++++++++++++++-------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 49a45d6d24d4..ea9aaae53edc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-30"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "01507625b76291bb41a3c92ca8a056d655b674cb"; - sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh"; + rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22"; + sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-21"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "aa817559be68d9e90316bc7e5d3205fe2ffcffbe"; - sha256 = "06c9ab58rj0qx2nyl63qpx5r8lwlx320j7913nafpk268pmqdz4i"; + rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; + sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f4a26c075f603c3d82baf56b04c9168a7e084c8b"; - sha256 = "02rsawnqixwq8cj8ryqg0nmmmzq5s1adfll9mmwa6bqh3nwxsb2s"; + rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027"; + sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2039,12 +2039,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736"; - sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp"; + rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b"; + sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2316,12 +2316,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8"; - sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w"; + rev = "6ff9e9938badea96f64154f2991e165e8d340cf2"; + sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2676,24 +2676,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-06-27"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1e79310e57404e86e00ceca2c4657bb9a9072673"; - sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx"; + rev = "b94accc40260be439b6bfa120402ebd10bd60577"; + sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f"; - sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf"; + rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; + sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007"; - sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk"; + rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; + sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3144,12 +3144,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e"; - sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11"; + rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d"; + sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3348,12 +3348,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "cbede2d4abef3f6054919863404ce46f3ed572a9"; - sha256 = "0w7fv6yl78inr81h57kgh5xfhha626sc2w8mmzgbwp7s7yhqxymk"; + rev = "98063a91de4179685c29acb1c765a99bf08ef0f2"; + sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3468,12 +3468,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa"; - sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa"; + rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c"; + sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-29"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a"; - sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8"; + rev = "161ec66bda585fd7ba402cf7434bac87c927734f"; + sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3684,24 +3684,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b"; - sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i"; + rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034"; + sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd"; - sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d"; + rev = "5fa8d5741dca82a15426db659f461244975678e6"; + sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4008,12 +4008,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-19"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "268002fdba2f8f5a4e86574e3b9924ad6d42da20"; - sha256 = "07zskz9b5s4cainjqj431b2skzdrhnm8agydmjxmw13qjmwj0q7z"; + rev = "18da6621459032aa5608b760622f0bc8fdc0535c"; + sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4057,12 +4057,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-14"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "65a16b25f98891e2832daa437cdd682e546a494e"; - sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay"; + rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23"; + sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4249,12 +4249,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-06-21"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "6817136df80ae9ddb980a97f7e4cf31cc4f9fa4a"; - sha256 = "13di6mjn6wb931ak98g1xl99j97c2kphhqrbwh673nl7syqwhnrf"; + rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c"; + sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4574,12 +4574,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-08"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5c1fc0452387cae323692e3345238a780a942056"; - sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; + rev = "e8935bde797ce92318c60a21ee671caf04387a33"; + sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4803,12 +4803,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-05-19"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "176f364f1b4acf894cdc248944f2d5506a37cc80"; - sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25"; + rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; + sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4984,12 +4984,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e5bd4963da81b5d044749ee4507061801aeb0f78"; - sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb"; + rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953"; + sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5837,12 +5837,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-26"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57"; - sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw"; + rev = "4402c9292c4495916b075e27dac88ad391c47ceb"; + sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9165,12 +9165,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-06-01"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "552403842b992efde3816a89b20055f7d66d9a0d"; - sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya"; + rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6"; + sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9502,12 +9502,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "299363d651c5a8c26a4440f434df613cdf66a4c4"; - sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf"; + rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8"; + sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From dab075049ac0bea54d175ca1e775c094c30fb7db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jul 2021 12:12:28 +0200 Subject: [PATCH 03/22] python3Packages.aiopg: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/aiopg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index cb9cd327e8ce..36ea00234830 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI="; }; propagatedBuildInputs = [ From 7a116c3e84f646b809e22a8517755b491fa3be47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jul 2021 20:20:51 +0200 Subject: [PATCH 04/22] python3Packages.pyeight: 0.1.5 -> 0.1.7 --- pkgs/development/python-modules/pyeight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index b3a2de5ed404..a714bbfaba95 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.5"; + version = "0.1.7"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; }; propagatedBuildInputs = [ From 5a46be366ee953d6bc9687cce10c3d42b4adbee4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 21:57:56 +0000 Subject: [PATCH 05/22] insomnia: 2021.3.0 -> 2021.4.0 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3ba900f3f691..8fcf4696d0e1 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.3.0"; + version = "2021.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; + sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; }; nativeBuildInputs = From 5fa81182bc4bc92f456b70cbc20f484d6c4753e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jun 2021 18:11:22 +0000 Subject: [PATCH 06/22] chezmoi: 2.0.15 -> 2.0.16 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 4d69f237a08c..81e2061b4cc1 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-PUcsDyszFT4DzTwvbcCO8FQErvmotmY7gREZ2sgpcw8="; + sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo="; }; - vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE="; + vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs="; doCheck = false; From ea73bad80ab2bd8d9b489416458a0dc5dda06b8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jun 2021 17:30:06 +0000 Subject: [PATCH 07/22] jbang: 0.71.1 -> 0.72.0 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 1220ec90d90f..b0d2cb719533 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.71.1"; + version = "0.72.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; + sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; }; nativeBuildInputs = [ makeWrapper ]; From 57e67d001fc7c94623ca5fc241c112462323eec3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 29 Jun 2021 22:04:42 +0000 Subject: [PATCH 08/22] argo: 3.0.8 -> 3.1.1 --- pkgs/applications/networking/cluster/argo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 272228878735..a49879e53528 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.8"; + version = "3.1.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I="; + sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g="; }; - vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; + vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4="; doCheck = false; From e005fe68e05c8073634b293661a37182dbdb5e3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 05:17:05 +0000 Subject: [PATCH 09/22] k9s: 0.24.11 -> 0.24.12 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index cb2ca48b9077..b2788f8b0701 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.11"; + version = "0.24.12"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw="; + sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-EEN3nKQBtAGG7MAa9h11KFPZ9g7xtNxhFB1i/2QS66g="; + vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; doCheck = false; From b907e8d6d06441782e3a232ecadba1a029950550 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Jun 2021 10:15:50 +0000 Subject: [PATCH 10/22] keybase: 5.6.1 -> 5.7.1 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index f1268717a917..ec240a7c7156 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.6.1"; + version = "5.7.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; + sha256 = "sha256-72rVk8pYIQFESQqBu4bmFBPpAOB0oG2Iu36TbAdecBw="; }; patches = [ From 10647f431d411b1a96c82d94b964b2e5f3ab0750 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jun 2021 18:55:11 +0000 Subject: [PATCH 11/22] _389-ds-base: 2.0.5 -> 2.0.6 --- pkgs/servers/ldap/389/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index e445184b9561..2e825dc96152 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8="; + sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; From a5e754c2447376327b0ffcb275768128b69abbed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 03:51:27 +0000 Subject: [PATCH 12/22] fission: 1.13.0 -> 1.13.1 --- pkgs/development/tools/fission/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 3045842d91f0..56d5161b49e9 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fission"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; + sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; }; vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; From efed1ede1f77307cb98751f5c71a9a3aff80d468 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jun 2021 01:05:12 +0000 Subject: [PATCH 13/22] freeciv: 2.6.4 -> 2.6.5 --- pkgs/games/freeciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 58e91a44842c..1560a45b0618 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI="; + sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE="; }; postPatch = '' From c7ec86b6894f7c216f4a381ebade4d717069a955 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 30 Jun 2021 23:21:22 +0800 Subject: [PATCH 14/22] linuxPackages.tuxedo-keyboard: 3.0.5 -> 3.0.7 --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 79271448b75b..17f8b3a28c4e 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; + sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; }; buildInputs = [ linuxHeaders ]; From 8a6ccd44f2f9937d4e78b2748921bd63b6011281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Jun 2021 03:08:17 +0000 Subject: [PATCH 15/22] drone-cli: 1.2.4 -> 1.3.0 --- .../tools/continuous-integration/drone-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6c9cffe41b20..245aeeb4351b 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.2.4"; +let version = "1.3.0"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; + vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; + sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; }; meta = with lib; { From f25a0f70e8989824aece5787a0c10dbdf842115f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 00:34:32 +0000 Subject: [PATCH 16/22] charliecloud: 0.23 -> 0.24 --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index f6d7ce3d6196..cbd7d8e5512d 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.23"; + version = "0.24"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY="; + sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From 2356a2582931681d44317914517a59fb3831e1f5 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 30 Jun 2021 13:36:23 -0500 Subject: [PATCH 17/22] helm-secrets: 3.7.0 -> 3.8.1 --- .../networking/cluster/helm/plugins/helm-secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4d7e170c2018..ec3f21c69d15 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AM+TLeSrXjn10DiQzXSqSwTqsc7CjTdnf6TWetden7g="; + hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM="; }; nativeBuildInputs = [ makeWrapper ]; From 5cbf555c2ff2cb29fbc6b2402a43dbf383db6558 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Jun 2021 04:53:25 +0000 Subject: [PATCH 18/22] libconfig: 1.7.2 -> 1.7.3 --- pkgs/development/libraries/libconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7387e9edc5b5..10d688d89b6c 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libconfig"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; + sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; doCheck = true; From dc9b36e54d2a3fa49254f36fcecbf21caabf3be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Jul 2021 18:12:31 +0200 Subject: [PATCH 19/22] rotate-backups: move out of pythonPackages --- pkgs/tools/backup/rotate-backups/default.nix | 23 ++++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c0a06e1b9ae5..c825baca1df7 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -1,6 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }: +{ lib +, python3 +, fetchFromGitHub +}: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "rotate-backups"; version = "6.0"; @@ -11,7 +14,20 @@ buildPythonPackage rec { sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; }; - propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + propagatedBuildInputs = with python3.pkgs; [ + python-dateutil + simpleeval + update-dotdee + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/xolox/python-rotate-backups/issues/33 + "test_removal_command" + ]; meta = with lib; { description = "Simple command line interface for backup rotation"; @@ -20,4 +36,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ eyjhb ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3425dfa9ddf0..b6961be94b87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18079,7 +18079,7 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; - rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b796d9ac4427..7ea357116233 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d166332109a0..5eac97ab1891 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7624,8 +7624,6 @@ in { ropper = callPackage ../development/python-modules/ropper { }; - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - routes = callPackage ../development/python-modules/routes { }; rpdb = callPackage ../development/python-modules/rpdb { }; From 1821fb45139fa9788d718774bdb5767ac1a0dfc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Jul 2021 23:02:00 +0200 Subject: [PATCH 20/22] rotate-backups: 6.0 -> 8.1 --- pkgs/tools/backup/rotate-backups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c825baca1df7..405fc6c3955d 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "rotate-backups"; - version = "6.0"; + version = "8.1"; src = fetchFromGitHub { owner = "xolox"; repo = "python-rotate-backups"; rev = version; - sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; + sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx"; }; propagatedBuildInputs = with python3.pkgs; [ From 246f3da3993dc488b589786a76ac7c116a3fdf2f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 -0500 Subject: [PATCH 21/22] dune_2: 2.8.5 -> 2.9.0 https://github.com/ocaml/dune/releases/tag/2.9.0 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 2acc7e5bdf32..3945389e8cd1 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; buildInputs = [ ocaml findlib ]; From 2e672ed71afb9d0cea962b694ddb4e63a9ee00eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Jul 2021 18:41:41 +0200 Subject: [PATCH 22/22] python3Packages.splinter: 0.14.0 -> 0.15.0 https://github.com/cobrateam/splinter/releases/tag/0.15.0 --- pkgs/development/python-modules/splinter/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ae05cab9738..cb63f8d11ba4 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6"; + sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "samples" "tests/test_djangoclient.py" "tests/test_flaskclient.py" + "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_firefox.py"