fixing mirage

This commit is contained in:
Ingolf Wagner 2023-01-16 11:21:15 +01:00
parent 3477cd94b2
commit bc25bcdc9e
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 42 additions and 22 deletions

View file

@ -154,11 +154,11 @@
"emacs-overlay_2": { "emacs-overlay_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673086123, "lastModified": 1673838100,
"narHash": "sha256-0gm7Zo/hR860E9MzTkSnr91gBg+GTpmE3EcNc9GFp3c=", "narHash": "sha256-iLNzJqL01hHuZcnxNoB7bqj65lfQtEAc7+krVW4R6ck=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f5f51705d5d8886d2c9aba5e6a19484711175e3f", "rev": "b63cf575927c768ad4dbc4a70f64201e59cf3da6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,13 +585,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-legacy": {
"locked": {
"lastModified": 1672580127,
"narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0874168639713f547c05947c76124f78441ea46c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1672500394, "lastModified": 1673740915,
"narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=", "narHash": "sha256-MMH8zONfqahgHly3K8/A++X34800rajA/XgZ2DzNL/M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8", "rev": "7c65528c3f8462b902e09d1ccca23bb9034665c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -603,11 +619,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1672953546, "lastModified": 1673631141,
"narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=", "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a518c77148585023ff56022f09c4b2c418a51ef5", "rev": "befc83905c965adfd33e5cae49acb0351f6e0404",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +650,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1672968032, "lastModified": 1673704454,
"narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=", "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2dea8991d89b9f1e78d874945f78ca15f6954289", "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,11 +680,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1672428209, "lastModified": 1673606088,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +849,11 @@
"retiolum": { "retiolum": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673003932, "lastModified": 1673744639,
"narHash": "sha256-ohPcnO+H9cpnrAyjW2463xPxSbFNDH7tJgVsQhuruvY=", "narHash": "sha256-3mcre4Rp86xhPwpTqBLZbX3YX7F5P7ySW9e7tckZ+YM=",
"owner": "krebs", "owner": "krebs",
"repo": "retiolum", "repo": "retiolum",
"rev": "ae2cd4e3765299f8aa1a7fc821d78aa96472a49b", "rev": "dbe439afc45434b0e53fa3c88ee37e07dad922d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -874,6 +890,7 @@
"landingpage": "landingpage", "landingpage": "landingpage",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-fmt": "nixpkgs-fmt", "nixpkgs-fmt": "nixpkgs-fmt",
"nixpkgs-legacy": "nixpkgs-legacy",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"permown": "permown", "permown": "permown",
"polygon-art": "polygon-art", "polygon-art": "polygon-art",
@ -955,11 +972,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1672543202, "lastModified": 1673752321,
"narHash": "sha256-nlCUtcIZxaBqUBG1GyaXhZmfyG5WK4e6LqypP8llX9E=", "narHash": "sha256-EFfXY1ZHJq4FNaNQA9x0djtu/jiOhBbT0Xi+BT06cJw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b35586cc5abacd4eba9ead138b53e2a60920f781", "rev": "e18eefd2b133a58309475298052c341c08470717",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -15,6 +15,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy.url = "github:nixos/nixpkgs/nixos-22.05";
polygon-art = { polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
}; };
@ -79,6 +80,7 @@
, nixpkgs , nixpkgs
, nixpkgs-fmt , nixpkgs-fmt
, nixpkgs-unstable , nixpkgs-unstable
, nixpkgs-legacy
, polygon-art , polygon-art
, private_assets , private_assets
, permown , permown
@ -134,6 +136,7 @@
(_self: _super: { (_self: _super: {
# we assign the overlay created before to the overlays of nixpkgs. # we assign the overlay created before to the overlays of nixpkgs.
unstable = nixpkgs-unstable.legacyPackages.${pkgs.system}; unstable = nixpkgs-unstable.legacyPackages.${pkgs.system};
legacy = nixpkgs-legacy.legacyPackages.${pkgs.system};
polygon-art = polygon-art.packages.${pkgs.system}; polygon-art = polygon-art.packages.${pkgs.system};
landingpage = landingpage.packages.${pkgs.system}.plain; landingpage = landingpage.packages.${pkgs.system}.plain;
}) })

View file

@ -76,7 +76,7 @@ in
# -------------- # --------------
#element-desktop #element-desktop
#fractal #fractal
mirage-im legacy.mirage-im
tor-browser-bundle-bin tor-browser-bundle-bin
#(tor-browser-bundle-bin.overrideAttrs (old: rec { #(tor-browser-bundle-bin.overrideAttrs (old: rec {