diff --git a/flake.lock b/flake.lock index 453a556..efef448 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1720542474, + "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1715699772, - "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", + "lastModified": 1718194053, + "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", + "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1719827415, + "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "type": "github" }, "original": { @@ -560,11 +560,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -574,11 +574,11 @@ }, "impermanence": { "locked": { - "lastModified": 1708968331, - "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -648,11 +648,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1719916745, - "narHash": "sha256-bZ7yzJ0uk9jYr4YGh8OPjhhIdJLWWe9MMVr5eVlGdxI=", + "lastModified": 1720115894, + "narHash": "sha256-oWiGxG2JRchzTYP11jSCHOnbom5tOwbZofV2IjbTdnk=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "0d56687226b3838a076a72ff8efadb288a3f9fdd", + "rev": "f05b4fdd5610255bd674ce75faaf573a614bdb60", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1719916783, - "narHash": "sha256-TdVvfSIQveEnmAk8RP0szTzGbxwq8QiitjSY8ZoTnlU=", + "lastModified": 1720116136, + "narHash": "sha256-cUfR+WCV5xz3nga7uGPdAMvlYaITpP7qEcVbEdoMRXU=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "ea7add4da4c7f972b8d75a4e1abaf60b90c83cbb", + "rev": "281333a642d6f8156554e0d8457083d8a0d435c2", "type": "github" }, "original": { @@ -680,11 +680,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -805,11 +805,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709831932, - "narHash": "sha256-WsP8rOFa/SqYNbVtYJ/l2mWWOgyDTJFbITMV8tv0biI=", + "lastModified": 1718869541, + "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", "owner": "yaxitech", "repo": "ragenix", - "rev": "06de099ef02840ec463419f12de73729d458e1eb", + "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", "type": "github" }, "original": { @@ -892,15 +892,15 @@ "sbt": "sbt" }, "locked": { - "lastModified": 1710796573, - "narHash": "sha256-23fLZFNacZU/skc8i7JExHfD//Mpkslhga6f5ATTqBA=", - "owner": "devplayer0", + "lastModified": 1720592125, + "narHash": "sha256-vR89LefkY8mBPWxDTQ8SNg6Z7/J6Yga80T4kSb6MNdk=", + "owner": "eikek", "repo": "sharry", - "rev": "4e7a87880ba0807afd5d21706ce383b8b8727990", + "rev": "604b20517150599cb05dbe178cd35cd10659aa4c", "type": "github" }, "original": { - "owner": "devplayer0", + "owner": "eikek", "repo": "sharry", "type": "github" } diff --git a/flake.nix b/flake.nix index ce78316..fd1b24e 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,7 @@ nixGL.inputs.nixpkgs.follows = "nixpkgs-unstable"; # Packages not in nixpkgs - # sharry.url = "github:eikek/sharry"; - sharry.url = "github:devplayer0/sharry"; + sharry.url = "github:eikek/sharry"; sharry.inputs.nixpkgs.follows = "nixpkgs-unstable"; borgthin.url = "github:devplayer0/borg"; borgthin.inputs.nixpkgs.follows = "nixpkgs-mine"; diff --git a/lib/default.nix b/lib/default.nix index 1f7bc92..40b8f25 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -248,8 +248,8 @@ rec { in { trivial = prev.trivial // { - release = "24.06:u-${prev.trivial.release}"; - codeName = "Carbrain"; + release = "24.07:u-${prev.trivial.release}"; + codeName = "Diffed"; revisionWithDefault = default: self.rev or default; versionSuffix = ".${date}.${revCode self}:u-${revCode pkgsFlake}"; };