update nixos
This commit is contained in:
		
							parent
							
								
									746eeffff8
								
							
						
					
					
						commit
						15f17e3051
					
				
							
								
								
									
										24
									
								
								189574.patch
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										24
									
								
								189574.patch
									
									
									
									
									
								
							@ -1,24 +0,0 @@
 | 
				
			|||||||
From 91e18cd7cd37d868425bf481ca453edfa81c9cc6 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Gabriel Ebner <gebner@gebner.org>
 | 
					 | 
				
			||||||
Date: Sat, 3 Sep 2022 11:56:49 +0200
 | 
					 | 
				
			||||||
Subject: [PATCH] khal: fix fish/zsh completion
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 pkgs/applications/misc/khal/default.nix | 4 ++--
 | 
					 | 
				
			||||||
 1 file changed, 2 insertions(+), 2 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
 | 
					 | 
				
			||||||
index b6bb65a0bfffb..f822ed8f0c2b9 100644
 | 
					 | 
				
			||||||
--- a/pkgs/applications/misc/khal/default.nix
 | 
					 | 
				
			||||||
+++ b/pkgs/applications/misc/khal/default.nix
 | 
					 | 
				
			||||||
@@ -32,8 +32,8 @@ with python3.pkgs; buildPythonApplication rec {
 | 
					 | 
				
			||||||
     # shell completions
 | 
					 | 
				
			||||||
     installShellCompletion --cmd khal \
 | 
					 | 
				
			||||||
       --bash <(_KHAL_COMPLETE=bash_source $out/bin/khal) \
 | 
					 | 
				
			||||||
-      --fish <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
 | 
					 | 
				
			||||||
-      --zsh <(_KHAL_COMPLETE=fish_source $out/bin/khal)
 | 
					 | 
				
			||||||
+      --zsh <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
 | 
					 | 
				
			||||||
+      --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
     # man page
 | 
					 | 
				
			||||||
     PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
 | 
					 | 
				
			||||||
@ -17,11 +17,11 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs": {
 | 
					    "nixpkgs": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1662019588,
 | 
					        "lastModified": 1663268520,
 | 
				
			||||||
        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
 | 
					        "narHash": "sha256-Jf6wkoMOhWUdx9d9UarWHExvOUDzVa98OsPYvbNLVYo=",
 | 
				
			||||||
        "owner": "nixos",
 | 
					        "owner": "nixos",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
 | 
					        "rev": "823e2c9b0a0ec8b61b6583f48338072f137b6889",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
 | 
				
			|||||||
@ -15,7 +15,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    channels.nixpkgs.input = nixpkgs;
 | 
					    channels.nixpkgs.input = nixpkgs;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    channels.nixpkgs.patches = [ ./189574.patch ];
 | 
					    channels.nixpkgs.patches = [ ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    nix.generateRegistryFromInputs = true;
 | 
					    nix.generateRegistryFromInputs = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user