Merge remote-tracking branch 'tv/master'

This commit is contained in:
makefu 2019-04-12 22:10:35 +02:00
commit 622afb523e
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -45,10 +45,9 @@ foldl' mergeAttrs {}
self.callPackage ./compat/18.03/pass { self.callPackage ./compat/18.03/pass {
pass-otp = self.callPackage ./compat/18.03/pass-otp {}; pass-otp = self.callPackage ./compat/18.03/pass-otp {};
}; };
"18.09" = }.${versions.majorMinor nixpkgsVersion} or
super.pass.withExtensions (ext: [ super.pass.withExtensions (ext: [
ext.pass-otp ext.pass-otp
]); ]);
}.${versions.majorMinor nixpkgsVersion};
} }