diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/libraries/libsoup | |
parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsoup')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libsoup/3.x.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libsoup/default.nix | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 60b7d2f38321..6d1545af4079 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -8,7 +8,6 @@ , gnome , libsysprof-capture , sqlite -, glib-networking , buildPackages , gobject-introspection , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages @@ -93,9 +92,6 @@ stdenv.mkDerivation rec { ''; passthru = { - propagatedUserEnvPackages = [ - glib-networking.out - ]; updateScript = gnome.updateScript { attrPath = "libsoup_3"; packageName = pname; diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 6d5b0183cdda..11e1a5a40f1e 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -14,7 +14,6 @@ , brotli , gnomeSupport ? true , sqlite -, glib-networking , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages }: @@ -85,9 +84,6 @@ stdenv.mkDerivation rec { ''; passthru = { - propagatedUserEnvPackages = [ - glib-networking.out - ]; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; |