nixpkgs: 2023-08-04 -> 2023-08-07
``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/18036c0be90f4e308ae3ebcab0e14aae0336fe42' (2023-08-04) → 'github:nixos/nixpkgs/5a8e9243812ba528000995b294292d3b5e120947' (2023-08-07) ```
This commit is contained in:
parent
b9259ff8b9
commit
4c4b0ce920
|
@ -85,11 +85,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691186842,
|
"lastModified": 1691368598,
|
||||||
"narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
|
"narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
|
"rev": "5a8e9243812ba528000995b294292d3b5e120947",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -235,13 +235,12 @@ in [
|
||||||
hash = "sha256-38sND/UNRj5WAYYKpzdrRBIOK4UAT14RzbIv49KmNNw=";
|
hash = "sha256-38sND/UNRj5WAYYKpzdrRBIOK4UAT14RzbIv49KmNNw=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(fetchpatch' {
|
# (fetchpatch' {
|
||||||
# TODO: send this upstream!
|
# # TODO: send this upstream!
|
||||||
title = "mepo: 1.1 -> 1.1.2";
|
# title = "mepo: 1.1 -> 1.1.2";
|
||||||
saneCommit = "eee68d7146a6cd985481cdd8bca52ffb204de423";
|
# saneCommit = "eee68d7146a6cd985481cdd8bca52ffb204de423";
|
||||||
hash = "sha256-uNerTwyFzivTU+o9bEKmNMFceOmy2AKONfKJWI5qkzo=";
|
# hash = "sha256-uNerTwyFzivTU+o9bEKmNMFceOmy2AKONfKJWI5qkzo=";
|
||||||
})
|
# })
|
||||||
|
|
||||||
|
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
title = "gthumb: make the webservices feature be optional";
|
title = "gthumb: make the webservices feature be optional";
|
||||||
|
|
|
@ -851,7 +851,7 @@ in {
|
||||||
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
|
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
|
||||||
});
|
});
|
||||||
|
|
||||||
mepo = prev.mepo.overrideAttrs (upstream: {
|
mepo-latest = prev.mepo-latest.overrideAttrs (upstream: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||||
# zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking
|
# zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking
|
||||||
|
|
18
pkgs/additional/mepo-latest/default.nix
Normal file
18
pkgs/additional/mepo-latest/default.nix
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
{ mepo
|
||||||
|
, fetchFromSourcehut
|
||||||
|
# to make it easier for consumers to `.override`
|
||||||
|
, stdenv
|
||||||
|
, zigHook
|
||||||
|
}:
|
||||||
|
(mepo.override {
|
||||||
|
inherit stdenv zigHook;
|
||||||
|
}).overrideAttrs (upstream: {
|
||||||
|
pname = "mepo-latest";
|
||||||
|
version = "1.1.2";
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~mil";
|
||||||
|
repo = "mepo";
|
||||||
|
rev = "1.1.2";
|
||||||
|
hash = "sha256-rKIyhr0sxG1moFsapylJWoAoHi9FSRdugIHr/TqY71s=";
|
||||||
|
};
|
||||||
|
})
|
|
@ -28,6 +28,7 @@ let
|
||||||
eg25-manager = callPackage ./additional/eg25-manager { };
|
eg25-manager = callPackage ./additional/eg25-manager { };
|
||||||
feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { });
|
feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { });
|
||||||
lemoa = callPackage ./additional/lemoa { };
|
lemoa = callPackage ./additional/lemoa { };
|
||||||
|
mepo-latest = callPackage ./additional/mepo-latest { };
|
||||||
jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
|
jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
|
||||||
firefox-extensions = lib.recurseIntoAttrs (callPackage ./additional/firefox-extensions { });
|
firefox-extensions = lib.recurseIntoAttrs (callPackage ./additional/firefox-extensions { });
|
||||||
gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { };
|
gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user