diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:57:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-10 12:57:19 -0500 |
commit | 09f7e376c224993e82828766bf524f0b34ad312e (patch) | |
tree | 61784455f0f29158fc189e8595d3ab37e83391d8 /pkgs/top-level | |
parent | eaeb87add1ec31b3b088b65aa601b3c4f6d78e51 (diff) | |
parent | e3cbebfc7c656c50e4506bcc5d21d909fad8c22f (diff) | |
download | nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar.gz nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar.bz2 nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar.lz nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar.xz nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.tar.zst nixpkgs-09f7e376c224993e82828766bf524f0b34ad312e.zip |
Merge pull request #79416 from jtojnar/flatpak-1.6
flatpak: 1.4.2 → 1.6.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 18 |
2 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 125f9e698e4..b325f77a87a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4825,6 +4825,8 @@ in libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; + libportal = callPackage ../development/libraries/libportal { }; + libmicrodns = callPackage ../development/libraries/libmicrodns { }; libnids = callPackage ../tools/networking/libnids { }; @@ -11738,6 +11740,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + glib-testing = callPackage ../development/libraries/glib-testing { }; + glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; gom = callPackage ../development/libraries/gom { }; @@ -12669,7 +12673,9 @@ in librelp = callPackage ../development/libraries/librelp { }; - librepo = callPackage ../tools/package-management/librepo { }; + librepo = callPackage ../tools/package-management/librepo { + python = python3; + }; libresample = callPackage ../development/libraries/libresample {}; @@ -12772,6 +12778,8 @@ in libmad = callPackage ../development/libraries/libmad { }; + malcontent = callPackage ../development/libraries/malcontent { }; + libmanette = callPackage ../development/libraries/libmanette { }; libmatchbox = callPackage ../development/libraries/libmatchbox { }; @@ -14767,6 +14775,8 @@ in yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; + zchunk = callPackage ../development/libraries/zchunk { }; + zeitgeist = callPackage ../development/libraries/zeitgeist { }; zlib = callPackage ../development/libraries/zlib { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0701cbc1bc..610a8d0852f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4043,9 +4043,21 @@ in { libkeepass = callPackage ../development/python-modules/libkeepass { }; - librepo = toPythonModule (pkgs.librepo.override { - inherit python; - }); + librepo = pipe pkgs.librepo [ + toPythonModule + + (p: p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + }; + })) + + (p: p.override { + inherit python; + }) + + (p: p.py) + ]; libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; |