From af88a80e1c5ad1ee655815925c6a92c26db5deaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 16:43:03 +0000 Subject: [PATCH 001/130] qtstyleplugin-kvantum-qt4: 0.16.0 -> 0.20.1 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7290b3830d07..c7a8a400a981 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.16.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq"; + sha256 = "sha256-sY2slI9ZVuEurBIEaJMxUiKiUNXx+h7UEwEZKKr7R2Y="; }; nativeBuildInputs = [ qmake4Hook ]; From 0fb51f3bf1b80091d2347a3c2df1dc5efb1f52c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 22:59:43 +0000 Subject: [PATCH 002/130] emuflight-configurator: 0.3.6 -> 0.4.0 --- .../science/robotics/emuflight-configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ab94df9ef18f..ca486006fecb 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0="; + sha256 = "sha256-s5AE+r9Fw6S7IG2cDW2T7vctcYIAY8al7eCFIDjD5oI="; }; nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; From 1936a4e5f0a8b4450a6b9bcc6603c5d230574154 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 23:45:17 +0000 Subject: [PATCH 003/130] faustPhysicalModeling: 2.30.5 -> 2.33.1 --- pkgs/applications/audio/faustPhysicalModeling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 6f827cea9564..8dd43ead5914 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.30.5"; + version = "2.33.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4="; + sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; }; buildInputs = [ faust2jaqt faust2lv2 ]; From fd9cd1d950de239cc20558ff8dff867e0416d81d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 19:44:17 +0000 Subject: [PATCH 004/130] blackfire: 1.46.0 -> 1.49.4 --- pkgs/development/tools/misc/blackfire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 31c5d0d26e8f..c6c8ff2a8a84 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.46.0"; + version = "1.49.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; + sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A="; }; nativeBuildInputs = [ From e22014ed4fe262250bc9350a78368dea884a3dee Mon Sep 17 00:00:00 2001 From: ash Date: Tue, 5 Oct 2021 21:47:06 +0100 Subject: [PATCH 005/130] maintainers: add sersorrel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e34f9e823e1f..613283beea61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10122,6 +10122,12 @@ githubId = 307899; name = "Gurkan Gur"; }; + sersorrel = { + email = "ash@sorrel.sh"; + github = "sersorrel"; + githubId = 9433472; + name = "ash"; + }; servalcatty = { email = "servalcat@pm.me"; github = "servalcatty"; From 62f9c03b182000ab5249ffc6280c7ec80c568d96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 Oct 2021 02:32:41 +0000 Subject: [PATCH 006/130] nano: 5.8 -> 5.9 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index bd61933b38d7..f7fb1b5bfc6a 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4"; + sha256 = "dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From bd57eaf87c44ad6f34218e291ffbcb8260a52ba3 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Wed, 6 Oct 2021 14:50:56 -0700 Subject: [PATCH 007/130] gtk-mac-integration: 2.1.3 -> 3.0.1 --- pkgs/development/libraries/gtk-mac-integration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f244a97edf24..f9d41916ecd6 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "gtk-mac-integration"; - version = "2.1.3"; + version = "3.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; + sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga"; }; nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; From e28ad86a6f04914cb0713cfee30177a6f2f87856 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 03:41:39 +0000 Subject: [PATCH 008/130] oh-my-zsh: 2021-10-06 -> 2021-10-07 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 41ff2b435426..de3177f7ca49 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-06"; + version = "2021-10-07"; pname = "oh-my-zsh"; - rev = "29b5c182bec4cec7704fb8bac9ee0ab971dfb89a"; + rev = "dc83d0b7204cf66315471e980729490813b7d915"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "pPBeZj/QTQCIuBtE7+4CmuXacblU4RGXty+cdeQw+54="; + sha256 = "7V6v9II48C4OoTf2CBQt+mqfh4kbMb8MspGBkX42Q/c="; }; installPhase = '' From 2491951642a60886480c3dc698b2ea39fbec5cec Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:00:59 +0200 Subject: [PATCH 009/130] all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-08T09:46:02Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index a936679d347e..a1af75ba6ae4 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz", - "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p", - "msg": "Update from Hackage at 2021-10-05T05:41:58Z" + "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz", + "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc", + "msg": "Update from Hackage at 2021-10-08T09:46:02Z" } From fc3dedf3225f047dbfb56c80b17b4d983e0ab472 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:01:42 +0200 Subject: [PATCH 010/130] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 926 +++++++----------- 1 file changed, 345 insertions(+), 581 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 313c95eca8ff..7d8e69f2b7ff 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1277,34 +1277,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.2"; - sha256 = "1wn46a6rw6fwxmqp3b8nz81ag2nphyalm6l2frzg63xbdxnlwgmi"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - }) {}; - - "BNFC_2_9_3" = callPackage ({ mkDerivation, alex, array, base, Cabal, cabal-doctest , containers, deepseq, directory, doctest, filepath, happy, hspec , hspec-discover, HUnit, mtl, pretty, process, QuickCheck @@ -1330,7 +1302,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -9785,26 +9756,6 @@ self: { }) {}; "HaXml" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , polyparse, pretty, random - }: - mkDerivation { - pname = "HaXml"; - version = "1.25.5"; - sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "4"; - editedCabalFile = "029jnlmab1llr55dmlamrn2hxkbqw7ryz1dfg19h1aip6byf4ljh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers filepath polyparse pretty random - ]; - executableHaskellDepends = [ base directory polyparse pretty ]; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - }) {}; - - "HaXml_1_25_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , polyparse, pretty, random }: @@ -9820,7 +9771,6 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "Hach" = callPackage @@ -10834,20 +10784,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7.1"; - sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10859,7 +10795,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -19078,16 +19013,18 @@ self: { }) {}; "SpaceInvaders" = callPackage - ({ mkDerivation, array, base, HGL, random, Yampa }: + ({ mkDerivation, array, base, deepseq, HGL, random + , simple-affine-space, Yampa + }: mkDerivation { pname = "SpaceInvaders"; - version = "0.4.5"; - sha256 = "1nf50gdjdm7bwxzg5ligly9v1hkkdmqd8b1f8637a9bg8sz1rzbd"; - revision = "1"; - editedCabalFile = "0s21i9snp7734amqd6q7ckbj77vsnl0mi2k939ha0phfvdisb5gy"; + version = "0.13.3"; + sha256 = "0gl1cs2msc7c8vs4zknl77wqmlmp2k4brv0asni6mlc6nigriq4f"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base HGL random Yampa ]; + executableHaskellDepends = [ + array base deepseq HGL random simple-affine-space Yampa + ]; description = "Video game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -21951,8 +21888,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.2"; - sha256 = "0y0jmk9cbcnhwdrjcacx5j8gb64aj61a04nxizwbds0zvibcdzgb"; + version = "0.13.3"; + sha256 = "06w2glnn5w97bjmwl88j46xkr2mkvgy5a2wwwzqq168awn436kk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33557,12 +33494,13 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.4"; - sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + version = "1.0.1.6"; + sha256 = "1bxii5r24p7i68h37m6q7bjqy9fgp6s33ia9s62hwh70xkkcm8yw"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; + testHaskellDepends = [ base text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; }) {}; @@ -33602,17 +33540,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.4"; - sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33622,21 +33549,9 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.8"; - sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_10" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33646,7 +33561,6 @@ self: { testHaskellDepends = [ base ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33677,17 +33591,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.4"; - sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33697,7 +33600,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33716,17 +33618,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.4"; - sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33736,7 +33627,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33784,19 +33674,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.4"; - sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_6" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33808,7 +33685,6 @@ self: { testHaskellDepends = [ ascii-char base text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33829,20 +33705,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.4"; - sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring , template-haskell, text }: @@ -33858,7 +33720,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -34528,24 +34389,6 @@ self: { }) {}; "async" = callPackage - ({ mkDerivation, base, hashable, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.2.3"; - sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hashable stm ]; - testHaskellDepends = [ - base HUnit stm test-framework test-framework-hunit - ]; - description = "Run IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "async_2_2_4" = callPackage ({ mkDerivation, base, hashable, HUnit, stm, test-framework , test-framework-hunit }: @@ -34561,7 +34404,6 @@ self: { ]; description = "Run IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -55507,10 +55349,8 @@ self: { }: mkDerivation { pname = "cipher-aes128"; - version = "0.7.0.5"; - sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; - revision = "1"; - editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; + version = "0.7.0.6"; + sha256 = "1pcxmgj9i8g3yl502lpywc75dilmaszlzixpd7wqjqr7lvasa117"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -58504,23 +58344,24 @@ self: { "cobot" = callPackage ({ mkDerivation, array, base, bytestring, clock, containers , criterion, deepseq, hspec, lens, linear, megaparsec, mtl - , parallel, random, split, template-haskell, text + , parallel, random, split, template-haskell, text, vector }: mkDerivation { pname = "cobot"; - version = "0.1.1.4"; - sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; + version = "0.1.1.7"; + sha256 = "12g2vfb224lax59pv6jd4061v0bdzk91w0dc034p6mzm02dpxhqr"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl - split template-haskell text + split template-haskell text vector ]; testHaskellDepends = [ array base bytestring containers deepseq hspec lens linear - megaparsec mtl split template-haskell text + megaparsec mtl split template-haskell text vector ]; benchmarkHaskellDepends = [ array base bytestring clock containers criterion deepseq lens linear megaparsec mtl parallel random split template-haskell text + vector ]; description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering"; license = lib.licenses.bsd3; @@ -65050,6 +64891,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-data_0_2_1_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.10"; + sha256 = "151b8kym71dklgynyjsbzpggbyw7wysa8bv1pkpy94jdbflmlpaf"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -65088,6 +64947,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_2_12_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.12.0"; + sha256 = "0gl1cv82h2ax8gf1jjqphkj2481plz64jqq497rvyy2cpqv72kvr"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -65105,6 +64986,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_4_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.4.0"; + sha256 = "1013s28p90fifkkqldh35wrdrs86fhan0r8q54imb7b8c7lasj3r"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -67542,14 +67441,14 @@ self: { , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl - , optparse-applicative, panic, parameterized-utils, pretty, process - , random, sbv, simple-smt, stm, strict, temporary, text, tf-random + , optparse-applicative, panic, parameterized-utils, prettyprinter + , process, sbv, simple-smt, stm, strict, temporary, text, tf-random , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.11.0"; - sha256 = "05h751lxyym27b5kfrcss5vjg4ifpl4lqgxvvp6fz4mpbigm7ds3"; + version = "2.12.0"; + sha256 = "13h5bd6xqh3x6jqdv8a25ffyj10wdyam0flzpdxi4zd23z5b2ihp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67557,14 +67456,14 @@ self: { array async base base-compat bv-sized bytestring containers cryptohash-sha1 deepseq directory exceptions filepath ghc-prim gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control - monadLib mtl panic parameterized-utils pretty process random sbv + monadLib mtl panic parameterized-utils prettyprinter process sbv simple-smt stm strict text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ ansi-terminal base base-compat blaze-html containers directory - extra filepath haskeline monad-control mtl optparse-applicative - process temporary text transformers + exceptions extra filepath haskeline monad-control mtl + optparse-applicative process temporary text transformers ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath sbv text @@ -78986,29 +78885,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-client, http-client-tls, http-directory, http-types - , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args - , text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.9.1"; - sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-client - http-client-tls http-directory http-types optparse-applicative - regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - - "dl-fedora_0_9_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -84257,6 +84133,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "elf_0_31" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec }: + mkDerivation { + pname = "elf"; + version = "0.31"; + sha256 = "180h5kz8wmrm6hy4myp83b2sjss7dq8wxvlqryi79qscsrz9n0ln"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "eliminators" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons, template-haskell, th-abstraction, th-desugar @@ -85445,18 +85334,6 @@ self: { }) {}; "emojis" = callPackage - ({ mkDerivation, base, containers, HUnit, text }: - mkDerivation { - pname = "emojis"; - version = "0.1"; - sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"; - libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base HUnit text ]; - description = "Conversion between emoji characters and their names"; - license = lib.licenses.bsd3; - }) {}; - - "emojis_0_1_1" = callPackage ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; @@ -85466,7 +85343,6 @@ self: { testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "empty" = callPackage @@ -87200,34 +87076,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.2.2"; - sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged text time - transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -87253,7 +87101,23 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + }) {}; + + "esqueleto-pgcrypto" = callPackage + ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent + , persistent-postgresql, QuickCheck, text, transformers, unliftio + }: + mkDerivation { + pname = "esqueleto-pgcrypto"; + version = "0.1.0.0"; + sha256 = "0xxs9nk6k3v7jjcrbgm0b85bncd6rzgrgflvw2w65i6dam0yr4ix"; + libraryHaskellDepends = [ base esqueleto text ]; + testHaskellDepends = [ + base esqueleto hspec monad-logger persistent persistent-postgresql + QuickCheck text transformers unliftio + ]; + description = "Esqueleto support for the pgcrypto PostgreSQL module"; + license = lib.licenses.bsd3; }) {}; "ess" = callPackage @@ -99505,8 +99369,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.20.3"; - sha256 = "1qz8grvf8zyn549zch6d3dkhzq8dmgqigf3q62141l1q7qa3b75q"; + version = "0.20.4"; + sha256 = "0yjm0s9risrc0aj1si8i403k6b1znr8szff1f8ksb5cr9j7nn7gn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101147,32 +101011,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, Cabal - , cabal-doctest, contravariant, criterion, deepseq, doctest - , generic-lens, ghc-boot-th, inspection-testing, one-liner - , QuickCheck, show-combinators, tasty, tasty-hunit - , template-haskell, unordered-containers - }: - mkDerivation { - pname = "generic-data"; - version = "0.9.2.0"; - sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators - ]; - testHaskellDepends = [ - base doctest generic-lens inspection-testing one-liner QuickCheck - show-combinators tasty tasty-hunit template-haskell - unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = lib.licenses.mit; - }) {}; - - "generic-data_0_9_2_1" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, contravariant , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing , one-liner, show-combinators, tasty, tasty-hunit, template-haskell @@ -101193,7 +101031,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -121263,6 +121100,8 @@ self: { pname = "haskell-gi-base"; version = "0.25.0"; sha256 = "140f6amq69r39vj54i1p4c9q0ysxkvb3yjcrlbrrayf66bhw8mqy"; + revision = "1"; + editedCabalFile = "1pl2mzjdsnvvkfmr622jvw2vk9gxdql5flck4vb60nr9d970zg9r"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -134961,6 +134800,32 @@ self: { license = lib.licenses.mit; }) {}; + "honeycomb" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, bytestring + , chronos, http-client, http-client-tls, http-conduit, http-types + , microlens, mmorph, monad-control, mtl, mwc-random, profunctors + , random, resource-pool, stm, text, unliftio, unordered-containers + , uuid, vector, zlib + }: + mkDerivation { + pname = "honeycomb"; + version = "0.0.0.3"; + sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + license = lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -151779,8 +151644,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.0"; - sha256 = "1wd2z7ngw53krg3y5klrhlndm9dilmqpvmlipjda168gqisxsscp"; + version = "1.0.1"; + sha256 = "1pw4z3h1ihb82105v1i3809icp024a6cmlic2zfgdhdqf8wvfzv4"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -152069,25 +151934,6 @@ self: { }) {}; "invertible-grammar" = callPackage - ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter - , profunctors, semigroups, tagged, template-haskell, text - , transformers - }: - mkDerivation { - pname = "invertible-grammar"; - version = "0.1.3"; - sha256 = "160hw7p5mpajwmv8fps2gicqj3x3yr9w239pfnv9i5gsf4irnn9n"; - revision = "2"; - editedCabalFile = "1fmw3v2g22n812ppba4yibgq1wlpfwkypsxa768calxafynb3i33"; - libraryHaskellDepends = [ - base bifunctors containers mtl prettyprinter profunctors semigroups - tagged template-haskell text transformers - ]; - description = "Invertible parsing combinators framework"; - license = lib.licenses.bsd3; - }) {}; - - "invertible-grammar_0_1_3_1" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text , transformers @@ -152102,7 +151948,6 @@ self: { ]; description = "Invertible parsing combinators framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -152509,12 +152354,17 @@ self: { }) {}; "ip2proxy" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, iproute, uri-encode + }: mkDerivation { pname = "ip2proxy"; - version = "3.1.0"; - sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; - libraryHaskellDepends = [ base binary bytestring iproute ]; + version = "3.2.0"; + sha256 = "0m50z5a32m28lfq6g8chkakvcgd6iplmx2ik0nbi2zsgfc0l209y"; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-types + iproute uri-encode + ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -158751,8 +158601,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.6"; - sha256 = "1qv867aks1vgcri7gsgim3852g7mnznarnsr97x1j3lx4qfkppnv"; + version = "0.2.0.7"; + sha256 = "0x0915nnrm03fryvwp0rcwvvqsbs1n639yjv509iz2v7wdw5kas8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -161525,15 +161375,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_10_1_2" = callPackage + "language-docker_10_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter , QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "10.1.2"; - sha256 = "07h2qarbscgppn9drpl72pi2w9arigqpczrxb51q9m6xhfdx12n1"; + version = "10.2.0"; + sha256 = "193hi4ls55pzybal7q4dlzdz1a8da2155a501h02j1w4nb25glrq"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -162213,6 +162063,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; + revision = "1"; + editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -163504,8 +163356,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.4.1"; - sha256 = "0m253jicjn8rqdrkcqd75bcrdg7bdq313crx2b54yv5s3mz6cxi2"; + version = "0.4.2"; + sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers fail network semigroups stm text @@ -167194,12 +167046,13 @@ self: { }) {}; "linebreak" = callPackage - ({ mkDerivation, base, hyphenation }: + ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.0.0.3"; - sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; + version = "1.1.0.0"; + sha256 = "1a1yzpdr1h9a1gnf1iwsqxzpv3w13vd7yb6c0djdc1yq25q0jg7d"; libraryHaskellDepends = [ base hyphenation ]; + testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; license = lib.licenses.bsd3; }) {}; @@ -174011,29 +173864,6 @@ self: { }) {}; "markdown" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, call-stack, conduit, conduit-extra, containers - , data-default, directory, filepath, hspec, text, transformers - , xml-conduit, xml-types, xss-sanitize - }: - mkDerivation { - pname = "markdown"; - version = "0.1.17.4"; - sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html bytestring call-stack conduit conduit-extra - containers directory filepath hspec text transformers - ]; - description = "Convert Markdown to HTML, with XSS protection"; - license = lib.licenses.bsd3; - }) {}; - - "markdown_0_1_17_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, call-stack, conduit, conduit-extra, containers , data-default, directory, filepath, hspec, text, transformers @@ -174054,7 +173884,6 @@ self: { ]; description = "Convert Markdown to HTML, with XSS protection"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -179364,27 +179193,28 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, directory, free, process - , record-dot-preprocessor, record-hasfield, temporary, text - , text-ansi, unix + ({ mkDerivation, base, base64, clock, containers, directory, free + , ki, process, record-dot-preprocessor, record-hasfield, temporary + , text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "3"; - sha256 = "0yy7j1ddnny5wq8ywkkmdas9qlfsi26pk0adklmh2c0kqfss4s3f"; + version = "4"; + sha256 = "14sfzb7ii0ldwkfx05r4jk4rc0nqxzi7nw81v8kgsyi0saa1ig0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; executableHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; testHaskellDepends = [ - base base64 clock directory free process record-dot-preprocessor - record-hasfield temporary text text-ansi unix + base base64 clock containers directory free ki process + record-dot-preprocessor record-hasfield temporary text text-ansi + unix ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; @@ -182570,8 +182400,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.1.0.0"; - sha256 = "1a2cszh84sgyml9yxw2yln7g1ll249aq37lqd6aqjjb7mzb9fjxm"; + version = "1.1.1.0"; + sha256 = "0jv7yc3jclqkh6z5hq47ws6pia0bhqsig06r392k95y96kal07xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185604,28 +185434,6 @@ self: { }) {}; "murmur3" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cereal, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "murmur3"; - version = "1.0.4"; - sha256 = "022sadxhnywbzx8crwkgky7kndxwpaddc89nq3ya4a4ikq3qvbhm"; - revision = "1"; - editedCabalFile = "130ign0n566nsrzfp4ipb2sy5hq1ymxdlmqb80zbpdc0rdkqh0x0"; - libraryHaskellDepends = [ base bytestring cereal ]; - testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "murmur3_1_0_5" = callPackage ({ mkDerivation, base, base16, bytestring, cereal, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -188985,14 +188793,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_2" = callPackage + "network_3_1_2_5" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.2"; - sha256 = "1dhflq7im3sjc6ascf12z73mhw7cqv1aqfvv3y5m9izr485jq0am"; + version = "3.1.2.5"; + sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -191899,27 +191707,6 @@ self: { }) {}; "nonempty-containers" = callPackage - ({ mkDerivation, aeson, base, comonad, containers, deepseq - , hedgehog, hedgehog-fn, nonempty-vector, semigroupoids, tasty - , tasty-hedgehog, text, these, vector - }: - mkDerivation { - pname = "nonempty-containers"; - version = "0.3.4.3"; - sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; - libraryHaskellDepends = [ - aeson base comonad containers deepseq nonempty-vector semigroupoids - these vector - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn nonempty-vector - semigroupoids tasty tasty-hedgehog text these vector - ]; - description = "Non-empty variants of containers data types, with full API"; - license = lib.licenses.bsd3; - }) {}; - - "nonempty-containers_0_3_4_4" = callPackage ({ mkDerivation, aeson, base, comonad, containers, deepseq , hedgehog, hedgehog-fn, invariant, nonempty-vector, semigroupoids , tasty, tasty-hedgehog, text, these, vector @@ -191939,7 +191726,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -195033,6 +194819,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.5.0"; + sha256 = "19y6a4qkzr8bm8fxwrlvlcjqvc12kagp0wrfqrr4gxvzi200plvr"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -196421,20 +196237,6 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.5"; - sha256 = "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ base mtl random ]; - description = "Implementation of difficult monads made easy with operational semantics"; - license = lib.licenses.bsd3; - }) {}; - - "operational_0_2_4_0" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; @@ -196446,7 +196248,6 @@ self: { executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "operational-alacarte" = callPackage @@ -199340,6 +199141,8 @@ self: { pname = "pandoc-types"; version = "1.22"; sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; + revision = "1"; + editedCabalFile = "11gfc2syn2c0x3hyyw3c6z9hxmhs8jgv2xnzr43ql00r76ka9s95"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -199602,6 +199405,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.3"; + sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -216753,10 +216598,8 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.2.2"; - sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; - revision = "2"; - editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; + version = "2.2.3"; + sha256 = "150zvz40r7lwmrqv7hvn07wb0gs9rcyn37ivcdv0m0h96bzy84w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218845,8 +218688,8 @@ self: { }: mkDerivation { pname = "quickbench"; - version = "1.0"; - sha256 = "09mrhwvz0jnjrxgj3as7d4jl739gakli5crxfmp390x6a0p2bzlb"; + version = "1.0.1"; + sha256 = "16bkhk5fskhhjqzklqwv51s1k7cxgcyr4p1vifmrd6smxvidb5rn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220034,8 +219877,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.0"; - sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; + version = "0.3.4"; + sha256 = "1kqinh0vwbl5qh55ai41nmkbcfbhmjdwp5pp0xap03cd0nmn84xq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -224204,8 +224047,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.5.1"; - sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; + version = "0.1.5.2"; + sha256 = "18w9n6sm9b0ykjxqa800228b7s3y6gg8ckl6jnms3860p0cskpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224407,10 +224250,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.1.0"; - sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; - revision = "1"; - editedCabalFile = "16vwrz7amccy8j2wn9146j8lif35f7ycpssd0p649ha746s7hrf4"; + version = "0.3.1.1"; + sha256 = "15f9qn5rx6dwjnkhg5szhagxsj7vnh3bh4ad7j4jsi87m627mlj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229838,17 +229679,6 @@ self: { }) {}; "roles" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "roles"; - version = "0.2.0.0"; - sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; - libraryHaskellDepends = [ base containers ]; - description = "Composable class-based roles"; - license = lib.licenses.bsd3; - }) {}; - - "roles_0_2_1_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "roles"; @@ -229857,7 +229687,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Composable class-based roles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rollbar" = callPackage @@ -236348,6 +236177,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.6"; + sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -237653,8 +237502,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "2"; - editedCabalFile = "1xg1w1cy44a06sb1x2j5crid9splfgay8cj20bpjdnv5sj510gd2"; + revision = "3"; + editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -240665,35 +240514,6 @@ self: { }) {}; "sexp-grammar" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, data-fix, deepseq, happy, invertible-grammar - , prettyprinter, QuickCheck, recursion-schemes, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , utf8-string - }: - mkDerivation { - pname = "sexp-grammar"; - version = "2.3.2"; - sha256 = "1rsa953pykrrfsf7lcnk4ds7vydb9p7s8irvaxvi1v4m2q2zg7a5"; - libraryHaskellDepends = [ - array base bytestring containers data-fix deepseq - invertible-grammar prettyprinter recursion-schemes scientific - semigroups text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Invertible grammar combinators for S-expressions"; - license = lib.licenses.bsd3; - }) {}; - - "sexp-grammar_2_3_3" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, data-fix, deepseq, happy, invertible-grammar , prettyprinter, QuickCheck, recursion-schemes, scientific @@ -240720,7 +240540,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -248660,6 +248479,8 @@ self: { pname = "solana-staking-csvs"; version = "0.1.1.0"; sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; + revision = "1"; + editedCabalFile = "14l72fkvvmiy1hmn2v3nxgx4s5z0zzyi3qf4l1i1cn54a0ln35q6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260101,8 +259922,8 @@ self: { }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.1"; - sha256 = "12iq9vw5y0pvag9gj6pzm76lh9vfvziawzqzvi35mhdn1hjwhg4b"; + version = "0.1.1.1"; + sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -262226,6 +262047,8 @@ self: { pname = "tasty-lua"; version = "0.2.3.2"; sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"; + revision = "1"; + editedCabalFile = "1m5mdn3riwwmvri430iq9m3yl09xsacvkp8w7vyqdmd70w3f9pcw"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -267929,8 +267752,8 @@ self: { pname = "tidal-midi"; version = "0.9.10"; sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; - revision = "1"; - editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj"; + revision = "2"; + editedCabalFile = "1vc5ck25wdqz8ywk2zmn2nmg1mihwkihwp2wirxmmd0qxi1v2vpf"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -275300,25 +275123,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.6.1"; - sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_3" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -275335,7 +275139,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -285919,23 +285722,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, unliftio - , wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.3.1"; - sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager unliftio wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - }) {}; - - "warp-tls_3_3_2" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp @@ -285950,7 +285736,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -290647,28 +290432,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib - , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl - , mutable-containers, time, vector, weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.4.2"; - sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-mmap bzlib criterion deepseq filepath - ghc-prim hexml hexpat time weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "xeno_0_4_3" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -290688,7 +290451,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xenstore" = callPackage @@ -293549,8 +293311,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.2"; - sha256 = "004qly1sags94p7ks1j93xziixbpi3wsblbh2d2ws78gyywqdj9f"; + version = "0.13.3"; + sha256 = "08xs3m14rqpgkjghgp2b8ddalzzs50bzf11nd9kgi72xbg451yzi"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -295316,24 +295078,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.11"; - sha256 = "044m6a949yifvyxbbc15ms11sdxvljvb68187h5v6xk0qw0p33i9"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - }) {}; - - "yesod-markdown_0_12_6_12" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -295349,7 +295093,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -296309,6 +296052,8 @@ self: { pname = "yi-core"; version = "0.19.2"; sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr"; + revision = "1"; + editedCabalFile = "1j3in75pnf72000hfia13z21d6z8vml3wg2sk35nsmr1x8r96xzf"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -296457,6 +296202,8 @@ self: { pname = "yi-keymap-emacs"; version = "0.19.0"; sha256 = "1pkdlkhs6am60whclfasd4axda8hlxzh7q38crmylcb89q90am1l"; + revision = "1"; + editedCabalFile = "1p9m3m25g31ysk4qkabr3vnd4nlycm4zgi56lmkzrlibbxvn6lja"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -296476,6 +296223,8 @@ self: { pname = "yi-keymap-vim"; version = "0.19.0"; sha256 = "046552bqfd3wycx73zksffcnbakfl7xnfz1s2q9z5affpzi5iyrv"; + revision = "1"; + editedCabalFile = "0rm2nm6lki2248vx45rglslcmq9fc6cnqxrb7x8hyb56fxjyq1gz"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -296561,6 +296310,8 @@ self: { pname = "yi-mode-javascript"; version = "0.19.0"; sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; + revision = "1"; + editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -297295,6 +297046,40 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-html_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, dlist, extra, HUnit, mtl, pretty-show + , raw-strings-qq, safe, safe-exceptions, test-framework + , test-framework-hunit, text, transformers, vector, word8 + }: + mkDerivation { + pname = "zenacy-html"; + version = "2.0.4"; + sha256 = "05jy3w7a94ns52w4a1p6xhcph09p2zzqmvncf47db9wwq6xl5ad2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default dlist extra mtl pretty-show + safe safe-exceptions text transformers vector word8 + ]; + executableHaskellDepends = [ + base bytestring containers data-default dlist extra pretty-show + text vector + ]; + testHaskellDepends = [ + base bytestring containers data-default dlist extra HUnit mtl + pretty-show raw-strings-qq test-framework test-framework-hunit text + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default dlist pretty-show + raw-strings-qq text + ]; + description = "A standard compliant HTML parsing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenacy-unicode" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, text, vector, word8 @@ -298505,26 +298290,6 @@ self: { }) {}; "zstd" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2, zlib - }: - mkDerivation { - pname = "zstd"; - version = "0.1.2.0"; - sha256 = "0vjw8r11k9kj6c63sfkwz8akq0g32g1bv6n6clvs4g2j12zq1xk8"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim zlib - ]; - description = "Haskell bindings to the Zstandard compression algorithm"; - license = lib.licenses.bsd3; - }) {}; - - "zstd_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2, zlib }: @@ -298542,7 +298307,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "zsyntax" = callPackage From 755cc527e1ddd9aa93e614dbcd879cd6c6d2c815 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:04:25 +0200 Subject: [PATCH 011/130] haskellPackages: stackage-lts 18.12 -> 18.13 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 54521699a0c4..5e40f12bcc59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.12 +# Stackage LTS 18.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -163,22 +163,22 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 + - ascii ==1.0.1.6 + - ascii-case ==1.0.0.6 + - ascii-char ==1.0.0.10 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 + - ascii-group ==1.0.0.6 + - ascii-predicates ==1.0.0.6 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 + - ascii-superset ==1.0.1.6 + - ascii-th ==1.0.0.6 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.3.0 - - async ==2.2.3 + - async ==2.2.4 - async-extra ==0.2.0.0 - async-pool ==0.9.1 - async-refresh ==0.3.0.0 @@ -277,7 +277,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.2.1 - bmp ==1.2.6.3 - - BNFC ==2.9.2 + - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 @@ -614,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.9.1 + - dl-fedora ==0.9.2 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -683,7 +683,7 @@ default-package-overrides: - elynx-tree ==0.5.1.1 - email-validate ==2.3.2.15 - emd ==0.2.0.0 - - emojis ==0.1 + - emojis ==0.1.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 @@ -704,7 +704,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.2 + - esqueleto ==3.5.3.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -838,7 +838,7 @@ default-package-overrides: - generic-aeson ==0.2.0.12 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 + - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.1 - generic-functor ==0.2.0.0 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 + - HaXml ==1.25.6 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.6 @@ -1107,7 +1107,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7.1 + - HsOpenSSL ==0.11.7.2 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.10 @@ -1259,7 +1259,7 @@ default-package-overrides: - intset-imperative ==0.1.0.0 - invariant ==0.5.4 - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 + - invertible-grammar ==0.1.3.1 - io-machine ==0.2.0.0 - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 @@ -1395,6 +1395,7 @@ default-package-overrides: - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 + - linux-capabilities ==0.1.0.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 @@ -1446,7 +1447,7 @@ default-package-overrides: - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 + - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - massiv ==0.6.1.0 @@ -1578,7 +1579,7 @@ default-package-overrides: - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 + - murmur3 ==1.0.5 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 @@ -1634,7 +1635,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.3 + - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1686,7 +1687,7 @@ default-package-overrides: - opentelemetry-extra ==0.7.0 - opentelemetry-lightstep ==0.7.0 - opentelemetry-wai ==0.7.0 - - operational ==0.2.3.5 + - operational ==0.2.4.0 - operational-class ==0.3.0.0 - optics ==0.3 - optics-core ==0.3.0.1 @@ -2011,7 +2012,7 @@ default-package-overrides: - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 + - roles ==0.2.1.0 - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 @@ -2120,7 +2121,7 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.2 + - sexp-grammar ==2.3.3 - SHA ==1.6.4.4 - shake ==0.19.6 - shake-language-c ==0.12.0 @@ -2464,7 +2465,7 @@ default-package-overrides: - turtle ==1.5.22 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - - typed-process ==0.2.6.1 + - typed-process ==0.2.6.3 - typed-uuid ==0.1.0.0 - type-equality ==1 - type-errors ==0.2.0.0 @@ -2608,7 +2609,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.17 - - warp-tls ==3.3.1 + - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2660,7 +2661,7 @@ default-package-overrides: - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 + - xeno ==0.4.3 - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 @@ -2693,7 +2694,7 @@ default-package-overrides: - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.2 - - yesod-markdown ==0.12.6.11 + - yesod-markdown ==0.12.6.12 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.9 - yesod-paginator ==1.1.1.0 @@ -2724,6 +2725,6 @@ default-package-overrides: - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 - - zstd ==0.1.2.0 + - zstd ==0.1.3.0 - ztail ==1.2.0.2 - zydiskell ==0.2.0.0 From 1beca619ac359ab5bc9719388c0d8b2a818fcc4a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 13:20:01 +0200 Subject: [PATCH 012/130] =?UTF-8?q?gi-docgen:=202021.5=20=E2=86=92=202021.?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gi-docgen/-/tags/2021.6 https://gitlab.gnome.org/GNOME/gi-docgen/-/tags/2021.7 --- pkgs/development/tools/documentation/gi-docgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 2218b441476e..7e8c61e1c8d2 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.5"; + version = "2021.7"; format = "other"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "1fz6r6mkp4fw1mn6gn9745wcdcqg7696bbwvdcnmhinlhrcnaiz6"; + sha256 = "i2s4JXg+D9sYq1QwVcDRLIr9qnRmzHC+cBInHv4SXHI="; }; nativeBuildInputs = [ From c037929980ecbcb46c9fcf19d5e821d1956d0f98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 10:19:32 +0000 Subject: [PATCH 013/130] =?UTF-8?q?gtk4:=204.2.1=20=E2=86=92=204.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/blob/4.4.0/NEWS https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3391 - ffmpeg is experimental (no audio support), let’s just use GStreamer - vulkan is experimental and can cause crashes in inspector, let’s disable it by default --- pkgs/development/libraries/gtk/4.x.nix | 28 ++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 8791d24ad361..78d9174d0953 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -19,15 +19,11 @@ , gdk-pixbuf , gobject-introspection , fribidi +, harfbuzz , xorg , epoxy -, json-glib , libxkbcommon , libxml2 -, librest -, libsoup -, ffmpeg -, gmp , gnome , gsettings-desktop-schemas , gst_all_1 @@ -37,6 +33,8 @@ , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , libGL +# experimental and can cause crashes in inspector +, vulkanSupport ? false , vulkan-loader , vulkan-headers , wayland @@ -61,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.2.1"; + version = "4.4.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; + sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs="; }; nativeBuildInputs = [ @@ -86,27 +84,25 @@ stdenv.mkDerivation rec { python3 sassc gi-docgen + libxml2 # for xmllint ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy - json-glib isocodes - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-headers ] ++ [ - librest - libsoup - ffmpeg gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad fribidi + harfbuzz ] ++ (with xorg; [ libICE libSM - libXcomposite libXcursor + libXdamage libXi libXrandr libXrender @@ -134,7 +130,7 @@ stdenv.mkDerivation rec { glib graphene pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-loader ] ++ [ # Required for GSettings schemas at runtime. @@ -148,10 +144,11 @@ stdenv.mkDerivation rec { "-Dbuild-tests=false" "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals vulkanSupport [ + "-Dvulkan=enabled" ] ++ lib.optionals (!cupsSupport) [ "-Dprint-cups=disabled" ] ++ lib.optionals stdenv.isDarwin [ - "-Dvulkan=disabled" "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ] ++ lib.optionals (!x11Support) [ "-Dx11-backend=false" @@ -168,6 +165,7 @@ stdenv.mkDerivation rec { postPatch = '' files=( build-aux/meson/post-install.py + build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py gdk/gen-gdk-gresources-xml.py From f3b42a3cccadd254341db3ebc4ce7f5cd651772e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:19:07 +0200 Subject: [PATCH 014/130] vala_0_54: init at 0.54.1 - https://gitlab.gnome.org/GNOME/vala/blob/0.54.0/NEWS - https://gitlab.gnome.org/GNOME/vala/blob/0.54.1/NEWS --- pkgs/development/compilers/vala/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 013b024f3bce..ef639d2f9b2a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -42,6 +42,8 @@ let "0.52" = ./disable-graphviz-0.46.1.patch; + "0.54" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -130,5 +132,10 @@ in rec { sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; + vala_0_54 = generic { + version = "0.54.1"; + sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx"; + }; + vala = vala_0_52; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c5484a9b18..3d29b7e82c8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12817,6 +12817,7 @@ with pkgs; vala_0_48 vala_0_50 vala_0_52 + vala_0_54 vala; vyper = with python3Packages; toPythonApplication vyper; From 0d44f9ce5341a5f140bb30de287434dd4d9d7e5d Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:19:33 +0200 Subject: [PATCH 015/130] vala: default to vala_0_54 --- pkgs/development/compilers/vala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ef639d2f9b2a..fb134962b74a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -137,5 +137,5 @@ in rec { sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx"; }; - vala = vala_0_52; + vala = vala_0_54; } From d88edc25a221496b05185d1b76e888fe40ca6a47 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:22:10 +0200 Subject: [PATCH 016/130] at-spi2-core: 2.40.3 -> 2.42.0 - https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_42_0/NEWS --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 8413ae597f77..66b0c13646b5 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.3"; + version = "2.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5Jg3wq0w1x4fKcqOCWilS5UDAnL3/0C4m0iWhlPzelw="; + sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab"; }; outputs = [ "out" "dev" ]; From eab3bf85d88c1b14cc324993433f85978060394f Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:23:24 +0200 Subject: [PATCH 017/130] gjs: 1.68.3 -> 1.70.0 - https://gitlab.gnome.org/GNOME/gjs/-/blob/1.70.0/NEWS --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 54f19d1756cb..29eb1b948247 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.3"; + version = "1.70.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8="; + sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8="; }; patches = [ From d7cde54c94727202280dd06ca825625ddf476571 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:24:26 +0200 Subject: [PATCH 018/130] glib: 2.68.4 -> 2.70.0 - https://gitlab.gnome.org/GNOME/glib/-/blob/2.70.0/NEWS --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 679a91d1bc3f..4825dd98976c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.4"; + version = "2.70.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; + sha256 = "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390"; }; patches = optionals stdenv.isDarwin [ From 286f16ff47398336d91e10bc4e3eaae1518a0f58 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:25:02 +0200 Subject: [PATCH 019/130] glib-networking: 2.68.2 -> 2.70.0 - https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.70.0/NEWS --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 6842470be4c0..d5bc952597d4 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.68.2"; + version = "2.70.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8="; + sha256 = "0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36"; }; patches = [ From 9c578fc1263c9e8ea9b6585d9baa45f15a40bd60 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 18:10:42 +0200 Subject: [PATCH 020/130] libsoup: 2.72.0 -> 2.74.0 - https://gitlab.gnome.org/GNOME/libsoup/-/blob/2.74.0/NEWS --- .../development/libraries/libsoup/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 0cc4c8b3453a..0bbfa5017d1b 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -18,26 +18,17 @@ , libpsl , python3 , brotli -, fetchpatch }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.72.0"; + version = "2.74.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; + sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/libsoup/-/issues/222 - url = "https://gitlab.gnome.org/GNOME/libsoup/commit/b5e4f15a09d197b6a9b4b2d78b33779f27d828af.patch"; - sha256 = "1hqk8lqzc200hi0nwbwq9qm6f03z296cnd79d4ql30683s80xqws"; - }) - ]; - postPatch = '' patchShebangs libsoup/ ''; @@ -71,10 +62,18 @@ stdenv.mkDerivation rec { "-Dsysprof=disabled" ]; + NIX_CFLAGS_COMPILE = "-lpthread"; + doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + postPatch = '' + patchShebangs libsoup/ + ''; + passthru = { - propagatedUserEnvPackages = [ glib-networking.out ]; + propagatedUserEnvPackages = [ + glib-networking.out + ]; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; From 9dbc996429d9a2a07be707f4023a5ca2b78893b4 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:30:38 +0200 Subject: [PATCH 021/130] libgudev: 236 -> 237 - https://gitlab.gnome.org/GNOME/libgudev/-/blob/237/NEWS --- pkgs/development/libraries/libgudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 6fd108b3b7a6..87061ae6559a 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libgudev"; - version = "236"; + version = "237"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; + sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; nativeBuildInputs = [ From 7423a0be064db18b7ee9aeb72eb2eb276dff1b0f Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:32:06 +0200 Subject: [PATCH 022/130] libdazzle: 3.40.0 -> 3.42.0 - https://gitlab.gnome.org/GNOME/libdazzle/-/blob/3.42.0/NEWS --- pkgs/development/libraries/libdazzle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d62614c56c76..426ffadf4c6e 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; + sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; }; nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; From 08fcd73d9dc9a28aa901210b259d9bfb3c228018 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:33:49 +0200 Subject: [PATCH 023/130] librsvg: 2.50.7 -> 2.52.0 - https://gitlab.gnome.org/GNOME/librsvg/-/blob/2.52.0/NEWS --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 05b7a00be590..03bd2eb96bc6 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.50.7"; + version = "2.52.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "//thsIzVKCqq4UegKzBRZqdCb60iqLlCdwjw8vxCbrw="; + sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx"; }; nativeBuildInputs = [ From 52f650a241558d78435dae7159c7ca4088bf9278 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:34:59 +0200 Subject: [PATCH 024/130] gobject-introspection: 1.68.0 -> 1.70.0 - https://gitlab.gnome.org/GNOME/gobject-introspection/-/blob/1.70.0/NEWS --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index e6a1ad979b91..25b7770101d1 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.68.0"; + version = "1.70.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj"; + sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh"; }; patches = [ From 120d9979b050477c077b5f51749e7c226f0e430e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:39:08 +0200 Subject: [PATCH 025/130] gtksourceview4: 4.8.1 -> 4.8.2 - https://gitlab.gnome.org/GNOME/gtksourceview/-/blob/4.8.2/NEWS --- pkgs/development/libraries/gtksourceview/4.x.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index eb92586ce84a..e5563d37f1ac 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.1"; + version = "4.8.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; + sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; }; patches = [ @@ -38,13 +37,6 @@ stdenv.mkDerivation rec { # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch - - # fixes intermittent "gtksourceview-gresources.h: no such file" errors - (fetchpatch { - name = "ensure-access-to-resources-in-corelib-build.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; - sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; - }) ]; nativeBuildInputs = [ From 2efe395e92f2f07b75a95d7ab5e48ccfdc6c5fe7 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:43:10 +0200 Subject: [PATCH 026/130] libmediaart: 1.9.4 -> 1.9.5 - https://gitlab.gnome.org/GNOME/libmediaart/-/blob/1.9.5/NEWS --- .../libraries/libmediaart/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index ee1b306c3e51..7f9c4d6ac94b 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,31 +1,23 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.4"; + version = "1.9.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; + sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=792272 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch"; - sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv"; - }) + mesonFlags = [ + "-Dgtk_doc=true" ]; - # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701 - # is fixed on master. - doCheck = false; - passthru = { updateScript = gnome.updateScript { packageName = pname; From ec0a2a0024e5a35fce3c1b562ef7f1563ae34bbb Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 26 Sep 2021 12:44:56 +0200 Subject: [PATCH 027/130] gsound: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/gsound/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index bcd39ce22733..13a8aaa2f198 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome, meson, ninja }: stdenv.mkDerivation rec { pname = "gsound"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; + sha256 = "06l80xgykj7x1kqkjvcq06pwj2rmca458zvs053qc55x3sg06bfa"; }; - nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { From 4cfee04bbf646f8a25809deda383e27082aa86cc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 21:52:09 +0000 Subject: [PATCH 028/130] =?UTF-8?q?pango:=201.48.5=20=E2=86=92=201.48.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/blob/1.48.10/NEWS --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index c75e33a0686e..513bfe2d17e6 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ let in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.5"; + version = "1.48.10"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; + sha256 = "IeH1eYvN/adeq8QoBRSwiWq1b2VtTn5mAwuaJTXs3Jg="; }; nativeBuildInputs = [ From 8b61a08118829b5bd33f01504d24672e5875fd21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 23:41:28 +0200 Subject: [PATCH 029/130] =?UTF-8?q?gnome.sushi:=203.38.1=20=E2=86=92=2041.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/sushi/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index cd93094120db..f08f51512c47 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,8 +8,7 @@ , gnome , gtksourceview4 , gjs -, webkitgtk -, libmusicbrainz5 +, webkitgtk_4_1 , icu , wrapGAppsHook , gst_all_1 @@ -23,11 +22,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "3.38.1"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8+bRDIFVKNA6Zl+v0VwHGeAXqBOXWzrzIHYZnjeIiOk="; + url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4="; }; nativeBuildInputs = [ @@ -49,8 +48,7 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - libmusicbrainz5 - webkitgtk + webkitgtk_4_1 epoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base From 6fe6ba7737eed11d16b3f7c731883e2c431ec42f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 23:42:36 +0200 Subject: [PATCH 030/130] =?UTF-8?q?gnome.cheese:=203.38.0=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/cheese/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 71a582993abf..38754a556938 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -2,7 +2,6 @@ , stdenv , gettext , fetchurl -, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -35,23 +34,15 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "3.38.0"; + version = "41.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; + url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk="; }; - patches = [ - # Fix build with latest Vala or GLib - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; - sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; - }) - ]; - nativeBuildInputs = [ appstream-glib docbook_xml_dtd_43 From 9778394a78173cf651693306cd6c6544bda10e40 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Sep 2021 23:44:41 +0200 Subject: [PATCH 031/130] =?UTF-8?q?gnome.polari:=203.38.0=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit UI uses GTK 4, thumbnailer GTK 3 (due to a dependency on WebkitGtk, where GTK 4 support is still experimental). Both work, though the console is full of warnings. --- pkgs/desktops/gnome/apps/polari/default.nix | 18 +++++++-------- .../polari/make-thumbnailer-wrappable.patch | 22 +++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 0675ccb2f82d..f207307588a1 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,17 +1,15 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }: -let +stdenv.mkDerivation rec { pname = "polari"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs="; }; patches = [ @@ -24,12 +22,12 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 + meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2 desktop-file-utils gobject-introspection appstream-glib ]; buildInputs = [ - gtk3 glib adwaita-icon-theme gsettings-desktop-schemas + gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk ]; diff --git a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch index 0fb09eb154af..269b455f9787 100644 --- a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch +++ b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch @@ -1,24 +1,24 @@ diff --git a/src/thumbnailer.js b/src/thumbnailer.js old mode 100644 new mode 100755 -index e2ad0a5..7ebf08a +index ed6350ea..83d832cb --- a/src/thumbnailer.js +++ b/src/thumbnailer.js @@ -1,3 +1,4 @@ -+#!/usr/bin/env gjs - imports.gi.versions.Gdk = '3.0'; - imports.gi.versions.Gtk = '3.0'; - ++#!/usr/bin/env gjs --module + import Cairo from 'cairo'; + import Gdk from 'gi://Gdk?version=3.0'; + import Gio from 'gi://Gio'; diff --git a/src/urlPreview.js b/src/urlPreview.js -index f17e0be..ccffc32 100644 +index 5f7931e4..d2282900 100644 --- a/src/urlPreview.js +++ b/src/urlPreview.js -@@ -44,7 +44,7 @@ class Thumbnailer { - _generateThumbnail(data) { +@@ -69,7 +69,7 @@ class Thumbnailer { + async _generateThumbnail(data) { let { filename, uri } = data; this._subProc = Gio.Subprocess.new( -- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], +- ['gjs', '--module', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], Gio.SubprocessFlags.NONE); - this._subProc.wait_async(null, (o, res) => { - try { + try { + await this._subProc.wait_async(null); From 4d2aea061f00b09be5919ee8e2bef0bdd95f380c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 15:40:01 +0200 Subject: [PATCH 032/130] gnome.gnome-boxes: 40.3 -> 41.1 - https://gitlab.gnome.org/GNOME/gnome-boxes/-/blob/41.1/NEWS --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 510da6c83d94..fa0f590b5f5b 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg="; + sha256 = "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"; }; doCheck = true; From fd2f09bed30237b895c37e17b0db3a03ab50875b Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 15:47:22 +0200 Subject: [PATCH 033/130] libblockdev: 2.25 -> 2.26 - https://github.com/storaged-project/libblockdev/releases/tag/2.26-1 - https://github.com/storaged-project/libblockdev/blob/2.26-1/NEWS.rst --- pkgs/development/libraries/libblockdev/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 9b1654420e74..feb721dce45f 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.25"; + version = "2.26"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ="; + sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -22,13 +22,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) - - # fix build with glib 2.68 (g_memdup is deprecated) - # https://github.com/storaged-project/libblockdev/pull/623 - (fetchpatch { - url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; - sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; - }) ]; postPatch = '' From 9ba684d4c3ff704936990fd2d302c63097f74bde Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 17:50:23 +0200 Subject: [PATCH 034/130] gnome.gnome-calendar: 40.2 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-calendar/-/blob/41.0/NEWS --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index da2e37e51fc4..c8c2853203ce 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM="; + sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k"; }; patches = [ From f9b11af83abc5818d58afe570c5025162d59465f Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 17:55:54 +0200 Subject: [PATCH 035/130] gnome.gnome-desktop: 40.4 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-desktop/-/blob/41.0/NEWS --- .../gnome/core/gnome-desktop/bubblewrap-paths.patch | 8 +++++--- pkgs/desktops/gnome/core/gnome-desktop/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch index 57eb4b3d44a9..c31e093f4b7e 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch @@ -1,15 +1,17 @@ +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index ddcc1511..546c2a36 100644 --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, +@@ -555,9 +555,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", + "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", ++ "--ro-bind-try", "/run/current-system", "/run/current-system", NULL); /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index df8096b90eec..6ab45283c852 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8="; + sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI="; }; patches = [ From 1dbb4780bfbb93d098b4ed69b9622e8ffaed551a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 21:57:56 +0200 Subject: [PATCH 036/130] gnome.gnome-music: 40.1.1 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-music/-/blob/41.0/NEWS --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 803235e95843..ef0931e273c9 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -25,18 +25,19 @@ , gst_all_1 , libdazzle , libsoup +, libhandy , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "40.1.1"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE="; + sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9"; }; nativeBuildInputs = [ @@ -67,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { libnotify libdazzle libsoup + libhandy gsettings-desktop-schemas tracker ] ++ (with gst_all_1; [ From 3faf2e9796306408e4bb1c26735e50e5935c9125 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 21:59:17 +0200 Subject: [PATCH 037/130] gnome.gnome-characters: 40.0 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-characters/-/blob/41.0/NEWS --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 5cbd58d602a9..960a3320472d 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; + sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; }; nativeBuildInputs = [ From aac7e4643e73365303e548544e3b660134e16b1b Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 21:59:55 +0200 Subject: [PATCH 038/130] gnome.gnome-todo: 40.0 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-todo/-/blob/41.0/NEWS --- pkgs/desktops/gnome/apps/gnome-todo/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index ae1334cd562b..cfa77fadb79d 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -21,15 +21,16 @@ , libical , librest , json-glib +, itstool }: stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE="; + sha256 = "1r94880d4khbjhhfnhaba3y3d4hv2bri82rzfzxn27s5iybpqras"; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { gettext python3 wrapGAppsHook + itstool ]; buildInputs = [ @@ -62,10 +64,6 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/meson_post_install.py - - # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103 - substituteInPlace src/meson.build \ - --replace 'Gtk-3.0' 'Gtk-4.0' ''; passthru = { From 3a22f6f94743e936b9a06b0a29a67105138a46e6 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 27 Sep 2021 22:01:08 +0200 Subject: [PATCH 039/130] gnome.gnome-weather: 40.1 -> 41.0 - https://gitlab.gnome.org/GNOME/gnome-weather/-/blob/41.0/NEWS --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 17e98bb2a569..aa192a6a3b65 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0="; + sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; }; nativeBuildInputs = [ From 55e4899855743e51576a0a641ebec5f4055e4840 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Sep 2021 14:09:39 +0200 Subject: [PATCH 040/130] libvirt-glib: fix build with GLib 2.70 --- pkgs/development/libraries/libvirt-glib/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 6c2cb095a818..f86edf1bfbcb 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; + patches = [ + # Fix build with GLib 2.70 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/9a34c4ea55e0246c34896e48b8ecd637bc559ac7.patch"; + sha256 = "UU70uTi55EzPMuLYVKRzpVcd3WogeAtWAWEC2hWlR7k="; + }) + ]; + nativeBuildInputs = [ meson ninja From feff9a8069ddf56adceb2a1698025cf775de4efd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Sep 2021 13:24:37 +0000 Subject: [PATCH 041/130] =?UTF-8?q?python3.pkgs.pygobject3:=203.40.1=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pygobject/-/blob/3.42.0/NEWS --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 373577dc4675..fda11ef89e83 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; + sha256 = "mxJhbjLPx5L53IQdnEcqQaNbhbpn06brQn4wem/kNns="; }; nativeBuildInputs = [ From c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Sep 2021 16:00:31 +0200 Subject: [PATCH 042/130] libsoup: clean up To keep in sync with libsoup3. --- .../development/libraries/libsoup/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 0bbfa5017d1b..6d2150103a10 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -24,16 +24,23 @@ stdenv.mkDerivation rec { pname = "libsoup"; version = "2.74.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - postPatch = '' - patchShebangs libsoup/ - ''; - - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala + ]; buildInputs = [ python3 @@ -44,12 +51,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config glib ] - ++ lib.optional withIntrospection gobject-introspection - ++ lib.optional withVala vala; - propagatedBuildInputs = [ glib libxml2 ]; - NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + propagatedBuildInputs = [ + glib + libxml2 + ]; mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency From 8d4272fdf1569986c756382f6801f5cb26ea407e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Sep 2021 16:01:00 +0200 Subject: [PATCH 043/130] libsoup3: init at 3.0.1 https://gitlab.gnome.org/GNOME/libsoup/-/blob/9be41160825b8238b482208b46bfe16b2f239ce3/NEWS --- pkgs/development/libraries/libsoup/3.x.nix | 102 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 104 insertions(+) create mode 100644 pkgs/development/libraries/libsoup/3.x.nix diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix new file mode 100644 index 000000000000..6fd7f3e696a2 --- /dev/null +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gnome +, libsysprof-capture +, sqlite +, glib-networking +, gobject-introspection +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, vala +, withVala ? stdenv.buildPlatform == stdenv.hostPlatform +, libpsl +, python3 +, brotli +, libnghttp2 +}: + +stdenv.mkDerivation rec { + pname = "libsoup"; + version = "3.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-bwwxbRD4RYuW9WTHZEvjwgEb11rVBUyNsmr7DJqRvEc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala + ]; + + buildInputs = [ + python3 + sqlite + libpsl + glib.out + brotli + libnghttp2 + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency + "-Dgssapi=disabled" + "-Dvapi=${if withVala then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dntlm=disabled" + # Requires wstest from autobahn-testsuite. + "-Dautobahn=disabled" + # Requires quart Python module. + "-Dhttp2_tests=disabled" + # Requires gnutls, not added for closure size. + "-Dpkcs11_tests=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" + ]; + + # TODO: For some reason the pkg-config setup hook does not pick this up. + PKG_CONFIG_PATH = "${libnghttp2.dev}/lib/pkgconfig"; + + # HSTS tests fail. + doCheck = false; + + postPatch = '' + patchShebangs libsoup/ + ''; + + passthru = { + propagatedUserEnvPackages = [ + glib-networking.out + ]; + updateScript = gnome.updateScript { + attrPath = "libsoup3"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "HTTP client/server library for GNOME"; + homepage = "https://wiki.gnome.org/Projects/libsoup"; + license = lib.licenses.lgpl2Plus; + inherit (glib.meta) maintainers platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d29b7e82c8d..c0e912b202d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17831,6 +17831,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libsoup3 = callPackage ../development/libraries/libsoup/3.x.nix { }; + libspectrum = callPackage ../development/libraries/libspectrum { }; libspiro = callPackage ../development/libraries/libspiro {}; From 21b1744593c3fd7489a8f51c67ba45dd9aedfe68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Sep 2021 18:37:45 +0200 Subject: [PATCH 044/130] =?UTF-8?q?webkitgtk:=202.32.3=20=E2=86=92=202.34.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: - https://webkitgtk.org/2021/05/14/webkitgtk2.33.1-released.html - https://webkitgtk.org/2021/06/08/webkitgtk2.33.2-released.html - https://webkitgtk.org/2021/08/16/webkitgtk2.33.3-released.html - https://webkitgtk.org/2021/09/02/webkitgtk2.33.90-released.html - https://webkitgtk.org/2021/09/17/webkitgtk2.33.91-released.html - https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html Notably, libsoup3 is used by default. We revert that to reduce breakage so programs using libsoup 3.x will need to override the argument. --- pkgs/development/libraries/webkitgtk/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 9165bb4be6f0..23307b0f36b7 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,6 +15,7 @@ , libnotify , gnutls , libgcrypt +, libgpg-error , gtk3 , wayland , libwebp @@ -41,6 +42,7 @@ , libGLU , mesa , libintl +, lcms2 , libmanette , openjpeg , enableGeoLocation ? true @@ -63,7 +65,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.4"; + version = "2.34.0"; outputs = [ "out" "dev" ]; @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; + sha256 = "sha256-iAyO5ib2cBn2dVfKCeWaI+zyReYPYXMhXxqII8sJrzQ="; }; patches = lib.optionals stdenv.isLinux [ @@ -140,8 +142,10 @@ stdenv.mkDerivation rec { libGLU mesa # for libEGL headers libgcrypt + libgpg-error libidn libintl + lcms2 ] ++ lib.optionals stdenv.isLinux [ libmanette ] ++ [ @@ -193,6 +197,7 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" + "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" From 9c00a39c6b6198ad43376d2666a0306218bfcee0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 03:43:24 +0200 Subject: [PATCH 045/130] webkitgtk_4_1: init 4.1 ABI version is the same as 4.0 but it links against libsoup 3.0 ABI. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0e912b202d7..33c5a11f00b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17831,7 +17831,7 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; - libsoup3 = callPackage ../development/libraries/libsoup/3.x.nix { }; + libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; libspectrum = callPackage ../development/libraries/libspectrum { }; @@ -19671,6 +19671,10 @@ with pkgs; inherit (darwin) apple_sdk; }; + webkitgtk_4_1 = webkitgtk.override { + libsoup = libsoup_3; + }; + websocketpp = callPackage ../development/libraries/websocket++ { }; webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; From 8bd329bfd3ad5e1b6cb9bd51d15e2a1c75f69ed3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:45:16 +0000 Subject: [PATCH 046/130] =?UTF-8?q?sysprof:=203.40.1=20=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/sysprof/3.42/sysprof-3.42.0.news --- .../development/tools/profiling/sysprof/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 6ceda016045b..7bcf387202ef 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -2,6 +2,7 @@ , lib , desktop-file-utils , fetchurl +, fetchpatch , gettext , glib , gtk3 @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; + sha256 = "PBbgPv3+XT5xxNI5xndBrTf3LOiXHi9/rxaNvV6T6IY="; }; + patches = [ + # Fix missing unistd.h include. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/sysprof/commit/b113c89af1de2f87589175795a197f6384852a78.patch"; + sha256 = "3Q8d6IZYNJl/vbyzRgoRR2sdl4aRkbcKPeVjSSqxb98="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext From c08615451f9a51875b060fbc7d807d5fa2ce6d8b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:42:14 +0000 Subject: [PATCH 047/130] =?UTF-8?q?gsettings-desktop-schemas:=2040.0=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gsettings-desktop-schemas/41/gsettings-desktop-schemas-41.alpha.news https://ftp.gnome.org/pub/GNOME/sources/gsettings-desktop-schemas/41/gsettings-desktop-schemas-41.rc.news https://ftp.gnome.org/pub/GNOME/sources/gsettings-desktop-schemas/41/gsettings-desktop-schemas-41.0.news --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index b4dc200f980a..483ee0b08496 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; + sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0="; }; strictDeps = true; From 336ff679a839a3c034a9703d2a43f74424972b52 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:43:50 +0000 Subject: [PATCH 048/130] =?UTF-8?q?jsonrpc-glib:=203.38.0=20=E2=86=92=203.?= =?UTF-8?q?40.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/jsonrpc-glib/3.40/jsonrpc-glib-3.40.0.news --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b43bcd07ca6b..7618110e86c4 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; + sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ="; }; mesonFlags = [ From 59a96f5bba62ca453fd0dec18da82b53d47f002c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:48:42 +0000 Subject: [PATCH 049/130] =?UTF-8?q?vte:=200.64.1=20=E2=86=92=200.64.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/vte/0.64/vte-0.64.2.changes --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index c3631cccbe01..0411086c78c3 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.1"; + version = "0.64.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; + sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; }; patches = [ From 9f92453b6e39576c200fe57bf5c63d15032bd2fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:38:00 +0000 Subject: [PATCH 050/130] =?UTF-8?q?gnome.adwaita-icon-theme:=2040.1.1=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.news --- pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 04f8a7a3c37b..c7c85779d3fb 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "40.1.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; + sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro="; }; # For convenience, we can specify adwaita-icon-theme only in packages From c85a6991696c690515fada63e8b149c16de10e17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:38:12 +0000 Subject: [PATCH 051/130] =?UTF-8?q?gnome.baobab:=2040.0=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/baobab/41/baobab-41.0.news --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 40ff8e201543..40ea18b1af1e 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; }; nativeBuildInputs = [ From c8993cf9281aaac3c9f20774f77d075d139bdfb0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:38:39 +0000 Subject: [PATCH 052/130] =?UTF-8?q?gnome.devhelp:=2040.1=20=E2=86=92=2041.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/devhelp/41/devhelp-41.alpha.news https://ftp.gnome.org/pub/GNOME/sources/devhelp/41/devhelp-41.beta.news https://ftp.gnome.org/pub/GNOME/sources/devhelp/41/devhelp-41.rc.news https://ftp.gnome.org/pub/GNOME/sources/devhelp/41/devhelp-41.0.news https://ftp.gnome.org/pub/GNOME/sources/devhelp/41/devhelp-41.1.news gnome.devhelp: 40.1 → 41.2 --- .../gnome/devtools/devhelp/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 6be6c77f7c27..2ad3c3ff39ad 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -7,10 +7,10 @@ , gtk3 , wrapGAppsHook , glib -, amtk , appstream-glib , gobject-introspection , python3 +, gi-docgen , webkitgtk , gettext , itstool @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "40.1"; + version = "41.2"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s="; + sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; }; nativeBuildInputs = [ @@ -37,22 +39,27 @@ stdenv.mkDerivation rec { appstream-glib gobject-introspection python3 + gi-docgen ]; buildInputs = [ glib gtk3 webkitgtk - amtk gnome.adwaita-icon-theme gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + doCheck = true; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py + # patchShebangs requires executable file + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py ''; preFixup = '' @@ -63,6 +70,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/devhelp-3 "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; From 0438f3d8c520e390c832a8a733413f73ebf6e49e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:38:45 +0000 Subject: [PATCH 053/130] =?UTF-8?q?gnome.eog:=2040.3=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/eog/41/eog-41.beta.news https://ftp.gnome.org/pub/GNOME/sources/eog/41/eog-41.rc.news https://ftp.gnome.org/pub/GNOME/sources/eog/41/eog-41.0.news --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index bffcb8b74c23..67ecf9f5c13c 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU="; + sha256 = "sha256-kX3ghv2X/T7JMPoHyIut0r4fXQrmueVpyYYATgNZqaw="; }; nativeBuildInputs = [ From e3953ce3e9484cd01fe998b0f2310ad7c7da3496 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 00:38:47 +0000 Subject: [PATCH 054/130] =?UTF-8?q?gnome.epiphany:=2040.3=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/epiphany/41/epiphany-41.alpha.news https://ftp.gnome.org/pub/GNOME/sources/epiphany/41/epiphany-41.beta.news https://ftp.gnome.org/pub/GNOME/sources/epiphany/41/epiphany-41.rc.news https://ftp.gnome.org/pub/GNOME/sources/epiphany/41/epiphany-41.0.news --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 6f673d632267..1a3a67f0d786 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; + sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA="; }; patches = lib.optionals withPantheon [ From 302360910af4051fa36b4ab8aa2d1f9fdc4b255c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 20:23:09 +0000 Subject: [PATCH 055/130] =?UTF-8?q?tracker:=203.1.1=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/blob/3.2.0/NEWS Notably, both libsoup 2.x and 3.x are linked and selected at runtime (to avoid conflicts). Also API documentation is now built by hotdoc but the build system copies it from the tarball for now. --- .../development/libraries/tracker/default.nix | 23 ++++----------- .../libraries/tracker/fix-docs.patch | 28 ------------------- 2 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/tracker/fix-docs.patch diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 0ee5e0fa5672..39ac21b7ad6c 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , gettext , meson , ninja @@ -8,7 +8,6 @@ , asciidoc , gobject-introspection , python3 -, gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 @@ -22,6 +21,7 @@ , icu , libuuid , libsoup +, libsoup_3 , json-glib , systemd , dbus @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.1.1"; + version = "3.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; + sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo="; }; patches = [ @@ -44,17 +44,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - - # Add missing build target dependencies to fix parallel building of docs. - # TODO: Upstream this. - ./fix-docs.patch - - # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch"; - sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA="; - }) ]; nativeBuildInputs = [ @@ -67,7 +56,6 @@ stdenv.mkDerivation rec { libxslt wrapGAppsNoGuiHook gobject-introspection - gtk-doc docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators @@ -81,6 +69,7 @@ stdenv.mkDerivation rec { sqlite icu libsoup + libsoup_3 libuuid json-glib libstemmer diff --git a/pkgs/development/libraries/tracker/fix-docs.patch b/pkgs/development/libraries/tracker/fix-docs.patch deleted file mode 100644 index a6ff84cda3e5..000000000000 --- a/pkgs/development/libraries/tracker/fix-docs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build -index 1cb1d9f3f..313c72345 100644 ---- a/docs/reference/libtracker-sparql/examples/meson.build -+++ b/docs/reference/libtracker-sparql/examples/meson.build -@@ -1,20 +1,20 @@ - executable( - 'readonly-example', - 'readonly-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) - - executable( - 'writeonly-example', - 'writeonly-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) - - executable( - 'writeonly-with-blank-nodes-example', - 'writeonly-with-blank-nodes-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) From ac38867f3d55480b9cf45d2d0a9602ff592787a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Sep 2021 21:05:40 +0000 Subject: [PATCH 056/130] =?UTF-8?q?evolution-data-server:=203.40.4=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/3.42.0/NEWS --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 156ffbb1c78f..aabe9af14827 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.4"; + version = "3.42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA="; + sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU="; }; patches = [ From db039f82ce9c0880c355796664fdeba1021a81b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:39:26 +0000 Subject: [PATCH 057/130] =?UTF-8?q?gnome.gdm:=2040.1=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gdm/default.nix | 7 ++- pkgs/desktops/gnome/core/gdm/fix-paths.patch | 65 ++++++++++++-------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index e3c693836374..392ea61688a6 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -26,6 +26,7 @@ , plymouth , librsvg , coreutils +, xorgserver , xwayland , dbus , nixos-icons @@ -42,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "40.1"; + version = "41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0="; + sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw="; }; mesonFlags = [ @@ -102,7 +103,7 @@ stdenv.mkDerivation rec { # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch; - inherit coreutils plymouth xwayland dbus; + inherit coreutils plymouth xorgserver xwayland dbus; }) # The following patches implement certain environment variables in GDM which are set by diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch index d649556fe9e6..980627c78d46 100644 --- a/pkgs/desktops/gnome/core/gdm/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -1,66 +1,64 @@ +diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c +index 5fbbad68..739718ec 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -201,7 +201,7 @@ +@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration { + const char *session_type; + } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT - gboolean wayland_enabled = FALSE; - if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { -- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) -+ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - return TRUE; - } +- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, ++ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, #endif +- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, ++ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" }, + { NULL, NULL, NULL }, + }; + +diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c +index cc61efc9..4c9d15af 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ plymouth_is_running (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth --ping", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -163,7 +163,7 @@ +@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth deactivate", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -178,7 +178,7 @@ +@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -194,7 +194,7 @@ +@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); ---- a/data/gdm.service.in -+++ b/data/gdm.service.in -@@ -26,7 +26,7 @@ Restart=always - IgnoreSIGPIPE=no - BusName=org.gnome.DisplayManager - EnvironmentFile=-${LANG_CONFIG_FILE} --ExecReload=/bin/kill -SIGHUP $MAINPID -+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID - KeyringMode=shared - - [Install] +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 4b709731..245ac0cf 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self, +@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self, */ if (run_launcher) { if (is_x11) { @@ -80,3 +78,16 @@ self->selected_program); } } +diff --git a/data/gdm.service.in b/data/gdm.service.in +index 17e8a8de..afc70977 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -26,7 +26,7 @@ Restart=always + IgnoreSIGPIPE=no + BusName=org.gnome.DisplayManager + EnvironmentFile=-${LANG_CONFIG_FILE} +-ExecReload=/bin/kill -SIGHUP $MAINPID ++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID + KeyringMode=shared + + [Install] From e985b2bc238d6b92c97050a4a6b2bfb2b465c947 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:39:34 +0000 Subject: [PATCH 058/130] =?UTF-8?q?gnome.ghex:=203.18.4=20=E2=86=92=203.41?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/ghex/default.nix | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 500e60feb75c..6275bcd3fc65 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "3.18.4"; + version = "3.41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; + sha256 = "KcdG8ihzteQVvDly29PdYNalH3CA5qPpVsNNZHrjRKI="; }; nativeBuildInputs = [ @@ -50,18 +50,6 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - patches = [ - # Fixes for darwin. Drop in next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; - sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; - sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py From 2401535732471b3cc72d9e28de4fdda4f1c8a03b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:39:42 +0000 Subject: [PATCH 059/130] =?UTF-8?q?gnome.gnome-autoar:=200.3.3=20=E2=86=92?= =?UTF-8?q?=200.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome/misc/gnome-autoar/default.nix | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 2afb401bef45..e8bfaffb45e8 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch +, meson +, ninja , pkg-config , gnome , gtk3 @@ -11,21 +15,32 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.3"; + version = "0.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ="; + sha256 = "6oxtUkurxxKsWeHQ46yL8BN0gtrfM8lP6RE3lKG8RHQ="; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; - }; + patches = [ + # Make compatible with older Meson. + # https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/26 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/2d90da6174c03aad546802234a3d77fa0b714e6b.patch"; + sha256 = "CysDpBJmVPm4gOSV2h041MY2yApfAy8+4QC7Jlka1xE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/ac21bd0c50584a1905a0da65d4bf9a6926ecd483.patch"; + sha256 = "aTu6eKFSKjljk0TYkhFjPcD8eJCIk8TR0YhZYO9JE1k="; + }) + ]; nativeBuildInputs = [ gobject-introspection + meson + ninja pkg-config vala ]; @@ -39,6 +54,17 @@ stdenv.mkDerivation rec { glib ]; + mesonFlags = [ + "-Dvapi=true" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-autoar"; + attrPath = "gnome.gnome-autoar"; + }; + }; + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; From 58e1f5e1cf5fae3bc71667d8dad040f293593953 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:39:57 +0000 Subject: [PATCH 060/130] =?UTF-8?q?gnome.gnome-backgrounds:=2040.1=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 370cd14e4677..814878d57140 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU="; }; passthru = { From 7d9d259d8054fdece0eb33fd24073c61f9d3167a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:04 +0000 Subject: [PATCH 061/130] =?UTF-8?q?gnome.gnome-calculator:=2040.1=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 7e19e9523ce8..58c079078d64 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + sha256 = "pm3AS9hYfnbWc3Wmrvp5VTtWnJvfeOvcKBfxwK3j3Jk="; }; nativeBuildInputs = [ From b7032c539faf465fbb0226c901e225bb7aea2bb6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:13 +0000 Subject: [PATCH 062/130] =?UTF-8?q?gnome.gnome-chess:=2040.1=20=E2=86=92?= =?UTF-8?q?=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index c632bce407bc..a2dbd9257a2d 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + sha256 = "8MKVFSLw5YX6aDdipBk9q2ujLtjOiSB/gIJ7VgRVaO8="; }; nativeBuildInputs = [ From 14a51b30b482b162712c01d4635bb18ad589a154 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:24 +0000 Subject: [PATCH 063/130] =?UTF-8?q?gnome.gnome-contacts:=2040.0=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 62a43d20d580..919bb5206cff 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; + sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA="; }; propagatedUserEnvPkgs = [ From 4ef77296cd2aea7933e78d09383b8f4cc4b05569 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:32 +0000 Subject: [PATCH 064/130] =?UTF-8?q?gnome.gnome-control-center:=2040.0=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/gnome-control-center/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6170f53c716b..d7a898c1c45c 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , substituteAll @@ -17,6 +16,7 @@ , gettext , glib , glib-networking +, gcr , glibc , gnome-bluetooth , gnome-color-manager @@ -24,8 +24,6 @@ , gnome-online-accounts , gnome-settings-daemon , gnome -, grilo -, grilo-plugins , gsettings-desktop-schemas , gsound , gtk3 @@ -70,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; + sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME="; }; patches = [ @@ -85,13 +83,6 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) - - # Fix startup assertion in power panel. - # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; - sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; - }) ]; nativeBuildInputs = [ @@ -119,14 +110,13 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking + gcr gnome-bluetooth gnome-desktop gnome-online-accounts gnome-remote-desktop # optional, sharing panel gnome-settings-daemon gnome-user-share # optional, sharing panel - grilo - grilo-plugins # for setting wallpaper from Flickr gsettings-desktop-schemas gsound gtk3 From a7fcd814fe00ce3c0ee7aa6c470c9b756239315e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:40 +0000 Subject: [PATCH 065/130] =?UTF-8?q?gnome.gnome-disk-utility:=2040.2=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index ead50f1c9d1a..195a0c4f016d 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec="; + sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8="; }; nativeBuildInputs = [ From 1c9eb176dc6867441b59dcc49dda464344e66de7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:48 +0000 Subject: [PATCH 066/130] =?UTF-8?q?gnome.gnome-font-viewer:=2040.0=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 622a7de1bffa..4ba915df2dbd 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; + sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY="; }; doCheck = true; From 59c498cd2c20a715a43b37b3808e2079dacf9911 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:40:52 +0000 Subject: [PATCH 067/130] =?UTF-8?q?gnome.gnome-initial-setup:=2040.4=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index b6aedeeb6464..ff1d95861e37 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QSplhO5upN+WN8QimT9Or4FYTSkZD16JOvmnhxy5Axs="; + sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo="; }; patches = [ From 76ba7d89263c1ac304b4d72be3a1d5a6f7a77235 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:03 +0000 Subject: [PATCH 068/130] =?UTF-8?q?gnome.gnome-maps:=2040.4=20=E2=86=92=20?= =?UTF-8?q?41.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5784fb8d481f..7ddf227a8fb3 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -9,13 +9,13 @@ , gtk3 , gobject-introspection , gdk-pixbuf +, librest , librsvg , libgweather , geoclue2 , wrapGAppsHook , folks , libchamplain -, gfbgraph , libsoup , gsettings-desktop-schemas , webkitgtk @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw="; + sha256 = "sha256-G0CC22wHDp3LCFJZ6+PIpCG44eiyezKEq2BXULudjJI="; }; doCheck = true; @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { gdk-pixbuf geoclue2 geocode-glib - gfbgraph gjs gnome-online-accounts gnome.adwaita-icon-theme @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { libgee libgweather libhandy + librest librsvg libsoup webkitgtk From ed658fd85b7fe30ca3f39fb68ec22ce10042a9ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:27 +0000 Subject: [PATCH 069/130] =?UTF-8?q?gnome.gnome-remote-desktop:=2040.1=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index fda0f6e2ffd6..fac50cd2b34d 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -7,6 +7,7 @@ , python3 , wrapGAppsHook , glib +, nv-codec-headers-11 , pipewire , systemd , libvncserver @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek="; + hash = "sha256-apvIscaHRvSjqsH+dMRKcuJqi7S+HxynMCdwWstlK14="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { fuse3 gdk-pixbuf # For libnotify glib + nv-codec-headers-11 libnotify libsecret libvncserver From d088817611ff96e10a33732d924ed7990554af35 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:37 +0000 Subject: [PATCH 070/130] =?UTF-8?q?gnome.gnome-settings-daemon:=2040.0.1?= =?UTF-8?q?=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 4a1b7f4c20c7..307de72cc4f0 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; + sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ="; }; patches = [ From b632011615d783dfb62712e5ba8a2eff35800d28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:40 +0000 Subject: [PATCH 071/130] =?UTF-8?q?gnome.gnome-shell:=2040.4=20=E2=86=92?= =?UTF-8?q?=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome/core/gnome-shell/default.nix | 11 +++- .../gnome/core/gnome-shell/fix-paths.patch | 50 +++++++++++-------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 6a7cb1742ba6..04a4b0984ecb 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b"; + sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U="; }; patches = [ @@ -103,6 +103,13 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; }) + + # Make color picker in GTK work again + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch"; + sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e17a608a2d85..8b35736ecfcd 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -1,30 +1,36 @@ ---- a/js/ui/extensionDownloader.js -+++ b/js/ui/extensionDownloader.js -@@ -86,7 +86,7 @@ - stream.output_stream.write_bytes(contents, null); - stream.close(null); - let [success, pid] = GLib.spawn_async(null, -- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], - null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - null); ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { - if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; - -- Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - } - }); +diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service +index de91167c5..1c9965678 100644 --- a/data/org.gnome.Shell-disable-extensions.service +++ b/data/org.gnome.Shell-disable-extensions.service -@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer +@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions [Service] Type=simple # Disable extensions -ExecStart=gsettings set org.gnome.shell disable-user-extensions true +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no +diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js +index 8bf4646a6..59e88bb4c 100644 +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) { + stream.close_async(GLib.PRIORITY_DEFAULT, null); + + const unzip = Gio.Subprocess.new( +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + Gio.SubprocessFlags.NONE); + await unzip.wait_check_async(null); + } +diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js +index bc50f3d37..868eb5abf 100644 +--- a/js/ui/status/keyboard.js ++++ b/js/ui/status/keyboard.js +@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { + if (xkbVariant.length > 0) + description = '%s\t%s'.format(description, xkbVariant); + +- Util.spawn(['gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); + } + }); From 509aa30b36c4365c8c45e24f2997e61c041ca17a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:41 +0000 Subject: [PATCH 072/130] =?UTF-8?q?gnome.gnome-shell-extensions:=2040.4=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 94b29e8b4dee..25f7fb93ab30 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk="; + sha256 = "2E+qwUSLOPl12cGUkMWSivxcWixJ3X5/ga9pD5Rm/Gg="; }; patches = [ From 74c1b50ca752e6251b57b5f0f91d9dd820550e50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:43 +0000 Subject: [PATCH 073/130] =?UTF-8?q?gnome.gnome-software:=2040.4=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-software/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 6d71c579d7ed..4d9a5c407653 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -25,7 +25,6 @@ , gsettings-desktop-schemas , gnome-desktop , libxmlb -, gnome-online-accounts , json-glib , libsecret , valgrind-light @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8="; + sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE="; }; patches = [ @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { polkit flatpak libxmlb - gnome-online-accounts libsysprof-capture ] ++ lib.optionals withFwupd [ fwupd From faf40e9572cccca5ba62c9a2debfd67e345fd965 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:41:56 +0000 Subject: [PATCH 074/130] =?UTF-8?q?gnome.gnome-system-monitor:=2040.1=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 77579be6272d..d373d6f358c6 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; + sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8="; }; nativeBuildInputs = [ From b12790f5cdfd370f767941daae43f13c003fbbf7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 04:42:03 +0000 Subject: [PATCH 075/130] =?UTF-8?q?gnome.gnome-terminal:=203.40.1=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome/core/gnome-terminal/default.nix | 83 ++++++++++++++----- 1 file changed, 62 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index ab3e3aecc035..48e65009ade7 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,36 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, pcre2 -, libxslt, docbook-xsl-nons }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, python3 +, libxml2 +, gnome +, dconf +, nautilus +, glib +, gtk3 +, gsettings-desktop-schemas +, vte +, gettext +, which +, libuuid +, vala +, desktop-file-utils +, itstool +, wrapGAppsHook +, pcre2 +, libxslt +, docbook-xsl-nons +}: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.40.1"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; + sha256 = "tQ6eVmQjDmyikLzziBKltl4LqsZqSG7iEIlM9nX3Lgs="; }; - buildInputs = [ - gtk3 gsettings-desktop-schemas vte libuuid dconf - # For extension - nautilus - ]; - nativeBuildInputs = [ - pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons - vala desktop-file-utils wrapGAppsHook pcre2 + meson + ninja + pkg-config + gettext + itstool + which + libxml2 + libxslt + glib # for glib-compile-schemas + docbook-xsl-nons + vala + desktop-file-utils + wrapGAppsHook + pcre2 + python3 ]; - # Silly ./configure, it looks for dbus file from gnome-shell in the + buildInputs = [ + glib + gtk3 + gsettings-desktop-schemas + vte + libuuid + dconf + nautilus # For extension + ]; + + # Silly build system, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - ''; + substituteInPlace src/meson.build \ + --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ + "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + patchShebangs \ + data/icons/meson_updateiconcache.py \ + data/meson_desktopfile.py \ + src/meson_compileschemas.py + ''; passthru = { updateScript = gnome.updateScript { @@ -39,8 +82,6 @@ stdenv.mkDerivation rec { }; }; - enableParallelBuilding = true; - meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; From a467a2e3eb1d56538171ebdd1e55eebe6d712c96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 18:06:31 +0000 Subject: [PATCH 076/130] =?UTF-8?q?gnome.mutter:=2040.4=20=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/blob/41.0/NEWS --- pkgs/desktops/gnome/core/mutter/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 3336cfab730e..78b90a379c38 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -14,6 +14,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -45,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pxwVnNKshKZ32l+nrMSUg7Jifa13L4gPiJ645FMKHiM="; + sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4="; }; patches = [ @@ -90,6 +91,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook From a25fb7a91166cbe8423343dd11da522881011604 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 20:27:28 +0200 Subject: [PATCH 077/130] =?UTF-8?q?umockdev:=200.15.4=20=E2=86=92=200.16.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/umockdev/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 2dac161bb4a4..d432fd158892 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,11 +2,11 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc , libgudev +, libpcap , meson , ninja , pkg-config @@ -19,23 +19,15 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.15.4"; + version = "0.16.3"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; + sha256 = "TjHxqtz8mPhzpsMb5lXWdj8hx/whsadTfor4S2x4U2M="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; - sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; - }) - ]; - nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -50,6 +42,7 @@ stdenv.mkDerivation rec { glib systemd libgudev + libpcap ]; checkInputs = [ From fc18bab5661ff55e485247f11352d23978699844 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 22:16:10 +0200 Subject: [PATCH 078/130] nv-codec-headers-11: init at 11.1.5.0 --- .../libraries/nv-codec-headers/11_x.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/nv-codec-headers/11_x.nix diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/development/libraries/nv-codec-headers/11_x.nix new file mode 100644 index 000000000000..a4bdd600282d --- /dev/null +++ b/pkgs/development/libraries/nv-codec-headers/11_x.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, fetchgit +}: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "11.1.5.0"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = licenses.mit; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33c5a11f00b6..68e194349c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18439,6 +18439,7 @@ with pkgs; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; + nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let From 78b9369f4ef33f2d1c53397132572c1eb571d9c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 00:50:46 +0200 Subject: [PATCH 079/130] =?UTF-8?q?folks:=20fix=20build=20with=20e-d-s=20?= =?UTF-8?q?=E2=89=A5=203.41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/folks/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 720c274ad520..45d3f128c01c 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,5 +1,7 @@ -{ fetchurl -, lib, stdenv +{ stdenv +, lib +, fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +45,15 @@ stdenv.mkDerivation rec { sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; + patches = [ + # Fix build with evolution-data-server ≥ 3.41 + # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; + sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection From 7abc812538f26261ff9f843fa3505c710bf19a8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 01:00:09 +0200 Subject: [PATCH 080/130] =?UTF-8?q?gnome.gpaste:=203.40.2=20=E2=86=92=203.?= =?UTF-8?q?42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.imagination-land.org/posts/2021-09-28-gpaste-3.42.0-released.html --- pkgs/desktops/gnome/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 15fcfbfe390a..12abe49b918a 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.40.2"; + version = "3.42.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; + sha256 = "sha256-YsAA487Q2BwDh4V2TPN/YwAFCw+F11OKMjatcNR98/c="; }; patches = [ From b95b5076b617e879e147a2b9161e3e011cad3089 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:06:46 +0000 Subject: [PATCH 081/130] =?UTF-8?q?gnome.hitori:=203.38.2=20=E2=86=92=203.?= =?UTF-8?q?38.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/games/hitori/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 9c08aa5cada4..15759c681984 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wmQ1cwN/ansW6SCK7e6GkQJvCBq6qhYJQu21LwkCnKw="; + sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; nativeBuildInputs = [ From 74b6a89cd7d0cc084e0dee6d72b43990b51f4d5d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:07:37 +0000 Subject: [PATCH 082/130] =?UTF-8?q?gnome.nautilus:=2040.2=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 1f92e49c4f66..a65eb44eed01 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0="; + sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU="; }; patches = [ From 9819e2dd88763d3e37c5cff76c7d02a8548ee20f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:07:48 +0000 Subject: [PATCH 083/130] =?UTF-8?q?gnome.networkmanager-openvpn:=201.8.12?= =?UTF-8?q?=20=E2=86=92=201.8.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/networkmanager/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 06df79e47052..ca5ec7abffa5 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.12"; + version = "1.8.16"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; + sha256 = "iSDeCceuXx9SDIP4REVduPrsMUJzUCaP4t2VuGD5H7U="; }; patches = [ From 34b2bfd81ac394c5af7d971b8fc1d0b3a2a6b36e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:08:07 +0000 Subject: [PATCH 084/130] =?UTF-8?q?gnome.rygel:=200.40.1=20=E2=86=92=200.4?= =?UTF-8?q?0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...add-option-for-installation-sysconfdir.patch | 17 +++++++---------- pkgs/desktops/gnome/core/rygel/default.nix | 14 ++++++-------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index 6fe651b9cbb4..d2319ec13ed3 100644 --- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4aa683d6..a930d533 100644 +index 8af2fcf9..0e318307 100644 --- a/meson.build +++ b/meson.build -@@ -20,7 +20,11 @@ if not get_option('uninstalled') +@@ -22,7 +22,11 @@ if not get_option('uninstalled') rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel') rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'rygel') @@ -15,7 +15,7 @@ index 4aa683d6..a930d533 100644 rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'presets') -@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) +@@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) @@ -25,14 +25,11 @@ index 4aa683d6..a930d533 100644 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e..1b049b77 100644 +index fd04776a..3dee43ba 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -1,6 +1,7 @@ +@@ -1,3 +1,4 @@ ++option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') -+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) - option('examples', type : 'boolean', value : 'true') + option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index f43df23f44a1..c3cfeec8ff80 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,16 +28,20 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.1"; + version = "0.40.2"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; + sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc="; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + nativeBuildInputs = [ meson ninja @@ -78,16 +82,10 @@ stdenv.mkDerivation rec { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" - # Build all plug-ins except for tracker 2 - "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" ]; doCheck = true; - patches = [ - ./add-option-for-installation-sysconfdir.patch - ]; - postPatch = '' patchShebangs data/xml/process-xml.py ''; From a15791d42d16fbc9314df61233526026d3a70e5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:08:17 +0000 Subject: [PATCH 085/130] =?UTF-8?q?gnome.seahorse:=2040.0=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/seahorse/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index d09a4c9ff3e6..67036df2d51b 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -27,15 +27,13 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; + hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja @@ -65,10 +63,21 @@ stdenv.mkDerivation rec { libhandy ]; + doCheck = true; + postPatch = '' patchShebangs build-aux/ ''; + preCheck = '' + # Add “org.gnome.crypto.pgp” GSettings schema to path + # to make it available for “gpgme-backend” test. + # It is used by Seahorse’s internal “common” library. + addToSearchPath XDG_DATA_DIRS "${glib.getSchemaPath gcr}/../.." + # The same test also requires home directory so that it can store settings. + export HOME=$TMPDIR + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 7bc541278a418f19fd1efe5eb96d05a73efad914 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:08:22 +0000 Subject: [PATCH 086/130] =?UTF-8?q?gnome.simple-scan:=2040.1=20=E2=86=92?= =?UTF-8?q?=2040.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index be501c0aef31..9514caa1e9b1 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.1"; + version = "40.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ="; + sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ="; }; nativeBuildInputs = [ From 15816fe142ca21464af543f0c81a3e55618384d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Oct 2021 23:08:31 +0000 Subject: [PATCH 087/130] =?UTF-8?q?gnome.swell-foop:=2040.1=20=E2=86=92=20?= =?UTF-8?q?41.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/games/swell-foop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix index 50fab598153a..b36f273f6d2f 100644 --- a/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "swell-foop"; - version = "40.1"; + version = "41.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + sha256 = "YEL/MTxsh9VkgnxwNpazsgkTbD/Dn+Jkpu+k4wWTg9g="; }; nativeBuildInputs = [ From 44c652961bccb5395d056e9a00ec755c6ce84f12 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 01:26:20 +0200 Subject: [PATCH 088/130] =?UTF-8?q?gcr:=203.40.0=20=E2=86=92=203.41.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gcr/default.nix | 34 ++++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 37238a5f59ec..9c97faaa45cb 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -11,6 +11,9 @@ , libtasn1 , gtk3 , pango +, libsecret +, openssh +, systemd , gobject-introspection , makeWrapper , libxslt @@ -22,22 +25,15 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.40.0"; + version = "3.41.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; + sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; - postPatch = '' - patchShebangs build/ gcr/fixtures/ - - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson @@ -56,6 +52,9 @@ stdenv.mkDerivation rec { libgcrypt libtasn1 pango + libsecret + openssh + systemd ]; propagatedBuildInputs = [ @@ -70,10 +69,22 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" + # We are still using ssh-agent from gnome-keyring. + # https://github.com/NixOS/nixpkgs/issues/140824 + "-Dssh_agent=false" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + postPatch = '' + patchShebangs build/ gcr/fixtures/ + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" @@ -82,7 +93,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; }; From afcfdd462efefcf4e281dc60fbbbec8834576064 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 00:17:17 +0000 Subject: [PATCH 089/130] =?UTF-8?q?gnome.yelp:=2040.3=20=E2=86=92=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/yelp/41/yelp-41.beta.news https://ftp.gnome.org/pub/GNOME/sources/yelp/41/yelp-41.beta2.news https://ftp.gnome.org/pub/GNOME/sources/yelp/41/yelp-41.0.news https://ftp.gnome.org/pub/GNOME/sources/yelp/41/yelp-41.1.news --- pkgs/desktops/gnome/core/yelp/default.nix | 44 +++++++++++++++++------ 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 746866fc9c20..b1e094292bf1 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome, sqlite -, itstool, libxml2, libxslt, gst_all_1 -, wrapGAppsHook }: +{ lib +, stdenv +, gettext +, fetchurl +, webkitgtk_4_1 +, pkg-config +, gtk3 +, glib +, gnome +, sqlite +, itstool +, libxml2 +, libxslt +, gst_all_1 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "yelp"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; + sha256 = "sha256-RWpkFWR7zusBWbkLNVP/MocozymmCPzggCQjJQTMuHQ="; }; - nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + itstool + wrapGAppsHook + ]; + buildInputs = [ - gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome.yelp-xsl + gtk3 + glib + webkitgtk_4_1 + sqlite + libxml2 + libxslt + gnome.yelp-xsl gnome.adwaita-icon-theme - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; passthru = { From 98398d034e1e51f67d51963a84ae83c275732bea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 00:17:18 +0000 Subject: [PATCH 090/130] =?UTF-8?q?gnome.yelp-xsl:=2040.2=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/yelp-xsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 32f3fbd61538..8b091e000bad 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4="; + sha256 = "sha256-yM1kwJO72MXV5H/TiGTpCDG1+c90A1MIcCBvqWY2pKU="; }; nativeBuildInputs = [ From 36a7b1ee2e728a0ed9b587de1cc2bc2724719cb8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 00:17:25 +0000 Subject: [PATCH 091/130] =?UTF-8?q?gnome.zenity:=203.32.0=20=E2=86=92=203.?= =?UTF-8?q?41.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/zenity/3.41/zenity-3.41.0.news yelp-tools not actually needed, meson uses itstool and gettext: https://github.com/mesonbuild/meson/blob/3feaea6b29197cd224fbce0ac65fd43d08c3beac/mesonbuild/scripts/yelphelper.py --- pkgs/desktops/gnome/core/zenity/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 51ad81a77a46..ef8259e9e82e 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxml2 , gnome , gtk3 -, yelp-tools , gettext , libX11 , itstool @@ -13,17 +15,18 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.32.0"; + version = "3.41.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; + sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E="; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext - yelp-tools itstool libxml2 wrapGAppsHook From e50d5470e134b406d8c2f7e1843b8945c3786211 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Oct 2021 03:40:17 +0200 Subject: [PATCH 092/130] bolt: fix tests Newer umockdev pre-creates directories which leads to conflicts when the testsuite tries to create them as well. --- pkgs/os-specific/linux/bolt/default.nix | 35 +++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d38a97387f5a..dd9436d9b0ea 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , pkg-config @@ -30,6 +31,25 @@ stdenv.mkDerivation rec { sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm"; }; + patches = [ + # meson install tries to create /var/lib/boltd + ./0001-skip-mkdir.patch + + # https://github.com/NixOS/nixpkgs/issues/104429 + # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 + (fetchpatch { + name = "disable-atime-tests.diff"; + url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; + sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; + }) + + # Fix tests with newer umockdev + (fetchpatch { + url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch"; + sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 @@ -61,19 +81,6 @@ stdenv.mkDerivation rec { (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; - patches = [ - # meson install tries to create /var/lib/boltd - ./0001-skip-mkdir.patch - - # https://github.com/NixOS/nixpkgs/issues/104429 - # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 - (fetchpatch { - name = "disable-atime-tests.diff"; - url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; - sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; - }) - ]; - postPatch = '' patchShebangs scripts tests ''; From f77e76341f4162b19acaad48e792645f184a24ea Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 3 Oct 2021 03:43:27 +0200 Subject: [PATCH 093/130] evolution: 3.40.4 -> 3.42.0 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 638d60777712..564a4c5499ea 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q="; + sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8"; }; nativeBuildInputs = [ From a018f305aceb6d1e714cbd75797c98151a93df2c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 3 Oct 2021 03:43:51 +0200 Subject: [PATCH 094/130] evolution-ews: 3.40.4 -> 3.42.0 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 2a6b0892bfe8..baad7602cf05 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0eAjb8gWhiyjqaOT5ur9gPoQv6W2u37u28qAJVMuUBU="; + sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; From 03ad4cb367e6045a76587d22516c418426440898 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 3 Oct 2021 03:44:26 +0200 Subject: [PATCH 095/130] gnome.gnome-user-docs: 40.3 -> 41.0 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index ded70a91c955..cdc104f3a535 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0="; + sha256 = "0lfxj8irwm88n3ba351ak85r97pqlds6y2hqbsic714yj4k8df1a"; }; nativeBuildInputs = [ From 5930952ba15102ab61f42281f338363c95fbc055 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 3 Oct 2021 03:44:57 +0200 Subject: [PATCH 096/130] gnome.gucharmap: 13.0.2 -> 14.0.0 --- pkgs/desktops/gnome/core/gucharmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 336a4d260c4e..3d2f19b02e8b 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -44,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.2"; + version = "14.0.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; + sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY="; }; nativeBuildInputs = [ From 01d15b12ec666cad5b5eba5443b8b6389b3dbead Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Oct 2021 10:41:54 +0200 Subject: [PATCH 097/130] atkmm: 2.28.0 -> 2.28.2 - https://gitlab.gnome.org/GNOME/atkmm/-/blob/2.28.2/NEWS --- pkgs/development/libraries/atkmm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index b357ed047259..0657a340d0b6 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome, meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.0"; + version = "2.28.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; + sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson python3 ninja ]; doCheck = true; From 66c6489fd9171e2d5564f04ff5f05a4eeb5fbd32 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Oct 2021 10:42:41 +0200 Subject: [PATCH 098/130] atkmm_2_36: init at 2.36.1 - https://gitlab.gnome.org/GNOME/atkmm/-/blob/2.36.1/NEWS --- pkgs/development/libraries/atkmm/2.36.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/atkmm/2.36.nix diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix new file mode 100644 index 000000000000..03dd009d2641 --- /dev/null +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, atk, glibmm_2_68, pkg-config, gnome, meson, ninja, python3 }: + +stdenv.mkDerivation rec { + pname = "atkmm"; + version = "2.36.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + }; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ atk glibmm_2_68 ]; + + nativeBuildInputs = [ pkg-config meson ninja python3 ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "C++ wrappers for ATK accessibility toolkit"; + license = lib.licenses.lgpl21Plus; + homepage = "https://gtkmm.org"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68e194349c02..81b1a182177a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16355,6 +16355,8 @@ with pkgs; atkmm = callPackage ../development/libraries/atkmm { }; + atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { }; + pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { }; From 9915ee8c3ffe145e0d8ea9f607378e2d18b82f91 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Oct 2021 10:43:32 +0200 Subject: [PATCH 099/130] atkmm: freeze --- pkgs/development/libraries/atkmm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 0657a340d0b6..7e3cecf12a92 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; From b7242cef6ee7a34f78d18af9ba293a6914796ee6 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 6 Sep 2021 12:48:54 +0200 Subject: [PATCH 100/130] glibmm: 2.64.5 -> 2.66.1 - https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.66.1/NEWS --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 344fcb43eba0..7ff70281ac52 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.64.5"; + version = "2.66.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y="; + sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; }; outputs = [ "out" "dev" ]; From 54a88efc32becfcdebd244b3200a7c7a9fd0240e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Oct 2021 10:44:11 +0200 Subject: [PATCH 101/130] glibmm: freeze --- pkgs/development/libraries/glibmm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 7ff70281ac52..dfa454b9253a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; From d542319560354790ba7a862ea10ea974ceaec0f3 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 6 Sep 2021 14:01:38 +0200 Subject: [PATCH 102/130] cairomm: 1.12.2 -> 1.14.3 --- pkgs/development/libraries/cairomm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 87b391d2ad0e..384b1b0e7cb1 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }: + stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.12.2"; + version = "1.14.3"; src = fetchurl { - url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; # gnome doesn't have the latest version ATM; beware: same name but different hash #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; + sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 4e1c9126a32d0418c80644b37f3ac97d0c55fd1e Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 6 Sep 2021 14:14:33 +0200 Subject: [PATCH 103/130] pangomm: 2.42.2 -> 2.46.1 - https://gitlab.gnome.org/GNOME/pangomm/-/blob/2.46.1/NEWS --- pkgs/development/libraries/pangomm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index d5921a5afe25..82f93b6add9a 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.2"; + version= "2.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; + sha256 = "sha256-yIUBP+YaTFEX/aOVdw1QdWNBHGPkn0o6ztTJ7+NNmXU="; }; outputs = [ "out" "dev" ]; From 602c1ddfb9d2d17f93738241f214d56b6ba02250 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 5 Oct 2021 10:46:02 +0200 Subject: [PATCH 104/130] pangomm: freeze --- pkgs/development/libraries/pangomm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 82f93b6add9a..f13dce99c135 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; From 2c34edbcd84de9b6ae1d430517f1db5859b1ee0c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 03:10:50 +0200 Subject: [PATCH 105/130] xdg-desktop-portal-gnome: init at 41.1 --- .../xdg-desktop-portal-gnome/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix new file mode 100644 index 000000000000..ad68f13fe0f1 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, fontconfig +, glib +, gsettings-desktop-schemas +, gtk4 +, libadwaita +, xdg-desktop-portal +, wayland +, gnome +}: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-gnome"; + version = "41.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "u6FEGZ5+1LlJCyScGvZFqGnWKZMmXerDjyGb8EL//fI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + fontconfig + glib + gsettings-desktop-schemas # settings exposed by settings portal + gtk4 + libadwaita + xdg-desktop-portal + wayland # required by GTK 4 + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; + maintainers = teams.gnome.members; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81b1a182177a..74f6dfe30ce3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28760,6 +28760,8 @@ with pkgs; xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; + xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { }; + xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; From d106b07997929663601d8128b8b7fb06475ef0a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 03:11:42 +0200 Subject: [PATCH 106/130] nixos/gnome: use GNOME xdg portal --- nixos/modules/services/x11/desktop-managers/gnome.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e65e0164667a..ef7c1508655f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -372,7 +372,10 @@ in services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + xdg.portal.extraPortals = [ + pkgs.xdg-desktop-portal-gnome + pkgs.xdg-desktop-portal-gtk + ]; # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. qt5 = { From ceacda70589f1c76e1e8a336ca2b044df2d2aa7b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 03:13:36 +0200 Subject: [PATCH 107/130] =?UTF-8?q?gnomeExtensions.gsconnect:=2047=20?= =?UTF-8?q?=E2=86=92=2048?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v48 https://github.com/GSConnect/gnome-shell-extension-gsconnect/compare/v47...v48 --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 37824495a188..2d3d2415db24 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "47"; + version = "48"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q="; + sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U="; }; patches = [ From ed3b4aa889a165918d822b7f7da4e8f965d8edc1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 06:18:51 +0200 Subject: [PATCH 108/130] nixos/release-notes: Mention GNOME 41 --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 1e732be031e1..8b15f8f4c0d7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -81,6 +81,13 @@ 6 for more details. + + + GNOME has been upgraded to 41. Please take a look at their + Release + Notes for details. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3abd869d672a..918542bcef3e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. +- GNOME has been upgraded to 41. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/41.0/) for details. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). From f2cf51c6ffcb0df3767de7208ce7403318dac40a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 15:22:51 +0200 Subject: [PATCH 109/130] =?UTF-8?q?font-manager:=200.8.6=20=E2=86=92=200.8?= =?UTF-8?q?.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/FontManager/font-manager/releases/tag/0.8.7 --- .../misc/font-manager/default.nix | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 29399ab2f5b5..bd6ae3d74780 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -26,33 +26,21 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; + sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs="; }; patches = [ - # Fix some Desktop Settings with GNOME 40. - # https://github.com/FontManager/font-manager/issues/215 + # Fix compilation with latest Vala. + # https://github.com/FontManager/font-manager/issues/240 (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch"; - sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch"; - sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch"; - sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch"; - sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM="; + url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch"; + sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY="; }) ]; From 0b986d5a0d2be44736d15edc15fbd9216cf5a2ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 17:12:54 +0200 Subject: [PATCH 110/130] =?UTF-8?q?xdg-desktop-portal:=201.8.1=20=E2=86=92?= =?UTF-8?q?=201.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.10.0 https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.10.1 --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 2b425300b31e..71674a6c3886 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , nixosTests , substituteAll @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.1"; + version = "1.10.1"; outputs = [ "out" "installedTests" ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; + sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; }; patches = [ From 80ea989ac96cc420089326b2e0d725b1e634499f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 17:15:18 +0200 Subject: [PATCH 111/130] =?UTF-8?q?xdg-desktop-portal-gtk:=201.8.0=20?= =?UTF-8?q?=E2=86=92=201.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.10.0 --- .../services/x11/desktop-managers/gnome.nix | 5 ++- .../xdg-desktop-portal-gtk/default.nix | 31 +++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index ef7c1508655f..1e316c379f5b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -374,7 +374,10 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gnome - pkgs.xdg-desktop-portal-gtk + (pkgs.xdg-desktop-portal-gtk.override { + # Do not build portals that we already have. + buildPortalsInGnome = false; + }) ]; # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 93a308a658da..08d695c15e53 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -9,19 +11,33 @@ , glib , wrapGAppsHook , gsettings-desktop-schemas +, buildPortalsInGnome ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0987fwsdgkcd3mh3scvg2kyg4ay1rr5w16js4pl3pavw9yhl9lbi"; + sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; }; + patches = [ + # Fix broken translation. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; + sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; + }) + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; + sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook libxml2 @@ -38,6 +54,15 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; + configureFlags = lib.optionals buildPortalsInGnome [ + "--enable-wallpaper" + "--enable-screenshot" + "--enable-screencast" + "--enable-background" + "--enable-settings" + "--enable-appchooser" + ]; + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; From b9e4f6e1ab3893a6dd715369b273addab28a76b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 21:44:55 +0200 Subject: [PATCH 112/130] dee: Fix build with latest Vala --- .../dee/0001-Fix-build-with-Vala-0.54.patch | 29 +++++++++++++++++++ pkgs/development/libraries/dee/default.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch diff --git a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch new file mode 100644 index 000000000000..4ad8ec8ffc73 --- /dev/null +++ b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch @@ -0,0 +1,29 @@ +From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Thu, 7 Oct 2021 21:42:26 +0200 +Subject: [PATCH] Fix build with Vala 0.54 + +Vala codegen now emits constructor methods so we need to skip @new +so that we can use a custom one from our VAPI overrides. + +https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8 +--- + vapi/Dee-1.0.metadata | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata +index 7e80de0..793ffd8 100644 +--- a/vapi/Dee-1.0.metadata ++++ b/vapi/Dee-1.0.metadata +@@ -1,6 +1,8 @@ + GListResultSet skip + GListResultSetClass skip + ++Filter ++ .new skip + FilterModel + .filter unowned + Model +-- +2.33.0 + diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index a023d164d8c3..25cf88253e6e 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/strict-prototype.patch" "${src}/debian/patches/vapi-skip-properties.patch" + ./0001-Fix-build-with-Vala-0.54.patch # Fixes glib 2.62 deprecations (fetchpatch { From b2ef3e68e7f4d805fcd2e71e992981c6dcc5e601 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 8 Oct 2021 04:21:01 +0200 Subject: [PATCH 113/130] nixosTests.gnome: fix GNOME Shell 41 made the Eval command we use for NixOS tests internal so in order to be still able to use it, we need to run the shell in an unsafe mode. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1970 https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1983 Hopefully, the test driver will eventually get better so that we will not need hacks like this forever. --- nixos/tests/gnome-xorg.nix | 15 +++++++++++++++ nixos/tests/gnome.nix | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 55f9c90c20a0..b9ff5e682875 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -25,6 +25,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; + systemd.user.services = { + "org.gnome.Shell@x11" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index e8d18a41bd06..1da97f733cfd 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -30,6 +30,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }) ]; + systemd.user.services = { + "org.gnome.Shell@wayland" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; From b556a29420a6f556567129b52e8508d97840b9a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Oct 2021 20:51:09 +0200 Subject: [PATCH 114/130] libshumate: init at unstable-2021-10-06 --- .../libraries/libshumate/default.nix | 85 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/libshumate/default.nix diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix new file mode 100644 index 000000000000..db669e5b6730 --- /dev/null +++ b/pkgs/development/libraries/libshumate/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitLab +, gi-docgen +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, cairo +, sqlite +, libsoup +, gtk4 +, xvfb-run +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libshumate"; + version = "unstable-2021-10-06"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libshumate"; + rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; + sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + }; + + nativeBuildInputs = [ + gi-docgen + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + cairo + sqlite + libsoup + gtk4 + ]; + + checkInputs = [ + xvfb-run + ]; + + mesonFlags = [ + "-Ddemos=true" + ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR xvfb-run meson test + + runHook postCheck + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libshumate-0.0 "$devdoc" + ''; + + passthru.updateScript = unstableGitUpdater { + url = meta.homepage; + }; + + meta = with lib; { + description = "GTK toolkit providing widgets for embedded maps"; + homepage = "https://gitlab.gnome.org/GNOME/libshumate"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74f6dfe30ce3..86d3e014d716 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6668,6 +6668,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + libshumate = callPackage ../development/libraries/libshumate { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; libsmi = callPackage ../development/libraries/libsmi { }; From 37a3e4ed31de88036929030ef910b2db861b4719 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 10 Oct 2021 16:23:30 +0200 Subject: [PATCH 115/130] haskellPackages: fix evaluation Some version upgrades caused attributes to disappear. The upgrade from language-docker 10.1.2 to 10.2.0 introduces a test failure which is caused by missing files in the release tarball, so we need to fix this up manually. --- .../haskell-modules/configuration-common.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 209391aaf5df..1d6f3a292822 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1996,9 +1996,16 @@ EOT # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; + # https://github.com/hadolint/language-docker/issues/72 + language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: { + testFlags = (drv.testFlags or []) ++ [ + "--skip=/Language.Docker.Integration/parse" + ]; + }); + # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_2; + language-docker = self.language-docker_10_2_0; }; # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) @@ -2025,11 +2032,11 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_3; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From aadf1d5f3f7bdbb30e5b9e348dbd97bcc8369634 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 10 Oct 2021 20:28:33 +0200 Subject: [PATCH 116/130] haskellPackages.network_3_1_2_5: Use correct version in all references to this pkg --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1d6f3a292822..de595427da84 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2032,7 +2032,7 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_3; + network = self.network_3_1_2_5; }); http3 = super.http3.overrideScope (self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6826e6174a55..454af580823c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -63,7 +63,7 @@ self: super: { HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); lukko = doJailbreak super.lukko; - network = super.network_3_1_2_2; + network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; From 3fab2e5082732dd121d57c17475ec03021a33f6b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 11 Oct 2021 00:10:31 +0200 Subject: [PATCH 117/130] haskell.packages.ghc921.language-haskell-extract: pin patch revision This should make it more reproducible, today's master has already diverged from the state it was in when the previous hash was obtained (for GHC 9.0.1), may need some digging to fix this in the 9.0.x configuration overlay. --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 454af580823c..1d46eec71e3b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -85,8 +85,8 @@ self: super: { }); doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x From 7ac7cb85df948d97237cb40a72900d2fb03551a3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 11 Oct 2021 11:56:24 +0800 Subject: [PATCH 118/130] kodi: tarball checksum changed underneath us --- pkgs/applications/video/kodi/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 02281514bf64..1ad0dee49c7e 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -46,7 +46,7 @@ let owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0qc3rf6fv6k35iq5p0j86kpyghzl9djqxl6526fxknvrlw0xnh9j"; + sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM="; }; ffmpeg = stdenv.mkDerivation rec { From 031f005cbe26e5bbad27dadd8d798803e54c77fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 10 Oct 2021 23:15:50 -0700 Subject: [PATCH 119/130] azure-cli: 2.28.0 -> 2.28.1 --- pkgs/tools/admin/azure-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index f2fec6fe6be7..4f0609d0a55a 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.28.0"; + version = "2.28.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M="; + sha256 = "sha256-9EkCScEj5kuKtkfnCmFUZg/qDzvmI3rvDS+NtkZC7sk="; }; # put packages that needs to be overriden in the py package scope From e0ac27c6042622e0bb880818a22d509c45f39523 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sat, 9 Oct 2021 23:00:20 +1100 Subject: [PATCH 120/130] haskell.packages.ghc921: make dependencies of ihaskell build See also https://github.com/gibiansky/IHaskell/pull/1283. --- .../configuration-ghc-9.2.x.nix | 108 ++++++++++++++++-- 1 file changed, 99 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 1d46eec71e3b..e31771a3e2fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,54 +43,129 @@ self: super: { unix = null; xhtml = null; + aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch"; + sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl"; + # The revision information is newer than that included in the patch + excludes = ["*.cabal"]; + }); + + attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch"; + sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da"; + }); + # 0.12.0 introduces support for 9.2 base-compat = self.base-compat_0_12_0; + base-compat-batteries = self.base-compat-batteries_0_12_0; + + basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch"; + sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; + })) (drv: { + # This is inside a conditional block so `doJailbreak` doesn't work + postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; + }); + + # Duplicate Show instances in tests and library cause compiling tests to fail + blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; + sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8"; + }); + + cereal = appendPatch super.cereal (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; + sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; + }); + + # Tests fail because of typechecking changes + conduit = dontCheck super.conduit; + + constraints = appendPatch super.constraints (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch"; + sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3"; + }); + + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch"; + sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; + }); # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; + sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; + }); + + entropy = appendPatch super.entropy (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch"; + sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi"; + }); + + # Tests fail in GHC 9.2 + extra = dontCheck super.extra; + # Jailbreaks & Version Updates + assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; ChasingBottoms = doJailbreak super.ChasingBottoms; + cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}); + cryptohash-md5 = doJailbreak super.cryptohash-md5; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + ghc-byteorder = doJailbreak super.ghc-byteorder; hackage-security = doJailbreak super.hackage-security; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); - integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }); + indexed-traversable = doJailbreak super.indexed-traversable; + lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; + polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }); primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; + scientific = doJailbreak super.scientific; + shelly = doJailbreak super.shelly; split = doJailbreak super.split; splitmix = doJailbreak super.splitmix; tar = doJailbreak super.tar; + these = doJailbreak super.these; time-compat = doJailbreak super.time-compat; + type-equality = doJailbreak super.type-equality; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 + alex = dontCheck super.alex; + # Apply patches from head.hackage. - alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; - sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); - # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x - hashable = super.hashable_1_3_3_0; + hashable = super.hashable_1_3_4_1; + + haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; + sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; + }); + + # Tests depend on `parseTime` which is no longer available + hourglass = dontCheck super.hourglass; # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0 # The test suite indirectly depends on random, which leads to infinite recursion @@ -100,16 +175,31 @@ self: super: { lens = super.lens_5_0_1; # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 - memory = super.memory_0_16_0; + memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch"; + sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl"; + }); # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; + quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch"; + sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp"; + # `.cabal` revision information has been included in the patch + excludes = ["*.cabal"]; + }); + # Disable tests pending resolution of # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; + sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy"; + }); + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { From 0b4c16d22904738640cb7b8b5d7330c2d4749f2e Mon Sep 17 00:00:00 2001 From: ash Date: Tue, 5 Oct 2021 21:59:19 +0100 Subject: [PATCH 121/130] hushboard: init at unstable-2021-03-17 --- pkgs/applications/audio/hushboard/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/audio/hushboard/default.nix diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix new file mode 100644 index 000000000000..e9d88d1f236f --- /dev/null +++ b/pkgs/applications/audio/hushboard/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, gobject-introspection +, gtk3 +, libappindicator +, libpulseaudio +, librsvg +, pycairo +, pygobject3 +, six +, wrapGAppsHook +, xlib +}: + +buildPythonApplication { + pname = "hushboard"; + version = "unstable-2021-03-17"; + + src = fetchFromGitHub { + owner = "stuartlangridge"; + repo = "hushboard"; + rev = "c16611c539be111891116a737b02c5fb359ad1fc"; + sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libappindicator + libpulseaudio + ]; + + propagatedBuildInputs = [ + pycairo + pygobject3 + six + xlib + ]; + + postPatch = '' + substituteInPlace hushboard/_pulsectl.py \ + --replace "ctypes.util.find_library('libpulse') or 'libpulse.so.0'" "'${libpulseaudio}/lib/libpulse.so.0'" + substituteInPlace snap/gui/hushboard.desktop \ + --replace "\''${SNAP}/hushboard/icons/hushboard.svg" "hushboard" + ''; + + postInstall = '' + # Fix tray icon, see e.g. https://github.com/NixOS/nixpkgs/pull/43421 + wrapProgram $out/bin/hushboard \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + + mkdir -p $out/share/applications $out/share/icons/hicolor/{scalable,512x512}/apps + cp snap/gui/hushboard.desktop $out/share/applications + cp hushboard/icons/hushboard.svg $out/share/icons/hicolor/scalable/apps + cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png + ''; + + # There are no tests + doCheck = false; + + meta = with lib; { + homepage = "https://kryogenix.org/code/hushboard/"; + license = licenses.mit; + description = "Mute your microphone while typing"; + platforms = platforms.linux; + maintainers = with maintainers; [ sersorrel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fce4f1836af..4a4a4192553b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25207,6 +25207,8 @@ with pkgs; go-org = callPackage ../applications/misc/go-org { }; + hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. From 895d09aa3a6100fa1e8e66ddcc825bbde8e489ff Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 11 Oct 2021 18:26:09 +0200 Subject: [PATCH 122/130] linux_lqx: 5.14.9 -> 5.14.11 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index e5a9032d3bda..a0da293548d9 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.9"; - suffix = "lqx4"; + version = "5.14.11"; + suffix = "lqx1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-nT8lc/JeuXsKVHGPQxK+w8BTasxyIfxCdKbAvoFgbYg="; + sha256 = "sha256-4SSAcI1TwaKgz/bwma+YQtIBtodEAYxqdtUI3ESM7I8="; }; extraMeta = { From 7ec67dc03c2ce8a1591643f3cd8b08635b125a27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Oct 2021 19:13:02 +0200 Subject: [PATCH 123/130] ansible_2_11: 2.11.5 -> 2.11.6 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index b64942b10780..dc87dcfeda83 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.5"; + version = "2.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; }; # ansible_connection is already wrapped, so don't pass it through From 8be8e6da4e6df079be93715738c3f6e26571182c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Oct 2021 19:15:42 +0200 Subject: [PATCH 124/130] ansible_2_10: 2.10.14 -> 2.10.15 --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 3156ba18e106..e6113b93dcbc 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.14"; + version = "2.10.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; + sha256 = "sha256-RHiBi6gh26FD4SNWjsXTF9yPpKxuFRP3pQFzTlKXa/8="; }; # ansible_connection is already wrapped, so don't pass it through From 390c80228c26e4a5a2b67c58b40cefb62d3abad6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Oct 2021 19:19:39 +0200 Subject: [PATCH 125/130] ansible_2_9: 2.9.26 -> 2.9.27 --- pkgs/development/python-modules/ansible/legacy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 3957e109c7c0..50662b43f32c 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.26"; + version = "2.9.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; + sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY="; }; prePatch = '' From 919226b1d8a9f623218bfb497e434a979c2bfd36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Oct 2021 19:53:46 +0200 Subject: [PATCH 126/130] httpx: 1.1.2 -> 1.1.3 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 08f4929bd240..07becc2c3488 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ="; + sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; }; - vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk="; + vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; From e148619e37ecb3648bebb8912a1d61b08c0d86c5 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 18 Aug 2021 21:12:26 +0200 Subject: [PATCH 127/130] hamlib: support cross-compilation, cleanup unfortunately, this disables perl bindings, but at least it compiles now - remove ExtUtilsMakeMaker, doesn't make a difference in the output - enable strictDeps --- pkgs/development/libraries/hamlib/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index cd56b04c0346..31b620ae5d2e 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -15,7 +15,8 @@ , perlPackages , pythonBindings ? true , tclBindings ? true -, perlBindings ? true +, perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform +, buildPackages }: stdenv.mkDerivation rec { @@ -27,11 +28,15 @@ stdenv.mkDerivation rec { sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ swig pkg-config libtool - ]; + ] ++ lib.optionals pythonBindings [ python3 ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl ]; buildInputs = [ gd @@ -39,10 +44,12 @@ stdenv.mkDerivation rec { libusb-compat-0_1 boost ] ++ lib.optionals pythonBindings [ python3 ncurses ] - ++ lib.optionals tclBindings [ tcl ] - ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; + ++ lib.optionals tclBindings [ tcl ]; - configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + + configureFlags = [ + "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optionals perlBindings [ "--with-perl-binding" ] ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] ++ lib.optionals pythonBindings [ "--with-python-binding" ]; From 18ad855d654fcdf353506df4c85cbae097a67304 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 11 Oct 2021 14:52:07 -0400 Subject: [PATCH 128/130] avizo: init at unstable-2021-07-21 --- pkgs/applications/misc/avizo/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/avizo/default.nix diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix new file mode 100644 index 000000000000..407dd7040637 --- /dev/null +++ b/pkgs/applications/misc/avizo/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, vala +, gtk3, glib, gtk-layer-shell +, dbus, dbus-glib, librsvg +, gobject-introspection, gdk-pixbuf, wrapGAppsHook +}: + +stdenv.mkDerivation { + pname = "avizo"; + version = "unstable-2021-07-21"; + + src = fetchFromGitHub { + owner = "misterdanb"; + repo = "avizo"; + rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1"; + sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc="; + }; + + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; + + postInstall = '' + substituteInPlace "$out"/bin/volumectl \ + --replace 'avizo-client' "$out/bin/avizo-client" + substituteInPlace "$out"/bin/lightctl \ + --replace 'avizo-client' "$out/bin/avizo-client" + ''; + + meta = with lib; { + description = "A neat notification daemon for Wayland"; + homepage = "https://github.com/misterdanb/avizo"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bd2c55fc7e3..07bc22bbad4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23598,6 +23598,8 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avizo = callPackage ../applications/misc/avizo { }; + avocode = callPackage ../applications/graphics/avocode {}; azpainter = callPackage ../applications/graphics/azpainter { }; From 1b4cdac33ea8335d6593ff47a46305dc78ea53c4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 9 Oct 2021 09:48:28 +1000 Subject: [PATCH 129/130] podman: remove darwin wrapper - wrapping gvproxy doesn't work since 3.4 - store paths are written to config files which then break when GCed --- pkgs/applications/virtualization/podman/wrapper.nix | 10 +--------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 400232d2246d..c9ec18593dff 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,7 +2,6 @@ , runCommand , makeWrapper , lib -, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -14,15 +13,12 @@ , cni-plugins # not added to path , iptables , iproute2 -, gvproxy -, qemu -, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath ([ runc crun conmon @@ -31,10 +27,6 @@ let util-linux iptables iproute2 - ] ++ lib.optionals stdenv.isDarwin [ - gvproxy - qemu - xz ] ++ extraPackages); in runCommand podman.name { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aeb1152a4cea..e228367407e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8451,7 +8451,10 @@ with pkgs; podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = if stdenv.isDarwin then + callPackage ../applications/virtualization/podman { } + else + callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; From cd78f8e761e2d88bfb71f97565656e3a0cb370c5 Mon Sep 17 00:00:00 2001 From: Skye Jensen Date: Mon, 11 Oct 2021 19:39:38 -0400 Subject: [PATCH 130/130] krita: 4.4.7 -> 4.4.8; krita-beta: init at 5.0.0-beta1 (#139476) --- pkgs/applications/graphics/krita/beta.nix | 7 +++ pkgs/applications/graphics/krita/default.nix | 58 ++----------------- pkgs/applications/graphics/krita/generic.nix | 59 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 73 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/graphics/krita/beta.nix create mode 100644 pkgs/applications/graphics/krita/generic.nix diff --git a/pkgs/applications/graphics/krita/beta.nix b/pkgs/applications/graphics/krita/beta.nix new file mode 100644 index 000000000000..167a96050fd6 --- /dev/null +++ b/pkgs/applications/graphics/krita/beta.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "5.0.0-beta1"; + kde-channel = "unstable"; + sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm"; +}) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 3a86d1d4cc73..7e0a8915c408 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,53 +1,7 @@ -{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules -, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons -, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem -, kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase -, qtmultimedia, qtx11extras, quazip -, python3Packages -}: +{ callPackage, ... } @ args: -mkDerivation rec { - pname = "krita"; - version = "4.4.7"; - - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk="; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; - - buildInputs = [ - karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons - ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio_1 poppler curl ilmbase - qtmultimedia qtx11extras quazip - python3Packages.pyqt5 - ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; - - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; - - cmakeFlags = [ - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - ]; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - meta = with lib; { - description = "A free and open source painting application"; - homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - license = licenses.gpl3Only; - }; -} +callPackage ./generic.nix (args // { + version = "4.4.8"; + kde-channel = "stable"; + sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"; +}) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix new file mode 100644 index 000000000000..efaf341b1f64 --- /dev/null +++ b/pkgs/applications/graphics/krita/generic.nix @@ -0,0 +1,59 @@ +{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules +, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons +, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem +, kio, kcrash, breeze-icons +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, qtmultimedia, qtx11extras, quazip +, python3Packages + +, version +, kde-channel +, sha256 + +, callPackage +}: + +mkDerivation rec { + pname = "krita"; + inherit version; + + src = fetchurl { + url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + + buildInputs = [ + karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons + ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib + openjpeg opencolorio_1 poppler curl ilmbase + qtmultimedia qtx11extras quazip + python3Packages.pyqt5 + ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; + + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] + ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with lib; { + description = "A free and open source painting application"; + homepage = "https://krita.org/"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e228367407e7..3f7c3bd803a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25806,6 +25806,7 @@ with pkgs; krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; + krita-beta = libsForQt5.callPackage ../applications/graphics/krita/beta.nix { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { };